You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by bu...@apache.org on 2013/09/23 00:21:27 UTC

svn commit: r879492 [19/30] - in /websites/production/tapestry/content: ./ 2009/ 2009/09/ 2009/09/13/ 2009/10/ 2009/10/27/ 2009/11/ 2009/11/25/ 2010/ 2010/07/ 2010/07/18/ 2010/07/24/ 2010/10/ 2010/10/11/ 2010/10/31/ 2010/11/ 2010/11/18/ 2010/11/19/ 201...

Modified: websites/production/tapestry/content/layout-component.html
==============================================================================
--- websites/production/tapestry/content/layout-component.html (original)
+++ websites/production/tapestry/content/layout-component.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,19 @@
     Layout Component -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +46,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -62,23 +74,23 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="page-and-component-classes-faq.html">Page And Component Classes FAQ</a>
+                         <a shape="rect" href="component-classes.html">Component Classes</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="templating-and-markup-faq.html">Templating and Markup FAQ</a>
+                         <a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="component-templates.html">Component Templates</a>
+                         <a shape="rect" href="templating-and-markup-faq.html">Templating and Markup FAQ</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a>
+                         <a shape="rect" href="page-and-component-classes-faq.html">Page And Component Classes FAQ</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="component-classes.html">Component Classes</a>
+                         <a shape="rect" href="component-templates.html">Component Templates</a>
         
                                             </td></tr></table>
 </div>
@@ -90,24 +102,24 @@
 <p>But there's an even better way. Just create a layout component that provides the overall structure and recurring content for your pages:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Layout.tml (a template for a Layout component)</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;html <span class="code-keyword">xmlns:t</span>=<span class="code-quote">"http://tapestry.apache.org/schema/tapestry_5_3.xsd"</span>&gt;</span>
-    <span class="code-tag">&lt;head&gt;</span>
-        <span class="code-tag">&lt;title&gt;</span>My Nifty Web Application<span class="code-tag">&lt;/title&gt;</span>
-    <span class="code-tag">&lt;/head&gt;</span>
-    <span class="code-tag">&lt;body&gt;</span>
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-top"</span>&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd"&gt;
+    &lt;head&gt;
+        &lt;title&gt;My Nifty Web Application&lt;/title&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;div class="nav-top"&gt;
             Nifty Web Application
-        <span class="code-tag">&lt;/div&gt;</span>
+        &lt;/div&gt;
 
-        <span class="code-tag">&lt;t:body/&gt;</span>
+        &lt;t:body/&gt;
 
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-bottom"</span>&gt;</span>
+        &lt;div class="nav-bottom"&gt;
             (C) 2012 NiftyWebCo, Inc.
-        <span class="code-tag">&lt;/div&gt;</span>
-    <span class="code-tag">&lt;/body&gt;</span>
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+        &lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
+]]></script>
 </div></div> 
 
 <p>In a real-world example, the two &lt;div&gt; elements above might contain the typical recurring content you'll see across the pages of a web application: banners, menus, login forms and so forth. Often these layout components get very complex ... in fact, in many applications the Layout component can grow to be as complex as any other component.</p>
@@ -117,23 +129,23 @@
 <p>To use your layout component, just have each page in your application <em>wrap itself</em> in the layout, like this:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Welcome.tml (the template for a page)</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;html t:type=<span class="code-quote">"layout"</span> <span class="code-keyword">xmlns:t</span>=<span class="code-quote">"http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"</span>&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"&gt;
 
-   <span class="code-tag">&lt;h1&gt;</span>Welcome to the Nifty Web Application!<span class="code-tag">&lt;/h1&gt;</span>
+   &lt;h1&gt;Welcome to the Nifty Web Application!&lt;/h1&gt;
 
-   <span class="code-tag">&lt;p&gt;</span>
-        Would you like to <span class="code-tag">&lt;t:pagelink page=<span class="code-quote">"login"</span>&gt;</span>Log In<span class="code-tag">&lt;/t:pagelink&gt;</span>?
-   <span class="code-tag">&lt;/p&gt;</span>
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+   &lt;p&gt;
+        Would you like to &lt;t:pagelink page="login"&gt;Log In&lt;/t:pagelink&gt;?
+   &lt;/p&gt;
+&lt;/html&gt;
+]]></script>
 </div></div>
 
 <p>Note the "t:type="layout" part. That says, in effect, "wrap the layout component around my <em>content</em>".</p>
 
 <p>The magic is in the &lt;t:body/&gt; element of the layout template; this will be replaced by each page's <em>content</em>, whatever that is.</p>
 
-<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Remember that if your layout component includes a link to a resource such as an image or a stylesheet, you must use an <em>absolute</em> URL. The same component will be used for pages in many different folders, or with many different activation contexts, so relative URLs won't work. The best approach is to use the <a shape="rect" href="assets.html" title="Assets">context binding prefix</a>.</td></tr></table></div>
+<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Remember that if your layout component includes a link to a resource such as an image or a stylesheet, you must use an <em>absolute</em> URL. The same component will be used for pages in many different folders, or with many different activation contexts, so relative URLs won't work. The best approach is to use the <a shape="rect" href="assets.html" title="Assets">context binding prefix</a>.</td></tr></table></div>
 
 <p>To keep our Welcome.tml page template relatively preview-able, we are using an &lt;html&gt; element and the t:type attribute to specify that it is a component. At render time, the page's &lt;html&gt; tag will be removed, and replaced with the content from the Layout.tml template (which conveniently starts with an &lt;html&gt; element). The &lt;t:body&gt; element in Layout.tml will be replaced with the page-specific content here: the &lt;h1&gt; and &lt;p&gt; tags.</p>
 
