adding stomp 1.0 info and fixing menus
git-svn-id: https://svn.apache.org/repos/asf/activemq/stomp/trunk@795926 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webgen/src/default.css b/webgen/src/default.css
index a0bc2c0..139597f 100644
--- a/webgen/src/default.css
+++ b/webgen/src/default.css
@@ -1,92 +1,2 @@
-/* andreas07 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use for any purpose as long as the proper credits are given for the original design work.
-Version: 1.1, November 28, 2005 */
-/**************** Page and tag styles ****************/
-
-body
-{margin:0; padding:0; color:#303030; background:#fafafa url(images/bodybg.gif) top left repeat-y; font:76% Verdana,Tahoma,sans-serif;}
-
-ul
-{list-style:circle; margin:15px 0 20px 0; font-size:0.9em;}
-
-li
-{margin:0 0 8px 25px;}
-
-a
-{color:#d85d5d; font-weight:bold; text-decoration:none;}
-
-a:hover
-{color:#505050; text-decoration:underline;}
-
-img
-{float:left; margin:0 15px 15px 0; padding:1px; background:#ffffff; border:1px solid #d0d0d0;}
-
-a img
-{border-color:#d85d5d;}
-
-a img:hover
-{background:#d85d5d; border-color:#d85d5d;}
-
-/**************** Sidebar area styles ****************/
-
-#sidebar
-{position:absolute; top:0; left:0; width:220px; height:100%; overflow:auto; background:#e0e0e0 url(images/sidebarbg.gif) top right repeat-y; text-align:right;}
-
-body > #sidebar
-{position:fixed;}
-
-#sidebar h1
-{margin:20px 18px 0 5px; color:#d85d5d; font-size:1.6em; letter-spacing:-2px; text-align:right;}
-
-#sidebar h2, #sidebar h3
-{margin:0 20px 18px 5px; color:#808080; font-size:1.1em; font-weight:bold; letter-spacing:-1px; text-align:right;}
-
-#sidebar h3
-{margin:20px 18px 4px 5px; color:#606060;}
-
-#sidebar p
-{margin:0 20px 18px 5px; color:#606060; font-size:0.8em;}
-
-#sidebar a
-{color:#808080}
-
-#sidebar ul
-{margin-right: 20px; margin-left: 5px; list-style-type: none;}
-
-#sidebar li
-{margin: 0px; padding-left: 5px;}
-
-/**************** Navigation menu styles ****************/
-
-#menu ul
-{list-style-type: none; margin: 0px; padding: 0px; font-size: 1.0em;}
-
-#menu li
-{margin: 0px; padding: 0px}
-
-#menu a, #menu span
-{display:block; width:202px; padding:5px 18px 5px 0; color:#606060; background:#e0e0e0 url(images/sidebarbg.gif) top right repeat-y; font-size:1.8em; font-weight:normal; text-decoration:none; letter-spacing:-2px;}
-
-#menu a:hover, #menu span:hover
-{color:#303030; background:#f0f0f0 url(images/sidebarbg.gif) top right repeat-y;}
-
-#menu li.webgen-menu-item-selected a, #menu li.webgen-menu-item-selected span
-{padding:5px 18px 5px 0; background:#fafafa; border-top:2px solid #c0c0c0; border-bottom:2px solid #c0c0c0;}
-
-#menu li.webgen-menu-item-selected a:hover, #menu li.webgen-menu-item-selected span:hover
-{color:#505050; background:#fafafa;}
-
-/**************** Content area styles ****************/
-
-#content
-{width:520px; margin:0 0 0 240px; padding:20px 0; background:#fafafa;}
-
-#content p
-{margin:0 0 20px 0; line-height:1.5em;}
-
-#content h1
-{margin:0; color:#808080; font-weight:normal; font-size:2.5em; letter-spacing:-2px; text-align:center;}
-
-#content h2
-{clear:both; margin:30px 0 10px 0; color:#d85d5d; font-weight:normal; font-size: 2em; letter-spacing:-2px;}
diff --git a/webgen/src/default.template b/webgen/src/default.template
index acb4088..16eabe2 100644
--- a/webgen/src/default.template
+++ b/webgen/src/default.template
@@ -20,6 +20,7 @@
<HEAD>
<LINK href="http://activemq.apache.org/styles/site.css" rel="stylesheet" type="text/css">
<LINK href="http://activemq.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" type="text/css" href="default.css" />
<SCRIPT src="http://activemq.apache.org/styles/prototype.js" type="text/javascript"></SCRIPT>
<SCRIPT src="http://activemq.apache.org/styles/rico.js" type="text/javascript"></SCRIPT>
<SCRIPT src="http://activemq.apache.org/styles/site.js" type="text/javascript"></SCRIPT>
@@ -64,7 +65,7 @@
<DIV class="top_red_bar">
<DIV id="site-breadcrumbs">
-<A href="" title="Apache ActiveMQ NMS">STOMP</A> > <A href="" title="Index">Home</A>
+ {breadcrumb_trail:}
</DIV>
<DIV id="site-quicklinks">
<P><A href="http://activemq.apache.org/discussion-forums.html" rel="nofollow">Forums</A> | <A href="http://activemq.apache.org/support.html" rel="nofollow">Support</A></P>
@@ -83,17 +84,22 @@
<DIV class="navigation">
<DIV class="navigation_top">
<DIV class="navigation_bottom">
- {menu: {max_levels: 1, used_nodes: files}}
- <!--
-<H3>
-<A name="Navigation-Overview"></A><A href="overview.html" title="Overview">Overview</A></H3>
-<UL class="alternate" type="square">
- <LI><A href="" title="Index">Home</A></LI>
- <LI><A href="faq.html" title="FAQ">FAQ</A></LI>
- <LI><A href="download.html" title="Download">Download</A></LI>
-</UL>
--->
- </DIV>
+ {menu: {max_levels: 2, min_levels: 2, used_nodes: files}}
+<!-- <H3>
+ <A name="Navigation-Overview"></A><A href="overview.html" title="Overview">Overview</A></H3>
+ <UL class="alternate" type="square">
+ <LI><A href="" title="Index">Home</A></LI>
+ <LI><A href="faq.html" title="FAQ">FAQ</A></LI>
+ <LI><A href="download.html" title="Download">Download</A></LI>
+ </UL>
+
+ <H3>
+ <A name="Navigation-Overview"></A><A href="/stomp10/index.html" title="Overview">Stomp 1.0</A></H3>
+ <UL class="alternate" type="square">
+ <LI><A href="/stomp10/specification.html" title="Specification">Specification</A></LI>
+ <LI><A href="/stomp10/additional.html" title="Additional Information">Additional Information</A></LI>
+ </UL>
+ --> </DIV>
</DIV>
</DIV>
</TD>
diff --git a/webgen/src/index.page b/webgen/src/index.page
index ad81435..bdef471 100644
--- a/webgen/src/index.page
+++ b/webgen/src/index.page
@@ -1,6 +1,5 @@
---
title: Home
-in_menu: true
routed_title: Stomp Protocol
---
## Stomp Protocol
diff --git a/webgen/src/metainfo b/webgen/src/metainfo
new file mode 100644
index 0000000..8731c9f
--- /dev/null
+++ b/webgen/src/metainfo
@@ -0,0 +1,9 @@
+--- name:paths
+
+/stomp10/*.page:
+ in_menu: true
+
+--- name:alcn
+
+/stomp10/:
+ title: Stomp 1.0
\ No newline at end of file
diff --git a/webgen/src/stomp10/additional.page b/webgen/src/stomp10/additional.page
new file mode 100644
index 0000000..c3cd064
--- /dev/null
+++ b/webgen/src/stomp10/additional.page
@@ -0,0 +1,71 @@
+---
+title: Additional Information
+sort_info: 30
+--- name:overview
+
+# Stomp 1.0 - additional information
+Stomp 1.0 - additional information
+
+--- name:content
+
+This page contains some additional information regarding Stomp protocol version 1.0 (not contained in the specification):
+
+{menu: {used_nodes: fragments}}
+
+#Transaction Handling
+
+Stomp uses named transactions so that many transactions can concurrently occur at the same time.
+
+The client specifies the name and it is unique to that client.
+
+so:
+
+ BEGIN
+ transaction: tx1
+
+ ^@
+
+then you can ack or send using the transaction
+
+ ACK
+ message: ID:19283:wheeeee:1234
+ transaction: tx1
+
+ ^@
+
+
+ SEND
+ destination: /queue/a
+ transaction: tx1
+
+ hello queue a!
+ ^@
+
+ ABORT
+ transaction: tx1
+
+ ^@
+
+Would "undo" the ack and send
+
+#Character Encoding
+
+We need to acknowledge character encoding and set some expectations. Much of this is taken from suggestions by SER (whom I don't otherwise know).
+
+First, make header names required to be legal [XML element names](http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-Name). This makes a lot of sense.
+
+Second, specify the default encoding is UTF-8. This makes ASCII a nice subset for telnet purposes. Add an encoding attribute to the CONNECT and CONNECTED frames. The server *should* use the same encoding the client requested on the CONNECT, defaulting to UTF-8 if nothing was specified, but if the client requested an encoding which the server cannot handle, it *must* send back the encoding it will use to handle the session (assuming it could understand the CONNECT frame, of course =)
+
+#Ack Modes
+The default message acknowledgement (when the server can consider the message to have been consumed by a client) is to treat it as acknowledged as soon as it is transmitted. An alternate is to require the client to acknowledge the message explicitely. Amongst other things this offers transactional message consumption and prevents flooding the client to the point of a crash and losing a pile of messages.
+
+To handle this the client may specify and ack header in a subscription request. The default is "auto" the alternate value (there may be more later) is "client". If "client" is used the client must send an ACK frame with the message-id from the message, which may also have a transaction header with an open transaction identifier.
+
+ SUBSCRIBE
+ ack: client
+ destination: /queue/a
+
+ ^@
+
+ ACK
+ message-id: ID:12345
\ No newline at end of file
diff --git a/webgen/src/stomp10/index.page b/webgen/src/stomp10/index.page
new file mode 100644
index 0000000..19aac13
--- /dev/null
+++ b/webgen/src/stomp10/index.page
@@ -0,0 +1,18 @@
+---
+title: Overview
+sort_info: 10
+--- name:overview
+
+# Stomp 1.0
+Stomp, Version 1.0
+
+--- name:content
+
+This page contains information about Stomp version 1.0. Here you can find:
+
+* [Specification](specification.html)
+* [Additional Information](additional.html)
+
+
+
+
diff --git a/webgen/src/stomp10.page b/webgen/src/stomp10/specification.page
similarity index 98%
rename from webgen/src/stomp10.page
rename to webgen/src/stomp10/specification.page
index 8fc8479..59ffb99 100644
--- a/webgen/src/stomp10.page
+++ b/webgen/src/stomp10/specification.page
@@ -1,9 +1,9 @@
---
-title: Stomp 1.0
-in_menu: true
+title: Specification
+sort_info: 20
--- name:overview
-# Stomp 1.0
+#Stomp Protocol Specification, Version 1.0
Stomp Protocol Specification, Version 1.0
--- name:content
