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

svn commit: r879492 [4/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/ 2010...

Modified: websites/production/tapestry/content/ajax-and-zones.html
==============================================================================
--- websites/production/tapestry/content/ajax-and-zones.html (original)
+++ websites/production/tapestry/content/ajax-and-zones.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,20 @@
     Ajax and Zones -- 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 src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJScript.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 +47,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>
@@ -66,7 +79,7 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="javascript-faq.html">JavaScript FAQ</a>
+                         <a shape="rect" href="assets.html">Assets</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
@@ -78,7 +91,7 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="assets.html">Assets</a>
+                         <a shape="rect" href="javascript-faq.html">JavaScript FAQ</a>
         
                                             </td></tr></table>
 </div>
@@ -94,13 +107,13 @@
 <p>A Zone can be updated via an EventLink, ActionLink or Select component, or by a Form. All of these components support a zone parameter, which provides the id of the Zone's &lt;div&gt;. Clicking such a link will invoke an event handler method on the server as normal ... except that the return value of the event handler method is used to send a <em>partial page response</em> to the client, and the content of that response is used to update the Zone's &lt;div&gt; in place.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;t:actionlink t:id=<span class="code-quote">"someLink"</span> zone=<span class="code-quote">"myzone"</span>&gt;</span>update<span class="code-tag">&lt;/t:actionlink&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;t:actionlink t:id="someLink" zone="myzone"&gt;update&lt;/t:actionlink&gt;
 ...
-<span class="code-tag">&lt;t:zone t:id=<span class="code-quote">"myZone"</span> id=<span class="code-quote">"myzone"</span>&gt;</span>
+&lt;t:zone t:id="myZone" id="myzone"&gt;
     The current time is ${currentTime}
-<span class="code-tag">&lt;/t:zone&gt;</span>
-</pre>
+&lt;/t:zone&gt;
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="AjaxandZones-EventHandlerReturnTypes"></a>Event Handler Return Types</h3>
@@ -115,18 +128,18 @@
 <p>This return value is often just the zone's own body (as below), but it can also be an injected component or block. The value will be rendered, and that markup will be used on the client side to update the Zone's &lt;div&gt;.</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> Request request;
+private Request request;
 
 @InjectComponent
-<span class="code-keyword">private</span> Zone myZone;
+private Zone myZone;
 ...
-<span class="code-object">Object</span> onClickFromSomeLink()
+Object onClickFromSomeLink()
 {
-   <span class="code-keyword">return</span> myZone.getBody(); <span class="code-comment">// AJAX request, <span class="code-keyword">return</span> zone's own body
-</span>} 
-</pre>
+   return myZone.getBody(); // AJAX request, return zone's own body
+} 
+]]></script>
 </div></div>
 
 <p>The possible return values are:</p>
@@ -141,19 +154,19 @@
 <p>To support graceful degradation, you should detect that case in your event handler method and return a traditional response: a page, page name or page class. This is accomplished by injecting the <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/services/Request.html">Request</a> object, and invoking the isXHR() method. This value will be true for Ajax requests, and false for traditional request.</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> Request request;
+private Request request;
 
 @InjectComponent
-<span class="code-keyword">private</span> Zone myZone;
+private Zone myZone;
 ...
-<span class="code-object">Object</span> onClickFromSomeLink()
+Object onClickFromSomeLink()
 {
-    <span class="code-comment">// <span class="code-keyword">return</span> either the zone body (ajax) or whole page (non-ajax)
-</span>    <span class="code-keyword">return</span> request.isXHR() ? myZone.getBody() : <span class="code-keyword">null</span>;
+    // return either the zone body (ajax) or whole page (non-ajax)
+    return request.isXHR() ? myZone.getBody() : null;
 } 
-</pre>
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="AjaxandZones-MultipleZoneUpdates"></a>Multiple Zone Updates</h3>
@@ -169,37 +182,37 @@
 
 <table class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><tbody><tr><td colspan="1" rowspan="1" valign="top" class="confluenceTd">
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>For Tapestry 5.3 and later</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 @InjectComponent
-<span class="code-keyword">private</span> Zone userInput;
+private Zone userInput;
 
 @InjectComponent
-<span class="code-keyword">private</span> Zone helpPanel;
+private Zone helpPanel;
 
 @Inject
-<span class="code-keyword">private</span> AjaxResponseRenderer ajaxResponseRenderer;
+private AjaxResponseRenderer ajaxResponseRenderer;
 
 void onActionFromRegister()
 {
-    ajaxResponseRenderer.addRender(<span class="code-quote">"userInput"</span>,
-        userInput).addRender(<span class="code-quote">"helpPanel"</span>, helpPanel);
+    ajaxResponseRenderer.addRender("userInput",
+        userInput).addRender("helpPanel", helpPanel);
 }
-</pre>
+]]></script>
 </div></div></td><td colspan="1" rowspan="1" valign="top" class="confluenceTd">
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>For Tapestry 5.1, 5.2 and 5.3</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> Form registrationForm;
+private Form registrationForm;
 
 @Inject Block registrationHelp;
 