@@ -144,12 +156,12 @@
 <p>Components must always have a Java class. But in this trivial example, the Layout component doesn't need any logic:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Layout.java</b></div><div class="codeContent panelContent">
-<pre class="code-java">
-@Import(stylesheet=<span class="code-quote">"context:css/site.css"</span>)
-<span class="code-keyword">public</span> class Layout
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+@Import(stylesheet="context:css/site.css")
+public class Layout
 {
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>We use the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/annotations/Import.html">Import</a> annotation (in 5.2 or later), as opposed to directly adding the &lt;link&gt; element to the template, for significant performance benefits <a shape="rect" href="assets.html" title="Assets">described elsewhere</a>. (For 5.0 and 5.1, use the deprecated @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/annotations/IncludeStylesheet.html">IncludeStyleSheet</a> annotation instead.) </p>
@@ -161,15 +173,15 @@
 <p>Layouts are really just ordinary components, so they can be nested to any level needed. You can have, for example, a "CommonLayout" component that provides the peripheral elements for all your pages, and then a more specialized "AdminLayout" component that provides the layout only for the administrative pages, and make the AdminLayout component wrap itself in the CommonLayout component. So then the administrative pages would start with <tt>&lt;html t:type="adminLayout" ...&gt;</tt> and the other pages (and the AdminLayout component itself) would start with <tt>&lt;html t:type="commonLayout" ...&gt;</tt>.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>AdminLayout.tml</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;html t:type=<span class="code-quote">"commonLayout"</span> <span class="code-keyword">xmlns:t</span>=<span class="code-quote">"http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"</span>&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;html t:type="commonLayout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"&gt;
 
-    <span class="code-tag">&lt;h1&gt;</span>Administrative Functions<span class="code-tag">&lt;/h1&gt;</span>
+    &lt;h1&gt;Administrative Functions&lt;/h1&gt;
 
-    <span class="code-tag">&lt;t:body/&gt;</span>
+    &lt;t:body/&gt;
 
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+&lt;/html&gt;
+]]></script>
 </div></div>
 
 <h2><a shape="rect" name="LayoutComponent-Amoreadvancedexample"></a>A more advanced example</h2>
@@ -177,33 +189,33 @@
 <p>Here's an example of a Layout component with a few more features. It has a "title" parameter, so that every page can pass in its own title to be rendered in the &lt;title&gt; tag <em>and</em> in an &lt;h1&gt; tag at the top of the HTML. There is also a "style" parameter that allows each page to pass in a block of CSS rules to be rendered in the &lt;head&gt; section of the page (useful for those few CSS rules that can't be put into a static CSS file). Notice the HTML5-style DOCTYPE declaration at the top, the charset definition as UTF-8, and the addition of an "alerts" component.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Layout.tml (a template for a Layout component)</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;!DOCTYPE html&gt;</span>
-<span class="code-tag">&lt;html <span class="code-keyword">xmlns:t</span>=<span class="code-quote">"http://tapestry.apache.org/schema/tapestry_5_3.xsd"</span>&gt;</span>
-    <span class="code-tag">&lt;head&gt;</span>
-        <span class="code-tag">&lt;meta charset=<span class="code-quote">"UTF-8"</span> /&gt;</span>
-        <span class="code-tag">&lt;title&gt;</span>$title - NiftyWebCo, Inc<span class="code-tag">&lt;/title&gt;</span>
-        <span class="code-tag">&lt;style type=<span class="code-quote">"text/css"</span>&gt;</span>
-            <span class="code-tag">&lt;t:delegate to=<span class="code-quote">"style"</span> /&gt;</span>
-        <span class="code-tag">&lt;/style&gt;</span>
-    <span class="code-tag">&lt;/head&gt;</span>
-    <span class="code-tag">&lt;body&gt;</span>
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-top"</span>&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;!DOCTYPE html&gt;
+&lt;html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd"&gt;
+    &lt;head&gt;
+        &lt;meta charset="UTF-8" /&gt;
+        &lt;title&gt;$title - NiftyWebCo, Inc&lt;/title&gt;
+        &lt;style type="text/css"&gt;
+            &lt;t:delegate to="style" /&gt;
+        &lt;/style&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;div class="nav-top"&gt;
             Nifty Web Application
-        <span class="code-tag">&lt;/div&gt;</span>
+        &lt;/div&gt;
 
-        <span class="code-tag">&lt;h1&gt;</span>${title}<span class="code-tag">&lt;/h1&gt;</span>
+        &lt;h1&gt;${title}&lt;/h1&gt;
 
-        <span class="code-tag">&lt;t:alerts/&gt;</span>
+        &lt;t:alerts/&gt;
    
-        <span class="code-tag">&lt;t:body/&gt;</span>
+        &lt;t:body/&gt;
 
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-bottom"</span>&gt;</span>
+        &lt;div class="nav-bottom"&gt;
             (C) 2012 NiftyWebCo, Inc.
