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

svn commit: r1591848 [10/11] - in /wicket/common/site/trunk: ./ _includes/ _posts/ _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/ ...

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/navomatic.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/navomatic.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -180,15 +189,15 @@
 
 <p>The link in the navigation to the current page is automatically turned into italic text to indicate to the user what page they are on. The first screen capture shows the Page1 page with the Page1 link in italics.</p>
 
-<p><img alt='Figure 1' src='navomatic1.png' /></p>
+<p><img src="navomatic1.png" alt="Figure 1" /></p>
 
 <p>When you click on the Page2 link, you get the following screen.</p>
 
-<p><img alt='Figure 2' src='navomatic2.png' /></p>
+<p><img src="navomatic2.png" alt="Figure 2" /></p>
 
 <p>As you can see, Page1 has no special style anymore, and Page2 is now displayed in italics. Also the message box shows that we are viewing Page2 instead of Page1.</p>
 
-<h2 id='navigation_component'>Navigation component</h2>
+<h2 id="navigation_component">Navigation component</h2>
 
 <p>To create a reusable navigation component we are going to use a <code>org.apache.wicket.markup.html.border.Border</code> component. From the Border Javadoc:</p>
 
@@ -196,11 +205,11 @@
 <p>A border component has associated markup which is drawn and determines placement of any markup and/or components nested within the border component.</p>
 </blockquote>
 
-<p>The portion of the border&#8217;s associated markup file which is to be used in rendering the border is denoted by a <code>&lt;wicket:border&gt;</code> tag. The children of the border component instance are then inserted into this markup, replacing the first <code>&lt;wicket:body/&gt;</code> tag in the border&#8217;s associated markup.</p>
+<p>The portion of the border’s associated markup file which is to be used in rendering the border is denoted by a <code>&lt;wicket:border&gt;</code> tag. The children of the border component instance are then inserted into this markup, replacing the first <code>&lt;wicket:body/&gt;</code> tag in the border’s associated markup.</p>
 
 <p>For example, here is markup for a simple Border subclass, a usage of that border, and the markup which would be output on rendering:</p>
 
-<h3 id='border_markup'>Border markup</h3>
+<h3 id="border_markup">Border markup</h3>
 <div class='highlight'><pre><code class='html'><span class='nt'>&lt;html&gt;</span>
 <span class='nt'>&lt;body&gt;</span>
     <span class='nt'>&lt;wicket:border&gt;</span>
@@ -209,7 +218,7 @@
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </code></pre></div>
-<h3 id='border_usage'>Border usage</h3>
+<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>
   <span class='nt'>&lt;span</span> <span class='na'>wicket:id =</span><span class='err'> </span><span class='s'>&quot;myBorder&quot;</span><span class='nt'>&gt;</span>
@@ -218,16 +227,16 @@
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </code></pre></div>
-<h3 id='rendered_markup'>Rendered markup</h3>
+<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>
-<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>
+<p>In other words, the markup around the <code>&lt;wicket:body/&gt;</code> tag in the border component is sort of “wrapped around” 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>
+<h3 id="navomaticapplicationjava">NavomaticApplication.java</h3>
 
 <p>Just as in the Hello World! example, we need to define our application. In this case, we set Page1 to be our home page.</p>
 <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>org</span><span class='o'>.</span><span class='na'>apache</span><span class='o'>.</span><span class='na'>wicket</span><span class='o'>.</span><span class='na'>examples</span><span class='o'>.</span><span class='na'>navomatic</span><span class='o'>;</span>
@@ -243,7 +252,7 @@
     <span class='o'>}</span>
 <span class='o'>}</span>
 </code></pre></div>
-<h3 id='page1java'>Page1.java</h3>
+<h3 id="page1java">Page1.java</h3>
 
 <p>The Page1 Java and HTML files look like this:</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'>examples</span><span class='o'>.</span><span class='na'>navomatic</span><span class='o'>;</span>
@@ -256,7 +265,7 @@
     <span class='o'>}</span>
 <span class='o'>}</span>
 </code></pre></div>
-<h3 id='page1html'>Page1.html</h3>
+<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> 
     <span class='nt'>&lt;span</span> <span class='na'>wicket:id =</span><span class='err'> </span><span class='s'>&quot;navomaticBorder&quot;</span><span class='nt'>&gt;</span>
@@ -265,18 +274,18 @@
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </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>
+<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 “navomaticBorder” and the <code>&lt;span&gt;</code> tag’s wicket:id attribute is set to “navomaticBorder”. 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>
+<h3 id="page2java">Page2.java</h3>
 