-<span class="code-object">Object</span> onActionFromRegister()
+Object onActionFromRegister()
 {
-    <span class="code-keyword">return</span> <span class="code-keyword">new</span> MultiZoneUpdate(<span class="code-quote">"userInput"</span>,
-        registrationForm).add(<span class="code-quote">"helpPanel"</span>,
+    return new MultiZoneUpdate("userInput",
+        registrationForm).add("helpPanel",
         registrationHelp);
 }
-</pre>
+]]></script>
 </div></div>
 <p>&#160; &#160; <em>Note that MultiZoneUpdate is deprecated starting with Tapestry 5.3.</em></p>
 
@@ -217,17 +230,17 @@ void onActionFromRegister()
 client-side id (<tt>id</tt>) is used ... on the client side to orchestrate requests and updates.  You will often seen the following construct:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;t:zone t:id=<span class="code-quote">"myZone"</span> id=<span class="code-quote">"myzone"</span>&gt;</span> ... <span class="code-tag">&lt;/t:zone&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;t:zone t:id="myZone" id="myzone"&gt; ... &lt;/t:zone&gt;
 
-<span class="code-tag">&lt;t:actionlink t:id=<span class="code-quote">"update"</span> zone=<span class="code-quote">"myzone"</span>&gt;</span>update<span class="code-tag">&lt;/t:actionlink&gt;</span>
-</pre>
+&lt;t:actionlink t:id="update" zone="myzone"&gt;update&lt;/t:actionlink&gt;
+]]></script>
 </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="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Added in 5.2</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.2</b><br clear="none"></td></tr></table></div>
 <div style="border-right: 20px solid #D8E4F1;border-left: 20px solid #D8E4F1;">
 <p>If the Form or Link is enclosed by the Zone itself, then the <tt>zone</tt> parameter may be set to the special value <tt>^</tt>. The carat is evaluated, on the client side, by searching up form the form or link element for the first enclosing element with the <tt>t-zone</tt> CSS class. In this way, the client-side coordination can occur without having to know what the specific client-side id of the Zone is. Because of this, in many cases, it is no longer necessary to specify the Zone's <tt>id</tt> parameter.</p>
 </div>
@@ -260,15 +273,15 @@ client-side id (<tt>id</tt>) is used ...
 <p>To have Tapestry update a zone without the usual yellow highlight effect, just specify "show" for the update parameter:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">&lt;t:zone t:id=<span class="code-quote">"myZone"</span> t:update=<span class="code-quote">"show"</span>&gt;</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;t:zone t:id="myZone" t:update="show"&gt;]]></script>
 </div></div>
 
 <p>You may also define and use your own JavaScript effect function (with lower-case names), like this:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-javascript">
-Tapestry.ElementEffect.myeffectname = <span class="code-keyword">function</span>(element){ YourJavascriptCodeGoesHere; };
-</pre>
+<script class="theme: Default; brush: javascript; gutter: false" type="syntaxhighlighter"><![CDATA[
+Tapestry.ElementEffect.myeffectname = function(element){ YourJavascriptCodeGoesHere; };
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="AjaxandZones-ZoneLimitations"></a>Zone Limitations</h3>
@@ -292,9 +305,9 @@ Tapestry.ElementEffect.myeffectname = <s
 <p>Autocomplete can be added to an existing text field:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;t:textfield t:id=<span class="code-quote">"accountName"</span> t:mixins=<span class="code-quote">"autocomplete"</span> size=<span class="code-quote">"100"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  &lt;t:textfield t:id="accountName" t:mixins="autocomplete" size="100"/&gt;
+]]></script>
 </div></div>
 
 <p>The mixin can be configured in a number of ways, see the <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/corelib/mixins/Autocomplete.html">component reference</a>.</p>
