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 [28/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/tapestry-reference-guide-plan-draft.html
==============================================================================
--- websites/production/tapestry/content/tapestry-reference-guide-plan-draft.html (original)
+++ websites/production/tapestry/content/tapestry-reference-guide-plan-draft.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Tapestry Reference Guide Plan (Draft) -- 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>
@@ -349,7 +352,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']);
@@ -360,7 +363,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/tapestry-reference-guide-plan-draft.html" async="true">

Modified: websites/production/tapestry/content/tapestry-tutorial.html
==============================================================================
--- websites/production/tapestry/content/tapestry-tutorial.html (original)
+++ websites/production/tapestry/content/tapestry-tutorial.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Tapestry Tutorial -- 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>
@@ -62,19 +65,19 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="principles.html">Principles</a>
+                         <a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a>
+                         <a shape="rect" href="getting-started.html">Getting Started</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="tapestry-for-jsf-users.html">Tapestry for JSF Users</a>
+                         <a shape="rect" href="principles.html">Principles</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="getting-started.html">Getting Started</a>
+                         <a shape="rect" href="tapestry-for-jsf-users.html">Tapestry for JSF Users</a>
         
                                             </td></tr></table>
 </div> 
@@ -124,7 +127,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']);
@@ -135,7 +138,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/tapestry-tutorial.html" async="true">

Modified: websites/production/tapestry/content/templating-and-markup-faq.html
==============================================================================
--- websites/production/tapestry/content/templating-and-markup-faq.html (original)
+++ websites/production/tapestry/content/templating-and-markup-faq.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Templating and Markup 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="general-questions.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="general-questions.html">General Questions</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="page-and-component-classes-faq.html">Page And Component Classes FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="page-and-component-class
 es-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="general-questions.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="general-questions.html">General Questions</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="page-and-component-classes-faq.html">Page And Component Classes FAQ</a></td><td colspan="1" rowspan="1" class="Scrol
 lbarNextIcon"><a shape="rect" href="page-and-component-classes-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="TemplatingandMarkupFAQ-TemplatingandMarkup"></a>Templating and Markup</h2>
 
@@ -75,10 +86,10 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Tapestry uses a standard SAX parser to read your templates. This means that your templates must be <em>well formed</em>: open and close tags must balance, attribute values must be quoted, and entities must be declared. The easiest way to accomplish this is to add a DOCTYPE to your the top of your template:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-&lt;!DOCTYPE html PUBLIC <span class="code-quote">"-<span class="code-comment">//W3C//DTD XHTML 1.0 Strict//EN"</span>
-</span>   <span class="code-quote">"http:<span class="code-comment">//www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"</span>&gt;</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
+]]></script>
 </div></div>
 
 <p>Part of the DOCTYPE is the declaration of entities such as <tt>&amp;nbsp;</tt>.</p>
@@ -92,9 +103,9 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>You have to be careful when using relative URLs inside page templates; the base URL may not always be what you expect.  For example, inside your <tt>ViewUser.tml</tt> file, you may have:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;img class=<span class="code-quote">"icon"</span> src=<span class="code-quote">"icons/admin.png"</span>/&gt;${user.name} has Administrative access
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;img class="icon" src="icons/admin.png"/&gt;${user.name} has Administrative access
+]]></script>
 </div></div>
 
 <p>This makes sense; <tt>ViewUser.tml</tt> is in the web context, as is the <tt>icons</tt> folder.  The default URL for this page will be <tt>/viewuser</tt><style type="text/css">
@@ -174,15 +185,15 @@ var footnoteMarkerHighlight = function(i
 <p>However, most likely, the ViewUser page has a page activation context to identify which user is to be displayed:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class ViewUser
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+public class ViewUser
 
   @Property
   @PageActivationContext
-  <span class="code-keyword">private</span> User user;
+  private User user;
 
   . . .
-</pre>
+]]></script>
 </div></div>
 
 <p>With a page activation context, the URL for the page will incorporate the id of the User object, something like <tt>/viewuser/37371</tt>.  This is why the relative URLs to the <tt>admin.png</tt> image is broken: the base path is relative to the page's URL, not to the page template
@@ -196,9 +207,9 @@ var footnoteMarkerHighlight = function(i
 <p>One solution would be to predict what the page URL will be, and adjust the path for that:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;img class=<span class="code-quote">"icon"</span> src=<span class="code-quote">"../icons/admin.png"</span>/&gt;${user.name} has Administrative access
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;img class="icon" src="../icons/admin.png"/&gt;${user.name} has Administrative access
+]]></script>
 </div></div>
 
 <p>But this has its own problems; the page activation context may vary in length at different times, or the template in question may be a component used across many different pages, making it difficult to predict what the correct relative URL would be.</p>