-        <span class="code-tag">&lt;/div&gt;</span>
-    <span class="code-tag">&lt;/body&gt;</span>
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+        &lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
+]]></script>
 </div></div> 
 
 <p>The <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/corelib/components/Alerts.html">Alerts</a> component above is new in Tapestry 5.3; it allows the application to present alert messages to the client in a consistent way. If you want alerts to always appear in the banner of your web site, it may make sense to put it in the layout component's template, as above.</p>
@@ -211,40 +223,40 @@
 <p>The corresponding component class is still very simple, adding support for the "title" and "style" parameters:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Layout.java</b></div><div class="codeContent panelContent">
-<pre class="code-java">
-@Import(stylesheet=<span class="code-quote">"context:css/site.css"</span>)
-<span class="code-keyword">public</span> class Layout
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+@Import(stylesheet="context:css/site.css")
+public class Layout
 {
-    /** The page title, <span class="code-keyword">for</span> the &lt;title&gt; element and the &lt;h1&gt; element. */
+    /** The page title, for the &lt;title&gt; element and the &lt;h1&gt; element. */
     @Property
-    @Parameter(required = <span class="code-keyword">true</span>, defaultPrefix = BindingConstants.LITERAL)
-    <span class="code-keyword">private</span> <span class="code-object">String</span> title;
+    @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL)
+    private String title;
 
     /** Optional CSS rules to place into the page head */
     @Property
     @Parameter(defaultPrefix = BindingConstants.LITERAL)
-    <span class="code-keyword">private</span> Block style;
+    private Block style;
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>Here's how you might use the above layout component for a UserList page:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>UserList.tml</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-&lt;html t:type=<span class="code-quote">"layout"</span> title=<span class="code-quote">"List of Users"</span>
-    <span class="code-keyword">xmlns:t</span>=<span class="code-quote">"http://tapestry.apache.org/schema/tapestry_5_3.xsd"</span>
-    <span class="code-keyword">xmlns:p</span>=<span class="code-quote">"tapestry:parameter"</span>&gt;
-<span class="code-tag">&lt;p:style&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;html t:type="layout" title="List of Users"
+    xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd"
+    xmlns:p="tapestry:parameter"&gt;
+&lt;p:style&gt;
     TD.profile { background: url('${backgroundImage}') }
-<span class="code-tag">&lt;/p:style&gt;</span>
+&lt;/p:style&gt;
 
-<span class="code-tag">&lt;div&gt;</span>
+&lt;div&gt;
     Imagine a table of user account information here.
-<span class="code-tag">&lt;/div&gt;</span>
+&lt;/div&gt;
 
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+&lt;/html&gt;
+]]></script>
 </div></div>
 
 <p>The &lt;p:style&gt; element (and its contents) are passed to the layout component as a <tt>style</tt> parameter (a block parameter, in this case, so you must have the <tt>xmlns:p="tapestry:parameter"</tt> namespace declared, as above).</p>
@@ -252,42 +264,42 @@
 <p>The rendered HTML would look like the following (whitespace aside, and assuming UserList.java has a backgroundImage property whose value is the string "http://www.example.com/fuzzy.gif"):</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>The rendered HTML</b></div><div class="codeContent panelContent">
-<pre class="code-html">
-<span class="code-tag">&lt;!DOCTYPE html&gt;</span>
-<span class="code-tag">&lt;html&gt;</span>
-    <span class="code-tag">&lt;head&gt;</span>
-        <span class="code-tag">&lt;meta charset=<span class="code-quote">"UTF-8"</span> /&gt;</span>
-        <span class="code-tag">&lt;title&gt;</span>List of Users - NiftyWebCo, Inc<span class="code-tag">&lt;/title&gt;</span>
-        <span class="code-tag">&lt;style type=<span class="code-quote">"text/css"</span>&gt;</span>
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+    &lt;head&gt;
+        &lt;meta charset="UTF-8" /&gt;
+        &lt;title&gt;List of Users - NiftyWebCo, Inc&lt;/title&gt;
+        &lt;style type="text/css"&gt;
             TD.profile { background: url('http://www.example.com/fuzzy.gif') }
-        <span class="code-tag">&lt;/style&gt;</span>
-    <span class="code-tag">&lt;/head&gt;</span>
-    <span class="code-tag">&lt;body&gt;</span>
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-top"</span>&gt;</span>
+        &lt;/style&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;div class="nav-top"&gt;
             Nifty Web Application
-        <span class="code-tag">&lt;/div&gt;</span>
+        &lt;/div&gt;
 
-        <span class="code-tag">&lt;h1&gt;</span>List of Users<span class="code-tag">&lt;/h1&gt;</span>
+        &lt;h1&gt;List of Users&lt;/h1&gt;
 
-        <span class="code-tag">&lt;div id=<span class="code-quote">"alerts"</span>&gt;</span><span class="code-tag">&lt;/div&gt;</span>
+        &lt;div id="alerts"&gt;&lt;/div&gt;
 
-        <span class="code-tag">&lt;div&gt;</span>
+        &lt;div&gt;
             Imagine a table of user account information here.
-        <span class="code-tag">&lt;/div&gt;</span>
+        &lt;/div&gt;
 
-        <span class="code-tag">&lt;div class=<span class="code-quote">"nav-bottom"</span>&gt;</span>
+        &lt;div class="nav-bottom"&gt;
             (C) 2012 NiftyWebCo, Inc.
