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 [10/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/confluence-site-setup.html
==============================================================================
--- websites/production/tapestry/content/confluence-site-setup.html (original)
+++ websites/production/tapestry/content/confluence-site-setup.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Confluence Site Setup -- 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>
@@ -62,23 +73,23 @@
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="developer-bible.html">Developer Bible</a>
+                         <a shape="rect" href="developer-information.html">Developer Information</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="version-numbers.html">Version Numbers</a>
+                         <a shape="rect" href="release-process.html">Release Process</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="developer-information.html">Developer Information</a>
+                         <a shape="rect" href="developer-bible.html">Developer Bible</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="building-tapestry-from-source.html">Building Tapestry from Source</a>
+                         <a shape="rect" href="version-numbers.html">Version Numbers</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
-                         <a shape="rect" href="release-process.html">Release Process</a>
+                         <a shape="rect" href="building-tapestry-from-source.html">Building Tapestry from Source</a>
         
                                             </td></tr></table>
 </div> 
@@ -95,11 +106,11 @@
 
 <p>On people.apache.org <em>another</em> cron job copies the exported Tapestry space to <tt>~uli/public_html/tapestry-site/</tt> which is available as <a shape="rect" class="external-link" href="http://people.apache.org/~uli/tapestry-site/">http://people.apache.org/~uli/tapestry-site/</a>. </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">This will shortly be updated to copy our space to a <tt>/www/tapestry.apache.org</tt> which is the folder that itself is copied out and available as <a shape="rect" class="external-link" href="http://tapestry.apache.org">http://tapestry.apache.org</a>.</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">This will shortly be updated to copy our space to a <tt>/www/tapestry.apache.org</tt> which is the folder that itself is copied out and available as <a shape="rect" class="external-link" href="http://tapestry.apache.org">http://tapestry.apache.org</a>.</td></tr></table></div>
 
 <p>Yes, this is a bit <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Rube_Goldberg_machine" >Rube Goldberg</a>, and the multiple steps, hops, and cron jobs mean it can be quite some time between a change in Confluence, and the content being visible (possibly a couple of hours).</p>
 
-<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Content copied to <tt>/www/tapestry.apache.org</tt> is not immediately visible; yet another cron job (!) copies this content to the main Apache web server, about once an hour. On the other hand, content <tt>~uli</tt> is available in real time.</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">Content copied to <tt>/www/tapestry.apache.org</tt> is not immediately visible; yet another cron job (!) copies this content to the main Apache web server, about once an hour. On the other hand, content <tt>~uli</tt> is available in real time.</td></tr></table></div>
 
 <h1><a shape="rect" name="ConfluenceSiteSetup-WikiFormattingGuidelines"></a>Wiki Formatting Guidelines</h1>
 
@@ -114,7 +125,7 @@
 
 <p>Because we include some pages in others it is sometimes necessary to reexport the whole space because the Autoexport plugin will only export the changed page, not the pages where the changed page is included. To do so you have to be a confluence administrator. You can then manually export our space via the Autoexport administrative console.</p>
 
-<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">HLS: I've noticed that pages with footnotes that are combined with the {include} macro do not render correctly ... the footnote numbers and anchors reset back to 1 for each included page. Perhaps there's a way to fix that with the template?</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">HLS: I've noticed that pages with footnotes that are combined with the {include} macro do not render correctly ... the footnote numbers and anchors reset back to 1 for each included page. Perhaps there's a way to fix that with the template?</td></tr></table></div>
 
 <h1><a shape="rect" name="ConfluenceSiteSetup-Updatingthetemplate"></a>Updating the template</h1>
 
@@ -142,7 +153,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']);
@@ -153,7 +164,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/confluence-site-setup.html" async="true">

Modified: websites/production/tapestry/content/content-type-and-markup.html
==============================================================================
--- websites/production/tapestry/content/content-type-and-markup.html (original)
+++ websites/production/tapestry/content/content-type-and-markup.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Content Type and Markup -- 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>
@@ -85,7 +88,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']);
@@ -96,7 +99,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/content-type-and-markup.html" async="true">

Modified: websites/production/tapestry/content/contributors.html
==============================================================================
--- websites/production/tapestry/content/contributors.html (original)
+++ websites/production/tapestry/content/contributors.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Contributors -- 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>
@@ -75,7 +78,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']);
@@ -86,7 +89,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/contributors.html" async="true">

Modified: websites/production/tapestry/content/cookbook.html
==============================================================================
--- websites/production/tapestry/content/cookbook.html (original)
+++ websites/production/tapestry/content/cookbook.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,10 @@
     Cookbook -- 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>
@@ -70,7 +73,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']);
@@ -81,7 +84,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/cookbook.html" async="true">

Modified: websites/production/tapestry/content/creating-the-skeleton-application.html
==============================================================================
--- websites/production/tapestry/content/creating-the-skeleton-application.html (original)
+++ websites/production/tapestry/content/creating-the-skeleton-application.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Creating The Skeleton Application -- 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="dependencies-tools-and-plugins.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="dependencies-tools-and-plugins.html">Dependencies, Tools and Plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="loading-the-project-into-eclipse.html">Loading the Project Into Eclipse</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="loading
 -the-project-into-eclipse.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="dependencies-tools-and-plugins.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="dependencies-tools-and-plugins.html">Dependencies, Tools and Plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="loading-the-project-into-eclipse.html">Loading the Project Into Eclipse</a></td><td colspan="1" rowspan
 ="1" class="ScrollbarNextIcon"><a shape="rect" href="loading-the-project-into-eclipse.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>Before we can get down to the fun, we have to create an empty application. Tapestry uses a feature of Maven to do this: <b>archetypes</b> (a too-clever way of saying "project templates").</p>
 
@@ -85,9 +96,9 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Our final command line is:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-mvn archetype:generate -DarchetypeCatalog=http:<span class="code-comment">//tapestry.apache.org</span>
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+mvn archetype:generate -DarchetypeCatalog=http://tapestry.apache.org
+]]></script>
 </div></div>
 
 <p>It will then prompt you to pick the archetype - choose the latest <b>Tapestry 5.X Quickstart Project</b>, enter the group id, artifact id, version and package when prompted.</p>
