You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2013/04/18 11:30:09 UTC
svn commit: r1469244 [4/4] - in /wicket/common/site/trunk: ./ _includes/
_posts/ _site/ _site/2009/07/30/ _site/2009/08/21/ _site/2009/10/12/
_site/2009/10/24/ _site/2009/12/13/ _site/2009/12/21/ _site/2010/02/01/
_site/2010/03/05/ _site/2010/05/03/ _s...
Modified: wicket/common/site/trunk/_site/learn/projects/authroles.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/authroles.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/authroles.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/authroles.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
@@ -223,8 +223,7 @@
<span class='c1'>// either bookmarkable or not</span>
<span class='nd'>@AuthorizeInstantiation</span><span class='o'>(</span><span class='s'>"ADMIN"</span><span class='o'>)</span>
<span class='kd'>public</span> <span class='kd'>class</span> <span class='nc'>AdminAnnotationsBookmarkablePage</span> <span class='kd'>extends</span> <span class='n'>WebPage</span>
-</code></pre>
-</div>
+</code></pre></div>
<p>When someone who doesn’t have the role ADMIN, Wicket will not allow the page to be fully constructed and throw an authorization exception during the construction of the page. This will result in an access denied page for the user.</p>
<p>Enablng the annotations for role based authorization is done by setting the <code>WebApplication#getSecuritySettings</code> value to <code>AnnotationsRoleAuthorizationStrategy</code>. Then you can use the auth/roles provided authorization annotations.</p>
@@ -257,10 +256,9 @@
<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-auth-roles<span class='nt'></artifactId></span>
- <span class='nt'><version></span>6.6.0<span class='nt'></version></span>
+ <span class='nt'><version></span>6.7.0<span class='nt'></version></span>
<span class='nt'></dependency></span>
-</code></pre>
-</div>
+</code></pre></div>
<h3 id='required_dependencies'>Required dependencies</h3>
<p>Wicket Auth/Roles requires the following jar files to be on your classpath:</p>
Modified: wicket/common/site/trunk/_site/learn/projects/datetime.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/datetime.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/datetime.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/datetime.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/devutils.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/devutils.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/devutils.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/devutils.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/extensions.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/extensions.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/extensions.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/extensions.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/guice.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/guice.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/guice.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/guice.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/index.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/index.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/index.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/ioc.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/ioc.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/ioc.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/ioc.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/jmx.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/jmx.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/jmx.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/jmx.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/spring.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/spring.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/spring.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/spring.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/learn/projects/velocity.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/velocity.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/learn/projects/velocity.html (original)
+++ wicket/common/site/trunk/_site/learn/projects/velocity.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
@@ -193,8 +193,7 @@
#else
They are not equivalent and this will be the output.
#end
-</code></pre>
-</div>
+</code></pre></div>
<p>Read <a href='http://velocity.apache.org/engine/releases/velocity-1.4/user-guide.html'>more</a> about the Velocity template language.</p>
<p>This project allows you to use Velocity templates as a component within your Wicket pages, and let them live next to Wicket components. A typical usecase would be to enable your users to embed Velocity templates in your application and using that as a type of portlet.</p>
@@ -207,8 +206,7 @@
<div class='highlight'><pre><code class='html'><span class='nt'><h2></span>This is a Velocity template<span class='nt'></h2></span>
<span class='nt'><p></span>The secret message is: $message<span class='nt'></p></span>
-</code></pre>
-</div>
+</code></pre></div>
<p>In this template we want to replace the string <code>$message</code> with the text “Hello, World!”. <code>$message</code> is Velocity markup denoting a variable that is taken from the context that is provided to the Velocity rendering engine.</p>
<p>To use Velocity in your Wicket pages we provide a <code>VelocityPanel</code> which enables you to generate parts of your page using Velocity markup. Adding the panel to your Wicket page is shown in the following example:</p>
@@ -220,16 +218,14 @@
<span class='n'>UrlResourceStream</span> <span class='n'>template</span> <span class='o'>=</span> <span class='k'>new</span> <span class='n'>UrlResourceStream</span><span class='o'>(</span><span class='n'>getClass</span><span class='o'>().</span><span class='na'>getResource</span><span class='o'>(</span><span class='s'>"test.html"</span><span class='o'>));</span>
<span class='n'>add</span><span class='o'>(</span><span class='n'>VelocityPanel</span><span class='o'>.</span><span class='na'>forTemplateResource</span><span class='o'>(</span><span class='s'>"velocityPanel"</span><span class='o'>,</span> <span class='n'>context</span><span class='o'>,</span> <span class='n'>template</span><span class='o'>));</span>
<span class='o'>}</span>
-</code></pre>
-</div>
+</code></pre></div>
<p><code>VelocityPanel.forTemplateResource</code> creates a <code>VelocityPanel</code> and sets up the engine such that the context is merged with the template with each render.</p>
<p>The markup of the page is quite simple: adding a VelocityPanel is as simple as using a <code>div</code> and attaching a <code>wicket:identifier</code> to it. The following example shows this.</p>
<div class='highlight'><pre><code class='html'><span class='cp'><!DOCTYPE html></span>
<span class='nt'><h1></span>This is a test page for Velocity<span class='nt'></h1></span>
<span class='nt'><div</span> <span class='na'>wicket:id=</span><span class='s'>"velocityPanel"</span><span class='nt'>></div></span>
-</code></pre>
-</div>
+</code></pre></div>
<h2 id='installing'>Installing</h2>
<p>Installing Wicket Velocity can be done through adding a dependency in your project’s Maven pom, or by putting the wicket-velocity.jar and the required dependencies in your projects classpath.</p>
@@ -240,10 +236,9 @@
<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-velocity<span class='nt'></artifactId></span>
- <span class='nt'><version></span>6.6.0<span class='nt'></version></span>
+ <span class='nt'><version></span>6.7.0<span class='nt'></version></span>
<span class='nt'></dependency></span>
-</code></pre>
-</div>
+</code></pre></div>
<h3 id='required_dependencies'>Required dependencies</h3>
<p>Wicket Velocity requires the following jar files to be on your classpath:</p>
Modified: wicket/common/site/trunk/_site/meet/blogs.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/blogs.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/blogs.html (original)
+++ wicket/common/site/trunk/_site/meet/blogs.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/meet/buzz.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/buzz.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/buzz.html (original)
+++ wicket/common/site/trunk/_site/meet/buzz.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/meet/features.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/features.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/features.html (original)
+++ wicket/common/site/trunk/_site/meet/features.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/meet/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/index.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/index.html (original)
+++ wicket/common/site/trunk/_site/meet/index.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/meet/introduction.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/introduction.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/introduction.html (original)
+++ wicket/common/site/trunk/_site/meet/introduction.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/meet/vision.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/meet/vision.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/meet/vision.html (original)
+++ wicket/common/site/trunk/_site/meet/vision.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/start/download.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/download.html (original)
+++ wicket/common/site/trunk/_site/start/download.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
@@ -168,16 +168,16 @@
<div id="contentbody">
<h1>Download Wicket releases</h1>
- <p>Apache Wicket 6.6.0 is the current stable release. Most users get Apache Wicket using <a href='#maven'>Apache Maven’s dependency management</a>, which incidentally is the most convenient way of obtaining the latest and greatest Wicket.</p>
+ <p>Apache Wicket 6.7.0 is the current stable release. Most users get Apache Wicket using <a href='#maven'>Apache Maven’s dependency management</a>, which incidentally is the most convenient way of obtaining the latest and greatest Wicket.</p>
<h2 id='download'>Download</h2>
-<p>New projects should use <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.6.0'>Wicket 6.6.0</a> as their base.</p>
+<p>New projects should use <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.7.0'>Wicket 6.7.0</a> as their base.</p>
<ul>
-<li><strong>Latest stable release</strong>: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.6.0'>6.6.0</a></li>
+<li><strong>Latest stable release</strong>: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.7.0'>6.7.0</a></li>
-<li><strong>Latest 6.x release</strong>: <a href='http://archive.apache.org/dist/wicket/6.6.0'>6.6.0</a></li>
+<li><strong>Latest 6.x release</strong>: <a href='http://archive.apache.org/dist/wicket/6.7.0'>6.7.0</a></li>
<li><strong>Latest 1.5.x release</strong>: <a href='http://archive.apache.org/dist/wicket/1.5.10'>1.5.10</a></li>
@@ -232,18 +232,16 @@
<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.6.0<span class='nt'></version></span>
+ <span class='nt'><version></span>6.7.0<span class='nt'></version></span>
<span class='nt'></dependency></span>
-</code></pre>
-</div>
+</code></pre></div>
<p>For the SLF4J log4j binding:</p>
<div class='highlight'><pre><code class='xml'><span class='nt'><dependency></span>
<span class='nt'><groupId></span>org.slf4j<span class='nt'></groupId></span>
<span class='nt'><artifactId></span>slf4j-log4j12<span class='nt'></artifactId></span>
<span class='nt'><version></span>1.6.4<span class='nt'></version></span>
<span class='nt'></dependency></span>
-</code></pre>
-</div>
+</code></pre></div>
<h2 id='snapshots_and_latest_bleedingedge_code'>SNAPSHOTs and latest bleeding-edge code</h2>
<p>If you wish to build the latest code from scratch, master and branches live in Git repository: <a href='https://git-wip-us.apache.org/repos/asf/wicket.git'>https://git-wip-us.apache.org/repos/asf/wicket.git</a></p>
@@ -277,8 +275,7 @@
<span class='nt'><layout></span>default<span class='nt'></layout></span>
<span class='nt'></repository></span>
<span class='nt'></repositories></span>
-</code></pre>
-</div>
+</code></pre></div>
</div>
<div id="clearer"></div>
<div id="footer"><span>
Modified: wicket/common/site/trunk/_site/start/index.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/index.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/index.html (original)
+++ wicket/common/site/trunk/_site/start/index.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/start/installing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/installing.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/installing.html (original)
+++ wicket/common/site/trunk/_site/start/installing.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
Modified: wicket/common/site/trunk/_site/start/quickstart.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/quickstart.html?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/quickstart.html (original)
+++ wicket/common/site/trunk/_site/start/quickstart.html Thu Apr 18 09:30:06 2013
@@ -89,7 +89,7 @@
</h5>
<ul>
<li>
- <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.6.0">Wicket 6.6</a>
+ <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.7.0">Wicket 6.7</a>
</li>
<li>
<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.10">Wicket 1.5</a>
@@ -218,7 +218,7 @@
<select id='version' onchange='changeIt();'>
- <option value='6.7-SNAPSHOT'>6.7-SNAPSHOT</option>
+ <option value='6.8-SNAPSHOT'>6.8-SNAPSHOT</option>
@@ -238,7 +238,7 @@
- <option selected='selected' value='6.6.0'>6.6.0</option>
+ <option value='6.6.0'>6.6.0</option>
</select><span title='Wicket Version'> (?)</span>
Modified: wicket/common/site/trunk/contribute/release.md
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/contribute/release.md?rev=1469244&r1=1469243&r2=1469244&view=diff
==============================================================================
--- wicket/common/site/trunk/contribute/release.md (original)
+++ wicket/common/site/trunk/contribute/release.md Thu Apr 18 09:30:06 2013
@@ -35,10 +35,12 @@ This assumes running a unix-y environmen
eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`
{% endhighlight %}
-* 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):
+* 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)
+* And create an environment variable for your Apache username for uploading the release:
{% highlight console %}
export NEWVERSION=6.0.0
+export APACHEID=apacheid
{% endhighlight %}
* 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:
@@ -107,17 +109,8 @@ git tag -s --force wicket-$NEWVERSION
#### Staging the build
{% highlight console %}
-ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION
-scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION
-{% endhighlight %}
-
-**TODO** figure out how to let `release:perform` work from a local checkout, such that we can actually *stage* the build instead of having to push the tag to our git repo.
-
-The following steps are ONLY necessary as long as the above TODO has not been resolved.
-
-{% highlight console %}
-git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION
-git push -tags origin
+ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION
+scp apache-wicket-* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION
{% endhighlight %}
The step below uploads the artifacts to a staging area for Maven.
@@ -148,16 +141,16 @@ cp ../LICENSE .
cp ../README .
cp ../NOTICE .
cd ..
-tar xfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION
-zip apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION
-gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz
-gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.zip
+tar cfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION
+zip -r apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION
+gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz
+gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.zip
gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.sha
gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.tar.gz > apache-wicket-$NEWVERSION-bin.tar.gz.md5
-gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION.-binzip.sha
+gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.sha
gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.md5
-ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin
-scp apache-wicket-*bin.* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION/bin
+ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin
+scp apache-wicket-*bin.* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION/bin
{% endhighlight %}
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.
@@ -168,7 +161,7 @@ Start a vote on dev@ for this release. A
#### Promoting the build
-The following two steps are only necessary when the previous TODO is resolved (you can't push the tag twice).
+When the vote has passed successfully (at least 3 binding +1's) push the branch and the tag to Apache git:
{% highlight console %}
git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION