You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/11/05 23:12:42 UTC

svn commit: r1539155 [3/3] - in /wicket/common/site/trunk: _includes/ _site/ _site/2009/07/30/ _site/2009/08/21/ _site/2009/10/12/ _site/2009/10/24/ _site/2009/12/13/ _site/2009/12/21/ _site/2010/02/01/ _site/2010/03/05/ _site/2010/05/03/ _site/2010/05...

Modified: wicket/common/site/trunk/_site/learn/examples/markupinheritance.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/markupinheritance.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/markupinheritance.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/markupinheritance.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -203,8 +203,7 @@
         This is in the super markup.<span class='nt'>&lt;br&gt;</span>
     <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In this markup you see two sentences that surround the <code>&lt;wicket:child&gt;</code> tag. All markup in this file will remain when a sub class of this page is created, only the <code>&lt;wicket:child&gt;</code> tag will be replaced with the child markup. So if we look at the following markup:</p>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;head&gt;&lt;/head&gt;</span>
@@ -216,8 +215,7 @@
     This is in the child markup.<span class='nt'>&lt;br&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>we can see the markup that should be included in the parent. Only the markup between the <code>&lt;wicket:extend&gt;</code> tags is included in the final page. Take a look at the following markup which is the final markup when you would use this in a Wicket application.</p>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;head&gt;&lt;/head&gt;</span>
@@ -229,8 +227,7 @@
     This is in the super markup.<span class='nt'>&lt;br&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>Here you can see that the <code>&lt;wicket:child /&gt;</code> tag has been expanded, and its contents filled with exactly the markup between the <code>&lt;wicket:extend&gt;</code> tags. If you want to get rid of the special Wicket tags, you can disable that on the markup settings (<a href='http://wicketframework.org/api/wicket/settings/IMarkupSettings'>IMarkupSettings</a>).</p>
 
 <h2 id='implementing_the_basepage'>Implementing the BasePage</h2>
@@ -249,8 +246,7 @@
 		<span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>&quot;footer&quot;</span><span class='o'>,</span> <span class='s'>&quot;This is in the footer&quot;</span><span class='o'>));</span>
 	<span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>The two links should go into the header, and the footer in the footer of the page. Note that the abstract keyword isn&#8217;t required, but considered a good practise. Now let&#8217;s take a look at the markup for the BasePage</p>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;head&gt;&lt;/head&gt;</span>
@@ -267,8 +263,7 @@
 <span class='nt'>&lt;/div&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In this markup file you see the specific basic layout: we have 3 div elements:</p>
 
 <ol>
@@ -293,8 +288,7 @@
 		<span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>&quot;label1&quot;</span><span class='o'>,</span> <span class='s'>&quot;This is in the subclass Page1&quot;</span><span class='o'>));</span>
 	<span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In this example you see that we add a new label component to the page: <code>label1</code>. This component is only available for <code>Page1</code>, as such <code>Page2</code> can define its own component hierarchy. Let&#8217;s take a look at the markup for <code>Page1</code>:</p>
 <div class='highlight'><pre><code class='java'><span class='o'>&lt;</span><span class='n'>html</span><span class='o'>&gt;</span>
 <span class='o'>&lt;</span><span class='n'>head</span><span class='o'>&gt;&lt;/</span><span class='n'>head</span><span class='o'>&gt;</span>
@@ -305,8 +299,7 @@
 <span class='o'>&lt;/</span><span class='nl'>wicket:</span><span class='n'>extend</span><span class='o'>&gt;</span>
 <span class='o'>&lt;/</span><span class='n'>body</span><span class='o'>&gt;</span>
 <span class='o'>&lt;/</span><span class='n'>html</span><span class='o'>&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>Here you see that we added the <code>Label</code> component in the markup between the <code>&lt;wicket:extend&gt;</code> tags. If we were to add the component outside those tags, Wicket will not be able to render the component in the final page.</p>
 
 <p>Now, let&#8217;s do the same for <code>Page2</code>.</p>