-        <span class="code-tag">&lt;/div&gt;</span>
-    <span class="code-tag">&lt;/body&gt;</span>
-<span class="code-tag">&lt;/html&gt;</span>
-</pre>
+        &lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
+]]></script>
 </div></div>
 </div>
 </div>
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -298,7 +310,7 @@
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/layout-component.html" async="true">

Modified: websites/production/tapestry/content/limitations.html
==============================================================================
--- websites/production/tapestry/content/limitations.html (original)
+++ websites/production/tapestry/content/limitations.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Limitations -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +45,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -64,7 +75,7 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="request-processing-faq.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="request-processing-faq.html">Request Processing FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="specific-errors-faq.html">Specific Errors FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="specific-errors-faq.html"><img 
 align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="request-processing-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="request-processing-faq.html">Request Processing FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="specific-errors-faq.html">Specific Errors FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNex
 tIcon"><a shape="rect" href="specific-errors-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <h2><a shape="rect" name="Limitations-Limitations"></a>Limitations</h2>
 
@@ -164,21 +175,21 @@ var footnoteMarkerHighlight = function(i
 <p>Consider the following example module:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> void bind(ServiceBinder binder)
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+public static void bind(ServiceBinder binder)
 {
   binder.bind(ArchiveService.class, ArchiveServiceImpl.class);
 }
 
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> JobQueue buildJobQueue(MessageService messageService, Map&lt;<span class="code-object">String</span>,Job&gt; configuration)
+public static JobQueue buildJobQueue(MessageService messageService, Map&lt;String,Job&gt; configuration)
 {
-  JobQueueImpl service = <span class="code-keyword">new</span> JobQueueImpl(configuration);
+  JobQueueImpl service = new JobQueueImpl(configuration);
 
   messageService.addQueueListener(service);
  
-  <span class="code-keyword">return</span> service;
+  return service;
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>ArchiveService is reloadable, because Tapestry instantiates <tt>ArchiveServiceImpl</tt> itself.  On the other hand, Tapestry invokes <tt>buildJobQueue()</tt> and it is your code inside the method that instantiates <tt>JobQueueImpl</tt>, so the JobQueue service will not be reloadable.</p>
@@ -199,7 +210,7 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="request-processing-faq.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="request-processing-faq.html">Request Processing FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="specific-errors-faq.html">Specific Errors FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="specific-errors-faq.html"><img 
 align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="request-processing-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="request-processing-faq.html">Request Processing FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="specific-errors-faq.html">Specific Errors FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNex
 tIcon"><a shape="rect" href="specific-errors-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <hr>
 <p><table class="Footnotes" style="width: 100%; border:none;" cellspacing="0" cellpadding="0" summary="This table contains one or more notes for references made elsewhere on the page."><caption class="accessibility">Footnotes</caption><thead class="accessibility"><tr class="accessibility"><th colspan="1" rowspan="1" class="accessibility" id="footnote-th1">Reference</th><th colspan="1" rowspan="1" class="accessibility" id="footnote-th2">Notes</th></tr></thead><tbody><tr name="Footnote1"><td colspan="1" rowspan="1" valign="top" class="FootnoteNum" headings="footnote-th1">
@@ -213,7 +224,7 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -224,7 +235,7 @@ table.ScrollbarTable td.ScrollbarNextIco
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/limitations.html" async="true">

Modified: websites/production/tapestry/content/link-components-faq.html
==============================================================================
--- websites/production/tapestry/content/link-components-faq.html (original)
+++ websites/production/tapestry/content/link-components-faq.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Link Components FAQ -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +45,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -64,7 +75,7 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="beaneditform-faq.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="beaneditform-faq.html">BeanEditForm FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-events-faq.html">Component Events FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-events-faq.html"><img align="middle" 
 border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="beaneditform-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="beaneditform-faq.html">BeanEditForm FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-events-faq.html">Component Events FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape=
 "rect" href="component-events-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <h2><a shape="rect" name="LinkComponentsFAQ-LinkComponents"></a>Link Components</h2>
 
@@ -75,41 +86,41 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>However, you can accomplish the same thing with a little code and markup.  For example, to create a link to another page and pass a query parameter, you can replace your PageLink component with a standard <tt>&lt;a&gt;</tt> tag:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;a href=<span class="code-quote">"${profilePageLink}"</span>&gt;Display Profile (w/ full details)&lt;/a&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+&lt;a href="${profilePageLink}"&gt;Display Profile (w/ full details)&lt;/a&gt;
+]]></script>
 </div></div>
 
 <p>In the matching Java class, you can create the Link programmatically:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
   @Inject
-  <span class="code-keyword">private</span> PageRenderLinkSource linkSource;
+  private PageRenderLinkSource linkSource;
 