@@ -306,21 +319,21 @@ Tapestry.ElementEffect.myeffectname = <s
 <p>For example:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  List&lt;<span class="code-object">String</span>&gt; onProvideCompletionsFromAccountName(<span class="code-object">String</span> partial)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  List&lt;String&gt; onProvideCompletionsFromAccountName(String partial)
   {
     List&lt;Account&gt; matches = accountDAO.findByPartialAccountName(partial);
 
-    List&lt;<span class="code-object">String</span>&gt; result = <span class="code-keyword">new</span> ArrayList&lt;<span class="code-object">String</span>&gt;();
+    List&lt;String&gt; result = new ArrayList&lt;String&gt;();
 
-    <span class="code-keyword">for</span> (Account a : matches)
+    for (Account a : matches)
     {
       result.add(a.getName());
     }
 
-    <span class="code-keyword">return</span> result;
+    return result;
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>This presumes that <tt>findByPartialAccountName()</tt> will sort the values, otherwise you will probably want to sort them. The Autocomplete mixin does <em>not</em> do any sorting.</p>
@@ -335,7 +348,7 @@ Tapestry.ElementEffect.myeffectname = <s
 
 <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 +359,7 @@ Tapestry.ElementEffect.myeffectname = <s
     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/ajax-and-zones.html" async="true">

Modified: websites/production/tapestry/content/ajax-components-faq.html
==============================================================================
--- websites/production/tapestry/content/ajax-components-faq.html (original)
+++ websites/production/tapestry/content/ajax-components-faq.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Ajax 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="javascript-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="javascript-faq.html">JavaScript 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="injection-faq.html">Injection FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="injection-faq.html"><img align="middle" border="0" src="/images/con
 fluence/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="javascript-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="javascript-faq.html">JavaScript 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="injection-faq.html">Injection FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="injecti
 on-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="AjaxComponentsFAQ-AjaxComponents"></a>Ajax Components</h2>
 
@@ -87,34 +98,34 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Where does that content come from?  You inject it into your page.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;t:zone id=<span class="code-quote">"search"</span> t:id=<span class="code-quote">"searchZone"</span>&gt;
-  &lt;t:form t:id=<span class="code-quote">"searchForm"</span> zone=<span class="code-quote">"searchZone"</span>&gt;
-    &lt;t:textfield t:id=<span class="code-quote">"query"</span> size=<span class="code-quote">"20"</span>/&gt;
-    &lt;input type=<span class="code-quote">"submit"</span> value=<span class="code-quote">"Search"</span>/&gt;
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+&lt;t:zone id="search" t:id="searchZone"&gt;
+  &lt;t:form t:id="searchForm" zone="searchZone"&gt;
+    &lt;t:textfield t:id="query" size="20"/&gt;
+    &lt;input type="submit" value="Search"/&gt;
   &lt;/t:form&gt;
 &lt;/t:zone&gt;
 
-&lt;t:block id=<span class="code-quote">"searchResults"</span>&gt;
+&lt;t:block id="searchResults"&gt;
   &lt;ul&gt;
-    &lt;li t:type=<span class="code-quote">"loop"</span> source=<span class="code-quote">"searchHits"</span> value=<span class="code-quote">"searchHit"</span>&gt;${searchHit}&lt;/li&gt;
+    &lt;li t:type="loop" source="searchHits" value="searchHit"&gt;${searchHit}&lt;/li&gt;
   &lt;/ul&gt;
 &lt;/t:block&gt;
-</pre>
+]]></script>
 </div></div>
 
 <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> Block searchResults;
+  private Block searchResults;
 
-  <span class="code-object">Object</span> onSuccessFromSearchForm()
+  Object onSuccessFromSearchForm()
   {
     searchHits = searchService.performSearch(query);
 
-    <span class="code-keyword">return</span> searchResults;
+    return searchResults;
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>So, when the search form is submitted, the resulting search hits are collected.  In the same request, the searchResults block is rendered, package, and sent to the client.  The form inside the client-side Zone <tt>&lt;div&gt;</tt> is replaced with the list of hits.</p>
@@ -122,15 +133,15 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>In many cases, you just want to re-render the Zone itself, to display updated content.  In that case, you don't need a separate <tt>&lt;t:block&gt;</tt>, instead you can use @InjectComponent to inject the Zone object itself, and return the Zone's body:</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[
   @InjectComponent
-  <span class="code-keyword">private</span> Zone statusZone;
+  private Zone statusZone;
 
-  <span class="code-object">Object</span> onActionFromUpdateStatus()
+  Object onActionFromUpdateStatus()
   {
-    <span class="code-keyword">return</span> statusZone.getBody();
+    return statusZone.getBody();
   }
-</pre>
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="AjaxComponentsFAQ-HowtoIupdatemultiplezonesinasingleeventhandler%3F"></a>How to I update multiple zones in a single event handler?</h3>
@@ -140,46 +151,46 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>From the event handler method, instead of returning a Block or a Component, return a multi-zone update:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Multiple Zone Update (5.2)</b></div><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> Block searchResults;
+  private Block searchResults;
 
   @Inject
-  <span class="code-keyword">private</span> Block statusBlock;
+  private Block statusBlock;
 
-  <span class="code-object">Object</span> onSuccessFromSearchForm()
+  Object onSuccessFromSearchForm()
   {
     searchHits = searchService.performSearch(query);
 
-    message = <span class="code-object">String</span>.format(<span class="code-quote">"Found %,d matching documents"</span>, searchHits.size());
+    message = String.format("Found %,d matching documents", searchHits.size());
 
-    <span class="code-keyword">return</span> <span class="code-keyword">new</span> MultiZoneUpdate(<span class="code-quote">"results"</span>, searchResults).add(<span class="code-quote">"status"</span>, statusBlock);
+    return new MultiZoneUpdate("results", searchResults).add("status", statusBlock);
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>The above will work in Tapestry 5.3, but MultiZoneUpdate is deprecated. For 5.3 and later, use AjaxResponseRenderer instead:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Multiple Zone Update (5.3)</b></div><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> Block searchResults;
+  private Block searchResults;
 
   @Inject
-  <span class="code-keyword">private</span> Block statusBlock;
+  private Block statusBlock;
 
   @Inject
-  <span class="code-keyword">private</span> AjaxResponseRenderer ajaxResponseRenderer;
+  private AjaxResponseRenderer ajaxResponseRenderer;
 
   void onSuccessFromSearchForm()
   {
     searchHits = searchService.performSearch(query);
 
-    message = <span class="code-object">String</span>.format(<span class="code-quote">"Found %,d matching documents"</span>, searchHits.size());
+    message = String.format("Found %,d matching documents", searchHits.size());
 
-    ajaxResponseRenderer.addRender(<span class="code-quote">"results"</span>, searchResults).addRender(<span class="code-quote">"status"</span>, statusBlock);
+    ajaxResponseRenderer.addRender("results", searchResults).addRender("status", statusBlock);
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>AjaxResponseRenderer adds other useful commands as well.  It also has the advantage that a simple return value can be returned to render content for the Zone that triggered the request.</p>
@@ -189,25 +200,25 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>You might start with markup in your template for a component such as a TextField:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;t:textfield t:id=<span class="code-quote">"firstName"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;t:textfield t:id="firstName"/&gt;
+]]></script>
 </div></div>
 
 <p>When the component initially renders as part of a full page render, you get a sensible bit of markup:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;input id=<span class="code-quote">"firstName"</span> name=<span class="code-quote">"firstName"</span> type=<span class="code-quote">"text"</span>&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;input id="firstName" name="firstName" type="text"&gt;
+]]></script>
 </div></div>
 
 <p>But when the form is inside a Zone and rendered as part of a zone update, the ids get weird:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-   &lt;input id=<span class="code-quote">"firstName_12a820cc40e"</span> name=<span class="code-quote">"firstName"</span> type=<span class="code-quote">"text"</span>&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+   &lt;input id="firstName_12a820cc40e" name="firstName" type="text"&gt;
