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 [11/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/meet/features.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/features.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/features.html (original)
+++ wicket/common/site/trunk/_site/meet/features.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,87 +183,87 @@
 
 		<div id="contentbody">
 			<h1>Features</h1>
-			<h2 id='pojo_component_model'>POJO Component Model</h2>
+			<h2 id="pojo_component_model">POJO Component Model</h2>
 
 <p>Pages and Components in Wicket are real Java objects that support encapsulation, inheritance and events.</p>
 
-<h2 id='ease_of_development'>Ease of Development</h2>
+<h2 id="ease_of_development">Ease of Development</h2>
 
 <p>Because Wicket is Java and HTML, you can leverage what you know about Java or your favorite HTML editor to write Wicket applications.</p>
 
-<h2 id='separation_of_concerns'>Separation of Concerns</h2>
+<h2 id="separation_of_concerns">Separation of Concerns</h2>
 
 <p>Wicket does not mix markup with Java code and adds no special syntax to your markup files. The worlds of HTML and Java are parallel and associated only by Wicket ids, which are attributes in HTML and Component properties in Java. Since Wicket HTML is just HTML and Wicket Java is just Java, coders and designers can work independently to a large degree and without relying on any special tools.</p>
 
-<h2 id='secure'>Secure</h2>
+<h2 id="secure">Secure</h2>
 
 <p>Wicket is secure by default. URLs do not expose sensitive information and all component paths are session-relative. Explicit steps must be taken to share information between sessions. Furthermore URL encryption allows highly secure web sites.</p>
 
-<h2 id='transparent_scalable_clustering_support'>Transparent, Scalable Clustering Support</h2>
+<h2 id="transparent_scalable_clustering_support">Transparent, Scalable Clustering Support</h2>
 
 <p>All Wicket applications will work on a cluster automatically and without additional work. Once bottlenecks are understood, Wicket enables tuning of page state replication. The next version of Wicket will support client-side models for zero-state scalability.</p>
 
-<h2 id='transparent_back_button_support'>Transparent Back Button Support</h2>
+<h2 id="transparent_back_button_support">Transparent Back Button Support</h2>
 
 <p>Wicket supports configurable page version management. When users submit a form or follow a link from a page they accessed with the back button in their browser, Wicket is able to revert the page object to the state it was in when the page was originally rendered. This means you can write web applications that support the back button with very little work.</p>
 
-<h2 id='multitab_and_multiwindow_support'>Multi-tab and multi-window support</h2>
+<h2 id="multitab_and_multiwindow_support">Multi-tab and multi-window support</h2>
 
 <p>Wicket provides an easy way to write application that supports multi-window and multi-tab usage allowing developer to react properly when users open new browser window or tab</p>
 
-<h2 id='reusable_components'>Reusable Components</h2>
+<h2 id="reusable_components">Reusable Components</h2>
 
 <p>Reusable components in Wicket are particularly easy to create. Not only can you extend existing components with the Java extends keyword, but you can also create Panel components which associate a group of components as a reusable unit.</p>
 
-<h2 id='simple_flexible_localizable_form_validation'>Simple, Flexible, Localizable Form Validation</h2>
+<h2 id="simple_flexible_localizable_form_validation">Simple, Flexible, Localizable Form Validation</h2>
 
 <p>It is trivial to write and use validators in Wicket. It is also quite easy to customize and localize the display and content of validation error messages.</p>
 
-<h2 id='typesafe_sessions'>Typesafe Sessions</h2>
+<h2 id="typesafe_sessions">Typesafe Sessions</h2>
 
 <p>Wicket eliminates the need to manage HttpSession attributes by hand. Page and component objects are transparently stored in the session and your application can create a custom session subclass with typesafe properties as well. All objects stored in the session can automatically participate in clustering replication.</p>
 
-<h2 id='factory_customizable'>Factory Customizable</h2>
+<h2 id="factory_customizable">Factory Customizable</h2>
 
 <p>Wicket is very extensible. Most operations are customizable through factories or factory methods.</p>
 
-<h2 id='detachable_models'>Detachable Models</h2>
+<h2 id="detachable_models">Detachable Models</h2>
 
-<p>Model objects in Wicket can be very lightweight in terms of memory and network use in a cluster. When a model is used, it can &#8220;attach&#8221;, populating itself with information from persistent storage. When the model is no longer in use, transient information can be reset, reducing the size of the object.</p>
+<p>Model objects in Wicket can be very lightweight in terms of memory and network use in a cluster. When a model is used, it can “attach”, populating itself with information from persistent storage. When the model is no longer in use, transient information can be reset, reducing the size of the object.</p>
 
-<h2 id='border_components'>Border Components</h2>
+<h2 id="border_components">Border Components</h2>
 
 <p>Wicket Border components enable the decoration of pages in a reusable fashion. This is especially useful for inheritance of common navigational structures or layout.</p>
 
-<h2 id='support_for_all_basic_html_features'>Support for All Basic HTML Features</h2>
+<h2 id="support_for_all_basic_html_features">Support for All Basic HTML Features</h2>
 
-<p>Wicket supports image tags, links, forms and everything else that you&#8217;re used to using in your web application development.</p>
+<p>Wicket supports image tags, links, forms and everything else that you’re used to using in your web application development.</p>
 
-<h2 id='programmatic_manipulation_of_attributes'>Programmatic Manipulation of Attributes</h2>
+<h2 id="programmatic_manipulation_of_attributes">Programmatic Manipulation of Attributes</h2>
 
 <p>Wicket Components can programmatically change any HTML tag attribute.</p>
 
-<h2 id='automatic_conversions'>Automatic Conversions</h2>
+<h2 id="automatic_conversions">Automatic Conversions</h2>
 
 <p>Once a Form validates, the model can be updated using Wicket converters. Most ordinary conversions are built-in and it is easy to write new converters.</p>
 
-<h2 id='dynamic_images'>Dynamic Images</h2>
+<h2 id="dynamic_images">Dynamic Images</h2>
 
 <p>Wicket makes image use, sharing and generation very easy. Dynamic images can be created by simply implementing a paint method.</p>
 
-<h2 id='pageable_listview'>Pageable ListView</h2>
+<h2 id="pageable_listview">Pageable ListView</h2>
 
 <p>ListViews in Wicket are extremely powerful. You can nest any kind of component in a ListView row, even other ListViews. PageableListView supports navigation links for large lists.</p>
 
-<h2 id='tree_component'>Tree Component</h2>
+<h2 id="tree_component">Tree Component</h2>
 
 <p>Out of the box tree component for navigating and selecting nodes.</p>
 
-<h2 id='localization'>Localization</h2>
+<h2 id="localization">Localization</h2>
 
 <p>HTML pages, images and resource strings can all be localized.</p>
 
-<h2 id='examples'>Examples</h2>
+<h2 id="examples">Examples</h2>
 
 <p>Wicket has numerous examples showcasing all of the above features.</p>
 		</div>

Modified: wicket/common/site/trunk/_site/meet/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/index.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/index.html (original)
+++ wicket/common/site/trunk/_site/meet/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/meet/introduction.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/introduction.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/introduction.html (original)
+++ wicket/common/site/trunk/_site/meet/introduction.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,11 +185,11 @@
 			<h1>Meet Apache Wicket</h1>
 			<p>By Jonathan Locke, original author of Wicket</p>
 
-<h2 id='why_wicket'>Why Wicket?</h2>
+<h2 id="why_wicket">Why Wicket?</h2>
 
 <p>If you are looking to do web application programming in Java, you have a very large number of choices these days. In fact, there are so many web application frameworks now that it has become somewhat of a joke. One blog site on the Internet poses the question: How many Java web frameworks can you name? The answer they show looks like this:</p>
 
-<h2 id='frameworks_frameworks_everywhere'>Frameworks, Frameworks Everywhere</h2>
+<h2 id="frameworks_frameworks_everywhere">Frameworks, Frameworks Everywhere</h2>
 <TABLE class='confluenceTable'><TBODY>
 <TR>
 <TD class='confluenceTd'>Echo</TD>
@@ -273,25 +282,25 @@
 <TD class='confluenceTd'>&nbsp;</TD>
 </TR>
 </TBODY></TABLE>
-<h2 id='why_reinvent_the_wheel'>Why &#8220;Reinvent the Wheel&#8221;?</h2>
+<h2 id="why_reinvent_the_wheel">Why “Reinvent the Wheel”?</h2>
 
-<p>In light of this, you may be wondering &#8220;What good is another web application framework?&#8221; Indeed. Why &#8220;re-invent the wheel?&#8221; One snappy comeback to that old saw is: because this time we could make it rounder!</p>
+<p>In light of this, you may be wondering “What good is another web application framework?” Indeed. Why “re-invent the wheel?” One snappy comeback to that old saw is: because this time we could make it rounder!</p>
 
 <p>But it was not simply a desire for higher quality that drove the creation of Wicket. Even with so many options, there really is no web toolkit which fills exactly the niche that Wicket fills. In fact, Wicket is quite unlike each of the frameworks above.</p>
 
-<p>Wicket&#8217;s closest cousins are probably Tapestry and Echo, but even there the likeness is very shallow. Like Tapestry, Wicket uses a special HTML attribute to denote components, enabling easy editing with ordinary HTML editors. Like Echo, Wicket has a first-class component model. But Wicket applications are not like applications written in either Tapestry or Echo, because in Wicket you get the best of both worlds. You get the benefits of a first-class component model and a non-intrusive approach to HTML. In many situations, this combination may prove to be a significant development advantage.</p>
+<p>Wicket’s closest cousins are probably Tapestry and Echo, but even there the likeness is very shallow. Like Tapestry, Wicket uses a special HTML attribute to denote components, enabling easy editing with ordinary HTML editors. Like Echo, Wicket has a first-class component model. But Wicket applications are not like applications written in either Tapestry or Echo, because in Wicket you get the best of both worlds. You get the benefits of a first-class component model and a non-intrusive approach to HTML. In many situations, this combination may prove to be a significant development advantage.</p>
 
 <p>To understand why Wicket is so different, it may help to understand the motivations that created it.</p>
 
-<h2 id='motivations'>Motivations</h2>
+<h2 id="motivations">Motivations</h2>
 
-<h3 id='most_existing_web_frameworks_provide_weak_to_nonexistent_support_in_managing_serverside_state'>Most existing web frameworks provide weak to non-existent support in managing server-side state</h3>
+<h3 id="most_existing_web_frameworks_provide_weak_to_nonexistent_support_in_managing_serverside_state">Most existing web frameworks provide weak to non-existent support in managing server-side state</h3>
 
 <p>This normally means lots of ad-hoc code in web applications dealing with the gory mechanics of state management. While Wicket will not allow you to stop thinking about server state, it goes a long ways towards making it easy and often transparent to manage that state.</p>
 
-<p>In Wicket, all server side state is automatically managed. You will never directly use an HttpSession object or similar wrapper to store state. Instead, state is associated with components. Each server-side page component holds a nested hierarchy of stateful components, where each component&#8217;s model is, in the end, a POJO (Plain Old Java Object). Wicket maintains a map of these pages in each user&#8217;s session. One purpose of this page map (and the component hierarchy on each page) is to allow the framework to hide all details of how your components and models are accessed. You deal with simple, familiar Java objects and Wicket deals with things like URLs, session ids and GET/POST requests.</p>
+<p>In Wicket, all server side state is automatically managed. You will never directly use an HttpSession object or similar wrapper to store state. Instead, state is associated with components. Each server-side page component holds a nested hierarchy of stateful components, where each component’s model is, in the end, a POJO (Plain Old Java Object). Wicket maintains a map of these pages in each user’s session. One purpose of this page map (and the component hierarchy on each page) is to allow the framework to hide all details of how your components and models are accessed. You deal with simple, familiar Java objects and Wicket deals with things like URLs, session ids and GET/POST requests.</p>
 
-<p>You will also find that this well-structured server state makes it very easy to deal with the dreaded &#8220;back button problem&#8221;. In fact, Wicket has a generic and robust solution which can identify and expire browser-cached pages that have become stale due to structural changes to the model of a component on the page.</p>
+<p>You will also find that this well-structured server state makes it very easy to deal with the dreaded “back button problem”. In fact, Wicket has a generic and robust solution which can identify and expire browser-cached pages that have become stale due to structural changes to the model of a component on the page.</p>
 
 <p>Finally, Wicket has been designed to work with POJO persistence frameworks such as JDO or Hibernate. This can make database driven web applications quite easy to write.</p>
 
@@ -299,33 +308,33 @@
 
 <p>In terms of efficiency versus productivity, perhaps Wicket is to JSP as Java is to C. You can accomplish anything in Wicket in JSP. You may even do it more efficiently in terms of memory or processor consumption. But it may take you weeks or months longer to develop your application. And in the end, since state management in JSP is ad-hoc, you are likely find security problems and bugs popping up everywhere. Most of the other frameworks above will do only a little more to help you.</p>
 
-<h3 id='most_existing_frameworks_require_special_html_code'>Most existing frameworks require special HTML code</h3>
+<h3 id="most_existing_frameworks_require_special_html_code">Most existing frameworks require special HTML code</h3>
 
 <p>JSP is by far the worst offender, allowing the embedding of Java code directly in web pages, but to some degree almost all of the frameworks from the list (except Tapestry) above introduce some kind of special syntax to your HTML code.</p>
 
 <p>Special syntax is highly undesirable because it changes the nature of HTML from the kind of pure-and-simple HTML markup that web designers are familiar with, to some kind of special HTML. This special HTML can be more difficult to preview, edit and understand.</p>
 
-<p>Wicket does not introduce any special syntax to HTML. Instead, it extends HTML in a standards-compliant way via a Wicket namespace that is fully compliant with the XHTML standard. This means that you can use Macromedia Dreamweaver, Microsoft Front Page, Word, Adobe Go Live, or any other existing HTML editor to work on your web pages and Wicket components. To accomplish this, Wicket consistently uses a single id attribute in the Wicket namespace (&#8220;wicket:id&#8221;) to mark HTML tags that should receive special treatment by the toolkit. If you prefer not to render Wicket namespaced tags and attributes to your end-users, Wicket has a simple setting to strip them all out, resulting in ordinary, standards-compliant HTML.</p>
+<p>Wicket does not introduce any special syntax to HTML. Instead, it extends HTML in a standards-compliant way via a Wicket namespace that is fully compliant with the XHTML standard. This means that you can use Macromedia Dreamweaver, Microsoft Front Page, Word, Adobe Go Live, or any other existing HTML editor to work on your web pages and Wicket components. To accomplish this, Wicket consistently uses a single id attribute in the Wicket namespace (“wicket:id”) to mark HTML tags that should receive special treatment by the toolkit. If you prefer not to render Wicket namespaced tags and attributes to your end-users, Wicket has a simple setting to strip them all out, resulting in ordinary, standards-compliant HTML.</p>
 
-<p>No &#8220;special sauce&#8221; in your HTML means designers can mock up pages that you can use directly in development. Adding Java components to the HTML is as simple as setting the component name attribute. And you can then give the HTML back to your web designers knowing that they can change it with confidence.</p>
+<p>No “special sauce” in your HTML means designers can mock up pages that you can use directly in development. Adding Java components to the HTML is as simple as setting the component name attribute. And you can then give the HTML back to your web designers knowing that they can change it with confidence.</p>
 
-<p>Wicket, more than any other framework gives you a separation of concerns. Web designers can work on the HTML with very little knowledge of the application code (they cannot remove the component name tags and they cannot arbitrarily change the nesting of components, but anything else goes). Likewise, coders can work on the Java components that attach to the HTML without concerning themselves with what a given page looks like. By not stepping on each other&#8217;s toes, everyone can get more work done.</p>
+<p>Wicket, more than any other framework gives you a separation of concerns. Web designers can work on the HTML with very little knowledge of the application code (they cannot remove the component name tags and they cannot arbitrarily change the nesting of components, but anything else goes). Likewise, coders can work on the Java components that attach to the HTML without concerning themselves with what a given page looks like. By not stepping on each other’s toes, everyone can get more work done.</p>
 
-<h3 id='existing_frameworks_are_not_easy'>Existing frameworks are not easy</h3>
+<h3 id="existing_frameworks_are_not_easy">Existing frameworks are not easy</h3>
 
 <p>Most of the existing toolkits have poorly defined or non-existent object models. In some cases, the model is defined using special XML syntaxes. The syntaxes may be so cumbersome that special tools are required to manipulate all the configuration information. Since these toolkits are not simple Java libraries you may or may not be able to use your favorite IDE tools such as editors, debuggers and compilers.</p>
 
 <p>Wicket is all about simplicity. There are no configuration files to learn in Wicket. Wicket is a simple class library with a consistent approach to component structure. In Wicket, your web applications will more closely resemble a Swing application than a JSP application. If you know Java (and especially if you know Swing), you already know a lot about Wicket.</p>
 
-<h3 id='existing_frameworks_inhibit_reusability'>Existing frameworks inhibit reusability</h3>
+<h3 id="existing_frameworks_inhibit_reusability">Existing frameworks inhibit reusability</h3>
 
-<p>Tapestry and JSF at least have component models that allow reuse, but you are likely to find that it is not particularly trivial to do, at least when compared with Wicket. Wicket has been explicitly designed to make it very, very easy to create reusable components. It&#8217;s surprisingly simple to extend existing components and to make compound components such as a SignInPanel or AddressForm. It is also relatively easy to create components that exploit new features of browsers. Components in Wicket can be packaged up in JAR files and reused by simply dropping them in your lib folder - no configuration necessary!</p>
+<p>Tapestry and JSF at least have component models that allow reuse, but you are likely to find that it is not particularly trivial to do, at least when compared with Wicket. Wicket has been explicitly designed to make it very, very easy to create reusable components. It’s surprisingly simple to extend existing components and to make compound components such as a SignInPanel or AddressForm. It is also relatively easy to create components that exploit new features of browsers. Components in Wicket can be packaged up in JAR files and reused by simply dropping them in your lib folder - no configuration necessary!</p>
 
-<h3 id='web_programming_should_be_fun'>Web programming should be fun!</h3>
+<h3 id="web_programming_should_be_fun">Web programming should be fun!</h3>
 
 <p>This is my most personal goal for writing Wicket . None of the existing frameworks are appealing to me in terms of intuitiveness, quickness, ease of development, etc. It is my hope that Wicket represents a significant step in the direction of making web applications easy and fun to write.</p>
 
-<h2 id='goals'>Goals</h2>
+<h2 id="goals">Goals</h2>
 
 <p>Coming from these motivations, the following goals for Wicket emerged:</p>
 
@@ -338,7 +347,7 @@
 
 <li>All code written in Java ala Swing</li>
 
-<li>Minimize &#8220;conceptual surface area&#8221;</li>
+<li>Minimize “conceptual surface area”</li>
 
 <li>Avoid overuse of XML configuration files</li>
 
@@ -412,7 +421,7 @@
 <p>COMPLETE</p>
 
 <ul>
-<li>The Wicket team is committed to deliver a feature complete, ready-to-use framework for developing Java web applications. The core framework was written and contributed by the author of this introduction, Jonathan Locke. The current team consists of a group of experienced programmers, some of which were active on some of the other frameworks stated above, and all of which have extensive experience building large scale Java web applications. We eat our own dogfood, and will thus work on Wicket from a framework user&#8217;s perspective.</li>
+<li>The Wicket team is committed to deliver a feature complete, ready-to-use framework for developing Java web applications. The core framework was written and contributed by the author of this introduction, Jonathan Locke. The current team consists of a group of experienced programmers, some of which were active on some of the other frameworks stated above, and all of which have extensive experience building large scale Java web applications. We eat our own dogfood, and will thus work on Wicket from a framework user’s perspective.</li>
 </ul>
 </li>
 </ul>

Modified: wicket/common/site/trunk/_site/meet/vision.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/vision.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/vision.html (original)
+++ wicket/common/site/trunk/_site/meet/vision.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>
@@ -184,7 +193,7 @@
 
 <p>I once heard Josh Bloch talk about the power to weight ratio of an API. The highest compliment anyone could make of Wicket would be to suggest that Wicket has a lot of power and not much conceptual surface area.</p>
 
-<p>In art, negative space is the part that&#8217;s not the subject. In music, negative space is the rest. In software, negative space is all the code that you managed to avoid writing. In all three disciplines, it&#8217;s what separates what is truly excellent from what is merely good.</p>
+<p>In art, negative space is the part that’s not the subject. In music, negative space is the rest. In software, negative space is all the code that you managed to avoid writing. In all three disciplines, it’s what separates what is truly excellent from what is merely good.</p>
 
 <p>Following this metaphor, if Wicket is our foreground object, it is defined in a negative sense by all the things that it is not (by the background).</p>
 
@@ -192,13 +201,13 @@
 
 <p>The more ways that Wicket can find to offload responsibilities (both now and in the future), the less it will be. And thus, the more it will be.</p>
 
-<p>The difficulty moving forward with Wicket will be balancing all the day-to-day needs people are going to be bringing up with this overall vision of minimalism. There ultimately will be compromises, and the &#8220;trick&#8221; to making the right compromises is simply to agonize over all the options for a long time and then to only make the compromises that everyone agrees are really essential to what Wicket needs to be and do.</p>
+<p>The difficulty moving forward with Wicket will be balancing all the day-to-day needs people are going to be bringing up with this overall vision of minimalism. There ultimately will be compromises, and the “trick” to making the right compromises is simply to agonize over all the options for a long time and then to only make the compromises that everyone agrees are really essential to what Wicket needs to be and do.</p>
 
-<p>A big part of this process of agonizing is to act like doctors and &#8220;first, do no harm&#8221;. If some issue isn&#8217;t sitting well with everyone yet, there&#8217;s probably a reason for that. So, maybe the near-term solution is to simply do nothing and let people use the existing functionality until the limits to that approach (as well as competing ideas) are better understood.</p>
+<p>A big part of this process of agonizing is to act like doctors and “first, do no harm”. If some issue isn’t sitting well with everyone yet, there’s probably a reason for that. So, maybe the near-term solution is to simply do nothing and let people use the existing functionality until the limits to that approach (as well as competing ideas) are better understood.</p>
 
-<p>It&#8217;s easy to add features. It&#8217;s often impossible to change or remove them.</p>
+<p>It’s easy to add features. It’s often impossible to change or remove them.</p>
 
-<p>Given this, the Wicket approach to the overall problem of evolving while keeping a high power to weight ratio will be partitioning off all controversial new ideas in a &#8220;wicket-stuff&#8221; package until they are broadly accepted. This way people can experiment and code away and check in lots of stuff without affecting the main codebase with untested ideas. Then, when ideas pan out to everyone&#8217;s satisfaction, the leads of the project will move them into the core.</p>
+<p>Given this, the Wicket approach to the overall problem of evolving while keeping a high power to weight ratio will be partitioning off all controversial new ideas in a “wicket-stuff” package until they are broadly accepted. This way people can experiment and code away and check in lots of stuff without affecting the main codebase with untested ideas. Then, when ideas pan out to everyone’s satisfaction, the leads of the project will move them into the core.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/start/download.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/download.html (original)
+++ wicket/common/site/trunk/_site/start/download.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,31 +183,43 @@
 
 		<div id="contentbody">
 			<h1>Download Wicket releases</h1>
-			<p>Apache Wicket 6.15.0 is the current stable release. Most users get Apache Wicket using <a href='#maven'>Apache Maven&#8217;s dependency management</a>, which incidentally is the most convenient way of obtaining the latest and greatest Wicket.</p>
+			<p>Apache Wicket 6.15.0 is the current stable release. Most users get Apache Wicket using <a href="#maven">Apache Maven’s dependency management</a>, which incidentally is the most convenient way of obtaining the latest and greatest Wicket.</p>
 
-<h2 id='download'>Download</h2>
+<h2 id="download">Download</h2>
 
-<p>New projects should use <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.15.0'>Wicket 6.15.0</a> as their base.</p>
+<p>New projects should use <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.15.0">Wicket 6.15.0</a> as their base.</p>
 
 <ul>
-<li><strong>Latest stable release</strong>: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.15.0'>6.15.0</a></li>
+<li><strong>Latest stable release</strong>: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.15.0">6.15.0</a></li>
 
-<li><strong>Latest 6.x release</strong>: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.15.0'>6.15.0</a></li>
+<li><strong>Latest 6.x release</strong>: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.15.0">6.15.0</a></li>
 
-<li><strong>Latest 1.5.x release</strong>: <a href='http://www.apache.org/dyn/closer.cgi/wicket/1.5.11'>1.5.11</a></li>
+<li><strong>Latest 1.5.x release</strong>: <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.11">1.5.11</a></li>
 
-<li><strong>Latest 1.4.x release</strong> (security updates only): <a href='http://www.apache.org/dyn/closer.cgi/wicket/1.4.23'>1.4.23</a></li>
+<li><strong>Latest 1.4.x release</strong> (security updates only): <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">1.4.23</a></li>
 
-<li><strong>Archived releases</strong>: <a href='http://archive.apache.org/dist/wicket'>http://archive.apache.org/dist/wicket</a></li>
+<li><strong>Archived releases</strong>: <a href="http://archive.apache.org/dist/wicket">http://archive.apache.org/dist/wicket</a></li>
 </ul>
 
-<p>We recommend you <a href='quickstart.html'>start</a> with our latest stable release.</p>
+<p>We recommend you <a href="quickstart.html">start</a> with our latest stable release.</p>
 
-<h3 id='requirements'>Requirements</h3>
+<h3 id="developer_releases">Developer releases</h3>
 
-<h4 id='java_version'>Java version</h4>
+<p>If you like to live on the cutting edge and help development of Wicket further along, you can try out the development milestone releases:</p>
 
 <ul>
+<li>Latest <strong>development milestone</strong> release for 7.x: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M1">7.0.0-M1</a></li>
+</ul>
+
+<p>This release is not fit for production use yet: it is only intended for developers of Wicket, or for people trying out our development versions. API changes will occur between releases.</p>
+
+<h3 id="requirements">Requirements</h3>
+
+<h4 id="java_version">Java version</h4>
+
+<ul>
+<li>Apache Wicket 7.x requires JDK 7.0 or newer</li>
+
 <li>Apache Wicket 6.x requires JDK 6.0 or newer</li>
 
 <li>Apache Wicket 1.5.x requires JDK 1.5 or newer</li>
@@ -206,33 +227,35 @@
 <li>Apache Wicket 1.4.x requires JDK 1.5 or newer</li>
 </ul>
 
-<h4 id='mixing_wicket_versions'>Mixing Wicket versions</h4>
+<h4 id="mixing_wicket_versions">Mixing Wicket versions</h4>
 
 <p>You cannot mix different Wicket versions in your project. You should always use the artifacts from a particular release train.</p>
 
 <p>For example it is <strong>NOT</strong> possible to use Wicket Extensions 1.5 in a Wicket 6 project. The same goes for 3rd party libraries: make sure you always use a compatible version of your 3rd party library.</p>
 
-<h4 id='logging'>Logging</h4>
+<h4 id="logging">Logging</h4>
 
-<p>You cannot use Wicket without adding an SLF4J logging implementation to your classpath. Most people use <a href='http://logging.apache.org/log4j'>log4j</a>.</p>
+<p>You cannot use Wicket without adding an SLF4J logging implementation to your classpath. Most people use <a href="http://logging.apache.org/log4j">log4j</a>.</p>
 
-<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get Wicket to use log4j too. If you want to use commons-logging or JDK14 logging or something else, please see the <a href='http://www.slf4j.org/faq.html'>SLF4J site</a> for more information.</p>
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get Wicket to use log4j too. If you want to use commons-logging or JDK14 logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a> for more information.</p>
 
-<h2 id='migrating_from_earlier_versions'>Migrating from earlier versions</h2>
+<h2 id="migrating_from_earlier_versions">Migrating from earlier versions</h2>
 
 <p>If you are migrating an existing application from earlier versions of Wicket you may find our migration guides invaluable:</p>
 
 <ul>
-<li>Migrating from <a href='https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3'>Wicket 1.2 to Wicket 1.3</a></li>
+<li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+
+<li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
 
-<li>Migrating from <a href='https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4'>Wicket 1.3 to Wicket 1.4</a></li>
+<li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Wicket 1.4 to Wicket 1.5</a></li>
 
-<li>Migrating from <a href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5'>Wicket 1.4 to Wicket 1.5</a></li>
+<li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0">Wicket 1.5 to Wicket 6.x</a></li>
 
-<li>Migrating from <a href='https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0'>Wicket 1.5 to Wicket 6</a></li>
+<li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Wicket 6.x to Wicket 7.x</a></li>
 </ul>
 
-<h2 id='maven'>Maven</h2>
+<h2 id="maven">Maven</h2>
 
 <p>Add the following snippet to your Maven project descriptor (<code>pom.xml</code>):</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;dependency&gt;</span>
@@ -248,7 +271,7 @@
     <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>
-<h2 id='snapshots_and_latest_bleedingedge_code'>SNAPSHOTs and latest bleeding-edge code</h2>
+<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 the Git repository: https://git-wip-us.apache.org/repos/asf/wicket.git</p>
 
@@ -268,7 +291,7 @@
 <li><strong>1.2.x</strong>: wicket-1.2.x</li>
 </ul>
 
-<p>There&#8217;s also a Maven 2 repository providing SNAPSHOTs available here:</p>
+<p>There’s also a Maven 2 repository providing SNAPSHOTs available here:</p>
 <div class='highlight'><pre><code class='xml'><span class='nt'>&lt;repositories&gt;</span>
     <span class='nt'>&lt;repository&gt;</span>
         <span class='nt'>&lt;releases&gt;</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=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/index.html (original)
+++ wicket/common/site/trunk/_site/start/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>
@@ -175,11 +184,11 @@
 		<div id="contentbody">
 			<h1>Get Started</h1>
 			<ul>
-<li>Start with Apache Wicket using the <a href='quickstart.html'>quickstart</a></li>
+<li>Start with Apache Wicket using the <a href="quickstart.html">quickstart</a></li>
 
-<li><a href='download.html'>Download</a> the latest and greatest Wicket release</li>
+<li><a href="download.html">Download</a> the latest and greatest Wicket release</li>
 
-<li>Or use one of the available third party <a rel='nofollow' href='http://www.jweekend.com/dev/LegUp'>Maven archetypes</a></li>
+<li>Or use one of the available third party <a href='http://www.jweekend.com/dev/LegUp' rel='nofollow'>Maven archetypes</a></li>
 </ul>
 		</div>
         <div id="clearer"></div>

Modified: wicket/common/site/trunk/_site/start/installing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/installing.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/installing.html (original)
+++ wicket/common/site/trunk/_site/start/installing.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>
@@ -182,11 +191,11 @@
 <li>logging</li>
 </ul>
 
-<h2 id='required_dependencies_to_use_wicket'>Required dependencies to use Wicket</h2>
+<h2 id="required_dependencies_to_use_wicket">Required dependencies to use Wicket</h2>
 
-<p>While we are adamant users of Apache Maven and its build infrastructure, this may not be to everyone&#8217;s liking. However, if you wish to learn all about which dependencies you need for your Wicket project, we ask you to learn to read the POM file format and retrieve the required versions stated there. We take great care to keep the POM files up to date with the latest and greatest of each dependency.</p>
+<p>While we are adamant users of Apache Maven and its build infrastructure, this may not be to everyone’s liking. However, if you wish to learn all about which dependencies you need for your Wicket project, we ask you to learn to read the POM file format and retrieve the required versions stated there. We take great care to keep the POM files up to date with the latest and greatest of each dependency.</p>
 
-<h3 id='compilation__testing'>Compilation &amp; Testing</h3>
+<h3 id="compilation__testing">Compilation &amp; Testing</h3>
 
 <p>At a minimum a vanilla Wicket application requires for compilation:</p>
 
@@ -202,7 +211,7 @@
 <li>junit if you build Wicket from source or want to use <code>WicketTester</code> to test your pages and components</li>
 </ul>
 
-<h3 id='runtime_dependencies'>Runtime dependencies</h3>
+<h3 id="runtime_dependencies">Runtime dependencies</h3>
 
 <p>At a minimum a barebones Wicket application requires the following at runtime:</p>
 
@@ -214,11 +223,11 @@
 <li>slf4j-api and your slf4j implementation and required logging provider dependencies.</li>
 </ul>
 
-<h2 id='logging'>Logging</h2>
+<h2 id="logging">Logging</h2>
 
-<p>As of Wicket 1.3.0, Wicket uses the <a href='http://www.slf4j.org/'>SLF4J</a> project for logging. SLF4J is similar to <a href='http://jakarta.apache.org/commons/logging/'>commons-logging</a>, in that it allows libraries/frameworks like Wicket to avoid forcing a choice of logging framework on their users.</p>
+<p>As of Wicket 1.3.0, Wicket uses the <a href="http://www.slf4j.org/">SLF4J</a> project for logging. SLF4J is similar to <a href="http://jakarta.apache.org/commons/logging/">commons-logging</a>, in that it allows libraries/frameworks like Wicket to avoid forcing a choice of logging framework on their users.</p>
 
-<p><strong>You cannot use Wicket without adding an SLF4J logging implementation to your classpath</strong>. Most people use <a href='http://logging.apache.org/log4j'>log4j</a>. If you do, just include <code>slf4j-log4j12.jar</code> on your classpath to get Wicket to use log4j too. If you want to use commons-logging or JDK14 logging or something else, please see the <a href='http://www.slf4j.org/faq.html'>SLF4J site</a> for more information.</p>
+<p><strong>You cannot use Wicket without adding an SLF4J logging implementation to your classpath</strong>. Most people use <a href="http://logging.apache.org/log4j">log4j</a>. If you do, just include <code>slf4j-log4j12.jar</code> on your classpath to get Wicket to use log4j too. If you want to use commons-logging or JDK14 logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a> for more information.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/start/quickstart.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/quickstart.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/quickstart.html (original)
+++ wicket/common/site/trunk/_site/start/quickstart.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,16 +183,16 @@
 
 		<div id="contentbody">
 			<h1>Create a Wicket Quickstart</h1>
-			<p>There are two really good reasons to create a Wicket quickstart. The first is if you just want to get started using Wicket quickly. The quickstart will set up a ready-to-use project in under a minute (depending on your bandwidth). Another great reason to create a quickstart is to accompany a bug report. If you report a bug in JIRA or on the mailing list, the core developers may not be able to recreate it easily. In most cases, you&#8217;ll be told &#8220;please create a quickstart and attach it to a JIRA issue&#8221;. If you don&#8217;t know how to do that, don&#8217;t worry - just follow the instructions below. (If you are submitting a quickstart for an issue report, please be sure to read the subheading below - &#8220;Submitting a quickstart for an issue report&#8221;</p>
+			<p>There are two really good reasons to create a Wicket quickstart. The first is if you just want to get started using Wicket quickly. The quickstart will set up a ready-to-use project in under a minute (depending on your bandwidth). Another great reason to create a quickstart is to accompany a bug report. If you report a bug in JIRA or on the mailing list, the core developers may not be able to recreate it easily. In most cases, you’ll be told “please create a quickstart and attach it to a JIRA issue”. If you don’t know how to do that, don’t worry - just follow the instructions below. (If you are submitting a quickstart for an issue report, please be sure to read the subheading below - “Submitting a quickstart for an issue report”</p>
 
-<p>Quickstarts are made from a Maven archetype. So, you will need to have <a href='http://maven.apache.org'>Maven 2</a> installed and working (from the command line) before following this.</p>
+<p>Quickstarts are made from a Maven archetype. So, you will need to have <a href="http://maven.apache.org">Maven 2</a> installed and working (from the command line) before following this.</p>
 
 <p>Creating a quickstart provides only a very basic starting point for your Wicket project. If you are looking for examples of how to use Wicket and its various features, please refer to the <em>wicket-example</em> projects instead!</p>
 
-<h2 id='creating_the_project__with_maven'>Creating the project - with Maven</h2>
+<h2 id="creating_the_project__with_maven">Creating the project - with Maven</h2>
 
 <p>To create your project, copy and paste the command line generated after typing in the groupId, artifactId and version.</p>
-<style>	
+<style><![CDATA[	
 	#mvncmd {
 		padding-left: 25px;
 	}
@@ -196,7 +205,7 @@
 	#mvncmd textarea { width: 400px; height: 100px; }
 	#mvncmd br { clear: left; }	
 	#mvncmd div { clear:both; padding-left: 25px; vertical-align:top;}
-</style><script type='text/javascript'>
+]]></style><script type='text/javascript'><![CDATA[
 	function changeIt()
 	{
 		var groupId = document.getElementById("groupId").value;
@@ -215,14 +224,14 @@
 		cmd += ' -DinteractiveMode=false'; 
 		document.getElementById("cmdLine").value = cmd;
 	}
-</script><div id='mvncmd'>
+]]></script><div id='mvncmd'>
 	<div>
 		<label for='groupId' title='Base Package'>GroupId:</label>
-		<input id='groupId' value='com.mycompany' onkeyup='changeIt();' type='text' /><span title='Base Package'>&nbsp;(?)</span><br />
+		<input id='groupId' onkeyup='changeIt();' type='text' value='com.mycompany' /><span title='Base Package'>&nbsp;(?)</span><br />
 	</div>
 	<div>
 		<label for='artifactId' title='Project Name'>ArtifactId:</label> 
-		<input id='artifactId' value='myproject' onkeyup='changeIt();' type='text' /><span title='Project Name'>&nbsp;(?)</span><br />
+		<input id='artifactId' onkeyup='changeIt();' type='text' value='myproject' /><span title='Project Name'>&nbsp;(?)</span><br />
 	</div>
 	<div>
 		<label for='version' title='Wicket Version'>Version:</label>
@@ -241,6 +250,10 @@
 		
 
 		
+			<option value='7.0.0-M1'>7.0.0-M1</option>
+		
+
+		
 			<option value='1.4.23'>1.4.23</option>
 		
 
@@ -249,20 +262,20 @@
 		
 
 		
-			<option value='6.15.0' selected='selected'>6.15.0</option>
+			<option selected='selected' value='6.15.0'>6.15.0</option>
 		
 
 		</select><span title='Wicket Version'>&nbsp;(?)</span>
 	</div>
 	<div>
 		<label for='cmdLine' id='cmdLabel'>Command Line:</label>
-		<textarea onfocus='this.select();' id='cmdLine'>
+		<textarea id='cmdLine' onfocus='this.select();'>
 		</textarea>
-		<script>changeIt();</script>
+		<script><![CDATA[changeIt();]]></script>
 	</div>
 	<br />
 </div>
-<h3 id='results'>Results</h3>
+<h3 id="results">Results</h3>
 
 <p>This will produce the following project structure/files:</p>
 <div style='margin-left: 3em; border: 1px solid black'>
@@ -293,53 +306,53 @@
                                 Start.java
 </pre>
 </div>
-<h3 id='using_maven_quickstart_with_a_specific_ide'>Using Maven quickstart with a specific IDE</h3>
+<h3 id="using_maven_quickstart_with_a_specific_ide">Using Maven quickstart with a specific IDE</h3>
 
 <p>Maven has an integration with many IDEs. If you want to use your new Maven-based Wicket quickstart with your favorite IDE, see one of these instructions:</p>
 
-<h4 id='eclipse'>Eclipse</h4>
+<h4 id="eclipse">Eclipse</h4>
 
 <p>Change directory into the project that you just created. Now, run <code>mvn eclipse:eclipse</code>. This will set up the .project, .settings, and .classpath files that Eclipse requires.</p>
 
-<p>Note that your workspace will have to have the classpath variable M2_REPO set to point to the directory where your local Maven repository exists. You can see this page for how to do that with Eclipse: <a href='http://maven.apache.org/plugins/maven-eclipse-plugin/usage.html'>http://maven.apache.org/plugins/maven-eclipse-plugin/usage.html</a></p>
+<p>Note that your workspace will have to have the classpath variable M2_REPO set to point to the directory where your local Maven repository exists. You can see this page for how to do that with Eclipse: <a href="http://maven.apache.org/plugins/maven-eclipse-plugin/usage.html">http://maven.apache.org/plugins/maven-eclipse-plugin/usage.html</a></p>
 
-<p>Now, in Eclipse, you can choose &#8220;File&#8221; (menu), then &#8220;Import&#8221;, then &#8220;Existing project&#8221;. Navigate to the folder where your project exists and let Eclipse import it. The classpath should be fully configured.</p>
+<p>Now, in Eclipse, you can choose “File” (menu), then “Import”, then “Existing project”. Navigate to the folder where your project exists and let Eclipse import it. The classpath should be fully configured.</p>
 
-<p>Alternatively install the <a href='http://m2eclipse.codehaus.org/'>m2eclipse</a> or <a href='http://www.eclipse.org/iam/'>Eclipse IAM</a> plugin and add the project directly.</p>
+<p>Alternatively install the <a href="http://m2eclipse.codehaus.org/">m2eclipse</a> or <a href="http://www.eclipse.org/iam/">Eclipse IAM</a> plugin and add the project directly.</p>
 
-<h4 id='idea'>IDEA</h4>
+<h4 id="idea">IDEA</h4>
 
-<p>From within IDEA, just use &#8220;File/Import Project&#8221;, choose the project directory and specify that this is a Maven project.</p>
+<p>From within IDEA, just use “File/Import Project”, choose the project directory and specify that this is a Maven project.</p>
 
-<h4 id='netbeans'>NetBeans</h4>
+<h4 id="netbeans">NetBeans</h4>
 
 <p>To create a NetBeans project, just open the pom.xml directly.</p>
 
-<h3 id='more_examples'>More examples</h3>
+<h3 id="more_examples">More examples</h3>
 
-<p>Many more information and examples can be found on our Wiki or <a href='http://www.ralfebert.de/blog/wicket/wicket_eclipse_setup/'>here</a></p>
+<p>Many more information and examples can be found on our Wiki or <a href="http://www.ralfebert.de/blog/wicket/wicket_eclipse_setup/">here</a></p>
 
-<h2 id='using_your_new_project'>Using your new project</h2>
+<h2 id="using_your_new_project">Using your new project</h2>
 
-<p>Wicket quickstart projects include a file named Start.java. If you open this file in your IDE (after configuring the project in your IDE), you can run it as a Java application. It will run an embedded Jetty instance that will run your app on <a href='http://localhost:8080'>http://localhost:8080</a> Navigate your browser to that address to see your app running.</p>
+<p>Wicket quickstart projects include a file named Start.java. If you open this file in your IDE (after configuring the project in your IDE), you can run it as a Java application. It will run an embedded Jetty instance that will run your app on <a href="http://localhost:8080">http://localhost:8080</a> Navigate your browser to that address to see your app running.</p>
 
-<h3 id='using_the_jetty_plugin'>Using the Jetty Plugin</h3>
+<h3 id="using_the_jetty_plugin">Using the Jetty Plugin</h3>
 
-<p>The Jetty plugin is also enabled by default in the quickstart. If you are using Maven, you can change directory into the project and run the &#8220;mvn jetty:run&#8221; command. This will compile the project and deploy it to an embeded instance of the Jetty servlet engine, which will run on port 8080, by default. As a result, once running, your application will be available at <a href='http://localhost:8080'>http://localhost:8080</a>.</p>
+<p>The Jetty plugin is also enabled by default in the quickstart. If you are using Maven, you can change directory into the project and run the “mvn jetty:run” command. This will compile the project and deploy it to an embeded instance of the Jetty servlet engine, which will run on port 8080, by default. As a result, once running, your application will be available at <a href="http://localhost:8080">http://localhost:8080</a>.</p>
 
-<p>See the <a href='http://www.mortbay.org/maven-plugin/index.html'>Jetty plugin</a> documentation for configuration options, etc.</p>
+<p>See the <a href="http://www.mortbay.org/maven-plugin/index.html">Jetty plugin</a> documentation for configuration options, etc.</p>
 
-<h2 id='submitting_a_quickstart_for_an_issue_report'>Submitting a quickstart for an issue report</h2>
+<h2 id="submitting_a_quickstart_for_an_issue_report">Submitting a quickstart for an issue report</h2>
 
-<h3 id='reproduce_the_problem'>Reproduce the problem</h3>
+<h3 id="reproduce_the_problem">Reproduce the problem</h3>
 
-<p>Assuming you have followed the instructions above, the quickstart is now created and ready for you to develop. Now comes the &#8220;duplicate the problem&#8221; part. Try to create pages or components that reproduce the problem you were trying to report. You can run the Start.java class from your IDE and go to <a href='http://localhost:8080'>http://localhost:8080</a> to see your test application. If you run the Start.java class in your IDE&#8217;s debug mode, you should be able to attach breakpoints and have automatic class and markup reloading.</p>
+<p>Assuming you have followed the instructions above, the quickstart is now created and ready for you to develop. Now comes the “duplicate the problem” part. Try to create pages or components that reproduce the problem you were trying to report. You can run the Start.java class from your IDE and go to <a href="http://localhost:8080">http://localhost:8080</a> to see your test application. If you run the Start.java class in your IDE’s debug mode, you should be able to attach breakpoints and have automatic class and markup reloading.</p>
 
-<p>If you can&#8217;t reproduce the problem - start looking at your own code. Keep adding pieces from your code until either you reproduce the problem, or else you&#8217;ve found the bug in your own code. A lot of times, you will find the bug in your code just by trying to create a quickstart that demonstrates the bug in ours.</p>
+<p>If you can’t reproduce the problem - start looking at your own code. Keep adding pieces from your code until either you reproduce the problem, or else you’ve found the bug in your own code. A lot of times, you will find the bug in your code just by trying to create a quickstart that demonstrates the bug in ours.</p>
 
-<h3 id='clean_up_the_quickstart_and_submit_it'>Clean up the quickstart and submit it</h3>
+<h3 id="clean_up_the_quickstart_and_submit_it">Clean up the quickstart and submit it</h3>
 
-<p>Once you have reproduced the desired behavior in your quickstart, it would be best to make it as small as possible before submitting. The best way to do this is to run the &#8220;mvn clean&#8221; command from the project directory. Then zip (or tar and gzip) the whole directory up and submit the zip (or tgz) file. (The mvn clean command removes all of the compiled classes and generated artifacts, generally in your &#8220;target&#8221; directory, leaving only the actual source.)</p>
+<p>Once you have reproduced the desired behavior in your quickstart, it would be best to make it as small as possible before submitting. The best way to do this is to run the “mvn clean” command from the project directory. Then zip (or tar and gzip) the whole directory up and submit the zip (or tgz) file. (The mvn clean command removes all of the compiled classes and generated artifacts, generally in your “target” directory, leaving only the actual source.)</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/_site/start/userguide.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/userguide.html?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/userguide.html (original)
+++ wicket/common/site/trunk/_site/start/userguide.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,14 +186,14 @@
 			<p>The user guide has been written using the doc engine from Grails project and is available in the following formats:</p>
 
 <ul>
-<li><a href='/guide/guide/index.html'>HTML</a></li>
+<li><a href="/guide/guide/index.html">HTML</a></li>
 
-<li><a href='/guide/guide/single.html'>HTML (single page)</a></li>
+<li><a href="/guide/guide/single.html">HTML (single page)</a></li>
 
-<li><a href='/guide/guide/single.pdf'>PDF</a></li>
+<li><a href="/guide/guide/single.pdf">PDF</a></li>
 </ul>
 
-<p>For more details about the format used to write the guide and to know how to contrinute, see <a href='/guide/guide/contributing.html'>the relative chapter</a>.</p>
+<p>For more details about the format used to write the guide and to know how to contrinute, see <a href="/guide/guide/contributing.html">the relative chapter</a>.</p>
 		</div>
         <div id="clearer"></div>
 		<div id="footer"><span>

Modified: wicket/common/site/trunk/start/download.md
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/start/download.md?rev=1591848&r1=1591847&r2=1591848&view=diff
==============================================================================
--- wicket/common/site/trunk/start/download.md (original)
+++ wicket/common/site/trunk/start/download.md Fri May  2 09:51:20 2014
@@ -3,7 +3,10 @@ layout: default
 title: Download Wicket releases
 ---
 
-Apache Wicket {{site.wicket.version}} is the current stable release. Most users get Apache Wicket using [Apache Maven's dependency management](#maven), which incidentally is the most convenient way of obtaining the latest and greatest Wicket.
+Apache Wicket {{site.wicket.version}} is the current stable release.
+Most users get Apache Wicket using [Apache Maven's dependency
+management](#maven), which incidentally is the most convenient way of
+obtaining the latest and greatest Wicket.
 
 ## Download
 
@@ -17,38 +20,58 @@ New projects should use [Wicket {{site.w
 
 We recommend you [start](quickstart.html) with our latest stable release. 
 
+### Developer releases
+
+If you like to live on the cutting edge and help development of Wicket
+further along, you can try out the development milestone releases:
+
+ * Latest **development milestone** release for 7.x: 
+   [{{site.wicket.version_70}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}})
+
+This release is not fit for production use yet: it is only intended for
+developers of Wicket, or for people trying out our development
+versions. API changes will occur between releases.
+
 ### Requirements
 
 #### Java version
 
+ * Apache Wicket 7.x requires JDK 7.0 or newer
  * Apache Wicket 6.x requires JDK 6.0 or newer
  * Apache Wicket 1.5.x requires JDK 1.5 or newer
  * Apache Wicket 1.4.x requires JDK 1.5 or newer
 
 #### Mixing Wicket versions
 
-You cannot mix different Wicket versions in your project. You should always use the artifacts from a particular release train.
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release train.
 
-For example it is **NOT** possible to use Wicket Extensions 1.5 in a Wicket 6 project. The same goes for 3rd party libraries: make sure you always use a compatible version of your 3rd party library.
+For example it is **NOT** possible to use Wicket Extensions 1.5 in a
+Wicket 6 project. The same goes for 3rd party libraries: make sure you
+always use a compatible version of your 3rd party library.
 
 #### Logging
 
 You cannot use Wicket without adding an SLF4J logging implementation to
-your classpath. Most people use [log4j](http://logging.apache.org/log4j).
+your classpath. Most people use
+[log4j](http://logging.apache.org/log4j).
 
-If you do, just include **slf4j-log4j12.jar** on your classpath to get Wicket
-to use log4j too. If you want to use commons-logging or JDK14 logging or
-something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
-for more information.
+If you do, just include **slf4j-log4j12.jar** on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the [SLF4J
+site](http://www.slf4j.org/faq.html) for more information.
 
 
 ## Migrating from earlier versions
-If you are migrating an existing application from earlier versions of Wicket you may find our migration guides invaluable:
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
 
  * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
  * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
  * Migrating from [Wicket 1.4 to Wicket 1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
- * Migrating from [Wicket 1.5 to Wicket 6](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
+ * Migrating from [Wicket 1.5 to Wicket 6.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
+ * Migrating from [Wicket 6.x to Wicket 7.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0)
 
 ## Maven
 
@@ -78,6 +101,7 @@ If you wish to build the latest code fro
 live in the Git repository: https://git-wip-us.apache.org/repos/asf/wicket.git
 
 Branches:
+
 * **7.x**: master
 * **6.x**: wicket-6.x
 * **1.5.x**: wicket-1.5.x