-  <span class="code-keyword">public</span> Link getProfilePageLink()
+  public Link getProfilePageLink()
   {
     Link link = linkSource.createPageRenderLinkWithContext(DisplayProfile.class, user);
 
-    link.addParameterValue(<span class="code-quote">"detail"</span>, <span class="code-keyword">true</span>);
+    link.addParameterValue("detail", true);
 
-    <span class="code-keyword">return</span> link;
+    return link;
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>... and in the DisplayProfile page:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class DisplayProfile
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+public class DisplayProfile
 {
-  void onActivate(@RequestParameter(<span class="code-quote">"detail"</span>) <span class="code-object">boolean</span> detail)
+  void onActivate(@RequestParameter("detail") boolean detail)
   {
     . . .
   }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>The @RequestParameter annotation directs Tapestry to extract the query parameter from the request and coerce it to type boolean.  You can use any reasonable type for such a parameter (int, long and Date are common).</p>
@@ -119,7 +130,7 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 
 
-<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Added in 5.3</b><br clear="none"></td></tr></table></div>
+<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Added in 5.3</b><br clear="none"></td></tr></table></div>
 <div style="border-right: 20px solid #D8E4F1;border-left: 20px solid #D8E4F1;">
 <p>You may also bind a link component's <tt>parameters</tt> parameter; this is a Map of additional query parameters to add to the URL.  The Map keys should be strings, and the Map values will be encoded to strings.  Tapestry 5.3 also adds a literal map syntax to the <a shape="rect" href="property-expressions.html" title="Property Expressions">property expression language</a>.</p>
 
@@ -130,9 +141,9 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Sometimes it is useful to create a link back to the current page, but you don't always know the name of the page (the link may appear inside a deeply nested subcomponent).  Fortunately, this is easy. </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;t:pagelink page=<span class="code-quote">"prop:componentResources.pageName"</span>&gt;refresh page&lt;/t:pagelink&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;t:pagelink page="prop:componentResources.pageName"&gt;refresh page&lt;/t:pagelink&gt;
+]]></script>
 </div></div>
 
 <p>Every component has an extra property, componentResources, added to it: it's the instance of <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ComponentResources.html">ComponentResources</a> that represents the link between your code and all of Tapestry's structure around your class. One of the properties of ComponentResources is pageName, the name of the page. By binding the PageLink's page parameter with the "prop:" binding prefix, we ensure that we bind to a computed property; this is necessary because the PageLink.page parameter defaults to the "literal:" binding prefix.</p>
@@ -147,12 +158,12 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="beaneditform-faq.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="beaneditform-faq.html">BeanEditForm FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-events-faq.html">Component Events FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-events-faq.html"><img align="middle" 
 border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="beaneditform-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="beaneditform-faq.html">BeanEditForm FAQ</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="frequently-asked-questions.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="frequently-asked-questions.html">Frequently Asked Questions</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-events-faq.html">Component Events FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape=
 "rect" href="component-events-faq.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
 </div>
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -163,7 +174,7 @@ table.ScrollbarTable td.ScrollbarNextIco
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/link-components-faq.html" async="true">

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.html
==============================================================================
--- websites/production/tapestry/content/loading-the-project-into-eclipse.html (original)
+++ websites/production/tapestry/content/loading-the-project-into-eclipse.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Loading the Project Into Eclipse -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +37,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -64,7 +67,7 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="creating-the-skeleton-application.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="creating-the-skeleton-application.html">Creating The Skeleton Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="exploring-the-project.html">Exploring the Project</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="exploring-the-project
 .html"><img align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="creating-the-skeleton-application.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="creating-the-skeleton-application.html">Creating The Skeleton Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="exploring-the-project.html">Exploring the Project</a></td><td colspan="1" rowspan="1" class="Sc
 rollbarNextIcon"><a shape="rect" href="exploring-the-project.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>The first step is to ask Maven to generate the Eclipse control files (<tt>.classpath</tt> and <tt>.project</tt>) for us:</p>
 
@@ -330,12 +333,12 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="creating-the-skeleton-application.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="creating-the-skeleton-application.html">Creating The Skeleton Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="exploring-the-project.html">Exploring the Project</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="exploring-the-project
 .html"><img align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="creating-the-skeleton-application.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="creating-the-skeleton-application.html">Creating The Skeleton Application</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="exploring-the-project.html">Exploring the Project</a></td><td colspan="1" rowspan="1" class="Sc
 rollbarNextIcon"><a shape="rect" href="exploring-the-project.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
 </div>
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -346,7 +349,7 @@ table.ScrollbarTable td.ScrollbarNextIco
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/loading-the-project-into-eclipse.html" async="true">

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-classpath-vars.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-import-folder.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-import.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-java-persp.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-jetty.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-launch-vmargs.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-launch.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-new-var.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-project-errors.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/loading-the-project-into-eclipse.thumbs/eclipse-run.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/localization.html
==============================================================================
--- websites/production/tapestry/content/localization.html (original)
+++ websites/production/tapestry/content/localization.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Localization -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +45,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -60,19 +71,19 @@
 
 <div class="navmenu" style="float:right; background:#eee; margin:3px; padding:3px"><table class="tableview" width="100%"><tr><th colspan="1" rowspan="1" style="padding: 3px 3px 3px 0px">Related Articles</th></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="templating-and-markup-faq.html">Templating and Markup FAQ</a>
+                         <a shape="rect" href="component-classes.html">Component Classes</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="component-parameters.html">Component Parameters</a>
+                         <a shape="rect" href="templating-and-markup-faq.html">Templating and Markup FAQ</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="localization.html">Localization</a>
+                         <a shape="rect" href="component-parameters.html">Component Parameters</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="component-classes.html">Component Classes</a>
+                         <a shape="rect" href="localization.html">Localization</a>
         
                                             </td></tr></table>
 </div> 
@@ -105,7 +116,7 @@
 
 <p>Individual pages and components can override the values defined in the message catalog.</p>
 
