diff options
-rw-r--r-- | cpp/INSTALL | 2 | ||||
-rw-r--r-- | cpp/INSTALL-WINDOWS | 2 | ||||
-rw-r--r-- | cpp/Makefile.am | 2 | ||||
-rw-r--r-- | cpp/docs/api/header.html | 37 | ||||
-rw-r--r-- | cpp/examples/xml-exchange/Makefile.am | 2 | ||||
-rw-r--r-- | doc/book/src/schemas.xml | 2 | ||||
-rw-r--r-- | doc/website/content/documentation.html | 36 | ||||
-rw-r--r-- | doc/website/content/getting_started.html | 12 | ||||
-rw-r--r-- | doc/website/content/qpid_integrated_with.html | 2 | ||||
-rw-r--r-- | doc/website/template/style.css | 6 | ||||
-rw-r--r-- | doc/website/template/template.html | 12 |
11 files changed, 49 insertions, 66 deletions
diff --git a/cpp/INSTALL b/cpp/INSTALL index 9977c13201..9afe4740a3 100644 --- a/cpp/INSTALL +++ b/cpp/INSTALL @@ -330,7 +330,7 @@ for qpid code outside the qpid/sys namespace should remain stable. 6. Tests ======== -See src/tests/README for details. +See src/tests/README.txt for details. 7. Doxygen diff --git a/cpp/INSTALL-WINDOWS b/cpp/INSTALL-WINDOWS index 195fc303d8..964d644a7a 100644 --- a/cpp/INSTALL-WINDOWS +++ b/cpp/INSTALL-WINDOWS @@ -125,7 +125,7 @@ Now follow instruction for building from a source distribution in step (3). 5. Tests
========
-See src/tests/README for details.
+See src/tests/README.txt for details.
6. Doxygen
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 5c475946a0..7cd022fb08 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ - LICENSE NOTICE README SSL RELEASE_NOTES DESIGN \ + LICENSE NOTICE README.txt SSL RELEASE_NOTES DESIGN \ xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \ packaging/NSIS QPID_VERSION.txt diff --git a/cpp/docs/api/header.html b/cpp/docs/api/header.html index 9c85c54000..883410ce25 100644 --- a/cpp/docs/api/header.html +++ b/cpp/docs/api/header.html @@ -19,32 +19,13 @@ --> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> -<title>$title</title> -<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css"> -<link href="$relpath$tabs.css" rel="stylesheet" type="text/css"> -</head><body> - - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> - <title>Apache Qpid C++ API</title> - <link href="doxygen.css" rel="stylesheet" type="text/css"> - <link href="tabs.css" rel="stylesheet" type="text/css"> - </head> - <body bgcolor="#FFFFFF"> - <table border="0" width="90%" align="center"> - <tr> - <td align="left"> - <a title="Apache Qpid Project Page" href="http://qpid.apache.org">Apache Qpid - AMQP Messaging for Java JMS, C++, Python, Ruby, and .NET</a> - </td> - - <td align="right"> - <a title="Apache Qpid Documentation" href="http://qpid.apache.org/documentation.html">Apache Qpid Documentation</a> - </td> - </tr> -</table> +<hr size="1"> +<address style="text-align: left;"><small> +Qpid C++ API Reference</small></address> +<address style="text-align: right;"> +<small> +Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</small> +</address> +</body> +</html> diff --git a/cpp/examples/xml-exchange/Makefile.am b/cpp/examples/xml-exchange/Makefile.am index e91cec370d..9001e3fa61 100644 --- a/cpp/examples/xml-exchange/Makefile.am +++ b/cpp/examples/xml-exchange/Makefile.am @@ -33,7 +33,7 @@ listener_SOURCES=listener.cpp listener_LDADD=$(CLIENT_LIB) EXTRA_DIST= \ - README \ + README.txt \ CMakeLists.txt examples_DATA= \ diff --git a/doc/book/src/schemas.xml b/doc/book/src/schemas.xml index 3d927b726b..d0bec81aed 100644 --- a/doc/book/src/schemas.xml +++ b/doc/book/src/schemas.xml @@ -21,6 +21,8 @@ --> <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> + <uri resource="foo.xml" typeId="DocBook"/> + <uri resource="foo.xml" typeId="DocBook"/> <uri resource="Programming-In-Apache-Qpid.xml" typeId="DocBook"/> <uri resource="queue-state-replication.xml" typeId="DocBook"/> <uri resource="AMQP-Messaging-Broker-Java-Book.xml" typeId="DocBook"/> diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html index 7c30078fe6..c5099120cb 100644 --- a/doc/website/content/documentation.html +++ b/doc/website/content/documentation.html @@ -1,31 +1,31 @@ <div class="main_text_area_body"> <h1>Qpid Documentation</h1> - <h2 id="doc06">Documentation for Qpid 0.6 (development branch)</h2> + <h2 id="doc06">Documentation for Qpid 0.7 (development branch)</h2> <ul> <li><a href="getting_started.html">Getting Started</a></li> <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p> <p> - <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf" + <a href="books/0.7/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf" name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | - <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li> + <a href="books/0.7/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li> <li><p>AMQP Messaging Broker (Java implemementation)</p> - <p><a href="books/0.6/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf" + <p><a href="books/0.7/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf" name="AMQP Messaging Broker (Java implemementation)">PDF</a> | - <a href="books/0.6/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li> + <a href="books/0.7/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li> <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p> <p> - <a href="books/0.6/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf" + <a href="books/0.7/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf" name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> | - <a href="books/0.6/Programming-In-Apache-Qpid/html/index.html" + <a href="books/0.7/Programming-In-Apache-Qpid/html/index.html" name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li> <li><p>API Reference Documentation</p> - <p>C++: <a href="apis/0.6/cpp/html/index.html">HTML</a> | <a href="apis/0.6/cpp/qpid-cpp-doxygen-0.6.html.tar.gz">qpid-cpp-doxygen-0.6.html.tar.gz</a></p> - <p>Python: <a href="apis/0.6/python/html/index.html">HTML</a> | <a href="apis/0.6/python/qpid-python-epydoc-0.6.html.tar.gz">qpid-python-epydoc-0.6.html.tar.gz</a></p></li> + <p>C++: <a href="apis/0.7/cpp/html/index.html">HTML</a> | <a href="apis/0.7/cpp/qpid-cpp-doxygen-0.7.html.tar.gz">qpid-cpp-doxygen-0.7.html.tar.gz</a></p> + <p>Python: <a href="apis/0.7/python/html/index.html">HTML</a> | <a href="apis/0.7/python/qpid-python-epydoc-0.7.html.tar.gz">qpid-python-epydoc-0.7.html.tar.gz</a></p></li> </ul> - <h2 id="doc05">Documentation for Qpid 0.5 (stable)</h2> + <h2 id="doc05">Documentation for Qpid 0.6 (stable)</h2> <p>This documentation was converted from the Wiki and organized into book form. <a href="#doc-archives">The archives</a> contain the @@ -35,19 +35,19 @@ <li><a href="getting_started.html">Getting Started</a></li> <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p> <p> - <a href="books/0.5/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf" + <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf" name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | - <a href="books/0.5/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li> + <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li> <li><p>AMQP Messaging Broker (Java implemementation)</p> - <p><a href="books/0.5/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf" + <p><a href="books/0.6/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf" name="AMQP Messaging Broker (Java implemementation)">PDF</a> | - <a href="books/0.5/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li> - <li><p>For programming examples and documentation for Qpid 0.5, + <a href="books/0.6/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li> + <li><p>For programming examples and documentation for Qpid 0.6, see the <a href="getting_started.html">Getting Started</a> page.</p></li> <li><p>API Reference Documentation</p> - <p>C++: <a href="apis/0.5/cpp/html/index.html">HTML</a> | <a href="apis/0.5/cpp/qpid-cpp-doxygen-0.5.html.tar.gz">qpid-cpp-doxygen-0.5.html.tar.gz</a></p> - <p>Python: <a href="apis/0.5/python/html/index.html">HTML</a> | <a href="apis/0.5/python/qpid-python-epydoc-0.5.html.tar.gz">qpid-python-epydoc-0.5.html.tar.gz</a></p></li> + <p>C++: <a href="apis/0.6/cpp/html/index.html">HTML</a> | <a href="apis/0.6/cpp/qpid-cpp-doxygen-0.6.html.tar.gz">qpid-cpp-doxygen-0.6.html.tar.gz</a></p> + <p>Python: <a href="apis/0.6/python/html/index.html">HTML</a> | <a href="apis/0.6/python/qpid-python-epydoc-0.6.html.tar.gz">qpid-python-epydoc-0.6.html.tar.gz</a></p></li> </ul> <h2 id="doc-archives">Documentation Archives</h2> @@ -61,7 +61,7 @@ <h2 id="qpid-wiki">Qpid Wiki</h2> <ul> - <li><p><a href="qpid.apache.org">Qpid Wiki</a></p></li> + <li><p><a href="qpid.apache.org/archives/wiki">Qpid Wiki</a></p></li> </ul> </div> diff --git a/doc/website/content/getting_started.html b/doc/website/content/getting_started.html index fce75fb211..c2de831176 100644 --- a/doc/website/content/getting_started.html +++ b/doc/website/content/getting_started.html @@ -1,15 +1,15 @@ <div class="main_text_area_body" > <h1>Getting Started with Apache Qpid</h1> <p>To get started with Apache Qpid, follow the steps below.</p> - + <ol> <li>Download the software <a href="download.html" title="Download">Download</a></li> <li>Start a broker. <ul> - <li>Instructions for <a href="http://qpid.apache.org/getting-started-guide.html" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li> - <li>Instructions for <a href="http://qpid.apache.org/rasc.html" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li> + <li>Instructions for <a href="http://qpid.apache.org/archives/wiki/getting-started-guide.html" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li> + <li>Instructions for <a href="http://qpid.apache.org/archives/wiki/rasc.html" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li> - <li><a href="http://qpid.apache.org/mgmtc.html" title="MgmtC++">Management tools </a> (AMQP 0-10, works with the Qpid C++ broker)</li> + <li><a href="http://qpid.apache.org/archives/wiki/mgmtc.html" title="MgmtC++">Management tools </a> (AMQP 0-10, works with the Qpid C++ broker)</li> </ul> </li> <li>Run an example program from the downloaded software, or from the following URLs (these are svn URLs, which you can use to browse the examples or check them out): @@ -44,7 +44,7 @@ <ul> <li>Examples: <a href="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ </a></li> - <li><a href="http://qpid.apache.org/net-user-guide.html">.NET Tutorial </a></li> + <li><a href="http://qpid.apache.org/archives/wiki/net-user-guide.html">.NET Tutorial </a></li> </ul> </li> </ul> @@ -56,7 +56,7 @@ </li> <li>Get your Questions Answered <ul> - <li>Read the <a href="https://cwiki.apache.org/confluence/display/qpid/FAQ" title="FAQ">FAQ</a></li> + <li>Read the <a href="archives/wiki/faq.html" title="FAQ">FAQ</a></li> <li>Ask a question on the user list <a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></li> </ul> diff --git a/doc/website/content/qpid_integrated_with.html b/doc/website/content/qpid_integrated_with.html index aa0f71c92e..541c8cac68 100644 --- a/doc/website/content/qpid_integrated_with.html +++ b/doc/website/content/qpid_integrated_with.html @@ -3,7 +3,7 @@ <h1><a name="QpidIntegrations-AMQPintegrations"></a>AMQP integrations </h1> <ul> - <li><a href="http://qpid.apache.org/hermesjms.html" title="HermesJMS">HermesJMS</a> - The integration of Hermes JMS with Qpid</li> + <li><a href="http://qpid.apache.org/archives/wiki/hermesjms.html" title="HermesJMS">HermesJMS</a> - The integration of Hermes JMS with Qpid</li> <li>Twisted AMQP - <a href="https://launchpad.net/txamqp" class="external-link" rel="nofollow">https://launchpad.net/txamqp</a></li> <li>Apache Camel - <a href="http://activemq.apache.org/camel/amqp.html" class="external-link" rel="nofollow">http://activemq.apache.org/camel/amqp.html</a></li> <li>Apache Axis2 Java - <a href="http://wso2.org/library/3663" class="external-link" rel="nofollow">http://wso2.org/library/3663</a></li> diff --git a/doc/website/template/style.css b/doc/website/template/style.css index efa4ca3220..a241836155 100644 --- a/doc/website/template/style.css +++ b/doc/website/template/style.css @@ -176,21 +176,21 @@ body { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } .feature_box_column2 { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } .feature_box_column3 { width:196px; float:left; padding:10px 15px 10px 15px; -# margin-left:0px; + margin-left:0px; } diff --git a/doc/website/template/template.html b/doc/website/template/template.html index e9986075be..54fa7fb15c 100644 --- a/doc/website/template/template.html +++ b/doc/website/template/template.html @@ -46,7 +46,7 @@ <li><a href="getting_started.html">Getting Started</a></li> <!-- <li><a href="roadmap.html">Roadmap</a></li> --> <li><a href="license.html">License</a></li> - <li><a href="https://cwiki.apache.org/confluence/display/qpid/FAQ">FAQ</a></li> + <li><a href="archives/wiki/faq.html">FAQ</a></li> </ul> </div> <!-- end of menu_box_body --> <div class="menu_box_bottom"></div> @@ -55,8 +55,8 @@ <div class="menu_box_body"> <h3>Documentation</h3> <ul> + <li><a href="documentation.html#doc07">Version 0.7</a></li> <li><a href="documentation.html#doc06">Version 0.6</a></li> - <li><a href="documentation.html#doc05">Version 0.5</a></li> <li><a href="documentation.html#doc-archives">Archive</a></li> </ul> </div> <!-- end of menu_box_body --> @@ -66,10 +66,10 @@ <div class="menu_box_body"> <h3>Community</h3> <ul> - <li><a href="http://qpid.apache.org/getting-involved.html">Getting Involved</a></li> + <li><a href="http://qpid.apache.org/archives/wiki/getting-involved.html">Getting Involved</a></li> <li><a href="source_repository.html">Source Repository</a></li> <li><a href="mailing_lists.html">Mailing Lists</a></li> - <li><a href="http://qpid.apache.org">Wiki</a></li> + <li><a href="http://qpid.apache.org/archives/wiki">Wiki</a></li> <li><a href="https://issues.apache.org/jira/browse/qpid">Issue Reporting</a></li> <li><a href="people.html">People</a></li> <!-- <li><a href="#">Project Status</a></li> --> @@ -82,8 +82,8 @@ <div class="menu_box_body"> <h3>Developers</h3> <ul> - <li><a href="http://qpid.apache.org/building.html">Building Qpid</a></li> - <li><a href="http://qpid.apache.org/developer-pages.html">Developer Pages</a></li> + <li><a href="http://qpid.apache.org/archives/wiki/building.html">Building Qpid</a></li> + <li><a href="http://qpid.apache.org/archives/wiki/developer-pages.html">Developer Pages</a></li> </ul> </div> <!-- end of menu_box_body --> <div class="menu_box_bottom"></div> |