@@ -206,9 +217,9 @@ var footnoteMarkerHighlight = function(i
 <p>The <em>best</em> solution for this situation, one that will be sure to work in all pages and all components, is to make use of the <tt>context:</tt> binding prefix:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  &lt;img class=<span class="code-quote">"icon"</span> src=<span class="code-quote">"${context:icons/admin.png}"</span>/&gt;${user.name} has Administrative access
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;img class="icon" src="${context:icons/admin.png}"/&gt;${user.name} has Administrative access
+]]></script>
 </div></div>
 
 <p>The src attribute of the &lt;img&gt; tag will now be bound to a dynamically computed value: the location of the image file relative to the web application context. This is especially important for components that may be used on different pages.</p>
@@ -218,9 +229,9 @@ var footnoteMarkerHighlight = function(i
 <p>You might occasionally see something like the following in a template:</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">"status"</span> t:id=<span class="code-quote">"statusZone"</span>&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+&lt;t:zone id="status" t:id="statusZone"&gt;
+]]></script>
 </div></div>
 
 <p>Why two ids?  Why are they different?</p>
@@ -228,18 +239,18 @@ var footnoteMarkerHighlight = function(i
 <p>The <tt>t:id</tt> attribute is the Tapestry component id. This id is unique within its immediate container.  This is the id you might use to inject the component into your page class:</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;
-</pre>
+  private Zone statusZone;
+]]></script>
 </div></div>
 
 <p>The other id is the client id, a unique id for the rendered element within the client-side DOM. JavaScript that needs to access the element uses this id.  For 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: true" type="syntaxhighlighter"><![CDATA[
   $('status').hide();
-</pre>
+]]></script>
 </div></div>
 
 <p>In many components, the <tt>id</tt> attribute is an informal parameter; a value from the template that is blindly echoed into the output document.  In other cases, the component itself has an <tt>id</tt> attribute.  Often, in the latter case, the Tapestry component id is the <em>default</em> value for the client id.</p>
@@ -258,12 +269,12 @@ var footnoteMarkerHighlight = function(i
 <p>By the time your application is ready for production, you should manage the application version number directly:</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 contributeApplicationDefaults(
-			MappedConfiguration&lt;<span class="code-object">String</span>, <span class="code-object">String</span>&gt; configuration) {
-		configuration.add(SymbolConstants.APPLICATION_VERSION, <span class="code-quote">"1.7.5"</span>);
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+	public static void contributeApplicationDefaults(
+			MappedConfiguration&lt;String, String&gt; configuration) {
+		configuration.add(SymbolConstants.APPLICATION_VERSION, "1.7.5");
 	}
-</pre>
+]]></script>
 </div></div>
 
 <p>You should be careful to change the application version number for each new deployment of your application; otherwise returning users may be stuck with old versions of assets that have changed in the interim.  This kind of mismatch can cause visual annoyances for style sheets or image files, but can break client-side behavior for changed JavaScript libraries.</p>
@@ -273,28 +284,28 @@ var footnoteMarkerHighlight = function(i
 <p>As they say, "just do it".  The majority of Tapestry components support <em>informal parameters</em>, meaning that any extra attributes in the element (in the template) will be rendered out as additional attributes.  So, you can apply a CSS class or style quite easily:</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">"username"</span> class=<span class="code-quote">"big-green"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;t:textfield t:id="username" class="big-green"/&gt;
+]]></script>
 </div></div>
 
 <p>You can even use template expansions inside the attribute value:</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">"username"</span> class=<span class="code-quote">"${usernameClass}"</span>/&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  &lt;t:textfield t:id="username" class="${usernameClass}"/&gt;
+]]></script>
 </div></div>
 
 <p>and</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-object">String</span> getUsernameClass() 
+<script class="theme: Default; brush: java; gutter: true" type="syntaxhighlighter"><![CDATA[
+  public String getUsernameClass() 
   {
-    <span class="code-keyword">return</span> isUrgent() ? <span class="code-quote">"urgent"</span> : <span class="code-keyword">null</span>;
+    return isUrgent() ? "urgent" : null;
   }
-</pre>
+]]></script>
 </div></div>
 
 <p>When an informal parameter is bound to null, then the attribute is not written out at all.</p>
@@ -310,7 +321,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="general-questions.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="general-questions.html">General Questions</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="page-and-component-classes-faq.html">Page And Component Classes FAQ</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="page-and-component-class
 es-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="general-questions.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="general-questions.html">General Questions</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="page-and-component-classes-faq.html">Page And Component Classes FAQ</a></td><td colspan="1" rowspan="1" class="Scrol
 lbarNextIcon"><a shape="rect" href="page-and-component-classes-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">