+]]></script>
 </div></div>
 
 <p>What's happening here is that Tapestry is working to prevent unwanted id clashes as part of the page update.  In an HTML document, each <tt>id</tt> is expected to be unique; most JavaScript is keyed off of the <tt>id</tt> field, for instance.</p>
@@ -229,9 +240,9 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>The solution is to add the following to the body of your Zone:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;div class=<span class="code-quote">"t-invisible"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;div class="t-invisible"/&gt;
+]]></script>
 </div></div>
 
 <p>This ensures that there's a place for the hidden input field. The "t-invisible" CSS class ensures that the &lt;div&gt; does not display or otherwise affect layout.</p>
@@ -245,12 +256,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="javascript-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="javascript-faq.html">JavaScript 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="injection-faq.html">Injection FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="injection-faq.html"><img align="middle" border="0" src="/images/con
 fluence/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="javascript-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="javascript-faq.html">JavaScript 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="injection-faq.html">Injection FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="injecti
 on-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']);
@@ -261,7 +272,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/ajax-components-faq.html" async="true">

Modified: websites/production/tapestry/content/ajax-components.html
==============================================================================
--- websites/production/tapestry/content/ajax-components.html (original)
+++ websites/production/tapestry/content/ajax-components.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Ajax Components -- 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>
@@ -61,7 +64,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']);
@@ -72,7 +75,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/ajax-components.html" async="true">

Modified: websites/production/tapestry/content/ajax-javascript.html
==============================================================================
--- websites/production/tapestry/content/ajax-javascript.html (original)
+++ websites/production/tapestry/content/ajax-javascript.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Ajax & JavaScript -- 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>
@@ -61,7 +64,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']);
@@ -72,7 +75,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/ajax-javascript.html" async="true">

Modified: websites/production/tapestry/content/aliases.html
==============================================================================
--- websites/production/tapestry/content/aliases.html (original)
+++ websites/production/tapestry/content/aliases.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Aliases -- 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,10 +69,10 @@
 <div id="content">
 <div id="ConfluenceContent">
 
-<div class="panelMacro"><table class="warningMacro"><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/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Deprecated since 5.2</b><br clear="none">Use ServiceOverrides instead. Aliases will be removed starting in 5.3.</td></tr></table></div>
+<div class="panelMacro"><table class="warningMacro"><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/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Deprecated since 5.2</b><br clear="none">Use ServiceOverrides instead. Aliases will be removed starting in 5.3.</td></tr></table></div>
 <div style="border-right: 20px solid #ffcccc;border-left: 20px solid #ffcccc;">
 
