You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/07/09 17:17:50 UTC

[38/52] [partial] wicket-site git commit: porting of the new site from https://github.com/dashorst/wicket-site/tree/asf-site

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/2015/06/21/wicket-7.0.0-M6-released.html
----------------------------------------------------------------------
diff --git a/content/2015/06/21/wicket-7.0.0-M6-released.html b/content/2015/06/21/wicket-7.0.0-M6-released.html
deleted file mode 100644
index 1143ca3..0000000
--- a/content/2015/06/21/wicket-7.0.0-M6-released.html
+++ /dev/null
@@ -1,415 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Apache Wicket - Apache Wicket 7.0.0-M6 released</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<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>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<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-M6">Download M6</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>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
-</div>
-
-		<div id="contentbody">
-			<h1>Apache Wicket 7.0.0-M6 released</h1>
-			<p>The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M6!</p>
-
-<p>We have released another milestone release for Apache Wicket 7. We aim
-to finalise Wicket 7 over the coming months and request your help in
-testing the new major version.</p>
-
-<h3 id="caveats">Caveats</h3>
-
-<p>It is still a development version so expect API breaks to happen over
-the course of the coming milestone releases.</p>
-
-<h3 id="semantic-versioning">Semantic versioning</h3>
-
-<p>As we adopted semver Wicket 7 will be the first release since 6.0 where
-we are able to refactor the API. We will continue to use semver when we
-have made Wicket 7 final and maintain api compatibility between minor
-versions of Wicket 7.</p>
-
-<h3 id="requirements">Requirements</h3>
-
-<p>Wicket 7 requires the following:</p>
-
-<ul>
-  <li>Java 7</li>
-  <li>Servlet 3 compatible container</li>
-</ul>
-
-<p>You can’t mix wicket libraries from prior Wicket versions with Wicket 7.</p>
-
-<h3 id="migration-guide">Migration guide</h3>
-
-<p>As usual we have a migration guide available online for people
-migrating their applications to Wicket 7. We will continue to update
-the guide as development progresses. If you find something that is not
-in the guide, please update the guide, or let us know so we can update
-the guide.</p>
-
-<p>You can find the guide here: <a href="http://s.apache.org/wicket7migrate">http://s.apache.org/wicket7migrate</a></p>
-
-<h3 id="new-and-noteworthy">New and noteworthy</h3>
-
-<ul>
-  <li>
-    <p>New inline image support for the new data: protocol. See
-http://ci.apache.org/projects/wicket/apidocs/6.x/org/apache/wicket/markup/html/image/InlineImage.html
-for more information.</p>
-  </li>
-  <li>
-    <p>Added CSRF prevention measure to Wicket. The
-CsrfPreventionRequestCycleListener
-(http://ci.apache.org/projects/wicket/apidocs/6.x/org/apache/wicket/protocol/http/CsrfPreventionRequestCycleListener.html)
-will prevent requests coming from other origins than allowed from
-performing actions. See the JavaDoc for more information on this
-listener.</p>
-  </li>
-  <li>
-    <p>JQuery was upgraded to most recent version.</p>
-  </li>
-</ul>
-
-<h3 id="using-this-release">Using this release</h3>
-
-<p>With Apache Maven update your dependency to (and don’t forget to
-update any other dependencies on Wicket projects to the same version):</p>
-
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>7.0.0-M6<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-
-<p>Or download and build the distribution yourself, or use our
-convenience binary package</p>
-
-<ul>
-  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6</a></li>
-  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6/binaries">http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6/binaries</a></li>
-</ul>
-
-<h3 id="about-this-release">About this release</h3>
-
-<p>Below you can find the cryptographic signatures for the distributions
-and the release notes.</p>
-
-<h4 id="the-signatures-for-the-source-release-artefacts">The signatures for the source release artefacts:</h4>
-
-<p>The signatures for the source release artefacts:</p>
-
-<p>Signature for apache-wicket-7.0.0-M6.zip:</p>
-
-<div class="highlight"><pre>
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-
-iEYEABECAAYFAlWANLgACgkQJBX8W/xy/UXSmQCgtAb+JrBeiq4+OdbpbN22sy+/
-F3YAn2ZeQ4byJPdmc4m4K6LLgg41AWSU
-=xN5i
------END PGP SIGNATURE-----
-</pre></div>
-
-<p>Signature for apache-wicket-7.0.0-M6.tar.gz:</p>
-
-<div class="highlight"><pre>
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-
-iEYEABECAAYFAlWANLgACgkQJBX8W/xy/UUEsACgxiS2RQzuOi35Yw5C4c90KAFZ
-yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
-=KW/I
------END PGP SIGNATURE-----
-</pre></div>
-
-<h4 id="changelog-for-700-m6">CHANGELOG for 7.0.0-M6:</h4>
-
-<p>Release Notes - Wicket - Version 7.0.0-M6</p>
-
-<h4 id="bugs">Bugs</h4>
-
-<pre><code>* [WICKET-5790] - VariableInterpolator &amp; #getThrowExceptionOnMissingResource
-* [WICKET-5814] - CryptoMapper clears feedback messages
-* [WICKET-5816] - Apps can't use Application.setName instead of WicketFilter for e.g. JMX names
-* [WICKET-5822] - AjaxSelfUpdatingTimer stops working after ajax download
-* [WICKET-5825] - Deployment of wicket-examples.war fails in Tomcat
-* [WICKET-5828] - PageProvider not serializable
-* [WICKET-5834] - NPE in DefaultPropertyResolver
-* [WICKET-5835] - InlineEnclosure doesn't call child.configure() before updating its visilbity
-* [WICKET-5837] - JUnit tests may fail because of AbstractDefaultAjaxBehavior
-* [WICKET-5838] - Last-modified header of external markup is ignored
-* [WICKET-5841] - continueToOriginalDestination() discards new cookies
-* [WICKET-5843] - CryptoMapper doesn't work with context relative UrlResourceReferences
-* [WICKET-5845] - AuthenticatedWebSession.get() returns a new session with signedIn false
-* [WICKET-5850] - LazyInitProxyFactory causes NoClassDefFound org/apache/wicket/proxy/ILazyInitProxy in case of multimodule deployment
-* [WICKET-5851] - PackageResourceTest#packageResourceGuard test fails under Windows
-* [WICKET-5853] - LongConverter converts some values greater than Long.MAX_VALUE
-* [WICKET-5855] - RememberMe functionality seems to be broken after the change of the default crypt factory
-* [WICKET-5856] - StackOverFlowError when working with transparent containers
-* [WICKET-5857] - PagingNavigator invalid HTML (rel attribute on span tag)
-* [WICKET-5858] - AjaxRequestTarget.focusComponent does not work in modal window
-* [WICKET-5861] - BigDecimalConverter does not allow parsing of values great than Double.MAX_VALUE
-* [WICKET-5862] - Wicket Container visibility bug
-* [WICKET-5864] - Multipart Ajax form submit does not release the channel in case of connection failure
-* [WICKET-5869] - Kittencaptcha doesn't calculate click y-coordinate correctly
-* [WICKET-5870] - wicket-event-jquery.js: Wicket.Browser.isIE11() does not return boolean
-* [WICKET-5874] - WicketTester TagTester does not work as expected when using non self closing tags
-* [WICKET-5879] - Using an AjaxSubmitLink to hide its form results in an exception
-* [WICKET-5881] - NPE in FormComponent#updateCollectionModel in case of no converted input and unmodifiable collection
-* [WICKET-5883] - Feedback messages not cleared for invisible/disabled form components on submit.
-* [WICKET-5887] - wicket.xsd refers to non-existing xhtml.label:attlist
-* [WICKET-5891] - Parsing of ChinUnionPay credit card should use the first 6 characters
-* [WICKET-5893] - CookieUtils should use the original response when saving a cookie
-* [WICKET-5895] - validateHeaders fails to detect missing head/body (regression)
-* [WICKET-5898] - StackOverflowError after form submit with a validation error
-* [WICKET-5900] - Add WicketTester support for IAjaxLink
-* [WICKET-5903] - Regression in mount resolution when using optional parameters
-* [WICKET-5904] - NPE after editing a markup file in debug mode
-* [WICKET-5906] - Use default on missing resource does not work
-* [WICKET-5908] - A new HtmlHeaderContainer is added each time a page instance is rendered
-* [WICKET-5910] - CGLib proxy should not intercept protected methods
-* [WICKET-5911] - Re-rendering page after exception in render phase does not call onBeforeRender()
-* [WICKET-5912] - NPE in Page#hasInvisibleTransparentChild
-* [WICKET-5915] - The application can not find /META-INF/wicket/**.properties on Windows systems
-* [WICKET-5916] - StackOverflowError when calling getObject() from load() in LDM
-* [WICKET-5917] - Do not use jQuery's $ in String snippets in Java code
-</code></pre>
-
-<h4 id="improvement">Improvement</h4>
-
-<pre><code>* [WICKET-5314] - AbstractAutoCompleteBehavior does not support AjaxChannels
-* [WICKET-5749] - Wicket-auth-roles should deal with resource authorization
-* [WICKET-5789] - Make org.apache.wicket.protocol.ws.javax.WicketServerEndpointConfig publicly visible
-* [WICKET-5801] - Responsive Images
-* [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it's functionality
-* [WICKET-5829] - rename PageSettings#recreateMountedPagesAfterExpiry
-* [WICKET-5831] - Improve unsafe Id reporting in the AbstractRepeater
-* [WICKET-5832] - Do not fail at CDI's ConversationPropagator when running in non-http thread
-* [WICKET-5833] - Add a way to get all opened web socket connections per user session
-* [WICKET-5840] - WicketTester doesn't support #clickLink() for ExternalLink component
-* [WICKET-5859] - Add Hebrew and Arabic translations
-* [WICKET-5860] - Cross-Site Websocket Hijacking protection
-* [WICKET-5863] - Overiding disableCaching in ServletWebResponse is ignored when responce is buffered
-* [WICKET-5865] - AjaxEditableLabel should implement IGenericComponent
-* [WICKET-5872] - wicket extensions initializer.properties for greek language
-* [WICKET-5875] - ComponentRenderer.renderComponent() unexpectedly produces a WicketRuntimeException when called with a nested Component which contains a nested wicket:message
-* [WICKET-5889] - Ability to not submit a nested form
-* [WICKET-5892] - add ClientProperties#isJavaScriptEnabled()
-* [WICKET-5894] - Support *.woff2 webfonts in SecurePackageResourceGuard as well
-* [WICKET-5901] - Leaving veil when ajax processing ends with redirect
-* [WICKET-5905] - allow listening to Ajax calls before scheduling
-* [WICKET-5921] - Provide a default implementation of IModelComparator that always returns false
-</code></pre>
-
-<h4 id="new-feature">New Feature</h4>
-
-<pre><code>* [WICKET-5819] - Support for HTML 5 media tags (audio / video)
-* [WICKET-5827] - Allow to apply multiple Javascript / CSS compressors
-* [WICKET-5897] - Use the #isEnabled() method with validators
-* [WICKET-5918] - Create an Image component that uses the new data: protocol (an InlineImage)
-* [WICKET-5919] - Add support for CSRF prevention
-</code></pre>
-
-<h4 id="task">Task</h4>
-
-<pre><code>* [WICKET-5896] - Upgrade jQuery to latest stable versions (1.11.4 &amp; 2.1.3)
-</code></pre>
-
-<h4 id="wish">Wish</h4>
-
-<pre><code>* [WICKET-5848] - Remove .settings folders of projects
-</code></pre>
-
-<p>Have fun!</p>
-
-<p>— The Wicket team</p>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
-    </div>
-</div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/Gemfile
----------------------------------------------------------------------
diff --git a/content/Gemfile b/content/Gemfile
new file mode 100644
index 0000000..a6893a9
--- /dev/null
+++ b/content/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'jekyll' 
+gem 'nokogiri'
+gem 'iconv'

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/apache/friends.html
----------------------------------------------------------------------
diff --git a/content/apache/friends.html b/content/apache/friends.html
index 3838430..90dfd43 100644
--- a/content/apache/friends.html
+++ b/content/apache/friends.html
@@ -1,231 +1,97 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Apache projects using Wicket</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Friend projects | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
 
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<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>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<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-M6">Download M6</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>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
-</div>
-
-		<div id="contentbody">
-			<h1>Apache projects using Wicket</h1>
-			<div style="margin-top: 40px">
-	<h2><a href="http://isis.apache.org/index.html" target="_blank">Apache Isis</a></h2>
-	<h4>Apache Isis is a full-stack framework for rapidly developing domain driven apps and RESTful APIs in Java.  It uses <a target="_blank" href="http://isis.apache.org/documentation.html#wicket-viewer">Apache Wicket</a> 6.x as a default viewer for Isis domain model.</h4>
-</div>
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
 
-<div style="margin-top: 40px">
-	<h2><a href="http://oodt.apache.org/" target="_blank">Apache OODT</a></h2>
-	<h4>Apache OODT is a data grid framework for transparent search and discovery of disparate science resources. It uses Apache Wicket for its <a href="http://oodt.apache.org/components/maven/webapp/filemgr/" target="_blank">CAS File Manager</a> and <a href="http://oodt.apache.org/components/maven/webapp/workflow/" target="_blank">CAS Workflow monitor.</h4>
-</div>
+    </head>
 
-<div style="margin-top: 40px">
-	<h2><a href="http://openmeetings.apache.org/" target="_blank">Apache OpenMettings</a></h2>
-	<h4>Apache Openmeetings provides video conferencing, instant messaging, white board, collaborative document editing and other groupware tools using API functions of the Red5 Streaming Server for Remoting and Streaming. It uses Apache Wicket for its web interfaces.</h4>
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /apache/friends.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /apache/friends.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /apache/friends.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /apache/friends.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /apache/friends.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /apache/friends.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
 </div>
-
-<div style="margin-top: 40px">
-	<h2><a href="https://syncope.apache.org/" target="_blank">Apache Syncope</a></h2>
-	<h4>Apache Syncope is an Open Source system for managing digital identities in enterprise environments. It uses Apache Wicket for its <a target="_blank" href="https://syncope.apache.org/architecture.html#The_console">web management console</a>.</h4>
-</div>
-
-<div style="margin-top: 40px">
-	<h2><a href="https://nutch.apache.org/" target="_blank">Apache Nutch</a></h2>
-	<h4>Apache Nutch is a well matured, production ready web crawler. Since version 2.3 it uses Apache Wicket for its <a target="_blank" href="https://nutch.apache.org/#22-september-2014-wicket-webapp-now-part-of-nutch-2x-codebase">web management console</a>.</h4>
-</div>
-
-<div style="margin-top: 40px">
-	<h2><a href="https://directory.apache.org/fortress/" target="_blank">Apache Fortress</a></h2>
-	<h4>Apache Fortress is a standards based and Open Source Identity Access Management Java SDK for LDAP v3 compliant systems. Fortress is 100% compliant with RBAC, ARBAC02 and IETF's password policy draft. It uses Apache Wicket for its <a target="_blank" href="https://directory.apache.org/fortress/overview.html">RBAC Web Management UI</a>.</h4>
+    </div>
 </div>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Friend projects</h1>
+            <h2>Apache projects using Wicket</h2>
+        </header>
+        <section class="l-one-third right">
+        </section>
+        <section class="l-two-third left">
+            <p>Being a member of the Apache Software Foundation creates opportunities
+for communities to collaborate and stand on one’s shoulders. The
+following friends within the Apache community are proud members using
+Wicket.</p>
+<h3 id="apache-isis">Apache Isis</h3>
+<p><a href="http://isis.apache.org">Apache Isis</a> is a full-stack framework for rapidly developing domain
+driven apps and RESTful APIs in Java. It uses Wicket
+6.x as a <a href="http://isis.apache.org/documentation.html#wicket-viewer">default viewer for Isis domain model</a>.</p>
+<h3 id="apache-oodt">Apache OODT</h3>
+<p><a href="http://oodt.apache.org">Apache OODT</a> is a data grid framework for transparent search
+and discovery of disparate science resources. It uses Apache Wicket for
+its <a href="http://oodt.apache.org/components/maven/webapp/filemgr/">CAS File Manager</a> and <a href="http://oodt.apache.org/components/maven/webapp/workflow/">CAS Workflow monitor</a>.</p>
+<h3 id="apache-openmeetings">Apache Openmeetings</h3>
+<p><a href="http://openmeetings.apache.org">Apache Openmeetings</a> provides video conferencing, instant messaging,
+white board, collaborative document editing and other groupware tools
+using API functions of the Red5 Streaming Server for Remoting and
+Streaming. It uses Apache Wicket for its web interfaces.</p>
+<h3 id="apache-syncope">Apache Syncope</h3>
+<p><a href="https://syncope.apache.org">Apache Syncope</a> is an Open Source system for managing
+digital identities in enterprise environments. It uses Apache Wicket
+for its <a href="https://syncope.apache.org/architecture.html#The_console">web management console</a>.</p>
+<h3 id="apache-nutch">Apache Nutch</h3>
+<p><a href="https://nutch.apache.org">Apache Nutch</a> is a well matured, production ready web
+crawler. Since version 2.3 it uses Apache Wicket for its <a href="https://nutch.apache.org/#22-september-2014-wicket-webapp-now-part-of-nutch-2x-codebase">web
+management console</a>.</p>
+<h3 id="apache-fortress">Apache Fortress</h3>
+<p><a href="https://directory.apache.org/fortress/">Apache Fortress</a> is a standards based and Open Source
+Identity Access Management Java SDK for LDAP v3 compliant systems.
+Fortress is 100% compliant with RBAC, ARBAC02 and IETF’s password
+policy draft. It uses Apache Wicket for its <a href="https://directory.apache.org/fortress/overview.html">RBAC Web Management UI</a>.</p>
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/apache/index.html
----------------------------------------------------------------------
diff --git a/content/apache/index.html b/content/apache/index.html
new file mode 100644
index 0000000..d33aed2
--- /dev/null
+++ b/content/apache/index.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>The Apache Software Foundation | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /apache -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /apache -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /apache -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /apache -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /apache -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /apache -->
+    	<li class="active"><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>The Apache Software Foundation</h1>
+            <h2>Proudly Powered by the ASF</h2>
+            <p>It is nice to have a welcoming home, and when you find that home, friends are not far away. Home to over a hundred projects, the Apache Software Foundation is a power house for open source community driven development. Wicket is proud to be part of the Apache Software Foundation since 2007. 
+</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#friends"><span class="toc-number">1</span> <span class="toc-text">Friends</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#apache-isis"><span class="toc-number">1.1</span> <span class="toc-text">Apache Isis</span></a></li><li class="toc--level-2 toc--section-3"><a href="#apache-oodt"><span class="toc-number">1.2</span> <span class="toc-text">Apache OODT</span></a></li><li class="toc--level-2 toc--section-4"><a href="#apache-openmeetings"><span class="toc-number">1.3</span> <span class="toc-text">Apache Openmeetings</span></a></li><li class="toc--level-2 toc--section-5"><a href="#apache-syncope"><span class="toc-number">1.4</span> <span class="toc-text">Apache Syncope</span></a></li><li class="toc--level-2 toc--section-6"><a href="#apache-nutch"><span class="toc-number">1.5</span> <span class="toc-text">Apache Nutch</span></a><
 /li><li class="toc--level-2 toc--section-7"><a href="#apache-fortress"><span class="toc-number">1.6</span> <span class="toc-text">Apache Fortress</span></a></li></ul></li><li class="toc--level-1 toc--section-8"><a href="#license"><span class="toc-number">2</span> <span class="toc-text">License</span></a></li><li class="toc--level-1 toc--section-9"><a href="#thanks"><span class="toc-number">3</span> <span class="toc-text">Thanks</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="friends">Friends</h2>
+<p>Being a member of the Apache Software Foundation creates opportunities
+for communities to collaborate and stand on one’s shoulders. The
+following friends within the Apache community are proud members using
+Wicket.</p>
+<h3 id="apache-isis">Apache Isis</h3>
+<p><a href="http://isis.apache.org">Apache Isis</a> is a full-stack framework for rapidly developing domain
+driven apps and RESTful APIs in Java. It uses Wicket
+6.x as a <a href="http://isis.apache.org/documentation.html#wicket-viewer">default viewer for Isis domain model</a>.</p>
+<h3 id="apache-oodt">Apache OODT</h3>
+<p><a href="http://oodt.apache.org">Apache OODT</a> is a data grid framework for transparent search
+and discovery of disparate science resources. It uses Apache Wicket for
+its <a href="http://oodt.apache.org/components/maven/webapp/filemgr/">CAS File Manager</a> and <a href="http://oodt.apache.org/components/maven/webapp/workflow/">CAS Workflow monitor</a>.</p>
+<h3 id="apache-openmeetings">Apache Openmeetings</h3>
+<p><a href="http://openmeetings.apache.org">Apache Openmeetings</a> provides video conferencing, instant messaging,
+white board, collaborative document editing and other groupware tools
+using API functions of the Red5 Streaming Server for Remoting and
+Streaming. It uses Apache Wicket for its web interfaces.</p>
+<h3 id="apache-syncope">Apache Syncope</h3>
+<p><a href="https://syncope.apache.org">Apache Syncope</a> is an Open Source system for managing
+digital identities in enterprise environments. It uses Apache Wicket
+for its <a href="https://syncope.apache.org/architecture.html#The_console">web management console</a>.</p>
+<h3 id="apache-nutch">Apache Nutch</h3>
+<p><a href="https://nutch.apache.org">Apache Nutch</a> is a well matured, production ready web
+crawler. Since version 2.3 it uses Apache Wicket for its <a href="https://nutch.apache.org/#22-september-2014-wicket-webapp-now-part-of-nutch-2x-codebase">web
+management console</a>.</p>
+<h3 id="apache-fortress">Apache Fortress</h3>
+<p><a href="https://directory.apache.org/fortress/">Apache Fortress</a> is a standards based and Open Source
+Identity Access Management Java SDK for LDAP v3 compliant systems.
+Fortress is 100% compliant with RBAC, ARBAC02 and IETF’s password
+policy draft. It uses Apache Wicket for its <a href="https://directory.apache.org/fortress/overview.html">RBAC Web Management UI</a>.</p>
+<h2 id="license">License</h2>
+<p>All projects of the Apache Wicket project are licensed using the
+<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0.txt">TXT</a> or
+<a href="http://www.apache.org/licenses/LICENSE-2.0.html">HTML</a>).</p>
+<p>You can read more about the current status of the license at the
+<a href="http://www.apache.org/licenses/">foundation license page</a>.</p>
+<h2 id="thanks">Thanks</h2>
+<p>The Apache Software Foundation could not exist without the continued
+generous support from the community. We would like to take this
+opportunity to thank our <a href="http://apache.org/foundation/thanks.html">Sponsors</a>. If you are
+interested in sponsoring the ASF, please read our <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship page</a>.</p>
+<p>The Wicket project would like to thank the following companies for
+their support of the project.</p>
+<ul>
+  <li><a href="http://jetbrains.com">JetBrains</a> for their IntelliJ open source license for our developers</li>
+  <li><a href="http://comsysto.com">ComSysto</a> for contributing the User Guide</li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/atom.xml
----------------------------------------------------------------------
diff --git a/content/atom.xml b/content/atom.xml
index f0d58db..0514da2 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
+<feed xmlns="http://www.w3.org/2005/Atom"> 
+    <title>Apache Wicket</title>
+    <link href="http://wicket.apache.org/atom.xml" rel="self"/>
+    <link href="http://wicket.apache.org/"/>
+    <updated>2015-07-09T16:58:02+02:00</updated>
+    <id>http://wicket.apache.org/</id>
+    <author>
+        <name>Apache Wicket</name>
+        <email>dev@wicket.apache.org</email>
+    </author>
  
- <title>Apache Wicket</title>
- <link href="http://wicket.apache.org/atom.xml" rel="self"/>
- <link href="http://wicket.apache.org/"/>
- <updated>2015-06-28T17:57:00+03:00</updated>
- <id>http://wicket.apache.org/</id>
- <author>
-   <name>Apache Wicket</name>
-   <email>dev@wicket.apache.org</email>
- </author>
- 
- 
- <entry>
-   <title>Apache Wicket 7.0.0-M6 released</title>
-   <link href="http://wicket.apache.org/2015/06/21/wicket-7.0.0-M6-released.html"/>
-   <updated>2015-06-21T00:00:00+03:00</updated>
-   <id>http://wicket.apache.org/2015/06/21/wicket-7.0.0-M6-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M6!&lt;/p&gt;
+
+    <entry>
+        <title>Apache Wicket 7.0.0-M6 released</title>
+        <link href="http://wicket.apache.org/news/2015/06/21/wicket-7.0.0-M6-released.html"/>
+        <updated>2015-06-21T00:00:00+02:00</updated>
+        <id>http://wicket.apache.org/news/2015/06/21/wicket-7.0.0-M6-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M6!&lt;/p&gt;
 
 &lt;p&gt;We have released another milestone release for Apache Wicket 7. We aim
 to finalise Wicket 7 over the coming months and request your help in
@@ -231,14 +230,14 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 
 &lt;p&gt;— The Wicket team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Apache Wicket 6.20.0 released</title>
-   <link href="http://wicket.apache.org/2015/06/14/wicket-6.20.0-released.html"/>
-   <updated>2015-06-14T00:00:00+03:00</updated>
-   <id>http://wicket.apache.org/2015/06/14/wicket-6.20.0-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.20.0!&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Apache Wicket 6.20.0 released</title>
+        <link href="http://wicket.apache.org/news/2015/06/14/wicket-6.20.0-released.html"/>
+        <updated>2015-06-14T00:00:00+02:00</updated>
+        <id>http://wicket.apache.org/news/2015/06/14/wicket-6.20.0-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.20.0!&lt;/p&gt;
 
 &lt;p&gt;This release marks another minor release of Wicket 6. Starting
 with Wicket 6 we use semantic versioning for the future development
@@ -358,14 +357,14 @@ migration guide found at&lt;/p&gt;
 
 &lt;p&gt;— The Wicket team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Wicket 1.5.13 released</title>
-   <link href="http://wicket.apache.org/2015/02/13/wicket-1.5.13-released.html"/>
-   <updated>2015-02-13T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2015/02/13/wicket-1.5.13-released</id>
-   <content type="html">&lt;p&gt;This is the thirteenth maintenance release of the Wicket 1.5.x series. This release brings over 1 bug fix and 1 improvement.&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Wicket 1.5.13 released</title>
+        <link href="http://wicket.apache.org/news/2015/02/13/wicket-1.5.13-released.html"/>
+        <updated>2015-02-13T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2015/02/13/wicket-1.5.13-released</id>
+        <content type="html">&lt;p&gt;This is the thirteenth maintenance release of the Wicket 1.5.x series. This release brings over 1 bug fix and 1 improvement.&lt;/p&gt;
 
 &lt;ul&gt;
   &lt;li&gt;&lt;a href=&quot;https://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=shortlog;h=refs/tags/wicket-1.5.13&quot;&gt;Git tag&lt;/a&gt;&lt;/li&gt;
@@ -383,14 +382,14 @@ migration guide found at&lt;/p&gt;
   &lt;li&gt;Download the &lt;a href=&quot;http://www.apache.org/dyn/closer.cgi/wicket/1.5.13&quot;&gt;full distribution&lt;/a&gt; (including sources)&lt;/li&gt;
 &lt;/ul&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>New committer - Sebastien Briquet</title>
-   <link href="http://wicket.apache.org/2015/02/13/new-committer-Sebastien-Briquet.html"/>
-   <updated>2015-02-13T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2015/02/13/new-committer-Sebastien-Briquet</id>
-   <content type="html">&lt;p&gt;The Project Management Committee (PMC) for Apache Wicket 
+    </entry>
+
+    <entry>
+        <title>New committer - Sebastien Briquet</title>
+        <link href="http://wicket.apache.org/news/2015/02/13/new-committer-Sebastien-Briquet.html"/>
+        <updated>2015-02-13T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2015/02/13/new-committer-Sebastien-Briquet</id>
+        <content type="html">&lt;p&gt;The Project Management Committee (PMC) for Apache Wicket 
 has asked Sebastien Briquet to become a committer and we are pleased 
 to announce that he has accepted. &lt;/p&gt;
 
@@ -402,14 +401,14 @@ to announce that he has accepted. &lt;/p&gt;
 
 &lt;p&gt;Bienvenue Sebastien! &lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Apache Wicket 7.0.0-M5 released</title>
-   <link href="http://wicket.apache.org/2015/02/02/wicket-7.0.0-M5-released.html"/>
-   <updated>2015-02-02T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2015/02/02/wicket-7.0.0-M5-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M5!&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Apache Wicket 7.0.0-M5 released</title>
+        <link href="http://wicket.apache.org/news/2015/02/02/wicket-7.0.0-M5-released.html"/>
+        <updated>2015-02-02T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2015/02/02/wicket-7.0.0-M5-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M5!&lt;/p&gt;
 
 &lt;p&gt;We have released another milestone release for Apache Wicket 7. We aim
 to finalise Wicket 7 over the coming months and request your help in
@@ -582,14 +581,14 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
 
 &lt;p&gt;— The Wicket team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Apache Wicket 6.19.0 released</title>
-   <link href="http://wicket.apache.org/2015/02/02/wicket-6.19.0-released.html"/>
-   <updated>2015-02-02T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2015/02/02/wicket-6.19.0-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.19.0!&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Apache Wicket 6.19.0 released</title>
+        <link href="http://wicket.apache.org/news/2015/02/02/wicket-6.19.0-released.html"/>
+        <updated>2015-02-02T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2015/02/02/wicket-6.19.0-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.19.0!&lt;/p&gt;
 
 &lt;p&gt;This release marks another minor release of Wicket 6. Starting
 with Wicket 6 we use semantic versioning for the future development
@@ -720,14 +719,14 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 
 &lt;p&gt;— The Wicket team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Apache Wicket 7.0.0-M4 released</title>
-   <link href="http://wicket.apache.org/2014/11/05/wicket-7.0.0-M4-released.html"/>
-   <updated>2014-11-05T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2014/11/05/wicket-7.0.0-M4-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M4!&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Apache Wicket 7.0.0-M4 released</title>
+        <link href="http://wicket.apache.org/news/2014/11/05/wicket-7.0.0-M4-released.html"/>
+        <updated>2014-11-05T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2014/11/05/wicket-7.0.0-M4-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M4!&lt;/p&gt;
 
 &lt;p&gt;We have released another milestone release for Apache Wicket 7. We aim
 to finalise Wicket 7 over the coming months and request your help in
@@ -896,14 +895,14 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
 
 &lt;p&gt;— The Wicket team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Apache Wicket 6.18.0 released</title>
-   <link href="http://wicket.apache.org/2014/11/05/wicket-6.18.0-released.html"/>
-   <updated>2014-11-05T00:00:00+02:00</updated>
-   <id>http://wicket.apache.org/2014/11/05/wicket-6.18.0-released</id>
-   <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.18.0!&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Apache Wicket 6.18.0 released</title>
+        <link href="http://wicket.apache.org/news/2014/11/05/wicket-6.18.0-released.html"/>
+        <updated>2014-11-05T00:00:00+01:00</updated>
+        <id>http://wicket.apache.org/news/2014/11/05/wicket-6.18.0-released</id>
+        <content type="html">&lt;p&gt;The Apache Wicket PMC is proud to announce Apache Wicket 6.18.0!&lt;/p&gt;
 
 &lt;p&gt;This release marks another minor release of Wicket 6. Starting
 with Wicket 6 we use semantic versioning for the future development
@@ -1025,14 +1024,14 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 &lt;/ul&gt;
 
 </content>
- </entry>
- 
- <entry>
-   <title>CVE-2014-3526 - Apache Wicket Information disclosure vulnerability</title>
-   <link href="http://wicket.apache.org/2014/09/22/cve-2014-3526.html"/>
-   <updated>2014-09-22T00:00:00+03:00</updated>
-   <id>http://wicket.apache.org/2014/09/22/cve-2014-3526</id>
-   <content type="html">&lt;p&gt;Severity: Important&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>CVE-2014-3526 - Apache Wicket Information disclosure vulnerability</title>
+        <link href="http://wicket.apache.org/news/2014/09/22/cve-2014-3526.html"/>
+        <updated>2014-09-22T00:00:00+02:00</updated>
+        <id>http://wicket.apache.org/news/2014/09/22/cve-2014-3526</id>
+        <content type="html">&lt;p&gt;Severity: Important&lt;/p&gt;
 
 &lt;p&gt;Vendor:
 The Apache Software Foundation&lt;/p&gt;
@@ -1056,14 +1055,14 @@ This issue was reported by Andrea Del Bene and Martin Grigorov!&lt;/p&gt;
 
 &lt;p&gt;Apache Wicket Team&lt;/p&gt;
 </content>
- </entry>
- 
- <entry>
-   <title>Wicket 1.5.12 released</title>
-   <link href="http://wicket.apache.org/2014/09/15/wicket-1.5.12-released.html"/>
-   <updated>2014-09-15T00:00:00+03:00</updated>
-   <id>http://wicket.apache.org/2014/09/15/wicket-1.5.12-released</id>
-   <content type="html">&lt;p&gt;This is the twelfth maintenance release of the Wicket 1.5.x series. This release brings over 5 bug fixes and improvements.&lt;/p&gt;
+    </entry>
+
+    <entry>
+        <title>Wicket 1.5.12 released</title>
+        <link href="http://wicket.apache.org/news/2014/09/15/wicket-1.5.12-released.html"/>
+        <updated>2014-09-15T00:00:00+02:00</updated>
+        <id>http://wicket.apache.org/news/2014/09/15/wicket-1.5.12-released</id>
+        <content type="html">&lt;p&gt;This is the twelfth maintenance release of the Wicket 1.5.x series. This release brings over 5 bug fixes and improvements.&lt;/p&gt;
 
 &lt;ul&gt;
   &lt;li&gt;&lt;a href=&quot;https://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=shortlog;h=refs/tags/wicket-1.5.12&quot;&gt;Git tag&lt;/a&gt;&lt;/li&gt;
@@ -1081,6 +1080,6 @@ This issue was reported by Andrea Del Bene and Martin Grigorov!&lt;/p&gt;
   &lt;li&gt;Download the &lt;a href=&quot;http://www.apache.org/dyn/closer.cgi/wicket/1.5.12&quot;&gt;full distribution&lt;/a&gt; (including sources)&lt;/li&gt;
 &lt;/ul&gt;
 </content>
- </entry>
- 
+    </entry>
+
 </feed>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/contribute/build.html
----------------------------------------------------------------------
diff --git a/content/contribute/build.html b/content/contribute/build.html
index 830dff7..55efcc2 100644
--- a/content/contribute/build.html
+++ b/content/contribute/build.html
@@ -1,218 +1,73 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Build from source</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<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>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<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-M6">Download M6</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>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Build from source | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /contribute/build.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/build.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/build.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/build.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/build.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/build.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
 </div>
-
-		<div id="contentbody">
-			<h1>Build from source</h1>
-			<p>The Wicket projects are built using a multi-module build as proposed by the
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Build from source</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#getting-your-wicket-version"><span class="toc-number">1</span> <span class="toc-text">Getting your Wicket version</span></a></li><li class="toc--level-1 toc--section-2"><a href="#building-wicket"><span class="toc-number">2</span> <span class="toc-text">Building Wicket</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#coping-with-test-failures"><span class="toc-number">2.1</span> <span class="toc-text">Coping with test failures</span></a></li><li class="toc--level-2 toc--section-4"><a href="#using-your-own-built-artifacts"><span class="toc-number">2.2</span> <span class="toc-text">Using your own built artifacts</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>The Wicket projects are built using a multi-module build as proposed by the
 Maven project. We use Maven to build our projects and distributions. To be
 able to build Wicket directly from subversion, you will need an understanding
 of Maven.</p>
-
 <p>This document contains the following sections.</p>
-
 <ol>
   <li>Getting your Wicket version</li>
   <li>Building Wicket</li>
   <li>Coping with test failures</li>
   <li>Using your own built artifacts</li>
 </ol>
-
 <p>For more information on the project structure, please read the ‘Better Builds
 With Maven’ book which has a detailed description on how to structure a
 maintainable, enterprise ready build. The book is available for free from the
 Mergere website.</p>
-
 <h2 id="getting-your-wicket-version">Getting your Wicket version</h2>
-
 <p>Clone the master branch from Apache Git Wicket repository</p>
-
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> git clone https://git-wip-us.apache.org/repos/asf/wicket.git</code></pre></div>
-
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> git clone http://git-wip-us.apache.org/repos/asf/wicket.git</code></pre></div>
 <p>This will give you a directory structure like the following directory tree:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">wicket</span>
 <span class="go">wicket/wicket-core</span>
 <span class="go">wicket/wicket-extensions</span>
@@ -221,45 +76,31 @@ Mergere website.</p>
 <span class="go">wicket/wicket-examples</span>
 <span class="go">wicket/wicket-spring-annot</span>
 <span class="go">...</span></code></pre></div>
-
 <p>To check out a different branch use:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> <span class="nb">cd </span>wicket
 <span class="gp">$</span> git checkout -b release/wicket-x.y.z release/wicket-x.y.z
 <span class="gp">#</span> verify the branch with:
 <span class="gp">$</span> git branch</code></pre></div>
-
 <p>In this document we focus at the maven project descriptor located in the top
 level directory, which enforces default settings for all Wicket projects such
 as plug-in settings, versioning of the Wicket projects, managing the various
 dependencies and more.</p>
-
 <p>The artifacts in this project are there only for having a consistent build.
 This top-level project doesn’t have sources for itself.</p>
-
 <h2 id="building-wicket">Building Wicket</h2>
-
 <p>The current development version of Wicket requires at least jdk 6.</p>
-
 <p>If you want to ensure that your Wicket version is built using JDK-6 and
 fully compatible with that Java version, you will need to build it with a Java
 6 compiler and runtime library.</p>
-
 <p>If you haven’t done so already change into the Wicket root directory:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">cd wicket</span></code></pre></div>
-
 <p>Now building all of Wicket is as simple as issuing the following command:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn install</span></code></pre></div>
-
 <p>This will compile, test, package and install all Wicket projects. Installation
 means putting the jar files into your local Maven repository, including the
 source, but without the javadoc jars (this is a Wicket specific configuration,
 because build javadoc takes a long time).</p>
-
 <p>The following commands are useful:</p>
-
 <table>
 <tr><th>Commandline</th><th>Description</th></tr>
 <tr><td>`mvn clean`</td><td>cleans up build artifacts</td></tr>
@@ -268,45 +109,48 @@ because build javadoc takes a long time).</p>
 <tr><td>`mvn install`</td><td>installs the jar files in your local repository</td></tr>
 <tr><td>`mvn -Prelease package`</td><td>generates the javadoc/source jars as well</td></tr>
 </table>
-
 <p>You can just run the install target, as Maven will build the previous stages
 automatically.</p>
-
 <h3 id="coping-with-test-failures">Coping with test failures</h3>
-
 <p>As this is our main development you might/will encounter failing unit tests.
 These can be skipped using:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn -Dmaven.test.skip=true install</span></code></pre></div>
-
 <p>Of course, all bets are off then and your mileage may vary if you use such a
 built jar.</p>
-
 <h3 id="using-your-own-built-artifacts">Using your own built artifacts</h3>
-
 <p>Now you have built your own fresh Wicket jar you must be anxious to use it.
 This is now as simple as adding a snapshot dependency on the specific Wicket
 version. So in your pom.xml you can use:</p>
-
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>6.0-SNAPSHOT<span class="nt">&lt;/version&gt;</span>
     <span class="nt">&lt;scope&gt;</span>compile<span class="nt">&lt;/scope&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-
-<p>Read <a href="../learn/ides.html">IDE support</a> to learn how to continue from here with an IDE.</p>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; The Apache Software Foundation. Apache Wicket,
-Wicket, Apache, the Apache feather logo, and the Apache Wicket project logo
-are trademarks of The Apache Software Foundation. All other marks mentioned
-may be trademarks or registered trademarks of their respective owners.
-</span></div>
-
+<p>And adding this to your Eclipse, NetBeans or IntelliJ IDEA project classpath
+is then as simple as:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn eclipse:eclipse</span></code></pre></div>
+<p>or opening the project using Netbeans or IDEAs Maven integration.</p>
+<p>Maven will then add all the necessary JAR files to the project’s classpath.</p>
+<p>One thing you need to make sure is that you have set the <code>M2_REPO</code> classpath
+variable in Eclipse (or a similar construct in Netbeans), and point it to your
+local repository, typically found in <code>C:\Documents and Settings\username\.m2\repo</code>
+or (for unix buffs) <code>~/.m2/repo</code></p>
+<p>You can add this setting using maven:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</span></code></pre></div>
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
 </div>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/d8f15469/content/contribute/ides.html
----------------------------------------------------------------------
diff --git a/content/contribute/ides.html b/content/contribute/ides.html
new file mode 100644
index 0000000..72e145d
--- /dev/null
+++ b/content/contribute/ides.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>IDE Support for Wicket development | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /contribute/ides.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/ides.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/ides.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/ides.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/ides.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/ides.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>IDE Support for Wicket development</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#wicket-plugins"><span class="toc-number">1</span> <span class="toc-text">Wicket Plugins</span></a></li><li class="toc--level-1 toc--section-2"><a href="#setting-up-your-ide"><span class="toc-number">2</span> <span class="toc-text">Setting up your IDE</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#eclipse"><span class="toc-number">2.1</span> <span class="toc-text">Eclipse</span></a></li><li class="toc--level-2 toc--section-4"><a href="#netbeans"><span class="toc-number">2.2</span> <span class="toc-text">NetBeans</span></a></li><li class="toc--level-2 toc--section-5"><a href="#idea"><span class="toc-number">2.3</span> <span class="toc-text">IDEA</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="wicket-plugins">Wicket Plugins</h2>
+<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>Netbeans: <a href="http://plugins.netbeans.org/plugin/3586/wicket-1-4-support">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>
+</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>
+<h3 id="eclipse">Eclipse</h3>
+<p>Eclipse offers a good support for Maven based projects with <a href="http://www.eclipse.org/m2e/">plugin M2Eclipse</a>. Once installed you can go to ‘Import…-&gt;Existing Maven Projects’ and import one or more Maven projects into your workspace.</p>
+<p>Alternatively, you can generate an Eclipse project typing the following command on project’s root:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn eclipse:eclipse</span></code></pre></div>
+<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="language-console" data-lang="console"><span class="go">mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</span></code></pre></div>
+<p>If you want to go along with the Wicket way of code formatting you should import the Wicket code format profile into your workspace (Preferences-&gt;Java-&gt;Code Style-&gt;Formatter), found in:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">&lt;path-to-eclipse-workspace&gt;/wicket-core/EclipseCodeFormat.xml</span></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>
+<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>
+<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>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>