You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/03/30 19:25:47 UTC

svn commit: r1583162 [3/4] - in /wicket/common/site/trunk/_site/guide: ./ gapi/ gapi/DefaultPackage/ gapi/spring/ guide/ guide/pages/ guide/src/docs/guide/ guide/src/docs/guide/resources/

Modified: wicket/common/site/trunk/_site/guide/guide/pages/resources_8.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/resources_8.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/resources_8.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/resources_8.html Sun Mar 30 17:25:43 2014
@@ -2,7 +2,7 @@
                       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-    <title>15.8 Custom resources 6.x</title>
+    <title>15.8 Header contributors positioning 6.x</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <link rel="stylesheet" href="../css/main.css" type="text/css" media="screen, print" title="Style" charset="utf-8"/>
     <link rel="stylesheet" href="../css/pdf.css" type="text/css" media="print" title="PDF" charset="utf-8"/>
@@ -146,7 +146,7 @@ function addJsClass() {
 
 
                 <div class="project">
-                    <h1>15.8 Custom resources - Reference Documentation</h1>
+                    <h1>15.8 Header contributors positioning - Reference Documentation</h1>
 
                     <p><strong>Authors:</strong> Andrea Del Bene, Carsten Hufe, Christian Kroemer, Daniel Bartl, Paul Borș</p>
 
@@ -159,29 +159,13 @@ function addJsClass() {
 
                 
 
-<h2 id="resources_8">15.8 Custom resources</h2>
-<p class="paragraph"/>In Wicket the best way to add dynamic functionalities to our application (such as csv export, a pdf generated on the fly, etc...) is implementing a custom resource. In this paragraph as example of custom resource we will build a basic RSS feeds generator which can be used to publish feeds on our site (project CustomResourceMounting). Instead of generating a RSS feed by hand we will use Rome framework and its utility classes.<p class="paragraph"/>As hinted above in paragraph 13.1, class <code>AbstractResource</code> can be used as base class to implement new resources. This class defines abstract method <code>newResourceResponse</code> which is invoked when the resource is requested. The following is the code of our RSS feeds generator:<p class="paragraph"/><div class="code"><pre><span class="java&#45;keyword">public</span> class RSSProducerResource <span class="java&#45;keyword">extends</span> AbstractResource &#123;<p class="paragraph"/>  @Override
-  <span class="java&#45;keyword">protected</span> ResourceResponse newResourceResponse(Attributes attributes) &#123;
-    ResourceResponse resourceResponse = <span class="java&#45;keyword">new</span> ResourceResponse();
-    resourceResponse.setContentType(<span class="java&#45;quote">"text/xml"</span>);
-    resourceResponse.setTextEncoding(<span class="java&#45;quote">"utf&#45;8"</span>);<p class="paragraph"/>    resourceResponse.setWriteCallback(<span class="java&#45;keyword">new</span> WriteCallback()
-    &#123;
-      @Override
-      <span class="java&#45;keyword">public</span> void writeData(Attributes attributes) <span class="java&#45;keyword">throws</span> IOException
-      &#123;
-        OutputStream outputStream = attributes.getResponse().getOutputStream();
-        Writer writer = <span class="java&#45;keyword">new</span> OutputStreamWriter(outputStream);
-        SyndFeedOutput output = <span class="java&#45;keyword">new</span> SyndFeedOutput();
-            <span class="java&#45;keyword">try</span> &#123;
-          output.output(getFeed(), writer);
-        &#125; <span class="java&#45;keyword">catch</span> (FeedException e) &#123;
-          <span class="java&#45;keyword">throw</span> <span class="java&#45;keyword">new</span> WicketRuntimeException(<span class="java&#45;quote">"Problems writing feed to response..."</span>);
-        &#125;
-      &#125;      
-    &#125;);<p class="paragraph"/>    <span class="java&#45;keyword">return</span> resourceResponse;
-  &#125;
-  // method getFeed()&#8230;
-&#125;</pre></div><p class="paragraph"/>Method <code>newResourceResponse</code> returns an instance of <code>ResourceResponse</code> representing the response generated by the custom resource. Since RSS feeds are based on XML, in the code above we have set the type of the response to text/xml and the text encoding to utf-8.<p class="paragraph"/>To specify the content that will be returned by our resource we must also provide an implementation of inner class <code>WriteCallback</code> which is responsible for writing content data to response's output stream. In our project we used class SyndFeedOutput from Rome framework to write our feed to response. Method <code>getFeed()</code> is just an utility method that generates a sample RSS feed (which is an instance of interface <code>com.sun.syndication.feed.synd.SyndFeed</code>).<p class="paragraph"/>Now that we have our custom resource in place, we can use it in the home page of the project. The easiest way to make a resource available 
 to users is to expose it with link component <code>ResourceLink</code>:<p class="paragraph"/><div class="code"><pre>add(<span class="java&#45;keyword">new</span> ResourceLink(<span class="java&#45;quote">"rssLink"</span>, <span class="java&#45;keyword">new</span> RSSProducerResource()));</pre></div><p class="paragraph"/>In the next paragraphs we will see how to register a resource at application-level and how to mount it to an arbitrary URL.
+<h2 id="resources_8">15.8 Header contributors positioning</h2>
+Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
+
 
 
                 <div style="clear:both;margin-top:15px;"></div>
@@ -210,7 +194,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/resources_9.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/resources_9.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/resources_9.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/resources_9.html Sun Mar 30 17:25:43 2014
@@ -2,7 +2,7 @@
                       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-    <title>15.9 Mounting resources 6.x</title>
+    <title>15.9 Custom resources 6.x</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <link rel="stylesheet" href="../css/main.css" type="text/css" media="screen, print" title="Style" charset="utf-8"/>
     <link rel="stylesheet" href="../css/pdf.css" type="text/css" media="print" title="PDF" charset="utf-8"/>
@@ -146,7 +146,7 @@ function addJsClass() {
 
 
                 <div class="project">
-                    <h1>15.9 Mounting resources - Reference Documentation</h1>
+                    <h1>15.9 Custom resources - Reference Documentation</h1>
 
                     <p><strong>Authors:</strong> Andrea Del Bene, Carsten Hufe, Christian Kroemer, Daniel Bartl, Paul Borș</p>
 
@@ -159,30 +159,12 @@ function addJsClass() {
 
                 
 
-<h2 id="resources_9">15.9 Mounting resources</h2>
-<p class="paragraph"/>Just like pages also resources can be mounted to a specific path. Class <code>WebApplication</code> provides method <code>mountResource</code> which is almost identical to <code>mountPage</code> seen in paragraph 8.6.1:<p class="paragraph"/><div class="code"><pre>@Override
-<span class="java&#45;keyword">public</span> void init() &#123;
-  <span class="java&#45;keyword">super</span>.init();
-  //resource mounted to path /foo/bar
-  ResourceReference resourceReference = <span class="java&#45;keyword">new</span> ResourceReference(<span class="java&#45;quote">"rssProducer"</span>)&#123;
-     RSSReaderResource rssResource = <span class="java&#45;keyword">new</span> RSSReaderResource();
-     @Override
-     <span class="java&#45;keyword">public</span> IResource getResource() &#123;
-	<span class="java&#45;keyword">return</span> rssResource;
-  &#125;&#125;;
-  mountResource(<span class="java&#45;quote">"/foo/bar"</span>, resourceReference);
-&#125;</pre></div><p class="paragraph"/>With the configuration above (taken from project <code>CustomResourceMounting</code>) every request to /foo/bar will be served by the custom resource built in the previous paragraph.<p class="paragraph"/>Parameter placeholders are supported as well:<p class="paragraph"/><div class="code"><pre>@Override
-<span class="java&#45;keyword">public</span> void init() &#123;
-  <span class="java&#45;keyword">super</span>.init();
-  //resource mounted to path /foo with a required indexed parameter
-  ResourceReference resourceReference = <span class="java&#45;keyword">new</span> ResourceReference(<span class="java&#45;quote">"rssProducer"</span>)&#123;
-     RSSReaderResource rssResource = <span class="java&#45;keyword">new</span> RSSReaderResource();
-     @Override
-     <span class="java&#45;keyword">public</span> IResource getResource() &#123;
-	<span class="java&#45;keyword">return</span> rssResource;
-  &#125;&#125;;
-  mountResource(<span class="java&#45;quote">"/bar/$&#123;baz&#125;"</span>, resourceReference);
-&#125;</pre></div>
+<h2 id="resources_9">15.9 Custom resources</h2>
+<p class="paragraph"/>Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
 
 
                 <div style="clear:both;margin-top:15px;"></div>
@@ -211,7 +193,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/security_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/security_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/security_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/security_1.html Sun Mar 30 17:25:43 2014
@@ -264,7 +264,7 @@ Since both <code>restartResponseAtSignIn
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/security_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/security_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/security_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/security_2.html Sun Mar 30 17:25:43 2014
@@ -300,7 +300,7 @@ Application class <code>AuthenticatedWeb
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/security_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/security_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/security_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/security_3.html Sun Mar 30 17:25:43 2014
@@ -212,7 +212,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/security_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/security_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/security_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/security_4.html Sun Mar 30 17:25:43 2014
@@ -208,7 +208,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/security_5.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/security_5.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/security_5.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/security_5.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testing_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testing_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testing_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testing_1.html Sun Mar 30 17:25:43 2014
@@ -319,7 +319,7 @@ After a test method has been executed, w
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testing_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testing_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testing_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testing_2.html Sun Mar 30 17:25:43 2014
@@ -239,7 +239,7 @@ formTester.submit(<span class="java&#45;
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testing_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testing_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testing_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testing_3.html Sun Mar 30 17:25:43 2014
@@ -214,7 +214,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testing_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testing_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testing_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testing_4.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testingspring_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testingspring_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testingspring_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testingspring_1.html Sun Mar 30 17:25:43 2014
@@ -233,7 +233,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testingspring_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testingspring_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testingspring_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testingspring_2.html Sun Mar 30 17:25:43 2014
@@ -250,7 +250,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/testingspring_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/testingspring_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/testingspring_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/testingspring_3.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_1.html Sun Mar 30 17:25:43 2014
@@ -215,7 +215,7 @@ pageParameters.get(1);</pre></div><p cla
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_2.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_3.html Sun Mar 30 17:25:43 2014
@@ -225,7 +225,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_4.html Sun Mar 30 17:25:43 2014
@@ -196,7 +196,7 @@ add(<span class="java&#45;keyword">new</
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_5.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_5.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_5.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_5.html Sun Mar 30 17:25:43 2014
@@ -201,7 +201,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_6.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_6.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_6.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_6.html Sun Mar 30 17:25:43 2014
@@ -230,7 +230,7 @@ setResponsePage(MountedPageWithPlacehold
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/urls_7.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/urls_7.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/urls_7.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/urls_7.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_1.html Sun Mar 30 17:25:43 2014
@@ -191,7 +191,7 @@ Stateless pages are never versioned and 
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_2.html Sun Mar 30 17:25:43 2014
@@ -233,7 +233,7 @@ For the second level cache we can use th
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_3.html Sun Mar 30 17:25:43 2014
@@ -212,7 +212,7 @@ Page '&#60;page class&#62;' is not state
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/versioningCaching_4.html Sun Mar 30 17:25:43 2014
@@ -189,7 +189,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_1.html Sun Mar 30 17:25:43 2014
@@ -190,7 +190,7 @@ However, none of these frameworks offers
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_2.html Sun Mar 30 17:25:43 2014
@@ -196,7 +196,7 @@ This approach is very similar to what GU
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_3.html Sun Mar 30 17:25:43 2014
@@ -195,7 +195,7 @@ Let's quickly review the main advantages
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html Sun Mar 30 17:25:43 2014
@@ -196,7 +196,7 @@ Wicket is not the only component oriente
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html Sun Mar 30 17:25:43 2014
@@ -194,7 +194,7 @@ Every WicketStuff module can be download
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html Sun Mar 30 17:25:43 2014
@@ -213,7 +213,7 @@ textArea.add(<span class="java&#45;keywo
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html Sun Mar 30 17:25:43 2014
@@ -204,7 +204,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html Sun Mar 30 17:25:43 2014
@@ -198,7 +198,7 @@ add(<span class="java&#45;keyword">new</
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html Sun Mar 30 17:25:43 2014
@@ -197,7 +197,7 @@ add(grid);</pre></div><p class="paragrap
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html Sun Mar 30 17:25:43 2014
@@ -213,7 +213,7 @@ To write/read objects to response/from r
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/redirects.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/redirects.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/redirects.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/redirects.html Sun Mar 30 17:25:43 2014
@@ -224,7 +224,7 @@ Quite a few teams have already got stuck
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/repeaters.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/repeaters.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/repeaters.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/repeaters.html Sun Mar 30 17:25:43 2014
@@ -348,7 +348,7 @@ Wicket provides also component PageableL
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/requestProcessing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/requestProcessing.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/requestProcessing.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/requestProcessing.html Sun Mar 30 17:25:43 2014
@@ -309,7 +309,7 @@ Remember that invalidateNow() will immed
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/resources.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/resources.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/resources.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/resources.html Sun Mar 30 17:25:43 2014
@@ -180,19 +180,22 @@ function addJsClass() {
                     <div class="toc-item" style="margin-left:0px"><a href="#resources_7"><strong>15.7</strong><span>Put JavaScript inside page body</span></a>
                     </div>
                     
-                    <div class="toc-item" style="margin-left:0px"><a href="#resources_8"><strong>15.8</strong><span>Custom resources</span></a>
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_8"><strong>15.8</strong><span>Header contributors positioning</span></a>
                     </div>
                     
-                    <div class="toc-item" style="margin-left:0px"><a href="#resources_9"><strong>15.9</strong><span>Mounting resources</span></a>
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_9"><strong>15.9</strong><span>Custom resources</span></a>
                     </div>
                     
-                    <div class="toc-item" style="margin-left:0px"><a href="#resources_10"><strong>15.10</strong><span>Shared resources</span></a>
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_10"><strong>15.10</strong><span>Mounting resources</span></a>
                     </div>
                     
-                    <div class="toc-item" style="margin-left:0px"><a href="#resources_11"><strong>15.11</strong><span>Customizing resource loading</span></a>
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_11"><strong>15.11</strong><span>Shared resources</span></a>
                     </div>
                     
-                    <div class="toc-item" style="margin-left:0px"><a href="#resources_12"><strong>15.12</strong><span>Summary</span></a>
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_12"><strong>15.12</strong><span>Customizing resource loading</span></a>
+                    </div>
+                    
+                    <div class="toc-item" style="margin-left:0px"><a href="#resources_13"><strong>15.13</strong><span>Summary</span></a>
                     </div>
                     
                 </div>
@@ -285,9 +288,9 @@ A specific resource reference can not be
 
 
 <h2 id="resources_7">15.7 Put JavaScript inside page body</h2>
-Some web developers prefer to put their &#60;script&#62; tags at the end of page body instead of inside the &#60;header&#62; tags:<p class="paragraph"/><div class="code"><pre>&#60;html&#62;<p class="paragraph"/>&#60;header&#62;
+Some web developers prefer to put their &#60;script&#62; tags at the end of page body instead of inside the &#60;head&#62; tags:<p class="paragraph"/><div class="code"><pre>&#60;html&#62;<p class="paragraph"/>&#60;head&#62;
 //no &#60;script&#62; tag here&#8230;
-&#60;/header&#62;<p class="paragraph"/>&#60;body&#62;
+&#60;/head&#62;<p class="paragraph"/>&#60;body&#62;
 &#8230;
 &#60;script&#62;
 //one or more &#60;script&#62; tags at the end of the body
@@ -326,32 +329,24 @@ The following code is taken from the App
     &#125;</pre></div><p class="paragraph"/>Looking at the code above you can note that our page adds two script to the header section: the first is an instance of <code>JavaScriptHeaderItem</code> and will be rendered in the <code>HeaderResponseContainer</code> while the second will follow the usual behavior and will be rendered inside &#60;head&#62; tag.<p class="paragraph"/><p class="paragraph"/>
 
 
-<h2 id="resources_8">15.8 Custom resources</h2>
-<p class="paragraph"/>In Wicket the best way to add dynamic functionalities to our application (such as csv export, a pdf generated on the fly, etc...) is implementing a custom resource. In this paragraph as example of custom resource we will build a basic RSS feeds generator which can be used to publish feeds on our site (project CustomResourceMounting). Instead of generating a RSS feed by hand we will use Rome framework and its utility classes.<p class="paragraph"/>As hinted above in paragraph 13.1, class <code>AbstractResource</code> can be used as base class to implement new resources. This class defines abstract method <code>newResourceResponse</code> which is invoked when the resource is requested. The following is the code of our RSS feeds generator:<p class="paragraph"/><div class="code"><pre><span class="java&#45;keyword">public</span> class RSSProducerResource <span class="java&#45;keyword">extends</span> AbstractResource &#123;<p class="paragraph"/>  @Override
-  <span class="java&#45;keyword">protected</span> ResourceResponse newResourceResponse(Attributes attributes) &#123;
-    ResourceResponse resourceResponse = <span class="java&#45;keyword">new</span> ResourceResponse();
-    resourceResponse.setContentType(<span class="java&#45;quote">"text/xml"</span>);
-    resourceResponse.setTextEncoding(<span class="java&#45;quote">"utf&#45;8"</span>);<p class="paragraph"/>    resourceResponse.setWriteCallback(<span class="java&#45;keyword">new</span> WriteCallback()
-    &#123;
-      @Override
-      <span class="java&#45;keyword">public</span> void writeData(Attributes attributes) <span class="java&#45;keyword">throws</span> IOException
-      &#123;
-        OutputStream outputStream = attributes.getResponse().getOutputStream();
-        Writer writer = <span class="java&#45;keyword">new</span> OutputStreamWriter(outputStream);
-        SyndFeedOutput output = <span class="java&#45;keyword">new</span> SyndFeedOutput();
-            <span class="java&#45;keyword">try</span> &#123;
-          output.output(getFeed(), writer);
-        &#125; <span class="java&#45;keyword">catch</span> (FeedException e) &#123;
-          <span class="java&#45;keyword">throw</span> <span class="java&#45;keyword">new</span> WicketRuntimeException(<span class="java&#45;quote">"Problems writing feed to response..."</span>);
-        &#125;
-      &#125;      
-    &#125;);<p class="paragraph"/>    <span class="java&#45;keyword">return</span> resourceResponse;
-  &#125;
-  // method getFeed()&#8230;
-&#125;</pre></div><p class="paragraph"/>Method <code>newResourceResponse</code> returns an instance of <code>ResourceResponse</code> representing the response generated by the custom resource. Since RSS feeds are based on XML, in the code above we have set the type of the response to text/xml and the text encoding to utf-8.<p class="paragraph"/>To specify the content that will be returned by our resource we must also provide an implementation of inner class <code>WriteCallback</code> which is responsible for writing content data to response's output stream. In our project we used class SyndFeedOutput from Rome framework to write our feed to response. Method <code>getFeed()</code> is just an utility method that generates a sample RSS feed (which is an instance of interface <code>com.sun.syndication.feed.synd.SyndFeed</code>).<p class="paragraph"/>Now that we have our custom resource in place, we can use it in the home page of the project. The easiest way to make a resource available 
 to users is to expose it with link component <code>ResourceLink</code>:<p class="paragraph"/><div class="code"><pre>add(<span class="java&#45;keyword">new</span> ResourceLink(<span class="java&#45;quote">"rssLink"</span>, <span class="java&#45;keyword">new</span> RSSProducerResource()));</pre></div><p class="paragraph"/>In the next paragraphs we will see how to register a resource at application-level and how to mount it to an arbitrary URL.
+<h2 id="resources_8">15.8 Header contributors positioning</h2>
+Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
+
+
+
+<h2 id="resources_9">15.9 Custom resources</h2>
+<p class="paragraph"/>Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
 
 
-<h2 id="resources_9">15.9 Mounting resources</h2>
+<h2 id="resources_10">15.10 Mounting resources</h2>
 <p class="paragraph"/>Just like pages also resources can be mounted to a specific path. Class <code>WebApplication</code> provides method <code>mountResource</code> which is almost identical to <code>mountPage</code> seen in paragraph 8.6.1:<p class="paragraph"/><div class="code"><pre>@Override
 <span class="java&#45;keyword">public</span> void init() &#123;
   <span class="java&#45;keyword">super</span>.init();
@@ -377,7 +372,7 @@ The following code is taken from the App
 &#125;</pre></div>
 
 
-<h2 id="resources_10">15.10 Shared resources</h2>
+<h2 id="resources_11">15.11 Shared resources</h2>
 <p class="paragraph"/>Resources can be added to a global registry in order to share them at application-level. Shared resources are identified by an application-scoped key and they can be easily retrieved at a later time using reference class <code>SharedResourceReference</code>. The global registry can be accessed with <code>Application</code>'s method <code>getSharedResources</code>. In the following excerpt of code (taken again from project <code>CustomResourceMounting</code>) we register an instance of our custom RSS feeds producer as application-shared resource:<p class="paragraph"/><div class="code"><pre>//init application's method
   @Override
   <span class="java&#45;keyword">public</span> void init()&#123;
@@ -391,7 +386,7 @@ Remember that we can get the URL of a re
 </blockquote>
 
 
-<h2 id="resources_11">15.11 Customizing resource loading</h2>
+<h2 id="resources_12">15.12 Customizing resource loading</h2>
 <p class="paragraph"/>Wicket loads application's resources delegating this task to a resource locator represented by interface <code>org.apache.wicket.core.util.resource.locator.IResourceStreamLocator</code>. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting interface <code>IResourceSettings</code>:<p class="paragraph"/><div class="code"><pre>//init application's method
   @Override
   <span class="java&#45;keyword">public</span> void init()&#123;   
@@ -409,7 +404,7 @@ By default, if resource files can not be
 </blockquote>
 
 
-<h2 id="resources_12">15.12 Summary</h2>
+<h2 id="resources_13">15.13 Summary</h2>
 In this chapter we have learnt how to manage resources with the built-in mechanism provided by Wicket. With this mechanism we handle resources from Java code and Wicket will automatically take care of generating a valid URL for them. We have also seen how resources can be bundled as package resources with a component that depends on them to make it self-contained.<p class="paragraph"/>Then, in the second part of the chapter, we have built a custom resource and we have learnt how to mount it to an arbitrary URL and how to make it globally available as shared resource.<p class="paragraph"/>Finally, in the last part of the paragraph we took a peek at the mechanism provided by the framework to customize the locations where the resource-lookup algorithm searches for resources. 
 
 
@@ -440,7 +435,7 @@ In this chapter we have learnt how to ma
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/security.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/security.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/security.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/security.html Sun Mar 30 17:25:43 2014
@@ -457,7 +457,7 @@ Application class <code>AuthenticatedWeb
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/single.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/single.html?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/single.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/single.html Sun Mar 30 17:25:43 2014
@@ -320,15 +320,17 @@ function addJsClass(el) {
                             
                             <div class="toc-item" style="margin-left:10px"><a href="#resources_7"><strong>15.7</strong><span>Put JavaScript inside page body</span></a></div>
                             
-                            <div class="toc-item" style="margin-left:10px"><a href="#resources_8"><strong>15.8</strong><span>Custom resources</span></a></div>
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_8"><strong>15.8</strong><span>Header contributors positioning</span></a></div>
                             
-                            <div class="toc-item" style="margin-left:10px"><a href="#resources_9"><strong>15.9</strong><span>Mounting resources</span></a></div>
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_9"><strong>15.9</strong><span>Custom resources</span></a></div>
                             
-                            <div class="toc-item" style="margin-left:10px"><a href="#resources_10"><strong>15.10</strong><span>Shared resources</span></a></div>
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_10"><strong>15.10</strong><span>Mounting resources</span></a></div>
                             
-                            <div class="toc-item" style="margin-left:10px"><a href="#resources_11"><strong>15.11</strong><span>Customizing resource loading</span></a></div>
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_11"><strong>15.11</strong><span>Shared resources</span></a></div>
                             
-                            <div class="toc-item" style="margin-left:10px"><a href="#resources_12"><strong>15.12</strong><span>Summary</span></a></div>
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_12"><strong>15.12</strong><span>Customizing resource loading</span></a></div>
+                            
+                            <div class="toc-item" style="margin-left:10px"><a href="#resources_13"><strong>15.13</strong><span>Summary</span></a></div>
                             
                             <div class="toc-item" style="margin-left:0px"><a href="#jsintegration"><strong>16</strong><span>An example of integration with JavaScript</span></a></div>
                             
@@ -2583,9 +2585,9 @@ A specific resource reference can not be
 
 
 <h2 id="resources_7">15.7 Put JavaScript inside page body</h2>
-Some web developers prefer to put their &#60;script&#62; tags at the end of page body instead of inside the &#60;header&#62; tags:<p class="paragraph"/><div class="code"><pre>&#60;html&#62;<p class="paragraph"/>&#60;header&#62;
+Some web developers prefer to put their &#60;script&#62; tags at the end of page body instead of inside the &#60;head&#62; tags:<p class="paragraph"/><div class="code"><pre>&#60;html&#62;<p class="paragraph"/>&#60;head&#62;
 //no &#60;script&#62; tag here&#8230;
-&#60;/header&#62;<p class="paragraph"/>&#60;body&#62;
+&#60;/head&#62;<p class="paragraph"/>&#60;body&#62;
 &#8230;
 &#60;script&#62;
 //one or more &#60;script&#62; tags at the end of the body
@@ -2624,32 +2626,24 @@ The following code is taken from the App
     &#125;</pre></div><p class="paragraph"/>Looking at the code above you can note that our page adds two script to the header section: the first is an instance of <code>JavaScriptHeaderItem</code> and will be rendered in the <code>HeaderResponseContainer</code> while the second will follow the usual behavior and will be rendered inside &#60;head&#62; tag.<p class="paragraph"/><p class="paragraph"/>
 
 
-<h2 id="resources_8">15.8 Custom resources</h2>
-<p class="paragraph"/>In Wicket the best way to add dynamic functionalities to our application (such as csv export, a pdf generated on the fly, etc...) is implementing a custom resource. In this paragraph as example of custom resource we will build a basic RSS feeds generator which can be used to publish feeds on our site (project CustomResourceMounting). Instead of generating a RSS feed by hand we will use Rome framework and its utility classes.<p class="paragraph"/>As hinted above in paragraph 13.1, class <code>AbstractResource</code> can be used as base class to implement new resources. This class defines abstract method <code>newResourceResponse</code> which is invoked when the resource is requested. The following is the code of our RSS feeds generator:<p class="paragraph"/><div class="code"><pre><span class="java&#45;keyword">public</span> class RSSProducerResource <span class="java&#45;keyword">extends</span> AbstractResource &#123;<p class="paragraph"/>  @Override
-  <span class="java&#45;keyword">protected</span> ResourceResponse newResourceResponse(Attributes attributes) &#123;
-    ResourceResponse resourceResponse = <span class="java&#45;keyword">new</span> ResourceResponse();
-    resourceResponse.setContentType(<span class="java&#45;quote">"text/xml"</span>);
-    resourceResponse.setTextEncoding(<span class="java&#45;quote">"utf&#45;8"</span>);<p class="paragraph"/>    resourceResponse.setWriteCallback(<span class="java&#45;keyword">new</span> WriteCallback()
-    &#123;
-      @Override
-      <span class="java&#45;keyword">public</span> void writeData(Attributes attributes) <span class="java&#45;keyword">throws</span> IOException
-      &#123;
-        OutputStream outputStream = attributes.getResponse().getOutputStream();
-        Writer writer = <span class="java&#45;keyword">new</span> OutputStreamWriter(outputStream);
-        SyndFeedOutput output = <span class="java&#45;keyword">new</span> SyndFeedOutput();
-            <span class="java&#45;keyword">try</span> &#123;
-          output.output(getFeed(), writer);
-        &#125; <span class="java&#45;keyword">catch</span> (FeedException e) &#123;
-          <span class="java&#45;keyword">throw</span> <span class="java&#45;keyword">new</span> WicketRuntimeException(<span class="java&#45;quote">"Problems writing feed to response..."</span>);
-        &#125;
-      &#125;      
-    &#125;);<p class="paragraph"/>    <span class="java&#45;keyword">return</span> resourceResponse;
-  &#125;
-  // method getFeed()&#8230;
-&#125;</pre></div><p class="paragraph"/>Method <code>newResourceResponse</code> returns an instance of <code>ResourceResponse</code> representing the response generated by the custom resource. Since RSS feeds are based on XML, in the code above we have set the type of the response to text/xml and the text encoding to utf-8.<p class="paragraph"/>To specify the content that will be returned by our resource we must also provide an implementation of inner class <code>WriteCallback</code> which is responsible for writing content data to response's output stream. In our project we used class SyndFeedOutput from Rome framework to write our feed to response. Method <code>getFeed()</code> is just an utility method that generates a sample RSS feed (which is an instance of interface <code>com.sun.syndication.feed.synd.SyndFeed</code>).<p class="paragraph"/>Now that we have our custom resource in place, we can use it in the home page of the project. The easiest way to make a resource available 
 to users is to expose it with link component <code>ResourceLink</code>:<p class="paragraph"/><div class="code"><pre>add(<span class="java&#45;keyword">new</span> ResourceLink(<span class="java&#45;quote">"rssLink"</span>, <span class="java&#45;keyword">new</span> RSSProducerResource()));</pre></div><p class="paragraph"/>In the next paragraphs we will see how to register a resource at application-level and how to mount it to an arbitrary URL.
+<h2 id="resources_8">15.8 Header contributors positioning</h2>
+Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
+
+
+
+<h2 id="resources_9">15.9 Custom resources</h2>
+<p class="paragraph"/>Starting from version 6.15.0 we can specify where header contributors must be rendered inside &#60;head&#62; tag using the placeholder tag <code>&#60;wicket:header-items/&#62;</code>:<p class="paragraph"/><div class="code"><pre>&#60;head&#62;
+  &#60;meta chartset=<span class="java&#45;quote">"UTF&#45;8"</span>/&#62;
+  &#60;wicket:header&#45;items/&#62;
+  &#60;script src=<span class="java&#45;quote">"my&#45;monkey&#45;patch&#45;of&#45;wicket&#45;ajax.js"</span>&#62;&#60;/script&#62;
+&#60;/head&#62;</pre></div><p class="paragraph"/>With the code above all header contributions done by using IHeaderResponse in your Java code or the special <code>&#60;wicket:head&#62;</code> tag will be put between the &#60;meta&#62; and &#60;script&#62; elements, i.e. in the place of <code>&#60;wicket:header-items/&#62;</code>.<p class="paragraph"/>This way you can make sure that some header item is always before or after the header items managed by Wicket.<p class="paragraph"/><code>&#60;wicket:header-items/&#62;</code> can be used only in the page's &#60;head&#62; element and there could be at most one instance of it.
 
 
-<h2 id="resources_9">15.9 Mounting resources</h2>
+<h2 id="resources_10">15.10 Mounting resources</h2>
 <p class="paragraph"/>Just like pages also resources can be mounted to a specific path. Class <code>WebApplication</code> provides method <code>mountResource</code> which is almost identical to <code>mountPage</code> seen in paragraph 8.6.1:<p class="paragraph"/><div class="code"><pre>@Override
 <span class="java&#45;keyword">public</span> void init() &#123;
   <span class="java&#45;keyword">super</span>.init();
@@ -2675,7 +2669,7 @@ The following code is taken from the App
 &#125;</pre></div>
 
 
-<h2 id="resources_10">15.10 Shared resources</h2>
+<h2 id="resources_11">15.11 Shared resources</h2>
 <p class="paragraph"/>Resources can be added to a global registry in order to share them at application-level. Shared resources are identified by an application-scoped key and they can be easily retrieved at a later time using reference class <code>SharedResourceReference</code>. The global registry can be accessed with <code>Application</code>'s method <code>getSharedResources</code>. In the following excerpt of code (taken again from project <code>CustomResourceMounting</code>) we register an instance of our custom RSS feeds producer as application-shared resource:<p class="paragraph"/><div class="code"><pre>//init application's method
   @Override
   <span class="java&#45;keyword">public</span> void init()&#123;
@@ -2689,7 +2683,7 @@ Remember that we can get the URL of a re
 </blockquote>
 
 
-<h2 id="resources_11">15.11 Customizing resource loading</h2>
+<h2 id="resources_12">15.12 Customizing resource loading</h2>
 <p class="paragraph"/>Wicket loads application's resources delegating this task to a resource locator represented by interface <code>org.apache.wicket.core.util.resource.locator.IResourceStreamLocator</code>. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting interface <code>IResourceSettings</code>:<p class="paragraph"/><div class="code"><pre>//init application's method
   @Override
   <span class="java&#45;keyword">public</span> void init()&#123;   
@@ -2707,7 +2701,7 @@ By default, if resource files can not be
 </blockquote>
 
 
-<h2 id="resources_12">15.12 Summary</h2>
+<h2 id="resources_13">15.13 Summary</h2>
 In this chapter we have learnt how to manage resources with the built-in mechanism provided by Wicket. With this mechanism we handle resources from Java code and Wicket will automatically take care of generating a valid URL for them. We have also seen how resources can be bundled as package resources with a component that depends on them to make it self-contained.<p class="paragraph"/>Then, in the second part of the chapter, we have built a custom resource and we have learnt how to mount it to an arbitrary URL and how to make it globally available as shared resource.<p class="paragraph"/>Finally, in the last part of the paragraph we took a peek at the mechanism provided by the framework to customize the locations where the resource-lookup algorithm searches for resources. 
 
 
@@ -4678,7 +4672,7 @@ and attach it to a ticket in Apache Wick
         <div id="footer">
             
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-05)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-03-30)</b>
 
             
         </div>

Modified: wicket/common/site/trunk/_site/guide/guide/single.pdf
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/single.pdf?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
Binary files - no diff available.

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_10.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_10.gdoc?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_10.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_10.gdoc Sun Mar 30 17:25:43 2014
@@ -1,33 +1,37 @@
 
 
-Resources can be added to a global registry in order to share them at application-level. Shared resources are identified by an application-scoped key and they can be easily retrieved at a later time using reference class @SharedResourceReference@. The global registry can be accessed with @Application@'s method @getSharedResources@. In the following excerpt of code (taken again from project @CustomResourceMounting@) we register an instance of our custom RSS feeds producer as application-shared resource:
+Just like pages also resources can be mounted to a specific path. Class @WebApplication@ provides method @mountResource@ which is almost identical to @mountPage@ seen in paragraph 8.6.1:
 
 {code}
-  //init application's method
-  @Override
-  public void init(){
-    RSSProducerResource rssResource = new RSSProducerResource();
-    // ...
-    getSharedResources().add("globalRSSProducer", rssResource);    
-  }
+@Override
+public void init() {
+  super.init();
+  //resource mounted to path /foo/bar
+  ResourceReference resourceReference = new ResourceReference("rssProducer"){
+     RSSReaderResource rssResource = new RSSReaderResource();
+     @Override
+     public IResource getResource() {
+	return rssResource;
+  }};
+  mountResource("/foo/bar", resourceReference);
+}
 {code}
 
-Now to use an application-shared resource we can simply retrieve it using class @SharedResourceReference@ and providing the key previously used to register the resource:
+With the configuration above (taken from project @CustomResourceMounting@) every request to /foo/bar will be served by the custom resource built in the previous paragraph. 
 
-{code}
-add(new ResourceLink("globalRssLink", new SharedResourceReference("globalRSSProducer")));
-{code}
-
-The URL generated for application shared resources follows the same pattern seen for package resources:
-
-@./wicket/resource/org.apache.wicket.Application/globalRSSProducer@
+Parameter placeholders are supported as well:
 
-The last segment of the URL is the key of the resource while the previous segment contains the scope of the resource. For application-scoped resources the scope is always the fully qualified name of class @Application@. This should not be surprising since global resources are visible at application level (i.e. the scope is the application).
-
-{note}
-Package resources are also application-shared resources but they don't need to be explicitly registered.
-{note}
-
-{note}
-Remember that we can get the URL of a resource reference using method @urlFor(ResourceReference resourceRef, PageParameters params )@ available with both class @RequestCycle@ and class @Component@.
-{note}
\ No newline at end of file
+{code}
+@Override
+public void init() {
+  super.init();
+  //resource mounted to path /foo with a required indexed parameter
+  ResourceReference resourceReference = new ResourceReference("rssProducer"){
+     RSSReaderResource rssResource = new RSSReaderResource();
+     @Override
+     public IResource getResource() {
+	return rssResource;
+  }};
+  mountResource("/bar/${baz}", resourceReference);
+}
+{code}
\ No newline at end of file

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_11.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_11.gdoc?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_11.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_11.gdoc Sun Mar 30 17:25:43 2014
@@ -1,45 +1,33 @@
 
 
-Wicket loads application's resources delegating this task to a resource locator represented by interface @org.apache.wicket.core.util.resource.locator.IResourceStreamLocator@. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting interface @IResourceSettings@:
+Resources can be added to a global registry in order to share them at application-level. Shared resources are identified by an application-scoped key and they can be easily retrieved at a later time using reference class @SharedResourceReference@. The global registry can be accessed with @Application@'s method @getSharedResources@. In the following excerpt of code (taken again from project @CustomResourceMounting@) we register an instance of our custom RSS feeds producer as application-shared resource:
 
 {code}
   //init application's method
   @Override
-  public void init(){   
-    //get the resource locator 
-    getResourceSettings().getResourceStreamLocator();
-    //set the resource locator    
-    getResourceSettings().setResourceStreamLocator(myLocator);
+  public void init(){
+    RSSProducerResource rssResource = new RSSProducerResource();
+    // ...
+    getSharedResources().add("globalRSSProducer", rssResource);    
   }
 {code}
 
-The default locator used by Wicket is class @ResourceStreamLocator@ which in turn tries to load a requested resource using a set of implementations of interface @IResourceFinder@. This interface defines method @find(Class class, String pathname)@ which tries to resolve a resource corresponding to the given class and path.
-
-The default implementation of @IResourceFinder@ used by Wicket is @ClassPathResourceFinder@ which searches for resources into the application class path. This is the implementation we have used so far in our examples. However some developers may prefer storing markup files and other resources in a separate folder rather than placing them side by side with Java classes. 
-
-To customize resource loading we can add further resource finders to our application in order to extend the resource-lookup algorithm to different locations. Wicket already comes with two other implementations of IResourceFinder designed to search for resources into a specific folder on the file system. The first is class @Path@ and it's defined in package @org.apache.wicket.util.file@. The constructor of this class takes in input an arbitrary folder that can be expressed as a string path or as an instance of Wicket utility class @Folder@ (in package @org.apache.wicket.util.file@). The second implementation of interface @IResourceFinder@ is class @WebApplicationPath@ which looks into a folder placed inside webapp's root path (but not inside folder WEB-INF).
-
-Project CustomFolder4MarkupExample uses @WebApplicationPath@ to load the markup file and the resource bundle for its home page from a custom folder. The folder is called markupFolder and it is placed in the root path of the webapp. The following picture illustrates the file structure of the project:
-
-!package-structure-custom-folder.png!
-
-As we can see in the picture above, we must preserve the package structure also in the custom folder used as resource container. The code used inside application class to configure  WebApplicationPath is the following:
+Now to use an application-shared resource we can simply retrieve it using class @SharedResourceReference@ and providing the key previously used to register the resource:
 
 {code}
-@Override
-public void init()
-{
-	getResourceSettings().getResourceFinders().add(
-			new WebApplicationPath(getServletContext(), "markupFolder"));
-}
+add(new ResourceLink("globalRssLink", new SharedResourceReference("globalRSSProducer")));
 {code}
 
-Method getResourceFinders() defined by setting interface IResourceSettings returns the list of  resource finders defined in our application. The constructor of WebApplicationPath takes in input also an instance of standard interface javax.servlet.ServletContext which can be retrieved with WebApplication's method getServletContext().
+The URL generated for application shared resources follows the same pattern seen for package resources:
 
-{note}
-By default, if resource files can not be found inside application classpath, Wicket will search for them inside “resources” folder. You may have noted this folder in the previous picture. It is placed next to the folder “java” containing our source files:
+@./wicket/resource/org.apache.wicket.Application/globalRSSProducer@
 
-!package-structure-resource-folder.png!
+The last segment of the URL is the key of the resource while the previous segment contains the scope of the resource. For application-scoped resources the scope is always the fully qualified name of class @Application@. This should not be surprising since global resources are visible at application level (i.e. the scope is the application).
 
-This folder can be used to store resource files without writing any configuration code.
+{note}
+Package resources are also application-shared resources but they don't need to be explicitly registered.
+{note}
+
+{note}
+Remember that we can get the URL of a resource reference using method @urlFor(ResourceReference resourceRef, PageParameters params )@ available with both class @RequestCycle@ and class @Component@.
 {note}
\ No newline at end of file

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_12.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_12.gdoc?rev=1583162&r1=1583161&r2=1583162&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_12.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_12.gdoc Sun Mar 30 17:25:43 2014
@@ -1,5 +1,45 @@
-In this chapter we have learnt how to manage resources with the built-in mechanism provided by Wicket. With this mechanism we handle resources from Java code and Wicket will automatically take care of generating a valid URL for them. We have also seen how resources can be bundled as package resources with a component that depends on them to make it self-contained.
 
-Then, in the second part of the chapter, we have built a custom resource and we have learnt how to mount it to an arbitrary URL and how to make it globally available as shared resource.
 
-Finally, in the last part of the paragraph we took a peek at the mechanism provided by the framework to customize the locations where the resource-lookup algorithm searches for resources. 
+Wicket loads application's resources delegating this task to a resource locator represented by interface @org.apache.wicket.core.util.resource.locator.IResourceStreamLocator@. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting interface @IResourceSettings@:
+
+{code}
+  //init application's method
+  @Override
+  public void init(){   
+    //get the resource locator 
+    getResourceSettings().getResourceStreamLocator();
+    //set the resource locator    
+    getResourceSettings().setResourceStreamLocator(myLocator);
+  }
+{code}
+
+The default locator used by Wicket is class @ResourceStreamLocator@ which in turn tries to load a requested resource using a set of implementations of interface @IResourceFinder@. This interface defines method @find(Class class, String pathname)@ which tries to resolve a resource corresponding to the given class and path.
+
+The default implementation of @IResourceFinder@ used by Wicket is @ClassPathResourceFinder@ which searches for resources into the application class path. This is the implementation we have used so far in our examples. However some developers may prefer storing markup files and other resources in a separate folder rather than placing them side by side with Java classes. 
+
+To customize resource loading we can add further resource finders to our application in order to extend the resource-lookup algorithm to different locations. Wicket already comes with two other implementations of IResourceFinder designed to search for resources into a specific folder on the file system. The first is class @Path@ and it's defined in package @org.apache.wicket.util.file@. The constructor of this class takes in input an arbitrary folder that can be expressed as a string path or as an instance of Wicket utility class @Folder@ (in package @org.apache.wicket.util.file@). The second implementation of interface @IResourceFinder@ is class @WebApplicationPath@ which looks into a folder placed inside webapp's root path (but not inside folder WEB-INF).
+
+Project CustomFolder4MarkupExample uses @WebApplicationPath@ to load the markup file and the resource bundle for its home page from a custom folder. The folder is called markupFolder and it is placed in the root path of the webapp. The following picture illustrates the file structure of the project:
+
+!package-structure-custom-folder.png!
+
+As we can see in the picture above, we must preserve the package structure also in the custom folder used as resource container. The code used inside application class to configure  WebApplicationPath is the following:
+
+{code}
+@Override
+public void init()
+{
+	getResourceSettings().getResourceFinders().add(
+			new WebApplicationPath(getServletContext(), "markupFolder"));
+}
+{code}
+
+Method getResourceFinders() defined by setting interface IResourceSettings returns the list of  resource finders defined in our application. The constructor of WebApplicationPath takes in input also an instance of standard interface javax.servlet.ServletContext which can be retrieved with WebApplication's method getServletContext().
+
+{note}
+By default, if resource files can not be found inside application classpath, Wicket will search for them inside “resources” folder. You may have noted this folder in the previous picture. It is placed next to the folder “java” containing our source files:
+
+!package-structure-resource-folder.png!
+
+This folder can be used to store resource files without writing any configuration code.
+{note}
\ No newline at end of file

Added: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_13.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_13.gdoc?rev=1583162&view=auto
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_13.gdoc (added)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/resources/resources_13.gdoc Sun Mar 30 17:25:43 2014
@@ -0,0 +1,5 @@
+In this chapter we have learnt how to manage resources with the built-in mechanism provided by Wicket. With this mechanism we handle resources from Java code and Wicket will automatically take care of generating a valid URL for them. We have also seen how resources can be bundled as package resources with a component that depends on them to make it self-contained.
+
+Then, in the second part of the chapter, we have built a custom resource and we have learnt how to mount it to an arbitrary URL and how to make it globally available as shared resource.
+
+Finally, in the last part of the paragraph we took a peek at the mechanism provided by the framework to customize the locations where the resource-lookup algorithm searches for resources.