-<p>The Page2 Java and HTML files look almost identical (and we&#8217;ll omit the sources for Page3 altogether because it follows the same pattern):</p>
+<p>The Page2 Java and HTML files look almost identical (and we’ll omit the sources for Page3 altogether because it follows the same pattern):</p>
 <div class='highlight'><pre><code class='java'><span class='kd'>public</span> <span class='kd'>class</span> <span class='nc'>Page2</span> <span class='kd'>extends</span> <span class='n'>WebPage</span> <span class='o'>{</span>
     <span class='kd'>public</span> <span class='nf'>Page2</span><span class='o'>()</span> <span class='o'>{</span>
         <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>
-<h3 id='page2html'>Page2.html</h3>
+<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>
     <span class='nt'>&lt;span</span> <span class='na'>wicket:id =</span><span class='err'> </span><span class='s'>&quot;navomaticBorder&quot;</span><span class='nt'>&gt;</span>
@@ -285,7 +294,7 @@
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </code></pre></div>
-<h3 id='navomaticborderjava'>NavomaticBorder.java</h3>
+<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>
 <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>examples</span><span class='o'>.</span><span class='na'>navomatic</span><span class='o'>;</span>
@@ -302,7 +311,7 @@
     <span class='o'>}</span>
 <span class='o'>}</span>
 </code></pre></div>
-<h3 id='navomaticborderhtml'>NavomaticBorder.html</h3>
+<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>
     <span class='nt'>&lt;wicket:border&gt;</span> 
@@ -333,13 +342,13 @@
  <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </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>Notice that the markup above encloses the entire contents of the markup file’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>
+<p>Next, notice that the navigation links and the border’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>
 
 <p>Finally, the <code>&lt;wicket:link&gt;</code> tag is used to mark the links in the navigation as automatic links. Ordinarily, you would need to create link components and attach them to your page manually, but anchor links that are marked as automatic are parsed and hooked up to link components for you, as appropriate. The italicizing behavior is also automatic. Since Wicket knows which page is current, it removes the anchor link tag for any link that points to the current page (since the link would be useless) and italicizes the link text.</p>
 
-<h3 id='webxml'>web.xml</h3>
+<h3 id="webxml">web.xml</h3>
 
 <p>In order to get this application up and running, we need to register the application with the Wicket servlet in the web.xml file. The following sections need to be added to the web.xml in the WEB-INF folder.</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;servlet&gt;</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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/examples/usingfragments.html (original)
+++ wicket/common/site/trunk/_site/learn/examples/usingfragments.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,15 +183,15 @@
 
 		<div id="contentbody">
 			<h1>Using Fragments</h1>
-			<p>This example shows you how to use fragments (Wicket 1.2 feature) to lessen the burden on extra markup files. Fragments are &#8216;inline panels&#8217; and are a quick way of using panel type components in pages without having to create a <code>Panel</code> markup file and class.</p>
+			<p>This example shows you how to use fragments (Wicket 1.2 feature) to lessen the burden on extra markup files. Fragments are ‘inline panels’ and are a quick way of using panel type components in pages without having to create a <code>Panel</code> markup file and class.</p>
 
 <p>In all the Wicket examples, you have to put all files in the same package directory. This means putting the markup files and the java files next to one another. It is possible to alter this behavior, but that is beyond the scope of this example. The only exception is the obligatory <code>web.xml</code> file which should reside in the <code>WEB-INF/</code> directory of your web application root folder.</p>
 
-<p>In this example we assume you already have read and understood the other examples which give you information on the structure and nature of Wicket applications. Specifically read and understand the <a href='helloworld.html'>Hello, World example</a>.</p>
+<p>In this example we assume you already have read and understood the other examples which give you information on the structure and nature of Wicket applications. Specifically read and understand the <a href="helloworld.html">Hello, World example</a>.</p>
 
-<h2 id='creating_a_fragment'>Creating a Fragment</h2>
+<h2 id="creating_a_fragment">Creating a Fragment</h2>
 
-<p>First things first, let&#8217;s create a page that we can add our fragments to. We will add a Loop that will repeat markup and choose a different Fragment for each item in the loop.</p>
+<p>First things first, let’s create a page that we can add our fragments to. We will add a Loop that will repeat markup and choose a different Fragment for each item in the loop.</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>
 <span class='nt'>&lt;body&gt;</span>
@@ -214,9 +223,9 @@
 </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>
+<h2 id="adding_components_to_fragments">Adding components to fragments</h2>
 
-<p>In the previous example we just showed different markup for each fragment, but you can add components to the fragments as well. Let&#8217;s add a label to fragment 1.</p>
+<p>In the previous example we just showed different markup for each fragment, but you can add components to the fragments as well. Let’s add a label to fragment 1.</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>
 <span class='nt'>&lt;body&gt;</span>
@@ -228,7 +237,7 @@
 <span class='nt'>&lt;/body&gt;</span>
 <span class='nt'>&lt;/html&gt;</span>
 </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>
+<p>In order to add the component to the first fragment we’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>
 
 <span class='kn'>import</span> <span class='nn'>wicket.markup.html.basic.Label</span><span class='o'>;</span>
@@ -259,9 +268,9 @@
     <span class='o'>}</span>
 <span class='o'>}</span>
 </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>
+<p>The class <code>Fragment1</code> adds the label to itself. In the loop’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’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>
+<h2 id="summary">Summary</h2>
 
 <p>Fragments make a quick way to add encapsulated components without having to resort to setting the visibility flag on a markup container. For fragments we introduced a new Wicket tag: <code>&lt;wicket:fragment&gt;</code>.</p>
 		</div>

Modified: wicket/common/site/trunk/_site/learn/ides.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/ides.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/ides.html (original)
+++ wicket/common/site/trunk/_site/learn/ides.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,28 +183,28 @@
 
 		<div id="contentbody">
 			<h1>IDE Support for Wicket development</h1>
-			<h2 id='wicket_plugins'>Wicket Plugins</h2>
+			<h2 id="wicket_plugins">Wicket 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>
+<p>For all leading IDE’s support is under development. Here’s a list of efforts for the major IDE’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>
+<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>
 
-<li>Netbeans: <a href='https://nbwicketsupport.dev.java.net/'>NB Wicket Support</a></li>
+<li>Netbeans: <a href="https://nbwicketsupport.dev.java.net/">NB Wicket Support</a></li>
 
-<li>IntelliJ IDEA: <a href='http://wicketforge.googlecode.com/'>Wicket Forge</a>, <a href='https://github.com/armhold/wicket-source-intellij'>Wicket Source</a></li>
+<li>IntelliJ IDEA: <a href="http://wicketforge.googlecode.com/">Wicket Forge</a>, <a href="https://github.com/armhold/wicket-source-intellij">Wicket Source</a></li>
 </ul>
 
 <p>These projects are not maintained or supported by the core Wicket team, but by their respective development teams.</p>
 
-<h2 id='setting_up_your_ide'>Setting up your IDE</h2>
+<h2 id="setting_up_your_ide">Setting up your IDE</h2>
 