@@ -330,7 +341,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']);
@@ -341,7 +352,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/templating-and-markup-faq.html" async="true">

Modified: websites/production/tapestry/content/test-page-2.html
==============================================================================
--- websites/production/tapestry/content/test-page-2.html (original)
+++ websites/production/tapestry/content/test-page-2.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Test Page 2 -- 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>
@@ -108,7 +111,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']);
@@ -119,7 +122,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/test-page-2.html" async="true">

Modified: websites/production/tapestry/content/test-page.html
==============================================================================
--- websites/production/tapestry/content/test-page.html (original)
+++ websites/production/tapestry/content/test-page.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Test Page -- 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,8 +61,8 @@
 <div id="content">
 <div id="ConfluenceContent"><p>Test page to test changes to the autoexport template...</p>
 
-
-<div id="cse-search-form" style="width: 10em;">Loading</div>
+<p>
+</p><div id="cse-search-form" style="width: 10em;">Loading</div>
 <script src="http://www.google.com/jsapi" type="text/javascript"></script>
 <script type="text/javascript">
   google.load('search', '1', {language : 'en'});
@@ -74,11 +77,11 @@
 <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css">
 
 
-<p>&#8212;</p>
-
-<div id="cse" style="width:100%;"></div>
+<p>&#8212;<br clear="none">
 
-<p>&#8212;</p>
+</p><div id="cse" style="width:100%;"></div>
+<br clear="none">
+&#8212;
 
 
 <ul><li><a shape="rect" href="test-page-2.html" title="Test Page 2">Test Page 2</a> &#8212; <span class="smalltext">{toc}</span></li></ul>
@@ -88,7 +91,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']);
@@ -99,7 +102,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/test-page.html" async="true">

Modified: websites/production/tapestry/content/test.html
==============================================================================
--- websites/production/tapestry/content/test.html (original)
+++ websites/production/tapestry/content/test.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Test -- 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/test.html" async="true">

Modified: websites/production/tapestry/content/the-tapestry-jail.html
==============================================================================
--- websites/production/tapestry/content/the-tapestry-jail.html (original)
+++ websites/production/tapestry/content/the-tapestry-jail.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     The tapestry jail -- 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,9 +75,9 @@
 <p><b>ONLY</b> use</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[
 sudo /usr/local/etc/rc.d/tomcat7 restart
-</pre>
+]]></script>
 </div></div>
 
 <p>if you need to restart Tomcat. Anything else will fail.</p>
@@ -76,27 +87,27 @@ sudo /usr/local/etc/rc.d/tomcat7 restart
 <p>If the jail lost Java and Tomcat:</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[
 cd /usr/ports
-</pre>
+]]></script>
 </div></div>
 
 <p>if it doesn't exist yet:</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[
 portsnap fetch
 portsnap extract
-</pre>
+]]></script>
 </div></div>
 
 <p>install java:</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[
 cd /usr/ports/java/diablo-jdk16/
 make install clean
-</pre>
+]]></script>
 </div></div>
 
 <p>Some files need manual download and have to be placed into <tt>/usr/ports/distfiles</tt>. Follow the instructions on screen.</p>
@@ -106,9 +117,9 @@ make install clean
 <p>Afterwards:</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[
 make install clean
-</pre>
+]]></script>
 </div></div>
 
 <p>Follow instructions and manually install any unresolved dependencies it might encounter.</p>
@@ -120,27 +131,27 @@ make install clean
 <p>Check your env for PACKAGESITE. It should point to tb.apache.org:</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[
 [root@tapestry ~]# env|grep PACKAGESITE
-PACKAGESITE=ftp:<span class="code-comment">//tb.apache.org/pub/FreeBSD/ports/packages/8.2-RELENG-j-tlp/Latest/</span>
-</pre>
+PACKAGESITE=ftp://tb.apache.org/pub/FreeBSD/ports/packages/8.2-RELENG-j-tlp/Latest/
+]]></script>
 </div></div>
 
 <p>Install the tomcat7 package:</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[
 pkg_add -r tomcat7
-</pre>
+]]></script>
 </div></div>
 
 <h5><a shape="rect" name="Thetapestryjail-fromports%28discouraged%29"></a>from ports (discouraged)</h5>
-<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">this is really discouraged!</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">this is really discouraged!</td></tr></table></div>
 <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[
 cd /usr/ports/www/tomcat7
 make install clean
-</pre>
+]]></script>
 </div></div>
 
 <h5><a shape="rect" name="Thetapestryjail-configuretomcat"></a>configure tomcat</h5>