-<div class="navmenu" style="float:right; background:white; margin:3px; padding:3px"><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>Related Articles</b><br clear="none"><ul><li><a shape="rect" href="ioc-cookbook-overriding-ioc-services.html" title="IoC Cookbook - Overriding IoC Services">IoC Cookbook: Overriding Services</a></li></ul>
+<div class="navmenu" style="float:right; background:white; margin:3px; padding:3px"><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>Related Articles</b><br clear="none"><ul><li><a shape="rect" href="ioc-cookbook-overriding-ioc-services.html" title="IoC Cookbook - Overriding IoC Services">IoC Cookbook: Overriding Services</a></li></ul>
 </td></tr></table></div></div> 
 
 <h1><a shape="rect" name="Aliases-Introduction"></a>Introduction</h1>
@@ -87,13 +98,13 @@
 <p>You can then contribute into the Infrastructure service's configuration:</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 contributeAlias(@InjectService(<span class="code-quote">"MyService"</span>) MyService myService,
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static void contributeAlias(@InjectService("MyService") MyService myService,
      Configuration&lt;AliasContribution&gt; configuration)
   {
      configuration.add(AliasContribution.create(MyService.class, myService));
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>The above example follows a typical pattern; the service to be vended is injected into the contributor method, using the explicit InjectService annotation. A contribution is made providing the service type.</p>
@@ -113,7 +124,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']);
@@ -124,7 +135,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/aliases.html" async="true">

Modified: websites/production/tapestry/content/annotations.html
==============================================================================
--- websites/production/tapestry/content/annotations.html (original)
+++ websites/production/tapestry/content/annotations.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Annotations -- 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>
@@ -58,11 +61,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="annotations.html">Annotations</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-cheat-sheet.html">Component Cheat Sheet</a>
+                         <a shape="rect" href="annotations.html">Annotations</a>
         
                                             </td></tr></table>
 </div>
@@ -97,7 +100,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']);
@@ -108,7 +111,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/annotations.html" async="true">

Modified: websites/production/tapestry/content/application-module-class-cheat-sheet.html
==============================================================================
--- websites/production/tapestry/content/application-module-class-cheat-sheet.html (original)
+++ websites/production/tapestry/content/application-module-class-cheat-sheet.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Application Module Class Cheat Sheet -- 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="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="cheat-sheets.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="cheat-sheets.html">Cheat Sheets</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-cheat-sheet.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="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="cheat-sheets.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="cheat-sheets.html">Cheat Sheets</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-cheat-sheet.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>
 <ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Namingconventions">Naming conventions</a></li><ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Thebindmethod">The bind method</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Servicebuildermethods">Service builder methods</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Contributemethods">Contribute methods</a></li><ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Unordered">Unordered</a></li></ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Decoratemethods">Decorate methods</a></li></ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Annotations">Annotations</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Parametertypes"> Parameter types</a></li><ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Configurationparametertypes">Configuration parameter types</a></li><li><a shape="rect" href="#Applic
 ationModuleClassCheatSheet-Linktoservices">Link to services</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Symbols">Symbols</a></li></ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Loadservicesonregistrystartup">Load services on registry startup</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Defineservicescope">Define service scope</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Disambiguateservices">Disambiguate services</a></li><ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-WithserviceId">With service Id</a></li><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-WithMarkers">With Markers</a></li></ul><li><a shape="rect" href="#ApplicationModuleClassCheatSheet-Overrideexistingservices">Override existing services</a></li></ul></div>
@@ -75,15 +86,15 @@ table.ScrollbarTable td.ScrollbarNextIco
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="ioc-cookbook-service-configurations.html">IoC cookbook - Service Configurations</a>
+                         <a shape="rect" href="tapestry-ioc-configuration.html">Tapestry IoC Configuration</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="tapestry-ioc-configuration.html">Tapestry IoC Configuration</a>
+                         <a shape="rect" href="symbols.html">Symbols</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="symbols.html">Symbols</a>
+                         <a shape="rect" href="ioc-cookbook-service-configurations.html">IoC cookbook - Service Configurations</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
@@ -108,26 +119,26 @@ table.ScrollbarTable td.ScrollbarNextIco
 
 <p>Methods should be <b>public</b> and, preferably <b>static</b>.</p>
 
-<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">Allowing for non-static methods may have been a design error, a kind of premature optimization. The thinking was that the module could have common dependencies that it could then easily access when building services. This was partly about runtime efficiency but mostly about reducing redundancy in the various service building, contribution, and decorating methods; the ServiceBinder came later, and was a better solution (trading runtime efficiency for developer ease of use).</td></tr></table></div>
+<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">Allowing for non-static methods may have been a design error, a kind of premature optimization. The thinking was that the module could have common dependencies that it could then easily access when building services. This was partly about runtime efficiency but mostly about reducing redundancy in the various service building, contribution, and decorating methods; the ServiceBinder came later, and was a better solution (trading runtime efficiency for developer ease of use).</td></tr></table></div>
 
 <h3><a shape="rect" name="ApplicationModuleClassCheatSheet-Thebindmethod"></a>The bind method</h3>
 
 <p>Every module may have an optional, static bind() method which is passed a ServiceBinder. By using the ServiceBinder, you will let Tapestry <em>autobuild</em> your services. Autobuilding is the <b>preferred way</b> to instantiate your services.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">package</span> org.example.myapp.services;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+package org.example.myapp.services;
 
-<span class="code-keyword">import</span> org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
 
-<span class="code-keyword">public</span> class MyAppModule
+public class MyAppModule
 {
-  <span class="code-keyword">public</span> <span class="code-keyword">static</span> void bind(ServiceBinder binder)
+  public static void bind(ServiceBinder binder)
   {
     binder.bind(Indexer.class, IndexerImpl.class);
   }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>Allowing Tapestry to instantiate your service implementations means that, during development, they will live-reload.</p>
@@ -139,17 +150,17 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Sometime you need to do more than just instantiate the class with dependencies. It is common inside Tapestry for one service to be a listener to events from another service. In that situation (or other similar ones), a service builder method is useful, as it shifts control back to your code, where you have the freedom to perform any additional operations necessary to get the service implementation up and running.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">package</span> org.example.myapp.services;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+package org.example.myapp.services;
 
-<span class="code-keyword">public</span> class MyAppModule
+public class MyAppModule
 {
-  <span class="code-keyword">public</span> <span class="code-keyword">static</span> Indexer build()
+  public static Indexer build()
   {
-    <span class="code-keyword">return</span> <span class="code-keyword">new</span> IndexerImpl();
+    return new IndexerImpl();
   }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>Here the service interface is Indexer. Tapestry IoC doesn't know about the IndexerImpl class (the service implementation of the Indexer service), but it does know about the build() method. Since Tapestry isn't instantiating the implementation class, there is no possibility of live class reloading.</p>
@@ -157,18 +168,18 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Here's a more complicated example:</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[
     @Marker(ClasspathProvider.class)
-    <span class="code-keyword">public</span> <span class="code-keyword">static</span> AssetFactory buildClasspathAssetFactory(ResourceCache resourceCache,
+    public static AssetFactory buildClasspathAssetFactory(ResourceCache resourceCache,
             ClasspathAssetAliasManager aliasManager, AssetPathConverter converter)
     {
-        ClasspathAssetFactory factory = <span class="code-keyword">new</span> ClasspathAssetFactory(resourceCache, aliasManager, converter);
+        ClasspathAssetFactory factory = new ClasspathAssetFactory(resourceCache, aliasManager, converter);
 
         resourceCache.addInvalidationListener(factory);
 
-        <span class="code-keyword">return</span> factory;
+        return factory;
     }
-</pre>
+]]></script>
 </div></div>
 
 <p>What's important in this example is that ClasspathAssetFactory, the implementation class, implements the InvalidationListener interface.  AssetFactory, the service interface, does <b>not</b> extend the InvalidationListener interface.</p>
@@ -176,15 +187,15 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Tapestry has evolved some additional tools to "have your cake and eat it too"; the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/Autobuild.html">Autobuild</a> annotation takes care of instantiating a service implementation, with dependencies, allowing your code to focus on the extra initialization logic, and not on the dependencies:</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> PersistentFieldStrategy buildClientPersistentFieldStrategy(LinkCreationHub linkCreationHub, @Autobuild
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+    public static PersistentFieldStrategy buildClientPersistentFieldStrategy(LinkCreationHub linkCreationHub, @Autobuild
     ClientPersistentFieldStrategy service)
     {
         linkCreationHub.addListener(service);
 
-        <span class="code-keyword">return</span> service;
+        return service;
     }
-</pre>
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="ApplicationModuleClassCheatSheet-Contributemethods"></a>Contribute methods</h3>
@@ -198,26 +209,26 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>For example, here's a kind of tapestry internal service that requires a list of Coercion tuples to be able to coerce values from one type to another (i.e. from string to the target type when reading values from the HTTP request)</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> TypeCoercerImpl(Collection&lt;CoercionTuple&gt; tuples)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public TypeCoercerImpl(Collection&lt;CoercionTuple&gt; tuples)
 {
-    <span class="code-comment">// ...
-</span>}
-</pre>
+    // ...
+}
+]]></script>
 </div></div>
 
 <p>On the contribution side, a service contribution method sees a Configuration object:</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 contributeTypeCoercer(Configuration&lt;CoercionTuple&gt; configuration) {
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public static void contributeTypeCoercer(Configuration&lt;CoercionTuple&gt; configuration) {
 {
-    <span class="code-comment">// Create Coercion tuple here
-</span>    <span class="code-comment">// ...
-</span>
+    // Create Coercion tuple here
+    // ...
+
     configuration.add(myTuple);
 }
-</pre>
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="ApplicationModuleClassCheatSheet-Decoratemethods"></a>Decorate methods</h3>
@@ -282,12 +293,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="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="cheat-sheets.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="cheat-sheets.html">Cheat Sheets</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-cheat-sheet.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="ScrollbarPrevName" width="33%">&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="cheat-sheets.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="cheat-sheets.html">Cheat Sheets</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="component-cheat-sheet.html">Component Cheat Sheet</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="component-cheat-sheet.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']);
@@ -298,7 +309,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/application-module-class-cheat-sheet.html" async="true">

Modified: websites/production/tapestry/content/applications.html
==============================================================================
--- websites/production/tapestry/content/applications.html (original)
+++ websites/production/tapestry/content/applications.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Applications -- 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>
@@ -86,7 +89,7 @@ Business Intelligence <a shape="rect" cl
 
 <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']);
@@ -97,7 +100,7 @@ Business Intelligence <a shape="rect" cl
     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/applications.html" async="true">

Modified: websites/production/tapestry/content/articles.html
==============================================================================
--- websites/production/tapestry/content/articles.html (original)
+++ websites/production/tapestry/content/articles.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Articles -- 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>
@@ -56,11 +59,11 @@
   </div>
 
 <div id="content">
-<div id="ConfluenceContent"><div id="bar">
-<p><b>We think you will love Tapestry!</b> Give us 20 minutes and <b><a shape="rect" href="tapestry-tutorial.html" title="Tapestry Tutorial">follow our tutorial</a></b>.</p>
+<div id="ConfluenceContent"><div id="bar"><br clear="none">
+<b>We think you will love Tapestry!</b> Give us 20 minutes and <b><a shape="rect" href="tapestry-tutorial.html" title="Tapestry Tutorial">follow our tutorial</a></b>.<br clear="none">
 </div>
 
-<div id="content">
+<p></p><div id="content">
 
 <h2><a shape="rect" name="Articles-ArticlesonTapestry"></a>Articles on Tapestry</h2>
 
@@ -77,13 +80,13 @@
 <p><font color="#000000">Links for many other works are kept on the&#160;</font><a shape="rect" class="external-link" href="http://wiki.apache.org/tapestry">Tapestry Wiki</a><font color="#000000">.</font></p>
 
 
-<div class="clearer"></div></div>
+<p></p><div class="clearer"></div></div>
 </div><div class="clearer"></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']);
@@ -94,7 +97,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/articles.html" async="true">

Modified: websites/production/tapestry/content/assets.html
==============================================================================
--- websites/production/tapestry/content/assets.html (original)
+++ websites/production/tapestry/content/assets.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,19 @@
     Assets -- 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,11 +76,11 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="css.html">CSS</a>
+                         <a shape="rect" href="request-processing.html">Request Processing</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="request-processing.html">Request Processing</a>
+                         <a shape="rect" href="css.html">CSS</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
@@ -76,11 +88,11 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="javascript.html">JavaScript</a>
+                         <a shape="rect" href="configuration.html">Configuration</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="configuration.html">Configuration</a>
+                         <a shape="rect" href="javascript.html">JavaScript</a>
         
                                             </td></tr></table>
 </div>
@@ -96,19 +108,19 @@
 <p>Assets can also be referenced directly in templates. Two <a shape="rect" href="component-parameters.html#ComponentParameters-bindingexpressions">binding prefixes</a> exist for this: "asset:" and "context:". The "asset:" prefix can obtain assets from the classpath (the default) or from the web context (by specifying the "context:" domain explicitly):</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;img src=<span class="code-quote">"${asset:context:image/tapestry_banner.gif}"</span> alt=<span class="code-quote">"Banner"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;img src="${asset:context:image/tapestry_banner.gif}" alt="Banner"/&gt;
+]]></script>
 </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="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">This is an example of using a <em>template expansion</em> inside an ordinary element (rather than a component).</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">This is an example of using a <em>template expansion</em> inside an ordinary element (rather than a component).</td></tr></table></div>
 
 <p>Because accessing context assets is so common, the "context:" binding prefix was introduced:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;img src=<span class="code-quote">"${context:image/tapestry_banner.gif}"</span> alt=<span class="code-quote">"Banner"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;img src="${context:image/tapestry_banner.gif}" alt="Banner"/&gt;
+]]></script>
 </div></div>
 
 <h2><a shape="rect" name="Assets-AssetsinComponentClasses"></a>Assets in Component Classes</h2>
@@ -116,11 +128,11 @@
 <p>Components learn about assets via <a shape="rect" href="injection.html" title="Injection">injection</a>. The @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/Inject.html">Inject</a> annotation allows Assets to be injected into components as read-only properties. The path to the resource is specified using the Path annotation:</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
-@Path(<span class="code-quote">"context:images/tapestry_banner.gif"</span>)
-<span class="code-keyword">private</span> Asset banner;
-</pre>
+@Path("context:images/tapestry_banner.gif")
+private Asset banner;
+]]></script>
 </div></div>
 
 <p>Assets are located within <em>domains</em>; these domains are identified by the prefix on the @Path annotation's <tt>value</tt>.</p>
@@ -134,11 +146,11 @@
 <p>You can use relative paths with domains (if you omit the prefix):</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
-@Path(<span class="code-quote">"../edit.png"</span>)
-<span class="code-keyword">private</span> Asset icon;
-</pre>
+@Path("../edit.png")
+private Asset icon;
+]]></script>
 </div></div>
 
 <p>Since you must omit the prefix, this only makes sense for components packaged in a library for reuse.</p>
@@ -148,14 +160,14 @@
 <p>Symbols inside the annotation value are expanded. This allows you to define a symbol and reference it as part of the path. For example, you could contribute a symbol named "skin.root" as "context:skins/basic" and then reference an asset from within it:</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
-@Path(<span class="code-quote">"${skin.root}/style.css"</span>)
-<span class="code-keyword">private</span> Asset style;
-</pre>
+@Path("${skin.root}/style.css")
+private Asset style;
+]]></script>
 </div></div>
 
-<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">The use of the <tt>${...</tt>} syntax here is a <em>symbol expansion</em> (because it occurs in an annotation in Java code), rather than a <em>template expansion</em> (which occurs only in Tapestry template files).</td></tr></table></div>
+<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">The use of the <tt>${...</tt>} syntax here is a <em>symbol expansion</em> (because it occurs in an annotation in Java code), rather than a <em>template expansion</em> (which occurs only in Tapestry template files).</td></tr></table></div>
 
 <p>An override of the skin.root symbol would affect all references to the named asset.</p>
 
@@ -288,12 +300,12 @@ var footnoteMarkerHighlight = function(i
 <p>By default, Tapestry secures file extensions ".class', ".tml" and ".properties".  The list can be extended by contributing to the <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/services/ResourceDigestGenerator.html">ResourceDigestGenerator</a> service:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>AppModule.java (partial)</b></div><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> void contributeResourceDigestGenerator(Configuration&lt;<span class="code-object">String</span>&gt; configuration)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public static void contributeResourceDigestGenerator(Configuration&lt;String&gt; configuration)
 {
-    configuration.add(<span class="code-quote">"xyz"</span>);
+    configuration.add("xyz");
 }
-</pre>
+]]></script>
 </div></div>
 
 <h2><a shape="rect" name="Assets-MinimizingAssets"></a>Minimizing Assets</h2>
@@ -303,39 +315,39 @@ var footnoteMarkerHighlight = function(i
 <p>By default, this service does nothing. You should include a third-party library, for example the tapestry-yuicompressor project, which makes it possible to minimize CSS and JavaScript files.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>pom.xml (partial)</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-<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-yuicompressor<span class="code-tag">&lt;/artifactId&gt;</span>
-    <span class="code-tag">&lt;version&gt;</span>5.3.1<span class="code-tag">&lt;/version&gt;</span>
-<span class="code-tag">&lt;/dependency&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;dependency&gt;
+    &lt;groupId&gt;org.apache.tapestry&lt;/groupId&gt;
+    &lt;artifactId&gt;tapestry-yuicompressor&lt;/artifactId&gt;
+    &lt;version&gt;5.3.1&lt;/version&gt;
+&lt;/dependency&gt;
+]]></script>
 </div></div>
 
 <p>By adding this dependency, all your JavaScript and CSS files will be minimized when <a shape="rect" href="configuration.html" title="Configuration">PRODUCTION_MODE=true</a>. You can force the minimization of these files, by changing the value of the constant SymbolConstants.MINIFICATION_ENABLED in your module class (usually AppModule.java):</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>AppModule.java (partial)</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 @Contribute(SymbolProvider.class)
 @ApplicationDefaults
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> void contributeApplicationDefaults(MappedConfiguration&lt;<span class="code-object">String</span>, <span class="code-object">String</span>&gt; configuration)
+public static void contributeApplicationDefaults(MappedConfiguration&lt;String, String&gt; configuration)
 {
-    configuration.add(SymbolConstants.MINIFICATION_ENABLED, <span class="code-quote">"<span class="code-keyword">true</span>"</span>);
+    configuration.add(SymbolConstants.MINIFICATION_ENABLED, "true");
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>If you want to add your own minimizer for particular types of assets, you can contribute to the ResourceMinimizer service. The service configuration maps the MIME-TYPE of your resource to an implementation of the ResourceMinimizer interface.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>AppModule.java (partial)</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 @Contribute(ResourceMinimizer.class)
 @Primary
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> void contributeMinimizers(MappedConfiguration&lt;<span class="code-object">String</span>, ResourceMinimizer&gt; configuration)
+public static void contributeMinimizers(MappedConfiguration&lt;String, ResourceMinimizer&gt; configuration)
 {
-    configuration.addInstance(<span class="code-quote">"text/coffeescript"</span>, CoffeeScriptMinimizer.class);
+    configuration.addInstance("text/coffeescript", CoffeeScriptMinimizer.class);
 }
-</pre>
+]]></script>
 </div></div>
 
 <hr>
@@ -362,7 +374,7 @@ var footnoteMarkerHighlight = function(i
 
 <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']);
@@ -373,7 +385,7 @@ var footnoteMarkerHighlight = function(i
     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/assets.html" async="true">