You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/07/19 14:26:15 UTC
svn commit: r1611904 [9/15] - in /wicket/common/site/trunk/_site: ./
2009/07/30/ 2009/08/21/ 2009/10/12/ 2009/10/24/ 2009/12/13/ 2009/12/21/
2010/02/01/ 2010/03/05/ 2010/05/03/ 2010/05/24/ 2010/08/04/ 2010/08/11/
2010/08/24/ 2010/09/09/ 2010/09/17/ 201...
Modified: wicket/common/site/trunk/_site/contribute/build.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/build.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/build.html (original)
+++ wicket/common/site/trunk/_site/contribute/build.html Sat Jul 19 12:26:11 2014
@@ -187,62 +187,80 @@
<div id="contentbody">
<h1>Build from source</h1>
- <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>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>
+ <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>
+<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>
+<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='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 https://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='console'><span class='go'>wicket</span>
-<span class='go'>wicket/wicket-core</span>
-<span class='go'>wicket/wicket-extensions</span>
-<span class='go'>wicket/wicket-spring</span>
-<span class='go'>wicket/wicket-auth-roles</span>
-<span class='go'>wicket/wicket-examples</span>
-<span class='go'>wicket/wicket-spring-annot</span>
-<span class='go'>...</span>
-</code></pre></div>
+
+<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>
+<span class="go">wicket/wicket-spring</span>
+<span class="go">wicket/wicket-auth-roles</span>
+<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='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>
+<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>
+<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 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='console'><span class='go'>cd wicket</span>
-</code></pre></div>
+
+<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='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>
+
+<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>
@@ -251,26 +269,35 @@
<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>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"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.wicket<span class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>wicket-core<span class="nt"></artifactId></span>
+ <span class="nt"><version></span>6.0-SNAPSHOT<span class="nt"></version></span>
+ <span class="nt"><scope></span>compile<span class="nt"></scope></span>
+<span class="nt"></dependency></span></code></pre></div>
-<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='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='xml'><span class='nt'><dependency></span>
- <span class='nt'><groupId></span>org.apache.wicket<span class='nt'></groupId></span>
- <span class='nt'><artifactId></span>wicket-core<span class='nt'></artifactId></span>
- <span class='nt'><version></span>6.0-SNAPSHOT<span class='nt'></version></span>
- <span class='nt'><scope></span>compile<span class='nt'></scope></span>
-<span class='nt'></dependency></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>
Modified: wicket/common/site/trunk/_site/contribute/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/index.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/index.html (original)
+++ wicket/common/site/trunk/_site/contribute/index.html Sat Jul 19 12:26:11 2014
@@ -188,6 +188,7 @@
<div id="contentbody">
<h1>Contribute</h1>
<p>TODO</p>
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/contribute/patch.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/patch.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/patch.html (original)
+++ wicket/common/site/trunk/_site/contribute/patch.html Sat Jul 19 12:26:11 2014
@@ -187,35 +187,30 @@
<div id="contentbody">
<h1>Submit a patch</h1>
- <h2 id="high_level">High level:</h2>
+ <p>TODO: this is just a set of basic instructions. We need to add more information here.</p>
+<h2 id="high-level">High level:</h2>
<p>The steps to submitting a patch for Wicket are:</p>
<ul>
-<li>Identify an issue that you want to fix or improve</li>
-
-<li>Search <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a> and the mailing list to see if itâs already been discussed</li>
-
-<li>If itâs a bug or a feature request, open a <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a></li>
-
-<li><a href="../start/quickstart.html">Create a quickstart</a> that you can use for prototyping the feature or demonstrating the bug</li>
-
-<li>Attach this quickstart to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a> if itâs representing a bug report.</li>
-
-<li>Get <a href="http://git-scm.com/">Git</a> running</li>
-
-<li><a href="../start/download.html#snapshots_and_latest_bleedingedge_code">Checkout out the code</a></li>
+ <li>Identify an issue that you want to fix or improve</li>
+ <li>Search <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a> and the mailing list to see if itâs already been discussed</li>
+ <li>If itâs a bug or a feature request, open a <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a></li>
+ <li><a href="../start/quickstart.html">Create a quickstart</a> that you can use for prototyping the feature or demonstrating the bug</li>
+ <li>Attach this quickstart to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a> if itâs representing a bug report.</li>
+ <li>Get <a href="http://git-scm.com/">Git</a> running</li>
+ <li><a href="../start/download.html#snapshots_and_latest_bleedingedge_code">Checkout out the code</a></li>
+ <li>Make your changes</li>
+ <li>Create the patch:</li>
+</ul>
-<li>Make your changes</li>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git add any_files_you_created_modified_or_deleted</span>
+<span class="go">git diff --cached > /tmp/fix-WICKET-NNNN.patch</span></code></pre></div>
-<li>Create the patch:</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>git add any_files_you_created_modified_or_deleted</span>
-<span class='go'>git diff --cached > /tmp/fix-WICKET-NNNN.patch</span>
-</code></pre></div>
<ul>
-<li>Attach that file (/tmp/fix-WICKET-NNNN.patch) to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a></li>
+ <li>Attach that file (/tmp/fix-WICKET-NNNN.patch) to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a></li>
</ul>
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/contribute/release.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/release.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/release.html (original)
+++ wicket/common/site/trunk/_site/contribute/release.html Sat Jul 19 12:26:11 2014
@@ -188,246 +188,236 @@
<div id="contentbody">
<h1>Build a release</h1>
<h2 id="contents">Contents</h2>
-
<ul>
-<li><a href="#release-60">Releasing Apache Wicket 6.x</a></li>
-
-<li><a href="#release-14">Releasing Apache Wicket 1.4.x+</a></li>
-
-<li><a href="#release-13">Releasing Apache Wicket 1.3.x</a></li>
-
-<li><a href="#nexus">Staging Releases using the Apache Nexus Repository</a></li>
-
-<li><a href="#announcing">Announcing the release</a></li>
-
-<li><a href="#additional">Additional tasks</a></li>
+ <li><a href="#release-60">Releasing Apache Wicket 6.x</a></li>
+ <li><a href="#release-14">Releasing Apache Wicket 1.4.x+</a></li>
+ <li><a href="#release-13">Releasing Apache Wicket 1.3.x</a></li>
+ <li><a href="#nexus">Staging Releases using the Apache Nexus Repository</a></li>
+ <li><a href="#announcing">Announcing the release</a></li>
+ <li><a href="#additional">Additional tasks</a></li>
</ul>
<h2 id="release-60">Releasing Apache Wicket 6.x</h2>
<p>Per <a href="http://apache.org/dev/release.html">Apache release policy</a> we need to build, vote on and release a source distribution. As a convenience to our users, we can also provide binary packages, that are uploaded to Maven Central, and a binary archive for folks that for whatever reason donât use Maven.</p>
-<h3 id="building_the_release">Building the Release</h3>
+<h3 id="building-the-release">Building the Release</h3>
-<h4 id="required_software">Required software</h4>
+<h4 id="required-software">Required software</h4>
<p>This assumes running a unix-y environment (i.e. OS X, Linux) and that you have the necessary tools installed, such as recent Maven, Java 6, gpg (-agent).</p>
<h4 id="preparing">Preparing</h4>
<ul>
-<li>Pull changes</li>
-
-<li>Checkout master</li>
-
-<li>Update changelog and commit them</li>
+ <li>Pull changes</li>
+ <li>Checkout master</li>
+ <li>Update changelog and commit them</li>
</ul>
<h4 id="building">Building</h4>
<ul>
-<li>Start gpg-agent as a daemon (OS X, using homebrew installation of gpg, gpg-agent, pinentry):</li>
+ <li>Start gpg-agent as a daemon (OS X, using homebrew installation of gpg, gpg-agent, pinentry):</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'> eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`</span>
-</code></pre></div>
-<ul>
-<li>Create an environment variable such that you can copy/paste several of the following commands (substitute 6.0.0 with the number youâre actually going to release)</li>
-<li>And create an environment variable for your Apache username for uploading the release:</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>export NEWVERSION=6.0.0</span>
-<span class='go'>export APACHEID=apacheid</span>
-</code></pre></div>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`</span></code></pre></div>
+
<ul>
-<li>Sign pom.xml such that gpg-agent has enabled your key (and remove the .asc file). This triggers the pinentry program and sets the stage for gpg-agent:</li>
+ <li>Create an environment variable such that you can copy/paste several of the following commands (substitute 6.0.0 with the number youâre actually going to release)</li>
+ <li>And create an environment variable for your Apache username for uploading the release:</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>gpg --armor --detach-sign --use-agent --sign pom.xml</span>
-<span class='go'>rm pom.xml.asc</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">export NEWVERSION=6.0.0</span>
+<span class="go">export APACHEID=apacheid</span></code></pre></div>
+
<ul>
-<li>Create release branch:</li>
+ <li>Sign pom.xml such that gpg-agent has enabled your key (and remove the .asc file). This triggers the pinentry program and sets the stage for gpg-agent:</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent --sign pom.xml</span>
+<span class="go">rm pom.xml.asc</span></code></pre></div>
+
<ul>
-<li>Checkout the release branch:</li>
+ <li>Create release branch: </li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>git checkout build/wicket-$NEWVERSION</span>
-</code></pre></div>
-<ul>
-<li>
-<p>Update archetypes/quickstart/src/main/archetype-resources/pom.xml to use NEWVERSION of Wicket and commit</p>
-</li>
-<li>
-<p>Use Maven to do the first steps of the release process by</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span></code></pre></div>
<ul>
-<li>Fill in NEWVERSION for all but the experimental submodules</li>
+ <li>Checkout the release branch: </li>
+</ul>
-<li>New development version doesnât matterâjust press enter, see next step</li>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-$NEWVERSION</span></code></pre></div>
-<li>And running the following command:</li>
-</ul>
-</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>mvn release:prepare</span>
-</code></pre></div>
<ul>
-<li>Remove last commit such that HEAD points to the NEWVERSION release, not the new development version</li>
+ <li>
+ <p>Update archetypes/quickstart/src/main/archetype-resources/pom.xml to use NEWVERSION of Wicket and commit</p>
+ </li>
+ <li>
+ <p>Use Maven to do the first steps of the release process by</p>
+ <ul>
+ <li>Fill in NEWVERSION for all but the experimental submodules</li>
+ <li>New development version doesnât matterâjust press enter, see next step</li>
+ <li>And running the following command:</li>
+ </ul>
+ </li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>git reset HEAD^ --hard</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:prepare</span></code></pre></div>
+
<ul>
-<li>Create source archive:</li>
+ <li>Remove last commit such that HEAD points to the NEWVERSION release, not the new development version</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>git archive --format=tar.gz --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.tar.gz wicket-$NEWVERSION</span>
-<span class='go'>git archive --format=zip --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.zip wicket-$NEWVERSION</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git reset HEAD^ --hard</span></code></pre></div>
+
<ul>
-<li><strong>NOTE 1</strong> the trailing â/â after âprefix=NEWVERSION is vital for the tarball</li>
+ <li>Create source archive:</li>
+</ul>
-<li><strong>NOTE 2</strong> you can ignore the gpg generated messages telling âYou need a passphrase to unlock the secret key forâ, unless an error occurredâthese messages are not error messages</li>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git archive --format=tar.gz --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.tar.gz wicket-$NEWVERSION</span>
+<span class="go">git archive --format=zip --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.zip wicket-$NEWVERSION</span></code></pre></div>
-<li>Sign the packages, the git tag and create the digests:</li>
+<ul>
+ <li><strong>NOTE 1</strong> the trailing â/â after âprefix=NEWVERSION is vital for the tarball</li>
+ <li><strong>NOTE 2</strong> you can ignore the gpg generated messages telling âYou need a passphrase to unlock the secret key forâ, unless an error occurredâthese messages are not error messages</li>
+ <li>Sign the packages, the git tag and create the digests:</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.tar.gz</span>
-<span class='go'>gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.zip</span>
-<span class='go'>gpg --print-md SHA1 apache-wicket-$NEWVERSION.tar.gz > apache-wicket-$NEWVERSION.tar.gz.sha</span>
-<span class='go'>gpg --print-md MD5 apache-wicket-$NEWVERSION.tar.gz > apache-wicket-$NEWVERSION.tar.gz.md5</span>
-<span class='go'>gpg --print-md SHA1 apache-wicket-$NEWVERSION.zip > apache-wicket-$NEWVERSION.zip.sha</span>
-<span class='go'>gpg --print-md MD5 apache-wicket-$NEWVERSION.zip > apache-wicket-$NEWVERSION.zip.md5</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.tar.gz</span>
+<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.zip</span>
+<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION.tar.gz > apache-wicket-$NEWVERSION.tar.gz.sha</span>
+<span class="go">gpg --print-md MD5 apache-wicket-$NEWVERSION.tar.gz > apache-wicket-$NEWVERSION.tar.gz.md5</span>
+<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION.zip > apache-wicket-$NEWVERSION.zip.sha</span>
+<span class="go">gpg --print-md MD5 apache-wicket-$NEWVERSION.zip > apache-wicket-$NEWVERSION.zip.md5</span></code></pre></div>
+
<p>To sign the tag (overwrites the maven generated tag), execute:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>git tag -s --force wicket-$NEWVERSION</span>
-</code></pre></div>
-<h4 id="staging_the_build">Staging the build</h4>
-<div class='highlight'><pre><code class='console'><span class='go'>ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
-<span class='go'>scp apache-wicket-* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION</span>
-</code></pre></div>
-<p>The step below uploads the artifacts to a staging area for Maven.</p>
-<ul>
-<li>assumes you have an Apache nexus account</li>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git tag -s --force wicket-$NEWVERSION</span></code></pre></div>
-<li>will checkout a fresh copy and build it (ask Maven for why)</li>
+<h4 id="staging-the-build">Staging the build</h4>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
+<span class="go">scp apache-wicket-* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></div>
+
+<p>The step below uploads the artifacts to a staging area for Maven.
+* assumes you have an Apache nexus account
+* will checkout a fresh copy and build it (ask Maven for why)
+* artifacts will have different signature than in previous release:prepare build (due to times changing)</p>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:perform</span></code></pre></div>
-<li>artifacts will have different signature than in previous release:prepare build (due to times changing)</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>mvn release:perform</span>
-</code></pre></div>
<p>This will upload artifacts and signatures to Apache nexus in a staging repository.</p>
-<h4 id="create_a_binary_release">Create a binary release</h4>
+<h4 id="create-a-binary-release">Create a binary release</h4>
<p>As we donât vote on binary packages, but do want to cater to developers not using Maven, it is very convenient to create a download for non-Maven users.</p>
<p>The binary distribution should contain the same jar files that are uploaded to Maven Central. Unfortunately the Maven build creates duplicate jar files, but with different manifests (due to the inclusion of date/time of build), and the jar files have different signatures. Therefore it is necessary to create a distribution of the artifacts generated by the <code>mvn release:perform</code> command.</p>
<p>Perform the following commands in the root of your Wicket checkout to create the binary release files.</p>
-<div class='highlight'><pre><code class='console'><span class='go'>mkdir apache-wicket-$NEWVERSION</span>
-<span class='go'>cd apache-wicket-$NEWVERSION</span>
-<span class='go'>find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;</span>
-<span class='go'>find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;</span>
-<span class='go'>cp ../LICENSE .</span>
-<span class='go'>cp ../README .</span>
-<span class='go'>cp ../NOTICE .</span>
-<span class='go'>cd ..</span>
-<span class='go'>tar cfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION</span>
-<span class='go'>zip -r apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION</span>
-<span class='go'>gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz</span>
-<span class='go'>gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.zip</span>
-<span class='go'>gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.sha</span>
-<span class='go'>gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.md5</span>
-<span class='go'>gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.sha</span>
-<span class='go'>gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.md5</span>
-<span class='go'>ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin</span>
-<span class='go'>scp apache-wicket-*bin.* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION/bin</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mkdir apache-wicket-$NEWVERSION</span>
+<span class="go">cd apache-wicket-$NEWVERSION</span>
+<span class="go">find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;</span>
+<span class="go">find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \;</span>
+<span class="go">cp ../LICENSE .</span>
+<span class="go">cp ../README .</span>
+<span class="go">cp ../NOTICE .</span>
+<span class="go">cd ..</span>
+<span class="go">tar cfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION</span>
+<span class="go">zip -r apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION</span>
+<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz</span>
+<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.zip</span>
+<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.sha</span>
+<span class="go">gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.md5</span>
+<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.sha</span>
+<span class="go">gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.md5</span>
+<span class="go">ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin</span>
+<span class="go">scp apache-wicket-*bin.* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION/bin</span></code></pre></div>
+
<p>This binary release contains all required files to comply with the release policy, and the binary artefacts generated by our Maven release build, including the experimental modules and examples.</p>
-<h4 id="vote_the_build">Vote the build</h4>
+<h4 id="vote-the-build">Vote the build</h4>
<p>Start a vote on dev@ for this release. Allow for at least 72 hours, and ensure you take into account weekends.</p>
-<h4 id="promoting_the_build">Promoting the build</h4>
+<h4 id="promoting-the-build">Promoting the build</h4>
<p>When the vote has passed successfully (at least 3 binding +1âs) push the branch and the tag to Apache git:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
-<span class='go'>git push -tags origin</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
+<span class="go">git push -tags origin</span></code></pre></div>
+
<p>You only need to do them if you havenât done so yet.</p>
<p>See also <a href="#nexus">managing nexus</a> for the steps needed to publish the artifacts to Maven Central. And donât forget to announce the release!</p>
<h2 id="release-14">Releasing Apache Wicket 1.4.x+</h2>
-<h3 id="building_the_release_2">Building the Release</h3>
+<h3 id="building-the-release-1">Building the Release</h3>
-<h4 id="preparing_2">Preparing</h4>
+<h4 id="preparing-1">Preparing</h4>
<ul>
-<li>Ask the dev@ mailing list if there are any issues that still need to be in the release (looking at JIRA is a good start)</li>
-
-<li><a href="https://issues.apache.org/jira/plugins/servlet/project-config/WICKET/versions">Release</a> the version in JIRA</li>
-
-<li>Assuming there are none, and you are now in build mode, update the CHANGELOG-x.y file (you can use JIRA for this list: go to âreleasesâ, and under âunreleasedâ, next to your version, thereâs a release notes link)</li>
+ <li>Ask the dev@ mailing list if there are any issues that still need to be in the release (looking at JIRA is a good start)</li>
+ <li><a href="https://issues.apache.org/jira/plugins/servlet/project-config/WICKET/versions">Release</a> the version in JIRA</li>
+ <li>Assuming there are none, and you are now in build mode, update the CHANGELOG-x.y file
+(you can use JIRA for this list: go to âreleasesâ, and under âunreleasedâ, next to your version, thereâs a release notes link)</li>
</ul>
<p>Make sure your <code>~/.m2/settings.xml</code> contains the following definition</p>
-<div class='highlight'><pre><code class='console'><span class='go'><?xml version="1.0"?></span>
-<span class='go'><settings></span>
-<span class='go'><servers></span>
-<span class='go'> <server></span>
-<span class='go'> <id>apache.releases.https</id></span>
-<span class='go'> <username>$your_apache_username</username></span>
-<span class='go'> <password>$your_apache_password</password></span>
-<span class='go'> </server></span>
-<span class='go'></servers></span>
-<span class='go'></settings></span>
-</code></pre></div>
-<ul>
-<li>Make sure you have a GnuPG key which is added to <a href="https://svn.apache.org/repos/asf/wicket/common/KEYS">KEYS</a>. Read the header of KEYS file to see how to add it.</li>
-
-<li>Copy release-igor.sh script and modify any commands which donât match your environment (e.g. mvn5)</li>
-
-<li>Run ./release-mine.sh and enter the required input (new version, gpg passphrase, etc.). The script will create the build branch in Git, will upload the artifacts at Apache Nexus Staging repository and will copy the assemblies to your people.apache.org account.</li>
-
-<li>Send vote message to dev@ mailing list. Include link to the closed repository for testing against.</li>
-
-<li>Wait requisite 72 hours for the vote to pass (we hope)</li>
-
-<li>Copy release to apache mirrors</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>ssh people.apache.org</span>
-<span class='go'>mkdir /www/www.apache.org/dist/wicket/x.y.z</span>
-<span class='go'>mv ~/public_html/wicket-x.y.z/dist/* /www/www.apache.org/dist/wicket/x.y.z</span>
-<span class='go'>chown -R :wicket /www/www.apache.org/dist/wicket/x.y.z</span>
-</code></pre></div>
-<ul>
-<li>Login to <a href="https://repository.apache.org">Apache Nexus Staging repo</a>, select the closed repository and click <strong>Release</strong>. It will be accessible immediately through the apache release repo and then within 1-2 hours through maven central.</li>
-
-<li>If the release is voted down you can <strong>Drop</strong> the staged release and then restage later after incorporating the necessary changes.</li>
-
-<li>Tag the release in Git:</li>
-</ul>
-<div class='highlight'><pre><code class='console'><span class='go'>git checkout build/wicket-x.y.z</span>
-<span class='go'>git tag release/wicket-x.y.z</span>
-<span class='go'>git push --tags</span>
-</code></pre></div>
-<ul>
-<li>Wait until repo1.maven.org has picked up the release artifacts.</li>
-
-<li>Wait 24 hours until mirrors picked up release artifacts</li>
-<li>Announce (see <a href="#announcing">below</a>)</li>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go"><?xml version="1.0"?></span>
+<span class="go"><settings></span>
+<span class="go"><servers></span>
+<span class="go"> <server></span>
+<span class="go"> <id>apache.releases.https</id></span>
+<span class="go"> <username>$your_apache_username</username></span>
+<span class="go"> <password>$your_apache_password</password></span>
+<span class="go"> </server></span>
+<span class="go"></servers></span>
+<span class="go"></settings></span></code></pre></div>
+
+<ul>
+ <li>Make sure you have a GnuPG key which is added to <a href="https://svn.apache.org/repos/asf/wicket/common/KEYS">KEYS</a>.
+Read the header of KEYS file to see how to add it.</li>
+ <li>Copy release-igor.sh script and modify any commands which donât match your environment (e.g. mvn5)</li>
+ <li>Run ./release-mine.sh and enter the required input (new version, gpg passphrase, etc.). The script
+will create the build branch in Git, will upload the artifacts at Apache Nexus Staging repository and
+will copy the assemblies to your people.apache.org account.</li>
+ <li>Send vote message to dev@ mailing list. Include link to the closed repository for testing against.</li>
+ <li>Wait requisite 72 hours for the vote to pass (we hope)</li>
+ <li>Copy release to apache mirrors</li>
+</ul>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh people.apache.org</span>
+<span class="go">mkdir /www/www.apache.org/dist/wicket/x.y.z</span>
+<span class="go">mv ~/public_html/wicket-x.y.z/dist/* /www/www.apache.org/dist/wicket/x.y.z</span>
+<span class="go">chown -R :wicket /www/www.apache.org/dist/wicket/x.y.z</span></code></pre></div>
+
+<ul>
+ <li>Login to <a href="https://repository.apache.org">Apache Nexus Staging repo</a>, select the closed repository and click <strong>Release</strong>. It will be accessible immediately through the apache release repo and then within 1-2 hours through maven central.</li>
+ <li>If the release is voted down you can <strong>Drop</strong> the staged release and then restage later after incorporating the necessary changes.</li>
+ <li>Tag the release in Git:</li>
+</ul>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-x.y.z</span>
+<span class="go">git tag release/wicket-x.y.z</span>
+<span class="go">git push --tags</span></code></pre></div>
+
+<ul>
+ <li>Wait until repo1.maven.org has picked up the release artifacts.</li>
+ <li>Wait 24 hours until mirrors picked up release artifacts</li>
+ <li>Announce (see <a href="#announcing">below</a>)</li>
</ul>
<h2 id="nexus">Staging Releases using the Apache Nexus Staging Repository</h2>
<p>The key to stage and manage repositories on <a href="https://repository.apache.org">Apache Nexus Staging repo</a> are your Apache Commiter credentials.</p>
-<h3 id="staging_artifacts">Staging Artifacts</h3>
+<h3 id="staging-artifacts">Staging Artifacts</h3>
<p><strong>Note</strong>: The steps below are part of release-igor.sh script!</p>
@@ -438,71 +428,74 @@
<p>The <code><id></code> of the staging repository is: <strong>apache.releases.https</strong>.</p>
<p>Place a <code><server></code> definition in your <code>~/.m2/settings.xml</code> file like this:</p>
-<div class='highlight'><pre><code class='console'><span class='go'><?xml version="1.0"?></span>
-<span class='go'><settings></span>
-<span class='go'><servers></span>
-<span class='go'> <server></span>
-<span class='go'> <id>apache.releases.https</id></span>
-<span class='go'> <username>$username</username></span>
-<span class='go'> <password>$password</password></span>
-<span class='go'> </server></span>
-<span class='go'></servers></span>
-<span class='go'></settings></span>
-</code></pre></div>
-<p>This works if you can deploy artifacts into the repository.apache.org properly (i.e. you donât see failures mentioning 401 errors).</p>
-
-<h3 id="managing_staged_artifacts">Managing Staged Artifacts</h3>
-<p>By logging in with your Apache committer credentials to <a href="https://repository.apache.org">Apache Nexus Staging repo</a> you can access the management interface for the staged artifacts.</p>
-
-<p>The interface will allow you to:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go"><?xml version="1.0"?></span>
+<span class="go"><settings></span>
+<span class="go"><servers></span>
+<span class="go"> <server></span>
+<span class="go"> <id>apache.releases.https</id></span>
+<span class="go"> <username>$username</username></span>
+<span class="go"> <password>$password</password></span>
+<span class="go"> </server></span>
+<span class="go"></servers></span>
+<span class="go"></settings></span></code></pre></div>
-<ul>
-<li>View the staging repositories.</li>
+<p>This works if you can deploy artifacts into the repository.apache.org properly (i.e. you donât see failures mentioning 401 errors).</p>
-<li>Close staging repositories.</li>
+<h3 id="managing-staged-artifacts">Managing Staged Artifacts</h3>
-<li>Release closed repository artifacts (into the release repo and after 1-2 hours into central as well).</li>
+<p>By logging in with your Apache committer credentials to <a href="https://repository.apache.org">Apache Nexus Staging repo</a> you can access the management interface for the staged artifacts.</p>
-<li>Drop open and closed staging repositories.</li>
-</ul>
+<p>The interface will allow you to:
+* View the staging repositories.
+* Close staging repositories.
+* Release closed repository artifacts (into the release repo and after 1-2 hours into central as well).
+* Drop open and closed staging repositories.</p>
<p>More information is available at: <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven">Publishing Maven Artifacts</a></p>
<h2 id="announcing">Announcing the release</h2>
-<p>Edit the _config.yaml file. This file contains a site wide configuration section specific to Wicket:</p>
-<div class='highlight'><pre><code class='yaml'><span class='l-Scalar-Plain'>wicket</span><span class='p-Indicator'>:</span>
- <span class='l-Scalar-Plain'>version</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>1.4.10</span>
- <span class='l-Scalar-Plain'>released</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>2010-08-11</span>
- <span class='l-Scalar-Plain'>versions</span><span class='p-Indicator'>:</span> <span class='p-Indicator'>[</span><span class='nv'>1.3.7</span><span class='p-Indicator'>,</span> <span class='nv'>1.3-SNAPSHOT</span><span class='p-Indicator'>,</span> <span class='nv'>1.4.9</span><span class='p-Indicator'>,</span> <span class='nv'>1.4.10</span><span class='p-Indicator'>,</span> <span class='nv'>1.4-SNAPSHOT</span><span class='p-Indicator'>,</span> <span class='nv'>1.5-M1</span><span class='p-Indicator'>,</span> <span class='nv'>1.5-SNAPSHOT</span><span class='p-Indicator'>]</span>
-</code></pre></div>
-<p>Youâll need to edit this part: modify the version, update the released date, and add the new version to the versions list (remove any stale releases, typically just leave the previous release as well).</p>
-
-<ul>
-<li>Write an announcement in the _posts directory</li>
+<p>Edit the _config.yaml file. This file contains a site wide configuration
+section specific to Wicket:</p>
-<li>Restart jekyll to regenerate the pages: it will automatically generate the correct links in the navigation menu, quickstart and downloads page. It will update the doap.rdf file, atom.xml rss feed and index.html file so that it contains your announcement.</li>
+<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="l-Scalar-Plain">wicket</span><span class="p-Indicator">:</span>
+ <span class="l-Scalar-Plain">version</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">1.4.10</span>
+ <span class="l-Scalar-Plain">released</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">2010-08-11</span>
+ <span class="l-Scalar-Plain">versions</span><span class="p-Indicator">:</span> <span class="p-Indicator">[</span><span class="nv">1.3.7</span><span class="p-Indicator">,</span> <span class="nv">1.3-SNAPSHOT</span><span class="p-Indicator">,</span> <span class="nv">1.4.9</span><span class="p-Indicator">,</span> <span class="nv">1.4.10</span><span class="p-Indicator">,</span> <span class="nv">1.4-SNAPSHOT</span><span class="p-Indicator">,</span> <span class="nv">1.5-M1</span><span class="p-Indicator">,</span> <span class="nv">1.5-SNAPSHOT</span><span class="p-Indicator">]</span></code></pre></div>
-<li>Send email to: users@wicket.apache.org, dev@wicket.apache.org, announce@wicket.apache.org, announce@apache.org</li>
+<p>Youâll need to edit this part: modify the version, update the released date,
+and add the new version to the versions list (remove any stale releases,
+typically just leave the previous release as well).</p>
-<li>Misc. websites like javalobby, serverside, onjava etc.</li>
+<ul>
+ <li>Write an announcement in the _posts directory</li>
+ <li>Restart jekyll to regenerate the pages: it will automatically generate the
+correct links in the navigation menu, quickstart and downloads page. It will
+update the doap.rdf file, atom.xml rss feed and index.html file so that it
+contains your announcement.</li>
+ <li>Send email to: users@wicket.apache.org, dev@wicket.apache.org, announce@wicket.apache.org, announce@apache.org</li>
+ <li>Misc. websites like javalobby, serverside, onjava etc.</li>
</ul>
-<h2 id="additional">Additional tasks</h2>
+<h2 id="additional-tasks---additional-">Additional tasks ## { #additional }</h2>
<ul>
-<li>Commit the JavaDocs to <a href="https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4">https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4</a> svnpubsub will push this directly to our website. (example script below)</li>
+ <li>Commit the JavaDocs to
+<a href="https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4">https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4</a>
+svnpubsub will push this directly to our website. (example script below)</li>
</ul>
-<div class='highlight'><pre><code class='console'><span class='gp'>#</span> <span class='k'>do </span>this in your locally-checked-out release branch <span class='o'>(</span>i.e. svn.../releases/wicket-1.4.13<span class='o'>)</span>
-<span class='go'>mvn javadoc:aggregate</span>
-<span class='gp'>#</span> note that you may need to tweak these paths to fit your configuration:
-<span class='go'>cp -r target/site/apidocs/* ../wicket-common/site/apidocs/1.4/</span>
-<span class='go'>cd ../wicket-common/</span>
-<span class='gp'>#</span> call <span class='s2'>"svn add"</span> <span class='k'>for </span>files that are new <span class='o'>(</span>there<span class='err'>'</span>s probably an easier way to <span class='k'>do </span>this<span class='o'>)</span>
-<span class='go'>svn stat | grep -e '^?' | sed 's/\?\W*//' | xargs svn add</span>
-<span class='go'>svn commit -m "changes to update javadocs to latest release"</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">#</span> <span class="k">do</span> this in your locally-checked-out release branch <span class="o">(</span>i.e. svn.../releases/wicket-1.4.13<span class="o">)</span>
+<span class="go">mvn javadoc:aggregate</span>
+<span class="gp">#</span> note that you may need to tweak these paths to fit your configuration:
+<span class="go">cp -r target/site/apidocs/* ../wicket-common/site/apidocs/1.4/</span>
+<span class="go">cd ../wicket-common/</span>
+<span class="gp">#</span> call <span class="s2">"svn add"</span> <span class="k">for</span> files that are new <span class="o">(</span>there<span class="err">'</span>s probably an easier way to <span class="k">do</span> this<span class="o">)</span>
+<span class="go">svn stat | grep -e '^?' | sed 's/\?\W*//' | xargs svn add</span>
+<span class="go">svn commit -m "changes to update javadocs to latest release"</span></code></pre></div>
+
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/contribute/write.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/write.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/contribute/write.html (original)
+++ wicket/common/site/trunk/_site/contribute/write.html Sat Jul 19 12:26:11 2014
@@ -187,99 +187,121 @@
<div id="contentbody">
<h1>Write documentation</h1>
- <p>We use <a href="http://github.com/mojombo/jekyll">Jekyll</a> for writing our documentation on our main website. Publishing new content is as simple as regenerating the site and committing the changed files.</p>
+ <p>We use <a href="http://github.com/mojombo/jekyll">Jekyll</a> for writing our
+documentation on our main website. Publishing new content is as simple as
+regenerating the site and committing the changed files.</p>
<h2 id="contents">Contents</h2>
<ul>
-<li><a href="#introduction">Introduction</a></li>
-
-<li><a href="#install">Install Jekyll</a></li>
-
-<li><a href="#checkout">Check out from SVN</a></li>
-
-<li><a href="#run">Run the site</a></li>
-
-<li><a href="#write">Write some documentation</a></li>
-
-<li><a href="#update">Update the site</a></li>
+ <li><a href="#introduction">Introduction</a></li>
+ <li><a href="#install">Install Jekyll</a></li>
+ <li><a href="#checkout">Check out from SVN</a></li>
+ <li><a href="#run">Run the site</a></li>
+ <li><a href="#write">Write some documentation</a></li>
+ <li><a href="#update">Update the site</a></li>
</ul>
<h2 id="introduction">Introduction</h2>
-<p>The site is split into two parts: static content and the official Apache Wicket blog. The static content contains all the documentation that is more static (such as mailing lists, downloads, examples). The blog includes release announcements, adding new committers and other important Wicket related news.</p>
+<p>The site is split into two parts: static content and the official Apache
+Wicket blog. The static content contains all the documentation that is more
+static (such as mailing lists, downloads, examples). The blog includes release
+announcements, adding new committers and other important Wicket related news.</p>
<h2 id="install">Install Jekyll</h2>
-<p>Follow the instructions available on the <a href="http://github.com/mojombo/jekyll">Jekyll website</a>. Basically it boils down to:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>gem install jekyll</span>
-</code></pre></div>
+<p>Follow the instructions available on the <a href="http://github.com/mojombo/jekyll">Jekyll
+website</a>. Basically it boils down to:</p>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gem install jekyll</span></code></pre></div>
+
<p>You also need to install the Pygments Python module.</p>
<h2 id="checkout">Check out from SVN</h2>
<p>Before you can edit the site, you need to check it out from SVN:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>svn co https://svn.apache.org/repos/asf/wicket/common/site/trunk wicket-site</span>
-</code></pre></div>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">svn co https://svn.apache.org/repos/asf/wicket/common/site/trunk wicket-site</span></code></pre></div>
+
<h2 id="generate">Generating the site</h2>
<p>You can regenerate the site in the checked out directory:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>./regenerate.sh</span>
-</code></pre></div>
-<p>Note that this script restores Subversion (<code>.svn</code>) subfolders inside <code>_site</code>, which are erased when Jekyll is generating the content.</p>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./regenerate.sh</span></code></pre></div>
+
+<p>Note that this script restores Subversion (<code>.svn</code>) subfolders
+inside <code>_site</code>, which are erased when Jekyll is generating the content.</p>
<h2 id="run">Run the site</h2>
<p>You can run the website and edit it live:</p>
-<div class='highlight'><pre><code class='console'><span class='go'>./liveedit.sh</span>
-</code></pre></div>
-<p>This not only runs the server, but watches for modifications and regenerates any modified files.</p>
+
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./liveedit.sh</span></code></pre></div>
+
+<p>This not only runs the server, but watches for modifications and regenerates
+any modified files.</p>
<p>You can check out the website running at <a href="http://localhost:4000">localhost, port 4000</a>.</p>
<h2 id="write">Write some documentation</h2>
-<p>Jekyll can render HTML from markdown syntax and textile syntax. <strong>For our site we use markdown</strong>.</p>
+<p>Jekyll can render HTML from markdown syntax and textile syntax. <strong>For our site
+we use markdown</strong>. </p>
-<h3 id="page_template">Page template</h3>
+<h3 id="page-template">Page template</h3>
-<p>Each page needs to have a YAML preamble that specifies the rendered template and other variables. If it doesnât include the YAML preamble, it wonât be rendered correctly.</p>
+<p>Each page needs to have a YAML preamble that specifies the rendered template
+and other variables. If it doesnât include the YAML preamble, it wonât be
+rendered correctly.</p>
<p>Example preamble (includes the <code>---</code>):</p>
-<div class='highlight'><pre><code class='yaml'><span class='nn'>---</span>
-<span class='l-Scalar-Plain'>layout</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>default</span>
-<span class='l-Scalar-Plain'>title</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>Write documentation</span>
-<span class='nn'>---</span>
-</code></pre></div>
-<h3 id="syntax_highlighting">Syntax highlighting</h3>
-<p>If you have a need to render code in your templates and have it syntax highlighted, surround the code with {\% highlight java \%} (substitute java with the language you want highlighted.)</p>
+<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">default</span>
+<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Write documentation</span>
+<span class="nn">---</span></code></pre></div>
+
+<h3 id="syntax-highlighting">Syntax highlighting</h3>
+
+<p>If you have a need to render code in your templates and have it syntax
+highlighted, surround the code with {\% highlight java \%} (substitute java
+with the language you want highlighted.)</p>
<h3 id="menu">Menu</h3>
-<p>If you want your page linked from every page, include the link in <code>_includes/navigation.html</code>.</p>
+<p>If you want your page linked from every page, include the link in
+<code>_includes/navigation.html</code>.</p>
-<h3 id="blog_posts">Blog posts</h3>
+<h3 id="blog-posts">Blog posts</h3>
-<p>For news items such as release announcements, new committers and other happenings, it is appriorate to create a blog post. The blog post is automatically added to the front page and the RSS feed.</p>
+<p>For news items such as release announcements, new committers and other
+happenings, it is appriorate to create a blog post. The blog post is
+automatically added to the front page and the RSS feed.</p>
+
+<p>The blog items are written using the normal Jekyll syntax. The filename needs
+to be formatted as <code>yyyy-mm-dd-title.md</code> and the blog item should start with a
+YAML preamble, similar to normal pages:</p>
+
+<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">post</span>
+<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Wicket 1.4.7 released</span>
+<span class="nn">---</span></code></pre></div>
-<p>The blog items are written using the normal Jekyll syntax. The filename needs to be formatted as <code>yyyy-mm-dd-title.md</code> and the blog item should start with a YAML preamble, similar to normal pages:</p>
-<div class='highlight'><pre><code class='yaml'><span class='nn'>---</span>
-<span class='l-Scalar-Plain'>layout</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>post</span>
-<span class='l-Scalar-Plain'>title</span><span class='p-Indicator'>:</span> <span class='l-Scalar-Plain'>Wicket 1.4.7 released</span>
-<span class='nn'>---</span>
-</code></pre></div>
<h2 id="update">Update the site</h2>
<p>When youâre done with making your changes, please check the following:</p>
<ul>
-<li>Do the modified files contain only those changes that you actually want to publish? (Use <code>svn diff</code> to check)</li>
-
-<li>Did you restart Jekyll to generate the site?</li>
+ <li>Do the modified files contain only those changes that you actually want to
+publish? (Use <code>svn diff</code> to check)</li>
+ <li>Did you restart Jekyll to generate the site?</li>
</ul>
-<p>If these things are OK, you can either <a href="patch.html">generate a patch</a> when youâre not a committer, or just commit the changes. In the latter case, the modifications are pushed immediately to the site and are live within a minute.</p>
+<p>If these things are OK, you can either <a href="patch.html">generate a patch</a> when
+youâre not a committer, or just commit the changes. In the latter case, the
+modifications are pushed immediately to the site and are live within a minute.</p>
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/dtds.data/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/dtds.data/index.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/dtds.data/index.html (original)
+++ wicket/common/site/trunk/_site/dtds.data/index.html Sat Jul 19 12:26:11 2014
@@ -187,17 +187,18 @@
<div id="contentbody">
<h1>Apache Wicket DTDs</h1>
- <p>The following are the Document Type Definitions and XML Schema Definitions which you can use for Wicket 1.3.x, 1.4.x and 1.5.x respectively.</p>
+ <p>The following are the Document Type Definitions and XML Schema Definitions which you can use
+for Wicket 1.3.x, 1.4.x and 1.5.x respectively.</p>
-<p>These definitions are not used by Wicket for its internal working but you can use them in your HTML/XML editor to simplify the development of your pages/panels markup.</p>
+<p>These definitions are not used by Wicket for its internal working but you can use them in your
+HTML/XML editor to simplify the development of your pages/panels markup.</p>
<ul>
-<li><a href="wicket-xhtml1.3-strict.dtd">Wicket 1.3 DTD</a></li>
-
-<li><a href="wicket-xhtml1.4-strict.dtd">Wicket 1.4 DTD</a></li>
-
-<li><a href="http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=blob_plain;f=wicket-core/src/main/resources/META-INF/wicket-1.5.xsd;hb=master">Wicket 1.5 XSD</a></li>
+ <li><a href="wicket-xhtml1.3-strict.dtd">Wicket 1.3 DTD</a></li>
+ <li><a href="wicket-xhtml1.4-strict.dtd">Wicket 1.4 DTD</a></li>
+ <li><a href="http://git-wip-us.apache.org/repos/asf/wicket/repo?p=wicket.git;a=blob_plain;f=wicket-core/src/main/resources/META-INF/wicket-1.5.xsd;hb=master">Wicket 1.5 XSD</a></li>
</ul>
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/help/email.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/help/email.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/help/email.html (original)
+++ wicket/common/site/trunk/_site/help/email.html Sat Jul 19 12:26:11 2014
@@ -190,57 +190,62 @@
<p>We run three main mailing lists:</p>
<ul>
-<li>The <strong>announcements</strong> mailing list for announcing new releases and other important Wicket news.</li>
-
-<li>The <strong>users</strong> mailing list for developers working with Wicket&emdash;that would be if youâre using Wicket or are interested in using it</li>
-
-<li>The <strong>dev</strong> mailing list for talking about development of Wicket itself. If you doubt that your message belongs on this list, use the <strong>users</strong> list.</li>
-
-<li>Thereâs also a <strong>commits</strong> mailing list for following SVN commits and JIRA issues.</li>
+ <li>The <strong>announcements</strong> mailing list for announcing new releases and other
+important Wicket news.</li>
+ <li>The <strong>users</strong> mailing list for developers working with Wicket&emdash;that
+would be if youâre using Wicket or are interested in using it</li>
+ <li>The <strong>dev</strong> mailing list for talking about development of Wicket itself. If
+you doubt that your message belongs on this list, use the <strong>users</strong> list.</li>
+ <li>Thereâs also a <strong>commits</strong> mailing list for following SVN commits and JIRA issues.</li>
</ul>
-<h2 id="subscribing_and_unsubscribing">Subscribing and unsubscribing</h2>
+<h2 id="subscribing-and-unsubscribing">Subscribing and unsubscribing</h2>
+
<table>
<tr>
<td>Announcements list</td>
<td>Low traffic</td>
- <td><a href='http://mail-archives.apache.org/mod_mbox/wicket-announce/'>Archives</a></td>
- <td><a href='http://wicket-announce.markmail.org/'>Search</a></td>
- <td><a href='mailto:announce-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket announcements list'>Subscribe</a></td>
- <td><a href='mailto:announce-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket announcements list'>Unsubscribe</a></td>
- <td><a href='mailto:announce-help@wicket.apache.org?subject=Get help for Apache Wicket announcements list'>Help</a></td>
+ <td><a href="http://mail-archives.apache.org/mod_mbox/wicket-announce/">Archives</a></td>
+ <td><a href="http://wicket-announce.markmail.org/">Search</a></td>
+ <td><a href="mailto:announce-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket announcements list">Subscribe</a></td>
+ <td><a href="mailto:announce-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket announcements list">Unsubscribe</a></td>
+ <td><a href="mailto:announce-help@wicket.apache.org?subject=Get help for Apache Wicket announcements list">Help</a></td>
</tr>
<tr>
<td>Users list</td>
<td>High traffic</td>
- <td><a href='http://mail-archives.apache.org/mod_mbox/wicket-users/'>Archives</a></td>
- <td><a href='http://wicket-users.markmail.org/'>Search</a></td>
- <td><a href='mailto:users-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket users list'>Subscribe</a></td>
- <td><a href='mailto:users-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket users list'>Unsubscribe</a></td>
- <td><a href='mailto:users-help@wicket.apache.org?subject=Get help for Apache Wicket users list'>Help</a></td>
+ <td><a href="http://mail-archives.apache.org/mod_mbox/wicket-users/">Archives</a></td>
+ <td><a href="http://wicket-users.markmail.org/">Search</a></td>
+ <td><a href="mailto:users-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket users list">Subscribe</a></td>
+ <td><a href="mailto:users-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket users list">Unsubscribe</a></td>
+ <td><a href="mailto:users-help@wicket.apache.org?subject=Get help for Apache Wicket users list">Help</a></td>
</tr>
<tr>
<td>Wicket development list</td>
<td>Medium traffic</td>
- <td><a href='http://mail-archives.apache.org/mod_mbox/wicket-dev/'>Archives</a></td>
- <td><a href='http://wicket-dev.markmail.org/'>Search</a></td>
- <td><a href='mailto:dev-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket development list'>Subscribe</a></td>
- <td><a href='mailto:dev-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket development list'>Unsubscribe</a></td>
- <td><a href='mailto:dev-help@wicket.apache.org?subject=Help for Apache Wicket development list'>Help</a></td>
+ <td><a href="http://mail-archives.apache.org/mod_mbox/wicket-dev/">Archives</a></td>
+ <td><a href="http://wicket-dev.markmail.org/">Search</a></td>
+ <td><a href="mailto:dev-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket development list">Subscribe</a></td>
+ <td><a href="mailto:dev-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket development list">Unsubscribe</a></td>
+ <td><a href="mailto:dev-help@wicket.apache.org?subject=Help for Apache Wicket development list">Help</a></td>
</tr>
<tr>
<td>Commits list</td>
<td>High traffic</td>
- <td><a href='http://mail-archives.apache.org/mod_mbox/wicket-commits/'>Archives</a></td>
- <td><a href='http://wicket-commits.markmail.org/'>Search</a></td>
- <td><a href='mailto:commits-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket commits list'>Subscribe</a></td>
- <td><a href='mailto:commits-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket commits list'>Unsubscribe</a></td>
- <td><a href='mailto:commits-help@wicket.apache.org?subject=Help for Apache Wicket commits list'>Help</a></td>
+ <td><a href="http://mail-archives.apache.org/mod_mbox/wicket-commits/">Archives</a></td>
+ <td><a href="http://wicket-commits.markmail.org/">Search</a></td>
+ <td><a href="mailto:commits-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket commits list">Subscribe</a></td>
+ <td><a href="mailto:commits-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket commits list">Unsubscribe</a></td>
+ <td><a href="mailto:commits-help@wicket.apache.org?subject=Help for Apache Wicket commits list">Help</a></td>
</tr>
</table>
-<h2 id="report_a_security_issue">Report a security issue</h2>
-<p>If you have a security issue to report, please contact the <a href="mailto:private@wicket.apache.org?Security">Wicket PMC</a>.</p>
+<h2 id="report-a-security-issue">Report a security issue</h2>
+
+<p>If you have a security issue to report, please contact the <a href="mailto:private@wicket.apache.org?Security">Wicket
+PMC</a>.</p>
+
+
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/help/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/help/index.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/help/index.html (original)
+++ wicket/common/site/trunk/_site/help/index.html Sat Jul 19 12:26:11 2014
@@ -190,56 +190,78 @@
<p>There are two types of help available for Apache Wicket:</p>
<ol>
-<li>Support from the Apache Wicket open source project</li>
-
-<li>Commercial Support</li>
+ <li>Support from the Apache Wicket open source project</li>
+ <li>Commercial Support</li>
</ol>
-<h2 id="support_from_the_apache_wicket_open_source_project">Support From the Apache Wicket Open Source Project</h2>
+<h2 id="support-from-the-apache-wicket-open-source-project">Support From the Apache Wicket Open Source Project</h2>
-<p>If you are experiencing problems using Wicket please report your problem via the Issue Tracker. You may also find it useful to discuss your issues with the community on one of the Mailing Lists. Below are some resources to check before asking for help:</p>
+<p>If you are experiencing problems using Wicket please report your problem via
+the Issue Tracker. You may also find it useful to discuss your issues with the
+community on one of the Mailing Lists. Below are some resources to check
+before asking for help:</p>
<ul>
-<li><a href="email.html">Mailing Lists</a></li>
-
-<li><a href="https://issues.apache.org/jira/browse/WICKET">Issue Tracker</a></li>
-
-<li><a href="irc://irc.freenode.net/%23%23wicket">IRC</a></li>
+ <li><a href="email.html">Mailing Lists</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/WICKET">Issue Tracker</a></li>
+ <li><a href="irc://irc.freenode.net/%23%23wicket">IRC</a></li>
</ul>
-<p>Before asking for help with your issue, itâs a very good idea to search for your issue in the mailing list archives and the FAQ. The majority of issues can be solved in this manner without having to send an email to the mailing list. If you donât find an answer, use the guidelines below when writing the e-mail.</p>
-
-<h3 id="how_to_get_help">How to Get Help</h3>
-
-<p>Whenever you are reporting a problem, please be sure to include as much information as possible; the more we know, the better the chance of a quicker resolution.</p>
+<p>Before asking for help with your issue, itâs a very good idea to search for
+your issue in the mailing list archives and the FAQ. The majority of issues
+can be solved in this manner without having to send an email to the mailing
+list. If you donât find an answer, use the guidelines below when writing the
+e-mail.</p>
+
+<h3 id="how-to-get-help">How to Get Help</h3>
+
+<p>Whenever you are reporting a problem, please be sure to include as much
+information as possible; the more we know, the better the chance of a quicker
+resolution.</p>
<ul>
-<li>which version of the software</li>
-
-<li>what platform and JDK</li>
-
-<li>any particular JEE container being used - if so what version</li>
-
-<li>stack traces generally really help! If in doubt include the whole thing; often exceptions get wrapped in other exceptions and the exception right near the bottom explains the actual error, not the first few lines at the top. Its very easy for us to skim-read past unnecessary parts of a stack trace.</li>
-
-<li>log output can be useful too; sometimes enabling DEBUG logging can help your code & configuration files are often useful</li>
+ <li>which version of the software</li>
+ <li>what platform and JDK</li>
+ <li>any particular JEE container being used - if so what version</li>
+ <li>stack traces generally really help! If in doubt include the whole thing;
+often exceptions get wrapped in other exceptions and the exception right
+near the bottom explains the actual error, not the first few lines at the
+top. Its very easy for us to skim-read past unnecessary parts of a stack
+trace.</li>
+ <li>log output can be useful too; sometimes enabling DEBUG logging can help your
+code & configuration files are often useful</li>
</ul>
-<h3 id="how_to_get_help_faster">How to get help faster</h3>
+<h3 id="how-to-get-help-faster">How to get help faster</h3>
<p>We can help you much quicker if you try the following</p>
<ul>
-<li>provide us with a JUnit test case that demonstrates your issue. e.g. if you think youâve found a bug, can you create a test case to demonstrate the bug?</li>
-
-<li>submit a patch fixing the bug! (We also buy you beer when we meet you if you submit bug fixes for memory leaks or performance related issues, if you can run a profiler on your test case and attach the output as a file (or zipped file if its huge) to the JIRA we can normally fix things much faster. e.g. run JProfiler or YourKit on your code and send us the output. To find memory leaks its quicker to resolve if you can tell us what classes are taking up all of the RAM; we can normally figure out whats wrong from that.</li>
+ <li>provide us with a JUnit test case that demonstrates your issue. e.g. if you
+think youâve found a bug, can you create a test case to demonstrate the bug?</li>
+ <li>submit a patch fixing the bug! (We also buy you beer when we meet you if you
+submit bug fixes for memory leaks or performance related issues, if you can
+run a profiler on your test case and attach the output as a file (or zipped
+file if its huge) to the JIRA we can normally fix things much faster. e.g.
+run JProfiler or YourKit on your code and send us the output. To find memory
+leaks its quicker to resolve if you can tell us what classes are taking up
+all of the RAM; we can normally figure out whats wrong from that.</li>
</ul>
-<h2 id="commercial_support">Commercial Support</h2>
+<h2 id="commercial-support">Commercial Support</h2>
-<p>The list of companies found at <a href="https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services">this wiki page</a> provide commercial services for Wicket which ranges from training courses, consultancy and even project development.</p>
+<p>The list of companies found at <a href="https://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services">this wiki
+page</a>
+provide commercial services for Wicket which ranges from training courses,
+consultancy and even project development.</p>
+
+<p>Being mentioned here is not an indication of official âendorsementâ by the
+Apache Software Foundation, but is instead provided as a public service. This
+list is in no way a complete listing of the many organizations providing
+either free or for cost support for ASF projects. If you would like to be
+added to this list, or removed, sign up for the wiki and add yourself to the
+list.</p>
-<p>Being mentioned here is not an indication of official âendorsementâ by the Apache Software Foundation, but is instead provided as a public service. This list is in no way a complete listing of the many organizations providing either free or for cost support for ASF projects. If you would like to be added to this list, or removed, sign up for the wiki and add yourself to the list.</p>
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/help/irc.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/help/irc.html?rev=1611904&r1=1611903&r2=1611904&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/help/irc.html (original)
+++ wicket/common/site/trunk/_site/help/irc.html Sat Jul 19 12:26:11 2014
@@ -188,6 +188,7 @@
<div id="contentbody">
<h1>Get help on IRC</h1>
+
</div>
<div id="clearer"></div>
<div id="footer"><span>