-<div class="navmenu" style="float:right; width:45%; background:white; margin:3px; padding:3px"><div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Avoid BOMs</b><br clear="none">Make sure that your properties files don't contain <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Byte_order_mark" >byte order marks (BOM)</a>, because Java &#8211; and thus Tapestry &#8211; doesn't support BOM in properties files (see <a shape="rect" class="external-link" href="http://bugs.sun.com/view_bug.do?bug_id=4508058" >http://bugs.sun.com/view_bug.do?bug_id=4508058</a>). Some editors write them out when saving a file in UTF-8, so watch out.</td></tr></table></div></div>
+<div class="navmenu" style="float:right; width:45%; background:white; margin:3px; padding:3px"><div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Avoid BOMs</b><br clear="none">Make sure that your properties files don't contain <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Byte_order_mark" >byte order marks (BOM)</a>, because Java &#8211; and thus Tapestry &#8211; doesn't support BOM in properties files (see <a shape="rect" class="external-link" href="http://bugs.sun.com/view_bug.do?bug_id=4508058" >http://bugs.sun.com/view_bug.do?bug_id=4508058</a>). Some editors write them out when saving a file in UTF-8, so watch out.</td></tr></table></div></div>
 
 <h2><a shape="rect" name="Localization-PropertiesFileCharset"></a>Properties File Charset</h2>
 
@@ -126,14 +137,14 @@ In the first case, you may use the messa
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;t:layout title=<span class="code-quote">"message:page-title"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;t:layout title="message:page-title"&gt;
 
   ${message:greeting}, ${user.name}!
   
   . . .
 &lt;/t:layout&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>Here, the <tt>page-title</tt> message is extracted from the catalog and passed to the Border component's title parameter.</p>
@@ -145,52 +156,52 @@ In the first case, you may use the messa
 <p>You would extend this with a set of properties files:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 page-title=Your Account
 greeting=Welcome back
-</pre>
+]]></script>
 </div></div>
 
 <p>Or, perhaps, a French version:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 page-title=Votre Compte
 greeting=Bienvenue en arriere
-</pre>
+]]></script>
 </div></div>
 
 <p>Programatically, you may inject your component message catalog into your class, as an instance of the Messages interface:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
   @Inject
-  <span class="code-keyword">private</span> Messages messages;
-</pre>
+  private Messages messages;
+]]></script>
 </div></div>
 
 <p>You could then <tt>get()</tt> messages, or <tt>format()</tt> them:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 
-  <span class="code-keyword">public</span> <span class="code-object">String</span> getCartSummary()     
+  public String getCartSummary()     
   {
-    <span class="code-keyword">if</span> (items.isEmpty())
-      <span class="code-keyword">return</span> messages.get(<span class="code-quote">"no-items"</span>);
+    if (items.isEmpty())
+      return messages.get("no-items");
       
-    <span class="code-keyword">return</span> messages.format(<span class="code-quote">"item-summary"</span>, _items.size());
+    return messages.format("item-summary", _items.size());
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>The format() option works using a <tt>java.util.Formatter</tt>, with all the printf-style loveliness you've come to expect:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 no-items=Your shopping cart is empty.     
 item-summary=You have %d items in your cart.
-</pre>
+]]></script>
 </div></div>
 
 <p>As easy as conditionals are to use inside a Tapestry template, sometimes it's even easier to do it in Java code.</p>
@@ -218,22 +229,22 @@ item-summary=You have %d items in your c
 <p>The <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/services/PersistentLocale.html">PersistentLocale service</a> can be used to programmatically override the locale. Note: You should be careful to only set the persistent locale to a supported locale.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Toggle between English and German</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 @Inject 
-<span class="code-keyword">private</span> PersistentLocale persistentLocale;
+private PersistentLocale persistentLocale;
 
 void onActionFromLocaleToggle() {
-    <span class="code-keyword">if</span> (<span class="code-quote">"en"</span>.equalsIgnoreCase(persistentLocale.get().getLanguage())) {
-        persistentLocale.set(<span class="code-keyword">new</span> Locale(<span class="code-quote">"de"</span>));
-    } <span class="code-keyword">else</span> {
-        persistentLocale.set(<span class="code-keyword">new</span> Locale(<span class="code-quote">"en"</span>));
+    if ("en".equalsIgnoreCase(persistentLocale.get().getLanguage())) {
+        persistentLocale.set(new Locale("de"));
+    } else {
+        persistentLocale.set(new Locale("en"));
     }
-    <span class="code-keyword">return</span> <span class="code-keyword">this</span>;
+    return this;
 }
-<span class="code-keyword">public</span> <span class="code-object">String</span> getDisplayLanguage() {
-    <span class="code-keyword">return</span> persistentLocale.get().getDisplayLanguage();
+public String getDisplayLanguage() {
+    return persistentLocale.get().getDisplayLanguage();
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>Once a persistent locale is set, you will see the locale name as the first virtual folder in page render and component event requests URLs. In this way, a persistent locale will, in fact, persist from request to request, or in a user's bookmarks.</p>
@@ -255,9 +266,9 @@ void onActionFromLocaleToggle() {
 
 <p>Fortunately, Tapestry uses all the same mechanisms for its own locale support as it provides for your application. So, to support other locales, just translate the built-in message catalog (property) files yourself:</p>
 
-
+<p>
 <style type="text/css">table.sectionMacro { width: auto; }</style>
-
+</p>
 
 <table class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><tbody><tr><td colspan="1" rowspan="1" valign="top" class="confluenceTd">
 <div class="table-wrap">
@@ -273,12 +284,12 @@ void onActionFromLocaleToggle() {
 
 <p>Finally, please open a new feature request <a shape="rect" class="external-link" href="https://issues.apache.org/jira/browse/TAP5">here</a> and attach the translated files so that they can be included in the next release of Tapestry.</p>
 
-<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Please note that a patch is always preferred over an archive of properties files.</td></tr></table></div> </div>
+<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Please note that a patch is always preferred over an archive of properties files.</td></tr></table></div> </div>
 </div>
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -289,7 +300,7 @@ void onActionFromLocaleToggle() {
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/localization.html" async="true">

Modified: websites/production/tapestry/content/logging-in-tapestry.html
==============================================================================
--- websites/production/tapestry/content/logging-in-tapestry.html (original)
+++ websites/production/tapestry/content/logging-in-tapestry.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,19 @@
     Logging in Tapestry -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +46,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -64,15 +76,15 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="parallel-execution.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="parallel-execution.html">Parallel Execution</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="ioc.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="ioc.html">IoC</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="using-jsr-330-standard-annotations.html">Using JSR 330 standard annotations</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="using-jsr-330-standard-annotations.html"><img align="middle" border="0" src="/imag
 es/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="parallel-execution.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="parallel-execution.html">Parallel Execution</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="ioc.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="ioc.html">IoC</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="using-jsr-330-standard-annotations.html">Using JSR 330 standard annotations</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="using-jsr-330-standard
 -annotations.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <div class="navmenu" style="float:right; background:#eee; margin:3px; padding:3px"><table class="tableview" width="100%"><tr><th colspan="1" rowspan="1" style="padding: 3px 3px 3px 0px">Related Articles</th></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="logging.html">Logging</a>
+                         <a shape="rect" href="logging-in-tapestry.html">Logging in Tapestry</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="logging-in-tapestry.html">Logging in Tapestry</a>
+                         <a shape="rect" href="logging.html">Logging</a>
         
                                             </td></tr></table>
 </div> 
@@ -168,34 +180,34 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>You can exclude some of the dependencies that Tapestry introduces, and replace them with your own. For example, to switch over to JDK logging, update your pom as follows:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"> 
-  <span class="code-tag">&lt;dependencies&gt;</span>
-    <span class="code-tag">&lt;dependency&gt;</span>
-      <span class="code-tag">&lt;groupId&gt;</span>org.apache.tapestry<span class="code-tag">&lt;/groupId&gt;</span>
-      <span class="code-tag">&lt;artifactId&gt;</span>tapestry-ioc<span class="code-tag">&lt;/artifactId&gt;</span>
-      <span class="code-tag">&lt;version&gt;</span>5.3<span class="code-tag">&lt;/version&gt;</span>
-      <span class="code-tag">&lt;exclusions&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;dependencies&gt;
+    &lt;dependency&gt;
+      &lt;groupId&gt;org.apache.tapestry&lt;/groupId&gt;
+      &lt;artifactId&gt;tapestry-ioc&lt;/artifactId&gt;
+      &lt;version&gt;5.3&lt;/version&gt;
+      &lt;exclusions&gt;
       
-        <span class="code-tag">&lt;exclusion&gt;</span>
-          <span class="code-tag">&lt;groupId&gt;</span>org.slf4j<span class="code-tag">&lt;/groupId&gt;</span>
-          <span class="code-tag">&lt;artifactId&gt;</span>slf4j-log4j12<span class="code-tag">&lt;/artifactId&gt;</span>
-        <span class="code-tag">&lt;/exclusion&gt;</span>
+        &lt;exclusion&gt;
+          &lt;groupId&gt;org.slf4j&lt;/groupId&gt;
+          &lt;artifactId&gt;slf4j-log4j12&lt;/artifactId&gt;
+        &lt;/exclusion&gt;
       
-        <span class="code-tag">&lt;exclusion&gt;</span>
-          <span class="code-tag">&lt;groupId&gt;</span>log4j<span class="code-tag">&lt;/groupId&gt;</span>
-          <span class="code-tag">&lt;artifactId&gt;</span>log4j<span class="code-tag">&lt;/groupId&gt;</span>
-        <span class="code-tag">&lt;/exclusion&gt;</span>
-
-      <span class="code-tag">&lt;/exclusions&gt;</span>
-    <span class="code-tag">&lt;/dependency&gt;</span>
-
-    <span class="code-tag">&lt;dependency&gt;</span>
-      <span class="code-tag">&lt;groupId&gt;</span>org.slf4j<span class="code-tag">&lt;/groupId&gt;</span>
-          <span class="code-tag">&lt;artifactId&gt;</span>slf4j-jdk14<span class="code-tag">&lt;/artifactId&gt;</span>
-          <span class="code-tag">&lt;version&gt;</span>1.4.3<span class="code-tag">&lt;/version&gt;</span>
-    <span class="code-tag">&lt;/dependency&gt;</span>
-  <span class="code-tag">&lt;/dependencies&gt;</span>
-</pre>
+        &lt;exclusion&gt;
+          &lt;groupId&gt;log4j&lt;/groupId&gt;
+          &lt;artifactId&gt;log4j&lt;/groupId&gt;
+        &lt;/exclusion&gt;
+
+      &lt;/exclusions&gt;
+    &lt;/dependency&gt;
+
+    &lt;dependency&gt;
+      &lt;groupId&gt;org.slf4j&lt;/groupId&gt;
+          &lt;artifactId&gt;slf4j-jdk14&lt;/artifactId&gt;
+          &lt;version&gt;1.4.3&lt;/version&gt;
+    &lt;/dependency&gt;
+  &lt;/dependencies&gt;
+]]></script>
 </div></div>
 
 <p>This pulls out the log4j support normally included with Tapestry, and replaces it with the SLF4J library that wraps around JDK 1.4 logging.</p>
@@ -210,12 +222,12 @@ table.ScrollbarTable td.ScrollbarParent 
 table.ScrollbarTable td.ScrollbarNextName {text-align: right;border: none;}
 table.ScrollbarTable td.ScrollbarNextIcon {text-align: center;width: 16px;border: none;}
 
-/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="parallel-execution.html"><img align="middle" border="0" src="/images/confluence/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="parallel-execution.html">Parallel Execution</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="ioc.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="ioc.html">IoC</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="using-jsr-330-standard-annotations.html">Using JSR 330 standard annotations</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="using-jsr-330-standard-annotations.html"><img align="middle" border="0" src="/imag
 es/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="parallel-execution.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/back_16.gif" width="16" height="16"></a></td><td colspan="1" rowspan="1" class="ScrollbarPrevName" width="33%"><a shape="rect" href="parallel-execution.html">Parallel Execution</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="ioc.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="ioc.html">IoC</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="using-jsr-330-standard-annotations.html">Using JSR 330 standard annotations</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="using-jsr-330-standard
 -annotations.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
 </div>
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -226,7 +238,7 @@ table.ScrollbarTable td.ScrollbarNextIco
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/logging-in-tapestry.html" async="true">

Modified: websites/production/tapestry/content/logging.html
==============================================================================
--- websites/production/tapestry/content/logging.html (original)
+++ websites/production/tapestry/content/logging.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Logging -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+    <link href='http://cxf.apache.org/resources/highlighter/styles/shCoreCXF.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +45,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -58,11 +69,11 @@
 <div id="content">
 <div id="ConfluenceContent"><div class="navmenu" style="float:right; background:#eee; margin:3px; padding:3px"><table class="tableview" width="100%"><tr><th colspan="1" rowspan="1" style="padding: 3px 3px 3px 0px">Related Articles</th></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="logging.html">Logging</a>
+                         <a shape="rect" href="logging-in-tapestry.html">Logging in Tapestry</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="logging-in-tapestry.html">Logging in Tapestry</a>
+                         <a shape="rect" href="logging.html">Logging</a>
         
                                             </td></tr></table>
 </div> 
@@ -87,19 +98,19 @@
 <p>You may mark a field of type <a shape="rect" class="external-link" href="http://www.slf4j.org/api/org/slf4j/Logger.html" >Logger</a> with the @Inject annotation. The proper Logger for your page or component will be injected.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyPage
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyPage
 {
     @Inject
-    <span class="code-keyword">private</span> Logger logger;
+    private Logger logger;
 
     . . .
   
     void onSuccessFromForm()
     {
-        logger.info(<span class="code-quote">"Changes saved successfully"</span>);
+        logger.info("Changes saved successfully");
     }
-</pre>
+]]></script>
 </div></div>
 
 <h1><a shape="rect" name="Logging-@Logannotation"></a>@Log annotation</h1>
@@ -205,7 +216,7 @@ public final class org/apache/tapestry5/
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -216,7 +227,7 @@ public final class org/apache/tapestry5/
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/logging.html" async="true">

Modified: websites/production/tapestry/content/mailing-lists.html
==============================================================================
--- websites/production/tapestry/content/mailing-lists.html (original)
+++ websites/production/tapestry/content/mailing-lists.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Mailing Lists -- Apache Tapestry
   </title>
   <link type="text/css" rel="stylesheet" href="/resources/space.css">
+
+
   <link href="/styles/style.css" rel="stylesheet" type="text/css"/>
+
 </head>
 <body>
   <div class="wrapper bs">
@@ -34,9 +37,9 @@
 </div>
 
 <div id="top">
-<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em">
+<div id="smallbanner"><div class="searchbox" style="float:right;margin: .3em 1em .1em 1em"><p>
 <span style="color: #999; font-size: 90%">Tapestry docs, issues, wikis &amp; blogs:</span>
-<form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
+</p><form enctype="application/x-www-form-urlencoded" method="get" action="http://tapestry.apache.org/search.html">
   <input type="text" name="q">
   <input type="submit" value="Search">
 </form>
@@ -68,7 +71,7 @@
 
 <div class="clearer"></div>
 <div id="footer">
-<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.</p>
+<div id="footer"><p>Apache Tapestry, Tapestry, Apache, the Apache feather logo, and the Apache Tapestry project logo are trademarks of The Apache Software Foundation.<br clear="none">
 <script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-400821-1']);
@@ -79,7 +82,7 @@
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-</script></div>
+</script></p></div>
 </div>
 		<div id="comments_thread"></div>
 		<script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=tapestry&amp;page=http://tapestry.apache.org/mailing-lists.html" async="true">