@@ -156,18 +167,18 @@ package: com.example.tutorial
 </pre>
 </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">The first time you use Maven, you'll see quite a bit more output, mostly about downloading all sorts of JARs and other files. These downloaded files are cached locally and will not need to be downloaded again, but you do have to be patient on first use.</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">The first time you use Maven, you'll see quite a bit more output, mostly about downloading all sorts of JARs and other files. These downloaded files are cached locally and will not need to be downloaded again, but you do have to be patient on first use.</td></tr></table></div>
 
 <p>After executing the command, you'll see a new directory, <tt>tutorial1</tt>.</p>
 
-<div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="/images/confluence/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Maven Behind a Firewall</b><br clear="none">If you are behind a firewall, before running any "mvn" commands, you will need to configure your proxy settings in settings.xml. Here is an example:
+<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>Maven Behind a Firewall</b><br clear="none">If you are behind a firewall, before running any "mvn" commands, you will need to configure your proxy settings in settings.xml. Here is an example:
 
 <div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>settings.xml</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;settings&gt;
   &lt;proxies&gt;
     &lt;proxy&gt;
-      &lt;active&gt;<span class="code-keyword">true</span>&lt;/active&gt;
+      &lt;active&gt;true&lt;/active&gt;
       &lt;protocol&gt;http&lt;/protocol&gt;
       &lt;host&gt;myProxyServer.com&lt;/host&gt;
       &lt;port&gt;8080&lt;/port&gt;
@@ -178,7 +189,7 @@ package: com.example.tutorial
   &lt;/proxies&gt;
   &lt;localRepository&gt;C:/Users/joeuser/.m2/repository&lt;/localRepository&gt;
 &lt;/settings&gt;
-</pre>
+]]></script>
 </div></div>
 <p>Of course, adjust the <tt>localRepository</tt> element to match the correct path for your computer.</p></td></tr></table></div>
 
@@ -189,9 +200,9 @@ package: com.example.tutorial
 <p>Change into the newly created directory, and execute the command:</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[
 mvn jetty:run
-</pre>
+]]></script>
 </div></div>
 
 <p>Again, the first time, there's a dizzying number of downloads, but before you know it, the Jetty servlet container is up and running.</p>
@@ -305,7 +316,7 @@ var footnoteMarkerHighlight = function(i
 </sup>
 .</p>
 
-<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">You should hit Control-C in the Terminal window to close down Jetty before continuing with the tutorial.</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">You should hit Control-C in the Terminal window to close down Jetty before continuing with the tutorial.</td></tr></table></div>
 
 <hr>
 
@@ -325,12 +336,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="dependencies-tools-and-plugins.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="dependencies-tools-and-plugins.html">Dependencies, Tools and Plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="loading-the-project-into-eclipse.html">Loading the Project Into Eclipse</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="loading
 -the-project-into-eclipse.html"><img align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="16"></a></td></tr></table></div></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="dependencies-tools-and-plugins.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="dependencies-tools-and-plugins.html">Dependencies, Tools and Plugins</a>&#160;</td><td colspan="1" rowspan="1" class="ScrollbarParent" width="33%"><sup><a shape="rect" href="tapestry-tutorial.html"><img align="middle" border="0" src="https://cwiki.apache.org/confluence/images/icons/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="tapestry-tutorial.html">Tapestry Tutorial</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="loading-the-project-into-eclipse.html">Loading the Project Into Eclipse</a></td><td colspan="1" rowspan
 ="1" class="ScrollbarNextIcon"><a shape="rect" href="loading-the-project-into-eclipse.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']);
@@ -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/creating-the-skeleton-application.html" async="true">

Modified: websites/production/tapestry/content/creating-the-skeleton-application.thumbs/startpage.png
==============================================================================
Binary files - no diff available.

Modified: websites/production/tapestry/content/css.html
==============================================================================
--- websites/production/tapestry/content/css.html (original)
+++ websites/production/tapestry/content/css.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,19 @@
     CSS -- 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>
@@ -60,15 +72,15 @@
 
 <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="css.html">CSS</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>
-                         <a shape="rect" href="layout-component.html">Layout Component</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>
-                         <a shape="rect" href="assets.html">Assets</a>
+                         <a shape="rect" href="layout-component.html">Layout Component</a>
         
                                             </td></tr><tr><td colspan="1" rowspan="1">
                                  <span class="icon icon-page" title="Page">Page:</span>
@@ -92,21 +104,21 @@
 <p>A page or component (for example, a <a shape="rect" href="layout-component.html" title="Layout Component">layout component</a>) that is rendering the &lt;head&gt; tag can add a style sheet directly in the markup.</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[
 &lt;head&gt;
-  &lt;link href=<span class="code-quote">"/css/site.css"</span> rel=<span class="code-quote">"stylesheet"</span> type=<span class="code-quote">"text/css"</span>/&gt;
+  &lt;link href="/css/site.css" rel="stylesheet" type="text/css"/&gt;
   . . .
-</pre>
+]]></script>
 </div></div>
 
 <p>If you want to leverage Tapestry's localization support, you may want to make use of an expansion and the "asset:" or "context:" binding 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[
 &lt;head&gt;
-  &lt;link href=<span class="code-quote">"${context:css/site.css}"</span> rel=<span class="code-quote">"stylesheet"</span> type=<span class="code-quote">"text/css"</span>/&gt;
+  &lt;link href="${context:css/site.css}" rel="stylesheet" type="text/css"/&gt;
   . . .
-</pre>
+]]></script>
 </div></div>
 
 <p>The "context:" prefix means that the remainder of the expansion is a path to a context asset, a resource in the web application root (src/main/webapp in your workspace). By contrast, the "asset:" prefix tells Tapestry to look in the class path. See <a shape="rect" href="assets.html" title="Assets">Assets</a>.</p>
@@ -116,13 +128,13 @@
 <p>Another approach to adding a style sheet is to include an @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/annotations/Import.html">Import</a> annotation (starting with Tapestry 5.2) on your component class:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-@Import(stylesheet=<span class="code-quote">"context:css/site.css"</span>)
-<span class="code-keyword">public</span> class MyComponent
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+@Import(stylesheet="context:css/site.css")
+public class MyComponent
 {
 
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>(For Tapestry 5.0 and 5.1, use the deprecated <a shape="rect" class="external-link" href="http://tapestry.apache.org/5.2/apidocs/org/apache/tapestry5/annotations/IncludeStylesheet.html">@IncludeStyleSheet</a> annotation instead.)</p>
@@ -134,29 +146,29 @@
 <p>For Tapestry 5.2 and later, if you need to load a different style sheet for Internet Explorer browsers, or for certain versions of IE browsers, you can use Tapestry's built-in support for IE conditional comments. Just add something like the following to your page or component (or layout) 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: false" type="syntaxhighlighter"><![CDATA[
 @Environmental
-<span class="code-keyword">private</span> JavaScriptSupport javaScriptSupport;
+private JavaScriptSupport javaScriptSupport;
      
-@Inject @Path(<span class="code-quote">"context:layout/ie-only.css"</span>)
-<span class="code-keyword">private</span> Asset ieOnlyStylesheet;
+@Inject @Path("context:layout/ie-only.css")
+private Asset ieOnlyStylesheet;
 
-<span class="code-comment">// add an IE-only style sheet <span class="code-keyword">if</span> browser is IE
-</span>void afterRender() {
-    javaScriptSupport.importStylesheet(<span class="code-keyword">new</span> StylesheetLink(ieOnlyStylesheet, <span class="code-keyword">new</span>
-                        StylesheetOptions(<span class="code-keyword">null</span>, <span class="code-quote">"IE"</span>)) );
+// add an IE-only style sheet if browser is IE
+void afterRender() {
+    javaScriptSupport.importStylesheet(new StylesheetLink(ieOnlyStylesheet, new
+                        StylesheetOptions(null, "IE")) );
 }
-</pre>
+]]></script>
 </div></div>
 
 <p>The above will render something like:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;!--[if IE]&gt;</span>
-<span class="code-tag">&lt;link type=<span class="code-quote">"text/css"</span> rel=<span class="code-quote">"stylesheet"</span> href=<span class="code-quote">"/assets/1.0-SNAPSHOT/ctx/layout/ie-only.css"</span>&gt;</span><span class="code-tag">&lt;/link&gt;</span>
-<span class="code-tag">&lt;![endif]--&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;!--[if IE]&gt;
+&lt;link type="text/css" rel="stylesheet" href="/assets/1.0-SNAPSHOT/ctx/layout/ie-only.css"&gt;&lt;/link&gt;
+&lt;![endif]--&gt;
+]]></script>
 </div></div>
 
 <p>Naturally, the conditional part can be any other IE <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Conditional_comment" >conditional expression</a>, such as "lt IE 8".</p>
@@ -166,20 +178,20 @@
 <p>Though it should be rarely needed, you can prevent Tapestry's default style sheet from loading by overriding the configuration in your application's module (normally 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(MarkupRenderer.class)
-<span class="code-keyword">public</span> <span class="code-keyword">static</span> void deactiveDefaultCSS(OrderedConfiguration&lt;MarkupRendererFilter&gt; configuration)
+public static void deactiveDefaultCSS(OrderedConfiguration&lt;MarkupRendererFilter&gt; configuration)
 {
-    configuration.override(<span class="code-quote">"InjectDefaultStyleheet"</span>, <span class="code-keyword">null</span>);
+    configuration.override("InjectDefaultStyleheet", null);
 }
-</pre>
+]]></script>
 </div></div>
 <p>Note: In Tapestry 5.3 and later, the misspelled "InjectDefaultStyleheet" is corrected to "InjectDefaultStylesheet".</p></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']);
@@ -190,7 +202,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/css.html" async="true">

Modified: websites/production/tapestry/content/default-parameter.html
==============================================================================
--- websites/production/tapestry/content/default-parameter.html (original)
+++ websites/production/tapestry/content/default-parameter.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,19 @@
     Default Parameter -- 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,22 +76,22 @@ 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="cookbook.html"><img align="middle" border="0" src="/images/confluence/up_16.gif" width="8" height="8"></a></sup><a shape="rect" href="cookbook.html">Cookbook</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="overriding-exception-reporting.html">Overriding Exception Reporting</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="overriding-exception-reporting.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="cookbook.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="cookbook.html">Cookbook</a></td><td colspan="1" rowspan="1" class="ScrollbarNextName" width="33%">&#160;<a shape="rect" href="overriding-exception-reporting.html">Overriding Exception Reporting</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="overriding-exception-reporting.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="DefaultParameter-DefaultParameter"></a>Default Parameter</h1>
 
 <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="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="default-parameter.html">Default Parameter</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="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>
@@ -95,26 +107,26 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Let's say you have created a component, <tt>RichTextEditor</tt>, which operates like a normal TextArea component, but provides a JavaScript rich text editor.  You might start with something like:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class RichTextEditor <span class="code-keyword">implements</span> Field
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class RichTextEditor implements Field
 {
   @Property
-  @Parameter(required=<span class="code-keyword">true</span>)
-  <span class="code-keyword">private</span> <span class="code-object">String</span> value;
+  @Parameter(required=true)
+  private String value;
 
-  . . . <span class="code-comment">// Lots more code not shown here
-</span>}
-</pre>
+  . . . // Lots more code not shown here
+}
+]]></script>
 </div></div>
 
 <p>However, the weakness here is when you make use of the component. You template may look like:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;t:label for=<span class="code-quote">"profile"</span>/&gt;</span>
-    <span class="code-tag">&lt;br/&gt;</span>
-    <span class="code-tag">&lt;t:richtexteditor t:id=<span class="code-quote">"profile"</span> value=<span class="code-quote">"profile"</span>/&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;t:label for="profile"/&gt;
+    &lt;br/&gt;
+    &lt;t:richtexteditor t:id="profile" value="profile"/&gt;
+]]></script>
 </div></div>
 
 <p>Every component has a unique id; if you don't assign one with the <tt>t:id</tt> attribute, Tapestry will assign a less meaningful one. Component ids can end up inside URLs or used as query parameter names, so using meaningful ids helps if you are ever stuck debugging a request. The most common case of using autoconnect is form control components such as TextField and friends ... or this RichTextEditor.</p>
@@ -122,11 +134,11 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>This repetition can be avoided by adding the autoconnect attribute to the @Parameter 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[
   @Property
-  @Parameter(required=<span class="code-keyword">true</span>, autoconnect=<span class="code-keyword">true</span>)
-  <span class="code-keyword">private</span> <span class="code-object">String</span> value;
-</pre>
+  @Parameter(required=true, autoconnect=true)
+  private String value;
+]]></script>
 </div></div>
 
 <p>This can now be written as <tt>&lt;t:richtexteditor t:id="profile"/&gt;</tt>. The unwanted repetition is gone: we set the id of the component and the property it edits in a single pass.   </p>
@@ -136,7 +148,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']);
@@ -147,7 +159,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/default-parameter.html" async="true">

Modified: websites/production/tapestry/content/defining-tapestry-ioc-services.html
==============================================================================
--- websites/production/tapestry/content/defining-tapestry-ioc-services.html (original)
+++ websites/production/tapestry/content/defining-tapestry-ioc-services.html Sun Sep 22 22:21:21 2013
@@ -24,7 +24,18 @@
     Defining Tapestry IOC Services -- 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="tapestry-ioc-modules.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="tapestry-ioc-modules.html">Tapestry IoC Modules</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="service-advisors.html">Service Advisors</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="service-advisors.html"><img align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="1
 6"></a></td></tr></table></div>
+/*]]>*/</style><div class="Scrollbar"><table class="ScrollbarTable"><tr><td colspan="1" rowspan="1" class="ScrollbarPrevIcon"><a shape="rect" href="tapestry-ioc-modules.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="tapestry-ioc-modules.html">Tapestry IoC Modules</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="service-advisors.html">Service Advisors</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="service-advisors.html"><img align="middle" border="0
 " src="https://cwiki.apache.org/confluence/images/icons/forwd_16.gif" width="16" height="16"></a></td></tr></table></div>
 
 <p>Services consist of two main parts: a service interface and a service implementation.</p>
 
@@ -90,15 +101,16 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Tapestry doesn't know how to instantiate and configure your service; instead it relies on you to provide the code to do so, in a service builder method, a method whose name is (or starts with) "build":</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 (presumably inside the org.example.myapp.services package, since there isn't an import). Tapestry IoC doesn't know about the IndexerImpl class (the service implementation of the Indexer service), but it does know about the build() method.</p>
@@ -116,17 +128,18 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Every module may have an optional, static bind() method which is passed a <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/ServiceBinder.html">ServiceBinder</a>. Services may be registered with the container by "binding" a service interface to a service implementation:</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>You can make repeated calls to ServiceBinder.bind(), to bind additional services.</p>
@@ -140,17 +153,18 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Following the convention over configuration principle, the autobuilding of services can be even less verbose. If a service interface is passed as a single argument to the bind() method, Tapestry will try to find an implementation in the same package whose name matches the name of the service interface followed by the suffix <em>Impl</em>.</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);
   }
-}</pre>
+}]]></script>
 </div></div>
 
 <h1><a shape="rect" name="DefiningTapestryIOCServices-ServiceIds"></a>Service Ids</h1>
@@ -162,20 +176,22 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>This can be overridden by adding the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/ServiceId.html">ServiceId</a> annotation to the service builder method:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  @ServiceId(<span class="code-quote">"FileSystemIndexer"</span>)
-  <span class="code-keyword">public</span> <span class="code-keyword">static</span> Indexer buildIndexer(@InjectService(<span class="code-quote">"FileSystem"</span>) FileSystem fileSystem)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  @ServiceId("FileSystemIndexer")
+  public static Indexer buildIndexer(@InjectService("FileSystem") FileSystem fileSystem)
   {
      . . .
-  }</pre>
+  }]]></script>
 </div></div>
 
 <p>Another option is to add the service id to the method name, after "build", for example:</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> Indexer buildFileSystemIndexer(@InjectService(<span class="code-quote">"FileSystem"</span>) FileSystem fileSystem)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer buildFileSystemIndexer(@InjectService("FileSystem") FileSystem fileSystem)
   {
      . . .
-  }</pre>
+  }]]></script>
 </div></div>
 
 <p>Here, the service id is "FileSystemIndexer" not "Indexer".</p>
@@ -183,23 +199,26 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>For autobuilt services, the service id can be specified by placing the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/ServiceId.html">ServiceId</a> annotation directly on a service implementation class.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  @ServiceId(<span class="code-quote">"FileSystemIndexer"</span>)
-  <span class="code-keyword">public</span> class IndexerImpl <span class="code-keyword">implements</span> Indexer
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  @ServiceId("FileSystemIndexer")
+  public class IndexerImpl implements Indexer
   {
       ...
-  }</pre>
+  }]]></script>
 </div></div>
 
 <p>When the service is bound, the value of the annotation is used as id:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  binder.bind(Indexer.class, IndexerImpl.class);</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  binder.bind(Indexer.class, IndexerImpl.class);]]></script>
 </div></div>
 
 <p>This id can be overriden again by calling the method <a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/ServiceBindingOptions.html#withIdjava.lang.String">withId</a></p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  binder.bind(Indexer.class, IndexerImpl.class).withId(<span class="code-quote">"FileSystemIndexer"</span>);</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  binder.bind(Indexer.class, IndexerImpl.class).withId("FileSystemIndexer");]]></script>
 </div></div>
 
 <h1><a shape="rect" name="DefiningTapestryIOCServices-InjectingDependencies"></a><a shape="rect" name="DefiningTapestryIOCServices-InjectingDependencies"></a>Injecting Dependencies</h1>
@@ -214,14 +233,15 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>For example, let's say the Indexer needs a JobScheduler to control when it executes, and a FileSystem to access files and store indexes.</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> Indexer build(JobScheduler scheduler, FileSystem fileSystem)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(JobScheduler scheduler, FileSystem fileSystem)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(fileSystem);
+    IndexerImpl indexer = new IndexerImpl(fileSystem);
 
     scheduler.scheduleDailyJob(indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>Tapestry assumes that parameters to builder methods are dependencies; in this example it is able to figure out what services to pass in based just on the type (later we'll see how we can fine tune this with annotations, when the service type is not sufficient to identify a single service).</p>
@@ -233,18 +253,19 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>What happens if there is more than one service that implements the JobScheduler interface, or the FileSystem interface? You'll see a runtime exception, because Tapestry is unable to resolve it down to a <em>single</em> service. At this point, it is necessary to <em>disambiguate</em> the link between the service interface and <em>one</em> service. One approach is to use the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/InjectService.html">InjectService</a> annotation:</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> Indexer build(@InjectService(<span class="code-quote">"JobScheduler"</span>)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(@InjectService("JobScheduler")
     JobScheduler scheduler,
 
-    @InjectService(<span class="code-quote">"FileSystem"</span>)
+    @InjectService("FileSystem")
     FileSystem fileSystem)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(fileSystem);
+    IndexerImpl indexer = new IndexerImpl(fileSystem);
 
     scheduler.scheduleDailyJob(indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>If you find yourself injecting the same dependencies into multiple service builder (or service decorator) methods, you can <a shape="rect" href="tapestry-ioc-modules.html" title="Tapestry IoC Modules">cache dependency injections</a> in your module, by defining a constructor. This reduces duplication in your module.</p>
@@ -262,11 +283,12 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>We can associate those two JobSchedulers with two annotations.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">@Target(
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+@Target(
 { PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-<span class="code-keyword">public</span> @<span class="code-keyword">interface</span> Clustered
+public @interface Clustered
 {
 
 }
@@ -275,20 +297,20 @@ table.ScrollbarTable td.ScrollbarNextIco
 { PARAMETER, FIELD })
 @Retention(RUNTIME)
 @Documented
-<span class="code-keyword">public</span> @<span class="code-keyword">interface</span> InProcess
+public @interface InProcess
 {
 
 }
 
 
-<span class="code-keyword">public</span> class MyModule
+public class MyModule
 {
-  <span class="code-keyword">public</span> <span class="code-keyword">static</span> void bind(ServiceBinder binder)
+  public static void bind(ServiceBinder binder)
   {
-    binder.bind(JobScheduler.class, ClusteredJobSchedulerImpl.class).withId(<span class="code-quote">"ClusteredJobScheduler"</span>).withMarker(Clustered.class);
-    binder.bind(JobScheduler.class, SimpleJobSchedulerImpl.class).withId(<span class="code-quote">"InProcessJobScheduler"</span>).withMarker(InProcess.class);
+    binder.bind(JobScheduler.class, ClusteredJobSchedulerImpl.class).withId("ClusteredJobScheduler").withMarker(Clustered.class);
+    binder.bind(JobScheduler.class, SimpleJobSchedulerImpl.class).withId("InProcessJobScheduler").withMarker(InProcess.class);
   }
-}</pre>
+}]]></script>
 </div></div>
 
 <p>Notice that the marker annotations have no attributes. Further, we support markers on fields (for use in Tapestry components) as well as parameters.</p>
@@ -296,17 +318,18 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>To get the right version of the service, you use one of the annotations:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> class MyServiceImpl <span class="code-keyword">implements</span> MyService
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyServiceImpl implements MyService
 {
-  <span class="code-keyword">private</span> <span class="code-keyword">final</span> JobScheduler jobScheduler;
+  private final JobScheduler jobScheduler;
 
-  <span class="code-keyword">public</span> MyServiceImpl(@Clustered JobScheduler jobScheduler)
+  public MyServiceImpl(@Clustered JobScheduler jobScheduler)
   {
-    <span class="code-keyword">this</span>.jobScheduler = jobScheduler;
+    this.jobScheduler = jobScheduler;
   }
 
   . . .
-}  </pre>
+}  ]]></script>
 </div></div>
 
 <p>The @Clustered annotation on the parameter is combined with the parameter type (JobScheduler) to find the exact service implementation.</p>
@@ -316,11 +339,12 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>With a service builder method, you use the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/Marker.html">Marker</a> annotation:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  @Marker(Clustered.class)
-  <span class="code-keyword">public</span> JobScheduler buildClusteredJobScheduler()
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  @Marker(Clustered.class)
+  public JobScheduler buildClusteredJobScheduler()
   {
-    <span class="code-keyword">return</span> . . .;
-  }</pre>
+    return . . .;
+  }]]></script>
 </div></div>
 
 <p>The @Marker annotation may also be placed on an implementation class, which means that you may omit the call to withMarker() inside the bind() method.</p>
@@ -340,21 +364,22 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Instead, the injections occur on <em>constructor</em> for the implementation class:</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.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
 
-<span class="code-keyword">public</span> class IndexerImpl <span class="code-keyword">implements</span> Indexer
+public class IndexerImpl implements Indexer
 {
-  <span class="code-keyword">private</span> <span class="code-keyword">final</span> FileSystem fileSystem;
+  private final FileSystem fileSystem;
 
-  <span class="code-keyword">public</span> IndexerImpl(@InjectService(<span class="code-quote">"FileSystem"</span>) FileSystem fileSystem)
+  public IndexerImpl(@InjectService("FileSystem") FileSystem fileSystem)
   {
-    <span class="code-keyword">this</span>.fileSystem = fileSystem;
+    this.fileSystem = fileSystem;
   }
 
   . . .
-}</pre>
+}]]></script>
 </div></div>
 
 <p>If the class has multiple constructors, the constructor with the <em>most</em> parameters will be invoked. Alternately, you may mark a single constructor with the Inject annotation, and Tapestry will use <em>that</em> constructor specifically, ignoring all other constructors.</p>
@@ -364,25 +389,26 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Once thing that is not a good idea is to pass in another service, such as JobScheduler in the previous example, and pass <tt>this</tt> from a constructor:</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.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
 
-<span class="code-keyword">public</span> class IndexerImpl <span class="code-keyword">implements</span> Indexer
+public class IndexerImpl implements Indexer
 {
-  <span class="code-keyword">private</span> <span class="code-keyword">final</span> FileSystem fileSystem;
+  private final FileSystem fileSystem;
 
-  <span class="code-keyword">public</span> IndexerImpl(@InjectService(<span class="code-quote">"FileSystem"</span>) FileSystem fileSystem,
+  public IndexerImpl(@InjectService("FileSystem") FileSystem fileSystem,
 
-  @InjectService(<span class="code-quote">"JobScheduler"</span>) JobScheduler scheduler)
+  @InjectService("JobScheduler") JobScheduler scheduler)
   {
-    <span class="code-keyword">this</span>.fileSystem = fileSystem;
+    this.fileSystem = fileSystem;
 
-    scheduler.scheduleDailyJob(<span class="code-keyword">this</span>); <span class="code-comment">// Bad Idea
-</span>  }
+    scheduler.scheduleDailyJob(this); // Bad Idea
+  }
 
   . . .
-}</pre>
+}]]></script>
 </div></div>
 
 <p>Understanding why this is a bad idea involves a long detour into inner details of the Java Memory Model. The short form is that other threads may end up invoking methods on the IndexerImpl instance, and its fields (even though they are final, even though they appear to already have been set) may be uninitialized.</p>
@@ -396,17 +422,18 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Caution: injection via fields uses reflection to make the fields accessible. In addition, it may not be as thread-safe as using the constructor to assign to final fields.</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.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
 
-<span class="code-keyword">public</span> class IndexerImpl <span class="code-keyword">implements</span> Indexer
+public class IndexerImpl implements Indexer
 {
-  @InjectService(<span class="code-quote">"FileSystem"</span>)
-  <span class="code-keyword">private</span> FileSystem fileSystem;
+  @InjectService("FileSystem")
+  private FileSystem fileSystem;
 
   . . .
-}</pre>
+}]]></script>
 </div></div>
 
 <h1><a shape="rect" name="DefiningTapestryIOCServices-DefiningServiceScope"></a><a shape="rect" name="DefiningTapestryIOCServices-ServiceScope"></a>Defining Service Scope</h1>
@@ -446,7 +473,8 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>In addition, it is possible to specify the scope when binding the service:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  bind(MyServiceInterface.class, MyServiceImpl.class).scope(ScopeConstants.PERTHREAD);</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  bind(MyServiceInterface.class, MyServiceImpl.class).scope(ScopeConstants.PERTHREAD);]]></script>
 </div></div>
 
 <h1><a shape="rect" name="DefiningTapestryIOCServices-EagerLoadingServices"></a>Eager Loading Services</h1>
@@ -472,7 +500,8 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>You may also specify eager loading explicitly when binding the service:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  bind(MyServiceInterface.class, MyServiceImpl.class).eagerLoad();</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  bind(MyServiceInterface.class, MyServiceImpl.class).eagerLoad();]]></script>
 </div></div>
 
 <h1><a shape="rect" name="DefiningTapestryIOCServices-InjectingResources"></a>Injecting Resources</h1>
@@ -491,15 +520,16 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Example:</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> Indexer build(<span class="code-object">String</span> serviceId, Log serviceLog,
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(String serviceId, Log serviceLog,
      JobScheduler scheduler, FileSystem fileSystem)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(serviceLog, fileSystem);
+    IndexerImpl indexer = new IndexerImpl(serviceLog, fileSystem);
 
     scheduler.scheduleDailyJob(serviceId, indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>The order of parameters is completely irrelevant. They can come first or last or be interspersed however you like.</p>
@@ -511,14 +541,15 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Further, ServiceResources includes an autobuild() method that allows you to easily trigger the construction of a class, including dependencies. Thus the previos example could be rewritten as:</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> Indexer build(ServiceResources resources, JobScheduler jobScheduler)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(ServiceResources resources, JobScheduler jobScheduler)
   {
     IndexerImpl indexer = resources.autobuild(IndexerImpl.class);
 
     scheduler.scheduleDailyJob(resources.getServiceId(), indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>This works the exact same way with autobuilt services, except that the parameters of the service implementation constructor are considered, rather than the parameters of the service builder method.</p>
@@ -530,33 +561,35 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>Every once and a while, you'll have a conflict between a resource type and an object injection. For example, the following does not work as expected:</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> Indexer build(<span class="code-object">String</span> serviceId, Log serviceLog,
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(String serviceId, Log serviceLog,
      JobScheduler scheduler, FileSystem fileSystem,
-     @Value(<span class="code-quote">"${index-alerts-email}"</span>)
-     <span class="code-object">String</span> alertEmail)
+     @Value("${index-alerts-email}")
+     String alertEmail)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(serviceLog, fileSystem, alertEmail);
+    IndexerImpl indexer = new IndexerImpl(serviceLog, fileSystem, alertEmail);
 
     scheduler.scheduleDailyJob(serviceId, indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>It doesn't work because type String always gets the service id, as a resource (as with the serviceId parameter). In order to get this to work, we need to turn off the resource injection for the alertEmail parameter. That's what the @<a shape="rect" class="external-link" href="http://tapestry.apache.org/current/apidocs/org/apache/tapestry5/ioc/annotations/Inject.html">Inject</a> annotation does:</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> Indexer build(<span class="code-object">String</span> serviceId, Log serviceLog,
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer build(String serviceId, Log serviceLog,
      JobScheduler scheduler, FileSystem fileSystem,
-     @Inject @Value(<span class="code-quote">"${index-alerts-email}"</span>)
-     <span class="code-object">String</span> alertEmail)
+     @Inject @Value("${index-alerts-email}")
+     String alertEmail)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(serviceLog, fileSystem, alertEmail);
+    IndexerImpl indexer = new IndexerImpl(serviceLog, fileSystem, alertEmail);
 
     scheduler.scheduleDailyJob(serviceId, indexer);
 
-    <span class="code-keyword">return</span> indexer;
-  }</pre>
+    return indexer;
+  }]]></script>
 </div></div>
 
 <p>Here, the alertEmail parameter will receive the configured alerts email (see <a shape="rect" href="symbols.html" title="Symbols">the symbols documentation</a> for more about this syntax) rather than the service id.</p>
@@ -583,19 +616,20 @@ table.ScrollbarTable td.ScrollbarNextIco
 <p>With Tapestry IoC, this is not even considered a special case:</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> Indexer buildIndexer(JobScheduler scheduler, FileSystem fileSystem)
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  public static Indexer buildIndexer(JobScheduler scheduler, FileSystem fileSystem)
   {
-    IndexerImpl indexer = <span class="code-keyword">new</span> IndexerImpl(fileSystem);
+    IndexerImpl indexer = new IndexerImpl(fileSystem);
 
     scheduler.scheduleDailyJob(indexer);
 
-    <span class="code-keyword">return</span> indexer;
+    return indexer;
   }
 
-  <span class="code-keyword">public</span> <span class="code-keyword">static</span> FileSystem buildFileSystem(Indexer indexer)
+  public static FileSystem buildFileSystem(Indexer indexer)
   {
-    <span class="code-keyword">return</span> <span class="code-keyword">new</span> FileSystemImpl(indexer);
-  }  </pre>
+    return new FileSystemImpl(indexer);
+  }  ]]></script>
 </div></div>
 
 <p>Here, Indexer and FileSystem are mutually dependent. Eventually, one or the other of them will be created ... let's say its FileSystem. The buildFileSystem() builder method will be invoked, and a proxy to Indexer will be passed in. Inside the FileSystemImpl constructor (or at some later date), a method of the Indexer service will be invoked, at which point, the builderIndexer() method is invoked. It still receives the proxy to the FileSystem service.</p>
@@ -614,12 +648,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="tapestry-ioc-modules.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="tapestry-ioc-modules.html">Tapestry IoC Modules</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="service-advisors.html">Service Advisors</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="service-advisors.html"><img align="middle" border="0" src="/images/confluence/forwd_16.gif" width="16" height="1
 6"></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="tapestry-ioc-modules.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="tapestry-ioc-modules.html">Tapestry IoC Modules</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="service-advisors.html">Service Advisors</a></td><td colspan="1" rowspan="1" class="ScrollbarNextIcon"><a shape="rect" href="service-advisors.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']);
@@ -630,7 +664,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/defining-tapestry-ioc-services.html" async="true">

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