@@ -150,11 +161,11 @@ make install clean
 <p>Add</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-tomcat7_enable=<span class="code-quote">"YES"</span>
-tomcat7_java_home=<span class="code-quote">"/usr/local/diablo-jdk1.6.0/jre"</span>
-tomcat7_java_opts=<span class="code-quote">"-XX:MaxPermSize=256M"</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+tomcat7_enable="YES"
+tomcat7_java_home="/usr/local/diablo-jdk1.6.0/jre"
+tomcat7_java_opts="-XX:MaxPermSize=256M"
+]]></script>
 </div></div>
 
 <p>to <tt>/etc/rc.conf</tt> to start tomcat on system startup and tell it to use the Diablo JVM.</p>
@@ -162,16 +173,16 @@ tomcat7_java_opts=<span class="code-quot
 <p>The sudoers file may have lost the entry allowing members of the tomcat-restart group to restart Tomcat. Add it back using <tt>visudo</tt>:</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[
 # restart tomcat
 %tomcat-restart ALL=(root)      NOPASSWD: /usr/local/etc/rc.d/tomcat7 restart
-</pre>
+]]></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']);
@@ -182,7 +193,7 @@ tomcat7_java_opts=<span class="code-quot
     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/the-tapestry-jail.html" async="true">

Modified: websites/production/tapestry/content/third-party-modules.html
==============================================================================
--- websites/production/tapestry/content/third-party-modules.html (original)
+++ websites/production/tapestry/content/third-party-modules.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Third Party Modules -- 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>
@@ -198,7 +201,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']);
@@ -209,7 +212,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/third-party-modules.html" async="true">

Modified: websites/production/tapestry/content/tutorial.html
==============================================================================
--- websites/production/tapestry/content/tutorial.html (original)
+++ websites/production/tapestry/content/tutorial.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Tutorial -- 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/tutorial.html" async="true">

Modified: websites/production/tapestry/content/type-coercion.html
==============================================================================
--- websites/production/tapestry/content/type-coercion.html (original)
+++ websites/production/tapestry/content/type-coercion.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Type Coercion -- 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>
@@ -61,23 +72,23 @@
 <div class="navmenu" style="float:right; background:white; margin:3px; padding:3px"><div class="navmenu" style="float:right; background:#eee; margin:3px; padding:3px"></div>
 <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="enum-parameter-recipe.html">Enum Parameter Recipe</a>
+                         <a shape="rect" href="supporting-informal-parameters.html">Supporting Informal Parameters</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="typecoercer-service.html">TypeCoercer Service</a>
+                         <a shape="rect" href="type-coercion.html">Type Coercion</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="type-coercion.html">Type Coercion</a>
+                         <a shape="rect" href="enum-parameter-recipe.html">Enum Parameter Recipe</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="default-parameter.html">Default Parameter</a>
+                         <a shape="rect" href="typecoercer-service.html">TypeCoercer Service</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="supporting-informal-parameters.html">Supporting Informal Parameters</a>
+                         <a shape="rect" href="default-parameter.html">Default Parameter</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
@@ -93,20 +104,20 @@
 <p>For example, consider the Count component:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class Count
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class Count
 {
     @Parameter
-    <span class="code-keyword">private</span> <span class="code-object">int</span> start = 1;
+    private int start = 1;
 
-    @Parameter(required = <span class="code-keyword">true</span>)
-    <span class="code-keyword">private</span> <span class="code-object">int</span> end;
+    @Parameter(required = true)
+    private int end;
 
     @Parameter
-    <span class="code-keyword">private</span> <span class="code-object">int</span> value;
+    private int value;
     
     . . .
-</pre>
+]]></script>
 </div></div>
 
 <p>Here, the type of all three parameters is <tt>int</tt>.</p>
@@ -114,9 +125,9 @@
 <p>However, it is likely that the component will be used as so:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-  Merry Christmas: &lt;t:count end=<span class="code-quote">"3"</span>&gt; Ho! &lt;/t:count&gt;
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  Merry Christmas: &lt;t:count end="3"&gt; Ho! &lt;/t:count&gt;
+]]></script>
 </div></div>
 
 <p>A bare whole number is interpreted by the prop binding prefix as a <tt>long</tt>. So this is the <em>long</em> value 3.</p>
@@ -133,7 +144,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']);
@@ -144,7 +155,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/type-coercion.html" async="true">

Modified: websites/production/tapestry/content/typecoercer-service.html
==============================================================================
--- websites/production/tapestry/content/typecoercer-service.html (original)
+++ websites/production/tapestry/content/typecoercer-service.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     TypeCoercer Service -- 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,18 +75,18 @@ 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="service-serialization.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="service-serialization.html">Service Serialization</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="starting-the-ioc-registry.html">Starting the IoC Registry</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="starting-the-ioc-registry.html"><img align="middle" border="0" src="/images/confluence/forw
 d_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="service-serialization.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="service-serialization.html">Service Serialization</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="starting-the-ioc-registry.html">Starting the IoC Registry</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="starting-the-ioc-registry.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>
 
 <h1><a shape="rect" name="TypeCoercerService-TypeCoercion"></a>Type Coercion</h1>
 
 <div class="navmenu" style="float:right; background:white; margin:3px; padding:3px"><div class="navmenu" style="float:right; background:#eee; margin:3px; padding:3px"></div> 
 <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="typecoercer-service.html">TypeCoercer Service</a>
+                         <a shape="rect" href="type-coercion.html">Type Coercion</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="type-coercion.html">Type Coercion</a>
+                         <a shape="rect" href="typecoercer-service.html">TypeCoercer Service</a>
         
                                             </td></tr></table>
 </div>
@@ -108,61 +119,61 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>As of Tapestry versions 5.1 and 5.2, the following coercions are available:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-object">Double</span> --&gt; <span class="code-object">Float</span>
-<span class="code-object">Float</span> --&gt; <span class="code-object">Double</span>
-<span class="code-object">Long</span> --&gt; <span class="code-object">Boolean</span>
-<span class="code-object">Long</span> --&gt; <span class="code-object">Byte</span>
-<span class="code-object">Long</span> --&gt; <span class="code-object">Double</span>
-<span class="code-object">Long</span> --&gt; <span class="code-object">Integer</span>
-<span class="code-object">Long</span> --&gt; <span class="code-object">Short</span>
-<span class="code-object">Number</span> --&gt; <span class="code-object">Long</span>
-<span class="code-object">Object</span> --&gt; <span class="code-object">Object</span>[]
-<span class="code-object">Object</span> --&gt; <span class="code-object">String</span>
-<span class="code-object">Object</span> --&gt; java.util.List
-<span class="code-object">Object</span>[] --&gt; java.util.List
-<span class="code-object">String</span> --&gt; <span class="code-object">Boolean</span>
-<span class="code-object">String</span> --&gt; <span class="code-object">Double</span>
-<span class="code-object">String</span> --&gt; <span class="code-object">Long</span>
-<span class="code-object">String</span> --&gt; java.io.File
-<span class="code-object">String</span> --&gt; java.math.BigDecimal
-<span class="code-object">String</span> --&gt; java.math.BigInteger
-<span class="code-object">String</span> --&gt; java.text.DateFormat
-<span class="code-object">String</span> --&gt; java.util.regex.Pattern
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.Renderable
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.SelectModel
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.ClientValidation
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.LoopFormState
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.SubmitMode
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.data.BlankOption
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.data.GridPagerPosition
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.corelib.data.InsertPosition
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.ioc.Resource
-<span class="code-object">String</span> --&gt; org.apache.tapestry5.ioc.util.TimeInterval
-<span class="code-object">boolean</span>[] --&gt; java.util.List
-<span class="code-object">byte</span>[] --&gt; java.util.List
-<span class="code-object">char</span>[] --&gt; java.util.List
-<span class="code-object">double</span>[] --&gt; java.util.List
-<span class="code-object">float</span>[] --&gt; java.util.List
-<span class="code-object">int</span>[] --&gt; java.util.List
-java.math.BigDecimal --&gt; <span class="code-object">Double</span>
-java.util.Collection --&gt; <span class="code-object">Boolean</span>
-java.util.Collection --&gt; <span class="code-object">Object</span>[]
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+Double --&gt; Float
+Float --&gt; Double
+Long --&gt; Boolean
+Long --&gt; Byte
+Long --&gt; Double
+Long --&gt; Integer
+Long --&gt; Short
+Number --&gt; Long
+Object --&gt; Object[]
+Object --&gt; String
+Object --&gt; java.util.List
+Object[] --&gt; java.util.List
+String --&gt; Boolean
+String --&gt; Double
+String --&gt; Long
+String --&gt; java.io.File
+String --&gt; java.math.BigDecimal
+String --&gt; java.math.BigInteger
+String --&gt; java.text.DateFormat
+String --&gt; java.util.regex.Pattern
+String --&gt; org.apache.tapestry5.Renderable
+String --&gt; org.apache.tapestry5.SelectModel
+String --&gt; org.apache.tapestry5.corelib.ClientValidation
+String --&gt; org.apache.tapestry5.corelib.LoopFormState
+String --&gt; org.apache.tapestry5.corelib.SubmitMode
+String --&gt; org.apache.tapestry5.corelib.data.BlankOption
+String --&gt; org.apache.tapestry5.corelib.data.GridPagerPosition
+String --&gt; org.apache.tapestry5.corelib.data.InsertPosition
+String --&gt; org.apache.tapestry5.ioc.Resource
+String --&gt; org.apache.tapestry5.ioc.util.TimeInterval
+boolean[] --&gt; java.util.List
+byte[] --&gt; java.util.List
+char[] --&gt; java.util.List
+double[] --&gt; java.util.List
+float[] --&gt; java.util.List
+int[] --&gt; java.util.List
+java.math.BigDecimal --&gt; Double
+java.util.Collection --&gt; Boolean
+java.util.Collection --&gt; Object[]
 java.util.Collection --&gt; org.apache.tapestry5.grid.GridDataSource
 java.util.Date --&gt; java.util.Calendar
 java.util.List --&gt; org.apache.tapestry5.SelectModel
 java.util.Map --&gt; org.apache.tapestry5.SelectModel
-<span class="code-object">long</span>[] --&gt; java.util.List
-<span class="code-keyword">null</span> --&gt; <span class="code-object">Boolean</span>
-<span class="code-keyword">null</span> --&gt; org.apache.tapestry5.grid.GridDataSource
+long[] --&gt; java.util.List
+null --&gt; Boolean
+null --&gt; org.apache.tapestry5.grid.GridDataSource
 org.apache.tapestry5.ComponentResources --&gt; org.apache.tapestry5.PropertyOverrides
 org.apache.tapestry5.PrimaryKeyEncoder --&gt; org.apache.tapestry5.ValueEncoder
 org.apache.tapestry5.Renderable --&gt; org.apache.tapestry5.Block
 org.apache.tapestry5.Renderable --&gt; org.apache.tapestry5.runtime.RenderCommand
-org.apache.tapestry5.ioc.util.TimeInterval --&gt; <span class="code-object">Long</span>
+org.apache.tapestry5.ioc.util.TimeInterval --&gt; Long
 org.apache.tapestry5.runtime.ComponentResourcesAware --&gt; org.apache.tapestry5.ComponentResources
-<span class="code-object">short</span>[] --&gt; java.util.List
-</pre>
+short[] --&gt; java.util.List
+]]></script>
 </div></div>
 
 
@@ -171,19 +182,19 @@ org.apache.tapestry5.runtime.ComponentRe
 <p>TypeCoercer is extensible; you may add new coercions as desired. For example, let's say you have a <tt>Money</tt> type that represents an amount of some currency, and you want to be able to convert from <tt>BigDecimal</tt> to <tt>Money</tt>. Further, let's assume that <tt>Money</tt> has a constructor that accepts a <tt>BigDecimal</tt> as its parameter. We'll use a little Tapestry IOC configuration jujitsu to inform the TypeCoercer about this coercion.</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)
 {
-    Coercion&lt;BigDecimal, Money&gt; coercion = <span class="code-keyword">new</span> Coercion&lt;BigDecimal, Money&gt;()
+    Coercion&lt;BigDecimal, Money&gt; coercion = new Coercion&lt;BigDecimal, Money&gt;()
     {
-        <span class="code-keyword">public</span> Money coerce(BigDecimal input)
+        public Money coerce(BigDecimal input)
         {
-           <span class="code-keyword">return</span> <span class="code-keyword">new</span> Money(input);
+           return new Money(input);
         }
     };
  
-    configuration.add(<span class="code-keyword">new</span> CoercionTuple&lt;BigDecimal, Money&gt;(BigDecimal.class, Money.class, coercion));     
-}</pre>
+    configuration.add(new CoercionTuple&lt;BigDecimal, Money&gt;(BigDecimal.class, Money.class, coercion));     
+}]]></script>
 </div></div>
 
 <p>Further, since TypeCoercer knows how to convert <tt>Double</tt> to <tt>BigDecimal</tt>, or even <tt>Integer</tt> (to <tt>Long</tt> to <tt>Double</tt>) to <tt>BigDecimal</tt>, all of those coercions would work as well.</p>
@@ -191,16 +202,16 @@ org.apache.tapestry5.runtime.ComponentRe
 <p>When creating a coercion from <tt>null</tt>, use <tt>Void.class</tt> as the source type. For example, the built-in coercion from <tt>null</tt> to <tt>Boolean</tt> is implemented as:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-    configuration.add(<span class="code-keyword">new</span> CoercionTuple(void.class, <span class="code-object">Boolean</span>.class,
-        <span class="code-keyword">new</span> Coercion&lt;<span class="code-object">Void</span>, <span class="code-object">Boolean</span>&gt;()
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+    configuration.add(new CoercionTuple(void.class, Boolean.class,
+        new Coercion&lt;Void, Boolean&gt;()
     {
-        <span class="code-keyword">public</span> <span class="code-object">Boolean</span> coerce(<span class="code-object">Void</span> input)
+        public Boolean coerce(Void input)
         {
-            <span class="code-keyword">return</span> <span class="code-keyword">false</span>;
+            return false;
         }
     }));
-</pre>
+]]></script>
 </div></div>
 
 <style type="text/css">/*<![CDATA[*/
@@ -211,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="service-serialization.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="service-serialization.html">Service Serialization</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="starting-the-ioc-registry.html">Starting the IoC Registry</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="starting-the-ioc-registry.html"><img align="middle" border="0" src="/images/confluence/forw
 d_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="service-serialization.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="service-serialization.html">Service Serialization</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="starting-the-ioc-registry.html">Starting the IoC Registry</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="starting-the-ioc-registry.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']);
@@ -227,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/typecoercer-service.html" async="true">

Modified: websites/production/tapestry/content/unit-testing-pages-or-components.html
==============================================================================
--- websites/production/tapestry/content/unit-testing-pages-or-components.html (original)
+++ websites/production/tapestry/content/unit-testing-pages-or-components.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Unit testing pages or components -- 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>
@@ -83,18 +94,18 @@
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyTest <span class="code-keyword">extends</span> Assert
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyTest extends Assert
 {
     @Test
-    <span class="code-keyword">public</span> void test1()
+    public void test1()
     {
-        <span class="code-object">String</span> appPackage = <span class="code-quote">"org.example.app"</span>;
-        <span class="code-object">String</span> appName = <span class="code-quote">"App1"</span>; <span class="code-comment">// App1Module.java has configured some services.
-</span>        PageTester tester = <span class="code-keyword">new</span> PageTester(appPackage, appName, <span class="code-quote">"src/main/webapp"</span>);
+        String appPackage = "org.example.app";
+        String appName = "App1"; // App1Module.java has configured some services.
+        PageTester tester = new PageTester(appPackage, appName, "src/main/webapp");
     }
 }
-</pre>
+]]></script>
 </div></div>
 <h2><a shape="rect" name="Unittestingpagesorcomponents-Testingtherenderingofapage"></a>Testing the rendering of a page</h2>
 
@@ -103,40 +114,40 @@
 <p>Here is an example. Let's assuming the page being tested is named "MyPage" and it should return a page containing an HTML element whose id is "id1" and whose text content should be "hello":</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyTest <span class="code-keyword">extends</span> Assert
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyTest extends Assert
 {
     @Test
-    <span class="code-keyword">public</span> void test1()
+    public void test1()
     {
-        <span class="code-object">String</span> appPackage = <span class="code-quote">"org.example.app"</span>;
-        <span class="code-object">String</span> appName = <span class="code-quote">"LocaleApp"</span>;
-        PageTester tester = <span class="code-keyword">new</span> PageTester(appPackage, appName, <span class="code-quote">"src/main/webapp"</span>);
-        Document doc = tester.renderPage(<span class="code-quote">"MyPage"</span>);
-        assertEquals(doc.getElementById(<span class="code-quote">"id1"</span>).getChildText(), <span class="code-quote">"hello"</span>);
+        String appPackage = "org.example.app";
+        String appName = "LocaleApp";
+        PageTester tester = new PageTester(appPackage, appName, "src/main/webapp");
+        Document doc = tester.renderPage("MyPage");
+        assertEquals(doc.getElementById("id1").getChildText(), "hello");
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>If the page requires a context, you can pass it this way:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyTest <span class="code-keyword">extends</span> Assert
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyTest extends Assert
 {
     @Test
-    <span class="code-keyword">public</span> void test1()
+    public void test1()
     {
-        <span class="code-object">String</span> appPackage = <span class="code-quote">"org.example.app"</span>;
-        <span class="code-object">String</span> appName = <span class="code-quote">"LocaleApp"</span>;
-        PageTester tester = <span class="code-keyword">new</span> PageTester(appPackage, appName, <span class="code-quote">"src/main/webapp"</span>);
-        <span class="code-object">Object</span>[] context = <span class="code-keyword">new</span> <span class="code-object">Object</span>[]{ <span class="code-quote">"abc"</span>, 123 };
-        Document doc = tester.invoke(<span class="code-keyword">new</span> ComponentInvocation(<span class="code-keyword">new</span> PageLinkTarget(<span class="code-quote">"MyPage"</span>), context));
-        assertEquals(doc.getElementById(<span class="code-quote">"id1"</span>).getChildText(), <span class="code-quote">"hello"</span>);
+        String appPackage = "org.example.app";
+        String appName = "LocaleApp";
+        PageTester tester = new PageTester(appPackage, appName, "src/main/webapp");
+        Object[] context = new Object[]{ "abc", 123 };
+        Document doc = tester.invoke(new ComponentInvocation(new PageLinkTarget("MyPage"), context));
+        assertEquals(doc.getElementById("id1").getChildText(), "hello");
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <h2><a shape="rect" name="Unittestingpagesorcomponents-Testinganactionlink"></a>Testing an action link</h2>
@@ -144,22 +155,22 @@
 <p>After rendering a page, you may want to "click" on an action link and then assert against the resulting page. You can do it this way:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyTest <span class="code-keyword">extends</span> Assert
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyTest extends Assert
 {
     @Test
-    <span class="code-keyword">public</span> void test1()
+    public void test1()
     {
-        <span class="code-object">String</span> appPackage = <span class="code-quote">"org.example.app"</span>;
-        <span class="code-object">String</span> appName = <span class="code-quote">"LocaleApp"</span>;
-        PageTester tester = <span class="code-keyword">new</span> PageTester(appPackage, appName, <span class="code-quote">"src/main/webapp"</span>);
-        Document doc = tester.renderPage(<span class="code-quote">"MyPage"</span>);
-        Element link = doc.getElementById(<span class="code-quote">"link1"</span>);
+        String appPackage = "org.example.app";
+        String appName = "LocaleApp";
+        PageTester tester = new PageTester(appPackage, appName, "src/main/webapp");
+        Document doc = tester.renderPage("MyPage");
+        Element link = doc.getElementById("link1");
         doc = tester.clickLink(link);
-        assertTrue(doc.toString().contains(<span class="code-quote">"abc"</span>));
+        assertTrue(doc.toString().contains("abc"));
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <h2><a shape="rect" name="Unittestingpagesorcomponents-Testingaformsubmission"></a>Testing a form submission</h2>
@@ -167,25 +178,25 @@
 <p>After rendering a page, you may want to fill out a form, submit it and then inspect the resulting page. You can do it this way:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyTest <span class="code-keyword">extends</span> Assert
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyTest extends Assert
 {
     @Test
-    <span class="code-keyword">public</span> void test1()
+    public void test1()
     {
-        <span class="code-object">String</span> appPackage = <span class="code-quote">"org.example.app"</span>;
-        <span class="code-object">String</span> appName = <span class="code-quote">"LocaleApp"</span>;
-        PageTester tester = <span class="code-keyword">new</span> PageTester(appPackage, appName, <span class="code-quote">"src/main/webapp"</span>);
-        Document doc = tester.renderPage(<span class="code-quote">"MyPage"</span>);
-        Element form = doc.getElementById(<span class="code-quote">"form1"</span>);
-        Map&lt;<span class="code-object">String</span>, <span class="code-object">String</span>&gt; fieldValues = <span class="code-keyword">new</span> HashMap&lt;<span class="code-object">String</span>, <span class="code-object">String</span>&gt;();
-        fieldValues.put(<span class="code-quote">"field1"</span>, <span class="code-quote">"hello"</span>);
-        fieldValues.put(<span class="code-quote">"field2"</span>, <span class="code-quote">"100"</span>);
+        String appPackage = "org.example.app";
+        String appName = "LocaleApp";
+        PageTester tester = new PageTester(appPackage, appName, "src/main/webapp");
+        Document doc = tester.renderPage("MyPage");
+        Element form = doc.getElementById("form1");
+        Map&lt;String, String&gt; fieldValues = new HashMap&lt;String, String&gt;();
+        fieldValues.put("field1", "hello");
+        fieldValues.put("field2", "100");
         doc = tester.submitForm(form, fieldValues);
-        assertTrue(doc.toString().contains(<span class="code-quote">"abc"</span>));
+        assertTrue(doc.toString().contains("abc"));
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>To submit a form by clicking a submit button, call the <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/test/PageTester.html#clickSubmit(org.apache.tapestry5.dom.Element,%20java.util.Map)">clickSubmit()</a> method instead.</p>
@@ -202,7 +213,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']);
@@ -213,7 +224,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/unit-testing-pages-or-components.html" async="true">

Modified: websites/production/tapestry/content/upgrade.html
==============================================================================
--- websites/production/tapestry/content/upgrade.html (original)
+++ websites/production/tapestry/content/upgrade.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Upgrade -- 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/upgrade.html" async="true">

Modified: websites/production/tapestry/content/upload.html
==============================================================================
--- websites/production/tapestry/content/upload.html (original)
+++ websites/production/tapestry/content/upload.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Upload -- 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/upload.html" async="true">