-<h3 id='eclipse'>Eclipse</h3>
+<h3 id="eclipse">Eclipse</h3>
 
 <p>Taking Maven, project configuration files for Eclipse can be generated with:</p>
 <div class='highlight'><pre><code class='console'><span class='go'>mvn eclipse:eclipse</span>
 </code></pre></div>
-<p>Maven will add all the necessary JAR files to the project&#8217;s classpath. Now the sources can be imported in Eclipse using the &#8220;Existing Projects into Workspace&#8221; wizard.</p>
+<p>Maven will add all the necessary JAR files to the project’s classpath. Now the sources can be imported in Eclipse using the “Existing Projects into Workspace” wizard.</p>
 
 <p>If not already present the <code>M2_REPO</code> classpath variable has to point to your local Maven repository. The repository is typically found in <code>C:\Documents and Settings\&lt;username&gt;\.m2\repo</code> or (for unix buffs) <code>~/.m2/repo</code>. It can be set within Eclipse (Preferences-&gt;Java-&gt;Build Path-&gt;Classpath Variables) or with the help of Maven:</p>
 <div class='highlight'><pre><code class='console'><span class='go'>mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</span>
@@ -205,15 +214,15 @@
 </code></pre></div>
 <p>Finally configure the editor to automatically format all edited lines and organize imports on save (Preferences-&gt;Java-&gt;Editor-&gt;Save Actions).</p>
 
-<h3 id='netbeans'>NetBeans</h3>
+<h3 id="netbeans">NetBeans</h3>
 
-<p>NetBeans comes with Maven integration. Further help can be found at their <a href='http://wiki.netbeans.org/MavenBestPractices' title='NetBeans Community Wiki'>Wiki</a></p>
+<p>NetBeans comes with Maven integration. Further help can be found at their <a href="http://wiki.netbeans.org/MavenBestPractices" title="NetBeans Community Wiki">Wiki</a></p>
 
-<h3 id='idea'>IDEA</h3>
+<h3 id="idea">IDEA</h3>
 
-<p>IntelliJ IDEA comes with <a href='http://www.jetbrains.com/idea/webhelp/maven.html' title='IDEA Web Help'>Maven support</a> too.</p>
+<p>IntelliJ IDEA comes with <a href="http://www.jetbrains.com/idea/webhelp/maven.html" title="IDEA Web Help">Maven support</a> too.</p>
 
-<p>With the <a href='http://plugins.jetbrains.com/plugin/6546'>Eclipse Code Formatter plugin</a> the Wicket format profile can be used in IntelliJ IDEA too. Configure the IDE to prevent star imports (Settings-&gt;Code Style-&gt;Imports).</p>
+<p>With the <a href="http://plugins.jetbrains.com/plugin/6546">Eclipse Code Formatter plugin</a> the Wicket format profile can be used in IntelliJ IDEA too. Configure the IDE to prevent star imports (Settings-&gt;Code Style-&gt;Imports).</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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/index.html (original)
+++ wicket/common/site/trunk/_site/learn/index.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/authroles.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/authroles.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -176,43 +185,43 @@
 			<h1>Wicket Auth/Roles</h1>
 			<p>This is mostly a technology demonstration implementing authorization and authentication for the Apache Wicket web framework. The project supplies roles based authorization and some simple authentication components.</p>
 
-<h2 id='contents'>Contents</h2>
+<h2 id="contents">Contents</h2>
 
 <ul>
-<li><a href='#introduction'>Introduction</a></li>
+<li><a href="#introduction">Introduction</a></li>
 
-<li><a href='#example'>Example</a></li>
+<li><a href="#example">Example</a></li>
 
-<li><a href='#installing'>Installing</a></li>
+<li><a href="#installing">Installing</a></li>
 </ul>
 
-<h2 id='introduction'>Introduction</h2>
+<h2 id="introduction">Introduction</h2>
 
-<p>Wicket Auth/Roles is a simplistic but useful security extension to the Wicket framework. It is intended to be simplistic and not to be confused with a framework. If you find this library useful, great. If you need more than is supplied by this library, either look at <a href='#alternatives'>alternative security integrations</a> or copy these classes and modify them at will (this project <strong>is</strong> <a href='http://www.apache.org/licenses/'>open source</a> after all.)</p>
+<p>Wicket Auth/Roles is a simplistic but useful security extension to the Wicket framework. It is intended to be simplistic and not to be confused with a framework. If you find this library useful, great. If you need more than is supplied by this library, either look at <a href="#alternatives">alternative security integrations</a> or copy these classes and modify them at will (this project <strong>is</strong> <a href="http://www.apache.org/licenses/">open source</a> after all.)</p>
 