@@ -319,8 +312,7 @@
 		<span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>&quot;label2&quot;</span><span class='o'>,</span> <span class='s'>&quot;This is in the subclass Page2&quot;</span><span class='o'>));</span>
 	<span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div><div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
+</code></pre></div><div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;head&gt;&lt;/head&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
 <span class='nt'>&lt;wicket:extend&gt;</span>
@@ -329,8 +321,7 @@
 <span class='nt'>&lt;/wicket:extend&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In <code>Page2</code> you see that we have a different component structure (<code>label2</code> instead of <code>label1</code>), and as such that the pages are quite different.</p>
 
 <p>If you paste this code into a Wicket quickstart application, you can see it immediately working (don&#8217;t forget to set the homepage to <code>Page1</code> or <code>Page2</code>).</p>

Modified: wicket/common/site/trunk/_site/learn/examples/navomatic.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/navomatic.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/navomatic.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/navomatic.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -208,8 +208,7 @@
     <span class='nt'>&lt;/wicket:border&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='border_usage'>Border usage</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
@@ -218,16 +217,14 @@
   <span class='nt'>&lt;/span&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='rendered_markup'>Rendered markup</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
       First Middle Last
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In other words, the markup around the <code>&lt;wicket:body/&gt;</code> tag in the border component is sort of &#8220;wrapped around&#8221; the body of the <code>&lt;span&gt;</code> tag where the border is used. This seems simple in this example, but keep in mind that nested components and even nested borders can appear anywhere in either markup file. This can be used to create quite complex effects with relatively little code.</p>
 
 <h3 id='navomaticapplicationjava'>NavomaticApplication.java</h3>
@@ -245,8 +242,7 @@
         <span class='k'>return</span> <span class='n'>Page1</span><span class='o'>.</span><span class='na'>class</span><span class='o'>;</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='page1java'>Page1.java</h3>
 
 <p>The Page1 Java and HTML files look like this:</p>
@@ -259,8 +255,7 @@
         <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>NavomaticBorder</span><span class='o'>(</span><span class='s'>&quot;navomaticBorder&quot;</span><span class='o'>));</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='page1html'>Page1.html</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span> 
@@ -269,8 +264,7 @@
     <span class='nt'>&lt;/span&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>Notice that the NavomaticBorder component is attached to the <code>&lt;span&gt;</code> tag because the name of the component in the Java code is &#8220;navomaticBorder&#8221; and the <code>&lt;span&gt;</code> tag&#8217;s wicket:id attribute is set to &#8220;navomaticBorder&#8221;. Because the two names match, Wicket associates the NavomaticBorder Java component with the <code>&lt;span&gt;</code> tag.</p>
 
 <h3 id='page2java'>Page2.java</h3>
@@ -281,8 +275,7 @@
         <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>NavomaticBorder</span><span class='o'>(</span><span class='s'>&quot;navomaticBorder&quot;</span><span class='o'>));</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='page2html'>Page2.html</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
@@ -291,8 +284,7 @@
     <span class='nt'>&lt;/span&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='navomaticborderjava'>NavomaticBorder.java</h3>
 
 <p>So how does NavomaticBorder work? Glad you asked. The Java code below simply adds the two BoxBorder components you see. These components are nested borders which each draw a thin black line around their contents. The rest of the magic is in the NavomaticBorder markup.</p>
@@ -309,8 +301,7 @@
         <span class='n'>addToBorder</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>BoxBorder</span><span class='o'>(</span><span class='s'>&quot;bodyBorder&quot;</span><span class='o'>));</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='navomaticborderhtml'>NavomaticBorder.html</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
@@ -341,8 +332,7 @@
     <span class='nt'>&lt;/wicket:border&gt;</span>
  <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>Notice that the markup above encloses the entire contents of the markup file&#8217;s <code>&lt;body&gt;</code> with a <code>&lt;wicket:border&gt;</code> tag, as we described earlier. This lets the NavomaticBorder know how much of its markup to use when it wraps itself around the markup it finds in the context where it is used. Notice also the <code>&lt;wicket:body/&gt;</code> marker which designates where to put whatever is found inside the tag at the use context.</p>
 
 <p>Next, notice that the navigation links and the border&#8217;s <code>&lt;wicket:body/&gt;</code> are both enclosed in <code>&lt;span&gt;</code> tags which have wicket:id attributes that associate those tags with the BoxBorder components added in the NavomaticBorder constructor. These nested border components will each draw a thin black line around their contents.</p>
@@ -365,8 +355,7 @@
     <span class='nt'>&lt;servlet-name&gt;</span>NavomaticApplication<span class='nt'>&lt;/servlet-name&gt;</span>
     <span class='nt'>&lt;url-pattern&gt;</span>/app/*<span class='nt'>&lt;/url-pattern&gt;</span>
 <span class='nt'>&lt;/servlet-mapping&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/learn/examples/usingfragments.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/usingfragments.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/usingfragments.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/usingfragments.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -193,8 +193,7 @@
     <span class='nt'>&lt;wicket:fragment</span> <span class='na'>wicket:id=</span><span class='s'>&quot;fragment2&quot;</span><span class='nt'>&gt;</span>panel 2<span class='nt'>&lt;/wicket:fragment&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>As you can see in this markup file, we already took care of adding the fragment markup to the page in the <code>&lt;wicket:fragment&gt;</code> tags. Each fragment can contain its own markup and components. Those components need to be added to the Fragment instance in the Java file, just as you would do with a panel and web markup container.</p>
 <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span>
 
@@ -212,8 +211,7 @@
         <span class='n'>add</span><span class='o'>(</span><span class='n'>loop</span><span class='o'>);</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>The Loop will render 5 items, and the <code>populateItem</code> method will be called for each item. In each item we construct a fragment identifier that corresponds to the identifier in the <code>&lt;wicket:fragment&gt;</code>. The <code>Fragment</code> constructor takes the identifier of the markup it needs to attach to, and the fragment identifier telling it where to find the specific markup in the file.</p>
 
 <h2 id='adding_components_to_fragments'>Adding components to fragments</h2>
@@ -229,8 +227,7 @@
     <span class='nt'>&lt;wicket:fragment</span> <span class='na'>wicket:id=</span><span class='s'>&quot;fragment2&quot;</span><span class='nt'>&gt;</span>panel 2<span class='nt'>&lt;/wicket:fragment&gt;</span>
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In order to add the component to the first fragment we&#8217;ll introduce a subclass for fragment one to encapsulate the component.</p>
 <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span>
 
@@ -261,8 +258,7 @@
         <span class='n'>add</span><span class='o'>(</span><span class='n'>loop</span><span class='o'>);</span>
     <span class='o'>}</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>The class <code>Fragment1</code> adds the label to itself. In the loop&#8217;s <code>populateItem</code> we alternate the fragments type between <code>Fragment</code> and <code>Fragment1</code>. This means that in the final page on one line you&#8217;ll see <code>&quot;panel 1 Hello, World!&quot;</code> and on the other line just <code>&quot;panel 2&quot;</code>.</p>
 
 <h2 id='summary'>Summary</h2>

Modified: wicket/common/site/trunk/_site/learn/ides.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/ides.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/ides.html (original)
+++ wicket/common/site/trunk/_site/learn/ides.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -174,7 +174,9 @@
 
 		<div id="contentbody">
 			<h1>IDE Support for Wicket development</h1>
-			<p>For all leading IDE&#8217;s support is under development. Here&#8217;s a list of efforts for the major IDE&#8217;s.</p>
+			<h2 id='plugins'>Plugins</h2>
+
+<p>For all leading IDE&#8217;s support is under development. Here&#8217;s a list of efforts for the major IDE&#8217;s.</p>
 
 <ul>
 <li>Eclipse: <a href='http://code.google.com/p/qwickie'>Qwickie</a>, <a href='https://github.com/42Lines/wicket-source/wiki'>Wicket Source</a></li>
@@ -185,6 +187,12 @@
 </ul>
 
 <p>These projects are not maintained or supported by the core Wicket team, but by their respective development teams.</p>
+
+<h2 id='working_on_wickets_source'>Working on Wicket&#8217;s source</h2>
+
+<p>When using Eclipse to work on Wicket&#8217;s source, it is recommended that you import our format settings <code>./wicke-core/EclipseCodeFormat.xml</code> into your workspace (Java-&gt;Code Style-&gt;Formatter). You should configure the editor to automatically format all edited lines and organize imports on save (Java-&gt;Editor-&gt;Save Actions).</p>
+
+<p>With the <a href='http://plugins.jetbrains.com/plugin/6546'>Eclipse Code Formatter plugin</a> these format settings can be used in IntelliJ Idea too.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/learn/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/index.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/index.html (original)
+++ wicket/common/site/trunk/_site/learn/index.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/authroles.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/authroles.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/authroles.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/authroles.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -229,8 +229,7 @@
 <span class='c1'>// either bookmarkable or not</span>
 <span class='nd'>@AuthorizeInstantiation</span><span class='o'>(</span><span class='s'>&quot;ADMIN&quot;</span><span class='o'>)</span>
 <span class='kd'>public</span> <span class='kd'>class</span> <span class='nc'>AdminAnnotationsBookmarkablePage</span> <span class='kd'>extends</span> <span class='n'>WebPage</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>When someone who doesn&#8217;t have the role ADMIN, Wicket will not allow the page to be fully constructed and throw an authorization exception during the construction of the page. This will result in an access denied page for the user.</p>
 
 <p>Enablng the annotations for role based authorization is done by setting the <code>WebApplication#getSecuritySettings</code> value to <code>AnnotationsRoleAuthorizationStrategy</code>. Then you can use the auth/roles provided authorization annotations.</p>
@@ -265,8 +264,7 @@
     <span class='nt'>&lt;artifactId&gt;</span>wicket-auth-roles<span class='nt'>&lt;/artifactId&gt;</span>
     <span class='nt'>&lt;version&gt;</span>6.11.0<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='required_dependencies'>Required dependencies</h3>
 
 <p>Wicket Auth/Roles requires the following jar files to be on your classpath:</p>

Modified: wicket/common/site/trunk/_site/learn/projects/datetime.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/datetime.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/datetime.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/datetime.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/devutils.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/devutils.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/devutils.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/devutils.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/extensions.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/extensions.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/extensions.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/extensions.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/guice.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/guice.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/guice.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/guice.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/index.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/index.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/index.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/ioc.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/ioc.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/ioc.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/ioc.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/jmx.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/jmx.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/jmx.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/jmx.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/spring.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/spring.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/spring.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/spring.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/learn/projects/velocity.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/velocity.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/velocity.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/velocity.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -199,8 +199,7 @@
 #else
   They are not equivalent and this will be the output.
 #end
-</code></pre>
-</div>
+</code></pre></div>
 <p>Read <a href='http://velocity.apache.org/engine/releases/velocity-1.4/user-guide.html'>more</a> about the Velocity template language.</p>
 
 <p>This project allows you to use Velocity templates as a component within your Wicket pages, and let them live next to Wicket components. A typical usecase would be to enable your users to embed Velocity templates in your application and using that as a type of portlet.</p>
@@ -213,8 +212,7 @@
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;h2&gt;</span>This is a Velocity template<span class='nt'>&lt;/h2&gt;</span>
 
 <span class='nt'>&lt;p&gt;</span>The secret message is: $message<span class='nt'>&lt;/p&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>In this template we want to replace the string <code>$message</code> with the text &#8220;Hello, World!&#8221;. <code>$message</code> is Velocity markup denoting a variable that is taken from the context that is provided to the Velocity rendering engine.</p>
 
 <p>To use Velocity in your Wicket pages we provide a <code>VelocityPanel</code> which enables you to generate parts of your page using Velocity markup. Adding the panel to your Wicket page is shown in the following example:</p>
@@ -226,16 +224,14 @@
 	<span class='n'>UrlResourceStream</span> <span class='n'>template</span> <span class='o'>=</span> <span class='k'>new</span> <span class='n'>UrlResourceStream</span><span class='o'>(</span><span class='n'>getClass</span><span class='o'>().</span><span class='na'>getResource</span><span class='o'>(</span><span class='s'>&quot;test.html&quot;</span><span class='o'>));</span>
 	<span class='n'>add</span><span class='o'>(</span><span class='n'>VelocityPanel</span><span class='o'>.</span><span class='na'>forTemplateResource</span><span class='o'>(</span><span class='s'>&quot;velocityPanel&quot;</span><span class='o'>,</span> <span class='n'>context</span><span class='o'>,</span> <span class='n'>template</span><span class='o'>));</span>
 <span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p><code>VelocityPanel.forTemplateResource</code> creates a <code>VelocityPanel</code> and sets up the engine such that the context is merged with the template with each render.</p>
 
 <p>The markup of the page is quite simple: adding a VelocityPanel is as simple as using a <code>div</code> and attaching a <code>wicket:identifier</code> to it. The following example shows this.</p>
 <div class='highlight'><pre><code class='html'><span class='cp'>&lt;!DOCTYPE html&gt;</span>
 <span class='nt'>&lt;h1&gt;</span>This is a test page for Velocity<span class='nt'>&lt;/h1&gt;</span>
 <span class='nt'>&lt;div</span> <span class='na'>wicket:id=</span><span class='s'>&quot;velocityPanel&quot;</span><span class='nt'>&gt;&lt;/div&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h2 id='installing'>Installing</h2>
 
 <p>Installing Wicket Velocity can be done through adding a dependency in your project&#8217;s Maven pom, or by putting the wicket-velocity.jar and the required dependencies in your projects classpath.</p>
@@ -248,8 +244,7 @@
     <span class='nt'>&lt;artifactId&gt;</span>wicket-velocity<span class='nt'>&lt;/artifactId&gt;</span>
     <span class='nt'>&lt;version&gt;</span>6.11.0<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h3 id='required_dependencies'>Required dependencies</h3>
 
 <p>Wicket Velocity requires the following jar files to be on your classpath:</p>

Modified: wicket/common/site/trunk/_site/meet/blogs.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/blogs.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/blogs.html (original)
+++ wicket/common/site/trunk/_site/meet/blogs.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/meet/buzz.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/buzz.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/buzz.html (original)
+++ wicket/common/site/trunk/_site/meet/buzz.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/meet/features.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/features.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/features.html (original)
+++ wicket/common/site/trunk/_site/meet/features.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/meet/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/index.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/index.html (original)
+++ wicket/common/site/trunk/_site/meet/index.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/meet/introduction.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/introduction.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/introduction.html (original)
+++ wicket/common/site/trunk/_site/meet/introduction.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/meet/vision.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/vision.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/vision.html (original)
+++ wicket/common/site/trunk/_site/meet/vision.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/start/download.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/download.html (original)
+++ wicket/common/site/trunk/_site/start/download.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -240,16 +240,14 @@
     <span class='nt'>&lt;artifactId&gt;</span>wicket-core<span class='nt'>&lt;/artifactId&gt;</span>
     <span class='nt'>&lt;version&gt;</span>6.11.0<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <p>For the SLF4J log4j binding:</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;dependency&gt;</span>
     <span class='nt'>&lt;groupId&gt;</span>org.slf4j<span class='nt'>&lt;/groupId&gt;</span>
     <span class='nt'>&lt;artifactId&gt;</span>slf4j-log4j12<span class='nt'>&lt;/artifactId&gt;</span>
     <span class='nt'>&lt;version&gt;</span>1.6.4<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 <h2 id='snapshots_and_latest_bleedingedge_code'>SNAPSHOTs and latest bleeding-edge code</h2>
 
 <p>If you wish to build the latest code from scratch, master and branches live in Git repository: <a href='https://git-wip-us.apache.org/repos/asf/wicket.git'>https://git-wip-us.apache.org/repos/asf/wicket.git</a></p>
@@ -283,8 +281,7 @@
         <span class='nt'>&lt;layout&gt;</span>default<span class='nt'>&lt;/layout&gt;</span>
     <span class='nt'>&lt;/repository&gt;</span>
 <span class='nt'>&lt;/repositories&gt;</span>
-</code></pre>
-</div>
+</code></pre></div>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/start/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/index.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/index.html (original)
+++ wicket/common/site/trunk/_site/start/index.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/start/installing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/installing.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/installing.html (original)
+++ wicket/common/site/trunk/_site/start/installing.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>

Modified: wicket/common/site/trunk/_site/start/quickstart.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/quickstart.html?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/quickstart.html (original)
+++ wicket/common/site/trunk/_site/start/quickstart.html Tue Nov  5 22:12:39 2013
@@ -84,7 +84,7 @@
 			<a href="/learn/books" title="Books">Books</a>
 		</li>
 		<li>
-			<a href="/learn/ides.html" title="IDEs">IDE plugins</a>
+			<a href="/learn/ides.html" title="IDEs">IDEs</a>
 		</li>
 	</ul>
 	<h5>
@@ -216,11 +216,11 @@
 	}
 </script><div id='mvncmd'>
 	<div>
-		<label for='groupId' title='Base Package'>GroupId:</label>
-		<input id='groupId' onkeyup='changeIt();' type='text' value='com.mycompany' /><span title='Base Package'>&nbsp;(?)</span><br />
-		<label for='artifactId' title='Project Name'>ArtifactId:</label> 
-		<input id='artifactId' onkeyup='changeIt();' type='text' value='myproject' /><span title='Project Name'>&nbsp;(?)</span><br />
-		<label for='version' title='Wicket Version'>Version:</label>
+		<label title='Base Package' for='groupId'>GroupId:</label>
+		<input type='text' id='groupId' onkeyup='changeIt();' value='com.mycompany' /><span title='Base Package'>&nbsp;(?)</span><br />
+		<label title='Project Name' for='artifactId'>ArtifactId:</label> 
+		<input type='text' id='artifactId' onkeyup='changeIt();' value='myproject' /><span title='Project Name'>&nbsp;(?)</span><br />
+		<label title='Wicket Version' for='version'>Version:</label>
 		<select id='version' onchange='changeIt();'>
 
 		
@@ -244,7 +244,7 @@
 		
 
 		
-			<option selected='selected' value='6.11.0'>6.11.0</option>
+			<option value='6.11.0' selected='selected'>6.11.0</option>
 		
 
 		</select><span title='Wicket Version'>&nbsp;(?)</span>

Modified: wicket/common/site/trunk/learn/ides.md
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/learn/ides.md?rev=1539155&r1=1539154&r2=1539155&view=diff
==============================================================================
--- wicket/common/site/trunk/learn/ides.md (original)
+++ wicket/common/site/trunk/learn/ides.md Tue Nov  5 22:12:39 2013
@@ -3,6 +3,8 @@ layout: default
 title: IDE Support for Wicket development
 ---
 
+## Plugins ##
+
 For all leading IDE's support is under development. Here's a list of efforts
 for the major IDE's.
 
@@ -12,3 +14,9 @@ for the major IDE's.
 
 These projects are not maintained or supported by the core Wicket team, but
 by their respective development teams.
+
+## Working on Wicket's source ##
+
+When using Eclipse to work on Wicket's source, it is recommended that you import our format settings `./wicke-core/EclipseCodeFormat.xml` into your workspace (Java->Code Style->Formatter). You should configure the editor to automatically format all edited lines and organize imports on save (Java->Editor->Save Actions).
+
+With the [Eclipse Code Formatter plugin](http://plugins.jetbrains.com/plugin/6546) these format settings can be used in IntelliJ Idea too.