You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/07/12 13:37:48 UTC
svn commit: r1502518 - in /qpid/site: docs/.htaccess docs/discussion.html
docs/documentation.html docs/proton/index.html docs/resources.html
input/.htaccess
Author: jross
Date: Fri Jul 12 11:37:48 2013
New Revision: 1502518
URL: http://svn.apache.org/r1502518
Log:
QPID-4987: Add rewrites for doc urls from the previous site version; remove unused .htaccess settings; publish changes to date
Modified:
qpid/site/docs/.htaccess
qpid/site/docs/discussion.html
qpid/site/docs/documentation.html
qpid/site/docs/proton/index.html
qpid/site/docs/resources.html
qpid/site/input/.htaccess
Modified: qpid/site/docs/.htaccess
URL: http://svn.apache.org/viewvc/qpid/site/docs/.htaccess?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/docs/.htaccess (original)
+++ qpid/site/docs/.htaccess Fri Jul 12 11:37:48 2013
@@ -17,22 +17,36 @@
# under the License.
#
-# Advisory: these are held over from the previous version of
-# the site and may be changed soon
-
-Options +Includes
-XBitHack On
-Redirect /download.cgi http://qpid.apache.org/download.html
-Redirect /licence.html http://www.apache.org/licenses/
-
-RewriteEngine on
-RewriteBase /
-RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf /books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf [R=301,L]
-RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/(.*)$ /books/trunk/Programming-In-Apache-Qpid/$1 [R=301,L]
-
-# End of advisory
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteBase /
+
+ RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf /books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf [R=301,L]
+ RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/(.*)$ /books/trunk/Programming-In-Apache-Qpid/$1 [R=301,L]
+
+ RewriteRule ^books/0.14/(.*)$ /releases/qpid-0.14/books/$1 [R=301,L]
+ RewriteRule ^books/0.16/(.*)$ /releases/qpid-0.16/books/$1 [R=301,L]
+ RewriteRule ^books/0.18/(.*)$ /releases/qpid-0.18/books/$1 [R=301,L]
+ RewriteRule ^apis/0.14/(.*)$ /releases/qpid-0.14/apis/$1 [R=301,L]
+ RewriteRule ^apis/0.16/(.*)$ /releases/qpid-0.16/apis/$1 [R=301,L]
+ RewriteRule ^apis/0.18/(.*)$ /releases/qpid-0.18/apis/$1 [R=301,L]
+
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
+ RewriteRule ^apis/0.20/cpp/html/(.*) /releases/qpid-0.20/messaging-api/cpp/api/$1 [R=301,L]
+ RewriteRule ^apis/0.20/python/html/(.*) /releases/qpid-0.20/messaging-api/python/api/$1 [R=301,L]
+
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
+ RewriteRule ^apis/0.22/cpp/html/(.*) /releases/qpid-0.22/messaging-api/cpp/api/$1 [R=301,L]
+ RewriteRule ^apis/0.22/python/html/(.*) /releases/qpid-0.22/messaging-api/python/api/$1 [R=301,L]
+</IfModule>
<IfModule mod_alias.c>
+ Redirect /download.cgi http://qpid.apache.org/download.html
+ Redirect /licence.html http://www.apache.org/licenses/
RedirectPermanent /acknowledgements.html http://qpid.apache.org/contributors.html
RedirectPermanent /compatibility.html http://qpid.apache.org/components/index.html
RedirectPermanent /getting_involved.html http://qpid.apache.org/get-involved.html
Modified: qpid/site/docs/discussion.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/discussion.html?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/docs/discussion.html (original)
+++ qpid/site/docs/discussion.html Fri Jul 12 11:37:48 2013
@@ -82,8 +82,8 @@ unsubscribe address.</p>
<table>
<tbody>
<tr><td></td><td><em>Subscribe</em></td><td><em>Unsubscribe</em></td></tr>
-<tr><td><em>Users</em></td><td><a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></td><td><a href="mailto:users-unsubscribe@qpid.apache.org">users-unsubscribe@qpid.apache.org</a></td></tr>
-<tr><td><em>Developers</em></td><td><a href="mailto:dev-subscribe@qpid.apache.org">dev-subscribe@qpid.apache.org</a></td><td><a href="mailto:dev-unsubscribe@qpid.apache.org">dev-unsubscribe@qpid.apache.org</a></td></tr>
+<tr><td><em>Users</em></td><td><a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></td><td><a href="mailto:users-unsubscribe@qpid.apache.org">users-unsubscribe@qpid.apache.org</a></td></tr>
+<tr><td><em>Developers</em></td><td><a href="mailto:dev-subscribe@qpid.apache.org">dev-subscribe@qpid.apache.org</a></td><td><a href="mailto:dev-unsubscribe@qpid.apache.org">dev-unsubscribe@qpid.apache.org</a></td></tr>
<tr><td></td><td>Send "subscribe" in the subject</td><td>Send "unsubscribe" in the subject</td></tr>
</tbody>
</table>
Modified: qpid/site/docs/documentation.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/documentation.html?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/docs/documentation.html (original)
+++ qpid/site/docs/documentation.html Fri Jul 12 11:37:48 2013
@@ -95,7 +95,7 @@ find older versions with our
<ul>
<li><a href="http://qpid.apache.org/components/qpid-jms/index.html">Overview</a></li>
-<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/index.html#QpidJMS">Using the Qpid JMS client</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
+<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/QpidJMS.html">Using the Qpid JMS client</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
<li><a href="http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html">API reference</a></li>
<li><a href="http://qpid.apache.org/releases/qpid-0.22/qpid-jms/examples/index.html">Examples</a></li>
</ul>
@@ -104,7 +104,7 @@ find older versions with our
<ul>
<li><a href="http://qpid.apache.org/components/messaging-api/index.html">Overview</a></li>
-<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/index.html">Using the Qpid Messaging API</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
+<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/ch02.html">Using the Qpid Messaging API</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/ch05.html">The .NET Binding for the C++ Messaging Client</a></li>
<li><a href="http://qpid.apache.org/releases/qpid-0.22/messaging-api/dotnet/api/index.html">.NET API reference</a></li>
<li><a href="http://qpid.apache.org/releases/qpid-0.22/messaging-api/dotnet/examples/index.html">.NET examples</a></li>
@@ -121,7 +121,7 @@ find older versions with our
<ul>
<li><a href="http://qpid.apache.org/components/qpid-wcf/index.html">Overview</a></li>
<li><a href="http://svn.apache.org/repos/asf/qpid/tags/0.22/qpid/wcf/ReadMe.txt">README</a></li>
-<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/index.html#QpidWCF">Using the Qpid WCF client</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
+<li><a href="http://qpid.apache.org/releases/qpid-0.22/programming/book/QpidWCF.html">Using the Qpid WCF client</a> (<a href="http://qpid.apache.org/releases/qpid-0.22/programming/programming-book.pdf">PDF</a>)</li>
<li><a href="http://msdn.microsoft.com/en-us/library/vstudio/ms735119(v=vs.90).aspx">API reference</a></li>
<li><a href="http://svn.apache.org/repos/asf/qpid/tags/0.22/qpid/wcf/samples">Examples</a></li>
</ul>
Modified: qpid/site/docs/proton/index.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/proton/index.html?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/docs/proton/index.html (original)
+++ qpid/site/docs/proton/index.html Fri Jul 12 11:37:48 2013
@@ -76,8 +76,8 @@ address. To unsubscribe, send "unsubscr
address.</p>
<ul>
-<li>Send "subscribe" to <a href="mailto:proton-subscribe@qpid.apache.org">proton-subscribe@qpid.apache.org</a></li>
-<li>Send "unsubscribe" to <a href="mailto:proton-unsubscribe@qpid.apache.org">proton-unsubscribe@qpid.apache.org</a></li>
+<li>Send "subscribe" to <a href="mailto:proton-subscribe@qpid.apache.org">proton-subscribe@qpid.apache.org</a></li>
+<li>Send "unsubscribe" to <a href="mailto:proton-unsubscribe@qpid.apache.org">proton-unsubscribe@qpid.apache.org</a></li>
<li><a href="http://mail-archives.apache.org/mod_mbox/qpid-proton/">List information</a></li>
<li><a href="http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html">List archive</a></li>
<li><a href="http://mail-archives.apache.org/mod_mbox/qpid-proton/?format=atom">News feed</a></li>
Modified: qpid/site/docs/resources.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/resources.html?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/docs/resources.html (original)
+++ qpid/site/docs/resources.html Fri Jul 12 11:37:48 2013
@@ -122,8 +122,8 @@ automated tests.</li>
<table>
<tbody>
<tr><td></td><td><em>Subscribe</em></td><td><em>Unsubscribe</em></td></tr>
-<tr><td><em>Commits</em></td><td><a href="mailto:commits-subscribe@qpid.apache.org">commits-subscribe@qpid.apache.org</a></td><td><a href="mailto:commits-unsubscribe@qpid.apache.org">commits-unsubscribe@qpid.apache.org</a></td></tr>
-<tr><td><em>Notifications</em></td><td><a href="mailto:notifications-subscribe@qpid.apache.org">notifications-subscribe@qpid.apache.org</a></td><td><a href="mailto:notifications-unsubscribe@qpid.apache.org">notifications-unsubscribe@qpid.apache.or
;g</a></td></tr>
+<tr><td><em>Commits</em></td><td><a href="mailto:commits-subscribe@qpid.apache.org">commits-subscribe@qpid.apache.org</a></td><td><a href="mailto:commits-unsubscribe@qpid.apache.org">commits-unsubscribe@qpid.apache.org</a></td></tr>
+<tr><td><em>Notifications</em></td><td><a href="mailto:notifications-subscribe@qpid.apache.org">notifications-subscribe@qpid.apache.org</a></td><td><a href="mailto:notifications-unsubscribe@qpid.apache.org">notifications-unsubscribe@qpid.apa&#
x63;he.org</a></td></tr>
<tr><td></td><td>Send "subscribe" in the subject</td><td>Send "unsubscribe" in the subject</td></tr>
</tbody>
</table>
Modified: qpid/site/input/.htaccess
URL: http://svn.apache.org/viewvc/qpid/site/input/.htaccess?rev=1502518&r1=1502517&r2=1502518&view=diff
==============================================================================
--- qpid/site/input/.htaccess (original)
+++ qpid/site/input/.htaccess Fri Jul 12 11:37:48 2013
@@ -17,22 +17,36 @@
# under the License.
#
-# Advisory: these are held over from the previous version of
-# the site and may be changed soon
-
-Options +Includes
-XBitHack On
-Redirect /download.cgi http://qpid.apache.org/download.html
-Redirect /licence.html http://www.apache.org/licenses/
-
-RewriteEngine on
-RewriteBase /
-RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf /books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf [R=301,L]
-RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/(.*)$ /books/trunk/Programming-In-Apache-Qpid/$1 [R=301,L]
-
-# End of advisory
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteBase /
+
+ RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf /books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf [R=301,L]
+ RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/(.*)$ /books/trunk/Programming-In-Apache-Qpid/$1 [R=301,L]
+
+ RewriteRule ^books/0.14/(.*)$ /releases/qpid-0.14/books/$1 [R=301,L]
+ RewriteRule ^books/0.16/(.*)$ /releases/qpid-0.16/books/$1 [R=301,L]
+ RewriteRule ^books/0.18/(.*)$ /releases/qpid-0.18/books/$1 [R=301,L]
+ RewriteRule ^apis/0.14/(.*)$ /releases/qpid-0.14/apis/$1 [R=301,L]
+ RewriteRule ^apis/0.16/(.*)$ /releases/qpid-0.16/apis/$1 [R=301,L]
+ RewriteRule ^apis/0.18/(.*)$ /releases/qpid-0.18/apis/$1 [R=301,L]
+
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.20/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.20/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.20/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.20/programming/book/$1 [R=301,L]
+ RewriteRule ^apis/0.20/cpp/html/(.*) /releases/qpid-0.20/messaging-api/cpp/api/$1 [R=301,L]
+ RewriteRule ^apis/0.20/python/html/(.*) /releases/qpid-0.20/messaging-api/python/api/$1 [R=301,L]
+
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-CPP-Book/(.*)$ /releases/qpid-0.22/cpp-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/AMQP-Messaging-Broker-Java-Book/(.*)$ /releases/qpid-0.22/java-broker/book/$1 [R=301,L]
+ RewriteRule ^books/0.22/Programming-In-Apache-Qpid/(.*)$ /releases/qpid-0.22/programming/book/$1 [R=301,L]
+ RewriteRule ^apis/0.22/cpp/html/(.*) /releases/qpid-0.22/messaging-api/cpp/api/$1 [R=301,L]
+ RewriteRule ^apis/0.22/python/html/(.*) /releases/qpid-0.22/messaging-api/python/api/$1 [R=301,L]
+</IfModule>
<IfModule mod_alias.c>
+ Redirect /download.cgi http://qpid.apache.org/download.html
+ Redirect /licence.html http://www.apache.org/licenses/
RedirectPermanent /acknowledgements.html http://qpid.apache.org/contributors.html
RedirectPermanent /compatibility.html http://qpid.apache.org/components/index.html
RedirectPermanent /getting_involved.html http://qpid.apache.org/get-involved.html
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org