-<p>Like most if not all security solutions for Wicket, this project provides an implementation for Wicket&#8217;s <code>IAuthorizationStrategy</code>. When an authorization strategy is installed in the security settings (<code>WebApplication#getSecuritySettings</code>), Wicket will check for each component (including pages) if instantiation is allowed and if rendering is allowed.</p>
+<p>Like most if not all security solutions for Wicket, this project provides an implementation for Wicket’s <code>IAuthorizationStrategy</code>. When an authorization strategy is installed in the security settings (<code>WebApplication#getSecuritySettings</code>), Wicket will check for each component (including pages) if instantiation is allowed and if rendering is allowed.</p>
 
 <p>For more documentation use the following links:</p>
 
 <ul>
-<li><a href='http://wicket.apache.org/apidocs/1.5/org/apache/wicket/authentication/package-summary.html'>Authentication API</a></li>
+<li><a href="http://wicket.apache.org/apidocs/1.5/org/apache/wicket/authentication/package-summary.html">Authentication API</a></li>
 
-<li><a href='http://wicket.apache.org/apidocs/1.5/org/apache/wicket/authorization/package-summary.html'>Authorization API</a></li>
+<li><a href="http://wicket.apache.org/apidocs/1.5/org/apache/wicket/authorization/package-summary.html">Authorization API</a></li>
 </ul>
 
 <p>Note that for the instantiation check Wicket will invoke the constructor hierarchy of your component, but will throw an exception if the authorization check fails.</p>
 
-<h3 id='authentication'>Authentication</h3>
+<h3 id="authentication">Authentication</h3>
 
-<p>As a basis, you should extend your web application class from <code>AuthenticatedWebApplication</code>. When you create your class you&#8217;ll be asked to override the following methods:</p>
+<p>As a basis, you should extend your web application class from <code>AuthenticatedWebApplication</code>. When you create your class you’ll be asked to override the following methods:</p>
 
 <ul>
 <li><code>newSession</code> - return a subclass of <code>AuthenticatedWebSession</code></li>
 
-<li><code>getSignInPageClass</code> - return the class for your login page (this one should not require authentication, otherwise you&#8217;ll create an infinite loop)</li>
+<li><code>getSignInPageClass</code> - return the class for your login page (this one should not require authentication, otherwise you’ll create an infinite loop)</li>
 </ul>
 
-<p>Next you&#8217;ll need to provide your custom session class-making it a subclass of <code>AuthenticatedWebSession</code>. This class requires you to override the following methods:</p>
+<p>Next you’ll need to provide your custom session class-making it a subclass of <code>AuthenticatedWebSession</code>. This class requires you to override the following methods:</p>
 
 <ul>
 <li><code>authenticate</code> - called when the user needs to be authenticated using a username and password</li>
@@ -220,9 +229,9 @@
 <li><code>getRoles</code> - called after the users was authenticated and should provide the roles associated with the authenticated user.</li>
 </ul>
 
-<p>You can use the provided <code>SignInPage</code>, which has been translated to a couple of languages (see the source code for the actual translations), or roll your own. When you roll your own, you can opt to use the provided <code>SignInPanel</code> (which has been translated as well) so you don&#8217;t have to create your own login form.</p>
+<p>You can use the provided <code>SignInPage</code>, which has been translated to a couple of languages (see the source code for the actual translations), or roll your own. When you roll your own, you can opt to use the provided <code>SignInPanel</code> (which has been translated as well) so you don’t have to create your own login form.</p>
 
-<h3 id='authorization'>Authorization</h3>
+<h3 id="authorization">Authorization</h3>
 
 <p>Annotation for configuring what roles are allowed for instantiation the annotated component or package. This annotation can be used for classes and packages, and can be used like this:</p>
 <div class='highlight'><pre><code class='java'><span class='c1'>// only users with role ADMIN are allowed to create instances of this page, whether it is</span>
@@ -230,33 +239,37 @@
 <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>
-<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>When someone who doesn’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>
 
-<h3 id='alternatives'>Alternatives</h3>
+<h3 id="alternatives">Alternatives</h3>
 
 <p>More elaborate security solutions exist in the following projects:</p>
 
 <ul>
-<li><a href='https://github.com/wicketstuff/core/tree/core-1.5.x/jdk-1.5-parent/shiro-security'>Wicket Shiro</a> - integration between Apache Shiro and Wicket</li>
+<li><a href="https://github.com/wicketstuff/core/tree/core-1.5.x/jdk-1.5-parent/shiro-security">Wicket Shiro</a> - integration between Apache Shiro and Wicket</li>
 
-<li><a href='https://github.com/wicketstuff/core/tree/core-1.5.x/jdk-1.5-parent/wicket-security-parent'>Wicket Security</a> - JAAS inspired, principal based security framework</li>
+<li><a href="https://github.com/wicketstuff/core/tree/core-1.5.x/jdk-1.5-parent/wicket-security-parent">Wicket Security</a>
+<ul>
+<li>JAAS inspired, principal based security framework</li>
+</ul>
+</li>
 </ul>
 
-<p>If other security solutions are available for Wicket, <a href='https://issues.apache.org/jira/browse/WICKET'>let us know</a>.</p>
+<p>If other security solutions are available for Wicket, <a href="https://issues.apache.org/jira/browse/WICKET">let us know</a>.</p>
 
-<h2 id='example'>Example</h2>
+<h2 id="example">Example</h2>
 
-<p>The Wicket Examples project contains a <a href='http://wicket-library.com/wicket-examples/authorization'>complete example</a> of limiting access to pages and components using roles based authorization. It also contains an <a href='http://wicket-library.com/wicket-examples/authentication'>authentication example</a>.</p>
+<p>The Wicket Examples project contains a <a href="http://wicket-library.com/wicket-examples/authorization">complete example</a> of limiting access to pages and components using roles based authorization. It also contains an <a href="http://wicket-library.com/wicket-examples/authentication">authentication example</a>.</p>
 
 <p>Click on the source links to see the related source code.</p>
 
-<h2 id='installing'>Installing</h2>
+<h2 id="installing">Installing</h2>
 
-<p>Installing Wicket Auth/Roles can be done through adding a dependency in your project&#8217;s Maven pom, or by putting the wicket-auth-roles.jar and the required dependencies in your projects classpath.</p>
+<p>Installing Wicket Auth/Roles can be done through adding a dependency in your project’s Maven pom, or by putting the wicket-auth-roles.jar and the required dependencies in your projects classpath.</p>
 
-<h3 id='using_maven'>Using Maven</h3>
+<h3 id="using_maven">Using Maven</h3>
 
 <p>Add the following dependency to your pom:</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;dependency&gt;</span>
@@ -265,7 +278,7 @@
     <span class='nt'>&lt;version&gt;</span>6.15.0<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
 </code></pre></div>
-<h3 id='required_dependencies'>Required dependencies</h3>
+<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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/datetime.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/datetime.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket Date/Time</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/devutils.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/devutils.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket Dev Utils</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/extensions.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/extensions.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket Extensions</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/guice.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/guice.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket Guice</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/index.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/index.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -178,42 +187,42 @@
 
 <ul>
 <li>
-<p><a href='authroles.html'>Wicket Auth/Roles</a> - very basic security project enabling annotation based authorization for two roles: user and admin.</p>
+<p><a href="authroles.html">Wicket Auth/Roles</a> - very basic security project enabling annotation based authorization for two roles: user and admin.</p>
 </li>
 
 <li>
-<p><a href='datetime.html'>Wicket Date/Time</a> - date components</p>
+<p><a href="datetime.html">Wicket Date/Time</a> - date components</p>
 </li>
 
 <li>
-<p><a href='devutils.html'>Wicket Dev Utils</a> - utilities that improve developer productivity by opening up the internals of your Wicket application right inside the web UI.</p>
+<p><a href="devutils.html">Wicket Dev Utils</a> - utilities that improve developer productivity by opening up the internals of your Wicket application right inside the web UI.</p>
 </li>
 
 <li>
-<p><a href='extensions.html'>Wicket Extensions</a> - additional components that are beyond the scope of the core Wicket framework. Contains components such as DataTable, MultiFileUpload, Rating component</p>
+<p><a href="extensions.html">Wicket Extensions</a> - additional components that are beyond the scope of the core Wicket framework. Contains components such as DataTable, MultiFileUpload, Rating component</p>
 </li>
 
 <li>
-<p><a href='jmx.html'>Wicket JMX</a> - opens up the internals of Wicket through JMX beans</p>
+<p><a href="jmx.html">Wicket JMX</a> - opens up the internals of Wicket through JMX beans</p>
 </li>
 
 <li>
-<p><a href='ioc.html'>Wicket IoC</a> - base services for the Guice and Spring integrations</p>
+<p><a href="ioc.html">Wicket IoC</a> - base services for the Guice and Spring integrations</p>
 </li>
 
 <li>
-<p><a href='guice.html'>Wicket integration for Guice</a> - inject <a href='http://code.google.com/p/google-guice'>Guice</a> managed services in a Wicket compatible manner</p>
+<p><a href="guice.html">Wicket integration for Guice</a> - inject <a href="http://code.google.com/p/google-guice">Guice</a> managed services in a Wicket compatible manner</p>
 </li>
 
 <li>
-<p><a href='spring.html'>Wicket integration for Spring</a> - inject <a href='http://springsource.org'>Spring</a> managed services in a Wicket compatible manner</p>
+<p><a href="spring.html">Wicket integration for Spring</a> - inject <a href="http://springsource.org">Spring</a> managed services in a Wicket compatible manner</p>
 </li>
 </ul>
 
-<h2 id='integrations_with_other_template_engines'>Integrations with other template engines</h2>
+<h2 id="integrations_with_other_template_engines">Integrations with other template engines</h2>
 
 <ul>
-<li><a href='velocity.html'>Wicket integration for Apache Velocity</a> - use <a href='http://velocity.apache.org'>Velocity</a> templates in your Wicket application</li>
+<li><a href="velocity.html">Wicket integration for Apache Velocity</a> - use <a href="http://velocity.apache.org">Velocity</a> templates in your Wicket application</li>
 </ul>
 		</div>
         <div id="clearer"></div>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/ioc.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/ioc.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket IoC</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/jmx.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/jmx.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket JMX</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/spring.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/spring.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,7 +183,7 @@
 
 		<div id="contentbody">
 			<h1>Wicket Spring</h1>
-			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href='velocity.html'>Velocity project description</a>.</p>
+			<p>Waiting for someone to contribute some introductory documentation about this project. See for an example the <a href="velocity.html">Velocity project description</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/velocity.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/velocity.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -174,19 +183,19 @@
 
 		<div id="contentbody">
 			<h1>Wicket Velocity</h1>
-			<p>Provides a specialized panel and some related utilities that enables users to work with <a href='http://velocity.apache.org'>Apache Velocity</a> and <a href='http://wicket.apache.org'>Apache Wicket</a>. Particularly useful for simple CMS like applications.</p>
+			<p>Provides a specialized panel and some related utilities that enables users to work with <a href="http://velocity.apache.org">Apache Velocity</a> and <a href="http://wicket.apache.org">Apache Wicket</a>. Particularly useful for simple CMS like applications.</p>
 
-<h2 id='contents'>Contents</h2>
+<h2 id="contents">Contents</h2>
 
 <ul>
-<li><a href='#introduction'>Introduction</a></li>
+<li><a href="#introduction">Introduction</a></li>
 
-<li><a href='#example'>Example</a></li>
+<li><a href="#example">Example</a></li>
 
-<li><a href='#installing'>Installing</a></li>
+<li><a href="#installing">Installing</a></li>
 </ul>
 
-<h2 id='introduction'>Introduction</h2>
+<h2 id="introduction">Introduction</h2>
 
 <p>Velocity brings a templating language to your users. You can let them create conditional markup, use loops and do all other things made possible by Velocity.</p>
 
@@ -200,20 +209,20 @@
   They are not equivalent and this will be the output.
 #end
 </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>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>
 
-<p>The main component for the Veloticy/Wicket integration is the <a href='http://wicket.apache.org/docs/1.4/org/apache/wicket/velocity/markup/html/VelocityPanel.html'><code>VelocityPanel</code></a>.</p>
+<p>The main component for the Veloticy/Wicket integration is the <a href="http://wicket.apache.org/docs/1.4/org/apache/wicket/velocity/markup/html/VelocityPanel.html"><code>VelocityPanel</code></a>.</p>
 
-<h2 id='example'>Example</h2>
+<h2 id="example">Example</h2>
 
 <p>Showing Hello, World using Velocity in a Wicket application, embedded in a Wicket page.</p>
 <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>
-<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>In this template we want to replace the string <code>$message</code> with the text “Hello, World!”. <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>
 <div class='highlight'><pre><code class='java'><span class='kd'>public</span> <span class='nf'>VelocityPage</span><span class='o'>()</span> <span class='o'>{</span>
@@ -232,11 +241,11 @@
 <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>
-<h2 id='installing'>Installing</h2>
+<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>
+<p>Installing Wicket Velocity can be done through adding a dependency in your project’s Maven pom, or by putting the wicket-velocity.jar and the required dependencies in your projects classpath.</p>
 
-<h3 id='using_maven'>Using Maven</h3>
+<h3 id="using_maven">Using Maven</h3>
 
 <p>Add the following dependency to your pom:</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;dependency&gt;</span>
@@ -245,7 +254,7 @@
     <span class='nt'>&lt;version&gt;</span>6.15.0<span class='nt'>&lt;/version&gt;</span>
 <span class='nt'>&lt;/dependency&gt;</span>
 </code></pre></div>
-<h3 id='required_dependencies'>Required dependencies</h3>
+<h3 id="required_dependencies">Required dependencies</h3>
 
 <p>Wicket Velocity requires the following jar files to be on your classpath:</p>
 
@@ -257,7 +266,7 @@
 <li>Apache Velocity</li>
 </ul>
 
-<p>Check the <a href='http://velocity.apache.org'>Apache Velocity project</a> to find out which other dependencies you need.</p>
+<p>Check the <a href="http://velocity.apache.org">Apache Velocity project</a> to find out which other dependencies you need.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/meet/blogs.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/blogs.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/blogs.html (original)
+++ wicket/common/site/trunk/_site/meet/blogs.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -179,38 +188,38 @@
 <p>Here is a list of regular Wicket bloggers, consisting of core contributers and enthusiastic users.</p>
 
 <ul>
-<li><a href='http://wicketinaction.com/'>Wicket in Action</a> - Igor Vaynberg, Martijn Dashorst</li>
+<li><a href="http://wicketinaction.com/">Wicket in Action</a> - Igor Vaynberg, Martijn Dashorst</li>
 
-<li><a href='http://chillenious.wordpress.com/'>Chillenious!</a> - Eelco Hillenius</li>
+<li><a href="http://chillenious.wordpress.com/">Chillenious!</a> - Eelco Hillenius</li>
 
-<li><a href='http://codeact.wordpress.com/'>Jonathan</a> - Jonathan Locke</li>
+<li><a href="http://codeact.wordpress.com/">Jonathan</a> - Jonathan Locke</li>
 
-<li><a href='http://herebebeasties.com/'>Here be beasties</a> - Al Maw</li>
+<li><a href="http://herebebeasties.com/">Here be beasties</a> - Al Maw</li>
 
-<li><a href='http://www.jeremythomerson.com/blog'>Jeremy Thomerson</a> - Jeremy Thomerson</li>
+<li><a href="http://www.jeremythomerson.com/blog">Jeremy Thomerson</a> - Jeremy Thomerson</li>
 
-<li><a href='http://technically.us/code'>Codierspiel</a> - Nathan Hamblen (runs on Wicket)</li>
+<li><a href="http://technically.us/code">Codierspiel</a> - Nathan Hamblen (runs on Wicket)</li>
 
-<li><a href='http://www.antwerkz.com/wp/'>Antwerkz</a> - Justin Lee</li>
+<li><a href="http://www.antwerkz.com/wp/">Antwerkz</a> - Justin Lee</li>
 
-<li><a href='http://www.systemmobile.com/?cat=4'>System Mobile</a> - Nick Heudecker</li>
+<li><a href="http://www.systemmobile.com/?cat=4">System Mobile</a> - Nick Heudecker</li>
 
-<li><a href='http://blogs.sun.com/geertjan'>Geertjan</a> - Geertjan Wielenga</li>
+<li><a href="http://blogs.sun.com/geertjan">Geertjan</a> - Geertjan Wielenga</li>
 
-<li><a href='http://martijndashorst.com/blog'>A Wicket Diary</a> - Martijn Dashorst</li>
+<li><a href="http://martijndashorst.com/blog">A Wicket Diary</a> - Martijn Dashorst</li>
 
-<li><a href='http://www.wicket-praxis.de/blog/'>Wicket Praxis</a> - Michael Mosmann</li>
+<li><a href="http://www.wicket-praxis.de/blog/">Wicket Praxis</a> - Michael Mosmann</li>
 
-<li><a href='http://mysticcoders.com/blog'>Mystic Coders</a> - Andrew Lombardi</li>
+<li><a href="http://mysticcoders.com/blog">Mystic Coders</a> - Andrew Lombardi</li>
 
-<li><a href='http://wicketbyexample.com/'>Wicket by Example</a> - Community driven</li>
+<li><a href="http://wicketbyexample.com/">Wicket by Example</a> - Community driven</li>
 
-<li><a href='http://yeswicket.com/'>Yes Wicket!</a> - French Wicket blog</li>
+<li><a href="http://yeswicket.com/">Yes Wicket!</a> - French Wicket blog</li>
 </ul>
 
-<h2 id='get_your_blog_listed'>Get your blog listed!</h2>
+<h2 id="get_your_blog_listed">Get your blog listed!</h2>
 
-<p>If you think your blog is missing, then please send a message to one of the core contributors or the mailinglist. In the mean time you can add your blog to our wiki&#8217;s <a href='https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs'>special blog page</a>.</p>
+<p>If you think your blog is missing, then please send a message to one of the core contributors or the mailinglist. In the mean time you can add your blog to our wiki’s <a href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs">special blog page</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/meet/buzz.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/buzz.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/buzz.html (original)
+++ wicket/common/site/trunk/_site/meet/buzz.html Fri May  2 09:51:20 2014
@@ -117,11 +117,8 @@
 		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
 	</h5>
 	<ul>
-		<!--li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">Wicket 7</a>
-		</li-->
 		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6</a>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
 		</li>
 		<li>
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
@@ -133,6 +130,18 @@
 			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
 		</li>
 	</ul>
+	<h5>Wicket 7.x</h5>
+	<ul>
+		<li>
+			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">Download M1</a>
+		</li>
+		<li>
+			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
+		</li>
+		<li>
+			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
+		</li>
+	</ul>
 	<h5>
 		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
 	</h5>
@@ -177,79 +186,79 @@
 			<p>Wicket has appeared in the press in a variety of industry trade magazines, including Network World, ComputerWorld, IT World and Information Week. Presentations on Wicket have been delivered by Wicket team members at JavaOne in San Francisco, Javapolis and TheServerSide Java Symposium in Europe. The following are quotes from reviewers and users of Wicket:</p>
 
 <blockquote>
-<p>After working with JSF for almost a year, trying Wicket was like that movie scene where the clouds part and this big ray of light hits you in the face. I just had this feeling while JSF&#8217;ing that certain things were harder than they needed to be. Well, I was right, and the Wicket people figured it out.</p>
+<p>After working with JSF for almost a year, trying Wicket was like that movie scene where the clouds part and this big ray of light hits you in the face. I just had this feeling while JSF’ing that certain things were harder than they needed to be. Well, I was right, and the Wicket people figured it out.</p>
 
-<p><a href='http://bigheadco.blogspot.com/2007/03/groovy-wicket.html'>Kevin Galligan</a></p>
+<p><a href="http://bigheadco.blogspot.com/2007/03/groovy-wicket.html">Kevin Galligan</a></p>
 </blockquote>
 
 <blockquote>
 <p>Wicket (currently undergoing incubation with Apache) is a good example of a web framework which throws caution to the wind, and has absolutely no XML needed. We here at Mystic have a lot of love for Wicket and are actively developing several projects with it currently.</p>
 
-<p><a href='http://www.mysticcoders.com/blog/2007/03/13/the-rise-of-the-xml-backlash/'>Mystic Coders</a></p>
+<p><a href="http://www.mysticcoders.com/blog/2007/03/13/the-rise-of-the-xml-backlash/">Mystic Coders</a></p>
 </blockquote>
 
 <blockquote>
 <p>Writing a Wicket app is rather more like writing an event-based desktop application than a web application.</p>
 
-<p><a href='http://www.lshift.net/blog/2006/07/06/wicket'>LShift</a></p>
+<p><a href="http://www.lshift.net/blog/2006/07/06/wicket">LShift</a></p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;Wickedly Cool&#8221; - I actually managed to whip together a Wicket Application in a few days. It is entertaining to work with, adding shiny stuff is really easy while you can develop Java code and keep those last bits of hair you have saved for ripping out in a CSS nightmare that you hopefully after finding Wicket will not have to deal with. So I&#8217;d go out on a limb and say that Wicket == Rogaine for developers.</p>
+<p>“Wickedly Cool” - I actually managed to whip together a Wicket Application in a few days. It is entertaining to work with, adding shiny stuff is really easy while you can develop Java code and keep those last bits of hair you have saved for ripping out in a CSS nightmare that you hopefully after finding Wicket will not have to deal with. So I’d go out on a limb and say that Wicket == Rogaine for developers.</p>
 
-<p><a href='http://blogs.opennms.org/joed/?p=3'>Joed</a></p>
+<p><a href="http://blogs.opennms.org/joed/?p=3">Joed</a></p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;So is Wicket the one true MVC framework that a lot of us have been hunting for? At the moment, I tend to think so. [&#8230;] If you like Java you will really like Wicket.&#8221;</p>
+<p>“So is Wicket the one true MVC framework that a lot of us have been hunting for? At the moment, I tend to think so. […] If you like Java you will really like Wicket.”</p>
 
-<p><a href='http://ptrthomas.wordpress.com/2007/03/02/wicket-impressions-moving-from-spring-mvc-webflow/'>Peter Thomas</a></p>
+<p><a href="http://ptrthomas.wordpress.com/2007/03/02/wicket-impressions-moving-from-spring-mvc-webflow/">Peter Thomas</a></p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;I think its an awesome way to deal with this whole web UI framework mess. I am happy to see someone take a simple and clean approach to the whole problem, and come up with a transparent POJO solution. I like the direction the framework is going&#8230; Wicket is clean, simple and elegant.&#8221;</p>
+<p>“I think its an awesome way to deal with this whole web UI framework mess. I am happy to see someone take a simple and clean approach to the whole problem, and come up with a transparent POJO solution. I like the direction the framework is going… Wicket is clean, simple and elegant.”</p>
 
 <p>Comment on TheServerSide.com</p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;Last week I wrote an article about Wicket and I spent some time discovering and taming it. And I have to confess this: I love it. &#8230; snip &#8230; Wicket is not a framework, it&#8217;s a candy bar. And everybody loves candy bars&#8230;&#8221;</p>
+<p>“Last week I wrote an article about Wicket and I spent some time discovering and taming it. And I have to confess this: I love it. … snip … Wicket is not a framework, it’s a candy bar. And everybody loves candy bars…”</p>
 
 <p>Comment made by Romain Guy</p>
 </blockquote>
 
 <blockquote>
-<p>The issue that impressed me in the Wicket model is that &#8220;Wicket does not mix markup with Java code and adds no special syntax to your markup files.&#8221; You reference Wicket identities as HTML attributes and define component properties in Java, which allows designers and programmers to work independently (within the obvious constraint of having common goals). There is no need for special tools.</p>
+<p>The issue that impressed me in the Wicket model is that “Wicket does not mix markup with Java code and adds no special syntax to your markup files.” You reference Wicket identities as HTML attributes and define component properties in Java, which allows designers and programmers to work independently (within the obvious constraint of having common goals). There is no need for special tools.</p>
 
-<p>From a Network World editorial entitled &#8220;Nothing Sticky about Wicket&#8221;</p>
+<p>From a Network World editorial entitled “Nothing Sticky about Wicket”</p>
 </blockquote>
 
 <blockquote>
 <p>In a recent blog post I asked for feedback on what Web frameworks folks are using. Well, I got quite a surprise: Wicket was the most often recommended framework in reader emails!</p>
 
-<p>From an About.com article entitled And the Winner is&#8230;Wicket</p>
+<p>From an About.com article entitled And the Winner is…Wicket</p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;I have used Wicket since last Fall for personal projects. I have 3 kids and a wife so my free-time is very limited. Given that, I had to be very picky about which framework I chose. I&#8217;ve been very impressed with how little hassle it has been to start creating powerful, reusable components and pages with Wicket even under rather severe time constraints.&#8221;</p>
+<p>“I have used Wicket since last Fall for personal projects. I have 3 kids and a wife so my free-time is very limited. Given that, I had to be very picky about which framework I chose. I’ve been very impressed with how little hassle it has been to start creating powerful, reusable components and pages with Wicket even under rather severe time constraints.”</p>
 
 <p>Comment on TheServerSide.com</p>
 </blockquote>
 
 <blockquote>
-<p>&#8221;&#8230;after using web MVC frameworks for a couple of years, building ever more complex web applications, I moved to component based frameworks. Of these, I think Wicket is by far the best&#8230;&#8221;</p>
+<p>”…after using web MVC frameworks for a couple of years, building ever more complex web applications, I moved to component based frameworks. Of these, I think Wicket is by far the best…”</p>
 
 <p>Comment on Manageability.org</p>
 </blockquote>
 
 <blockquote>
-<p>&#8221;&#8230; Talk about a mind blowing experience, it literally took me ten minutes to have a sample application up and running! The Wicket API is very Swing like, which was a welcome change for me, and allowed for a very familiar development experience. There is even an extension that allows for direct use of a Swing TreeModel. There are so many things that I like about this framework &#8230;&#8221;</p>
+<p>”… Talk about a mind blowing experience, it literally took me ten minutes to have a sample application up and running! The Wicket API is very Swing like, which was a welcome change for me, and allowed for a very familiar development experience. There is even an extension that allows for direct use of a Swing TreeModel. There are so many things that I like about this framework …”</p>
 
 <p>From a blog item by the Code Poet</p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;Wicket has a learning flat.&#8221;</p>
+<p>“Wicket has a learning flat.”</p>
 
 <p>Al Maw</p>
 </blockquote>
@@ -257,35 +266,35 @@
 <blockquote>
 <p>JSF is Cool and young but Wicket is younger and even cooler. Have you tried wicket?. I am also building a large CRUD application for Job Exchange System in my country using Wicket + JPA + Stateless EJB3 + Glassfish (the latest promoted build of glassfish) and we are currently in testing phase and I am not having any serious headaches as things seems to be under control. All our forms are Ajax. We have several concurrent accesses and system is stable. I believe greatly in the Wicket Project especially for CRUD cases.</p>
 
-<p><a href='http://www.javalobby.org/java/forums/t90719.html#92132195'>Dabar Aladejebi</a></p>
+<p><a href="http://www.javalobby.org/java/forums/t90719.html#92132195">Dabar Aladejebi</a></p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;focuses the development efforts in the right place, inside plain Java code&#8221; !! This was the winning ticket for me. The framework is truly amazing. I used ever dang framework in the book and can say that I&#8217;m most impressed with this one.</p>
+<p>“focuses the development efforts in the right place, inside plain Java code” !! This was the winning ticket for me. The framework is truly amazing. I used ever dang framework in the book and can say that I’m most impressed with this one.</p>
 
-<p><a href='http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html'>Anonymous on JavaGeek.org</a>&#8211; <a href='http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html'>Anonymous on JavaGeek.org</a></p>
+<p><a href="http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html">Anonymous on JavaGeek.org</a>– <a href="http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html">Anonymous on JavaGeek.org</a></p>
 </blockquote>
 
 <blockquote>
 <p>Shocking simplicity. Back to the roots. Thanks.</p>
 
-<p><a href='http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html'>joozsa on JavaGeek.org</a></p>
+<p><a href="http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html">joozsa on JavaGeek.org</a></p>
 </blockquote>
 
 <blockquote>
 <p>Wicket as far as I am concerned is the way forward for web development in Java. A lot of creativity involved though especially with the loops but It makes Web Development so much fun.</p>
 
-<p><a href='http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html'>Anonymous on JavaGeek.org</a></p>
+<p><a href="http://javageek.org/2006/03/08/comparing_web_frameworks_wicket.html">Anonymous on JavaGeek.org</a></p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;Wicket became my favorite framework in about a 24-hour period, and I think it has a very bright future. With most frameworks I see limitations, with Wicket I see possibilities. There&#8217;s your platitude for the day :)&#8221;</p>
+<p>“Wicket became my favorite framework in about a 24-hour period, and I think it has a very bright future. With most frameworks I see limitations, with Wicket I see possibilities. There’s your platitude for the day :)”</p>
 
 <p>wicket-user mailing list</p>
 </blockquote>
 
 <blockquote>
-<p>&#8220;Count me in&#8230; I&#8217;ve only been using Wicket for maybe 2 weeks or so, and I&#8217;m sold.&#8221;</p>
+<p>“Count me in… I’ve only been using Wicket for maybe 2 weeks or so, and I’m sold.”</p>
 
 <p>Phillip Rhodes</p>
 </blockquote>