Modified: wicket/common/site/trunk/_site/contribute/release.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/contribute/release.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/contribute/release.html (original) +++ wicket/common/site/trunk/_site/contribute/release.html Thu Apr 25 05:51:14 2013 @@ -210,7 +210,8 @@ <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> +</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> @@ -218,23 +219,27 @@ </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> +</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> </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> +</code></pre> +</div> <ul> <li>Create release branch:</li> </ul> <div class='highlight'><pre><code class='console'><span class='go'>mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span> -</code></pre></div> +</code></pre> +</div> <ul> <li>Checkout the release branch:</li> </ul> <div class='highlight'><pre><code class='console'><span class='go'>git checkout build/wicket-$NEWVERSION</span> -</code></pre></div> +</code></pre> +</div> <ul> <li> <p>Update archetypes/quickstart/src/main/archetype-resources/pom.xml to use NEWVERSION of Wicket and commit</p> @@ -253,18 +258,21 @@ </li> </ul> <div class='highlight'><pre><code class='console'><span class='go'>mvn release:prepare</span> -</code></pre></div> +</code></pre> +</div> <ul> <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 reset HEAD^ --hard</span> -</code></pre></div> +</code></pre> +</div> <ul> <li>Create source archive:</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> +</code></pre> +</div> <ul> <li><strong>NOTE 1</strong> the trailing ’/’ after –prefix=NEWVERSION is vital for the tarball</li> @@ -278,15 +286,18 @@ <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> +</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> +</code></pre> +</div> <h4 id='staging_the_build'>Staging the build</h4> <p><div class='highlight'><pre><code class='console'><span class='go'>ssh [email protected] mkdir public_html/wicket-$NEWVERSION</span> <span class='go'>scp apache-wicket-* [email protected]:public_html/wicket-$NEWVERSION</span> -</code></pre></div></p> +</code></pre> +</div></p> <p>The step below uploads the artifacts to a staging area for Maven.</p> @@ -298,7 +309,8 @@ <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> +</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> @@ -326,7 +338,8 @@ <span class='go'>gpg --print-md MD5 apache-wicket-$NEWVERSION-bin.zip > apache-wicket-$NEWVERSION-bin.zip.md5</span> <span class='go'>ssh [email protected] mkdir public_html/wicket-$NEWVERSION/bin</span> <span class='go'>scp apache-wicket-*bin.* [email protected]:public_html/wicket-$NEWVERSION/bin</span> -</code></pre></div> +</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> @@ -338,7 +351,8 @@ <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> +</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> @@ -368,7 +382,8 @@ <span class='go'> </server></span> <span class='go'></servers></span> <span class='go'></settings></span> -</code></pre></div> +</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> @@ -386,7 +401,8 @@ <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> +</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> @@ -397,7 +413,8 @@ <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> +</code></pre> +</div> <ul> <li>Wait until repo1.maven.org has picked up the release artifacts.</li> @@ -431,7 +448,8 @@ <span class='go'> </server></span> <span class='go'></servers></span> <span class='go'></settings></span> -</code></pre></div> +</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> @@ -459,7 +477,8 @@ <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> +</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> @@ -485,7 +504,8 @@ <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> +</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=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/contribute/write.html (original) +++ wicket/common/site/trunk/_site/contribute/write.html Thu Apr 25 05:51:14 2013 @@ -194,26 +194,30 @@ <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> +</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> +</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> +</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> +</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> @@ -231,7 +235,8 @@ <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> +</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> @@ -249,7 +254,8 @@ <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> +</code></pre> +</div> <h2 id='update'>Update the site</h2> <p>When you’re done with making your changes, please check the following:</p> Modified: wicket/common/site/trunk/_site/index.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/index.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/index.html (original) +++ wicket/common/site/trunk/_site/index.html Thu Apr 25 05:51:14 2013 @@ -194,7 +194,8 @@ <span class='nt'><artifactId></span>wicket-core<span class='nt'></artifactId></span> <span class='nt'><version></span>6.7.0<span class='nt'></version></span> <span class='nt'></dependency></span> -</code></pre></div><p>Or download and build the distribution yourself, or use our convenience binary package</p><ul> +</code></pre> +</div><p>Or download and build the distribution yourself, or use our convenience binary package</p><ul> <li>Source: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.7.0'>http://www.apache.org/dyn/closer.cgi/wicket/6.7.0</a></li> <li>Binary: <a href='http://www.apache.org/dyn/closer.cgi/wicket/6.7.0/binaries'>http://www.apache.org/dyn/closer.cgi/wicket/6.7.0/binaries</a></li> Modified: wicket/common/site/trunk/_site/learn/examples/ajaxcounter.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/ajaxcounter.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/ajaxcounter.html (original) +++ wicket/common/site/trunk/_site/learn/examples/ajaxcounter.html Thu Apr 25 05:51:14 2013 @@ -186,7 +186,8 @@ <span class='nt'></p></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>The link component will refresh the page and the label will replace the text ‘nr of times’ with the count. Take a look at the following Java file to see how it works on the Java side:</p> <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span> @@ -212,7 +213,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'><</span><span class='n'>Integer</span><span class='o'>>(</span><span class='s'>"counter"</span><span class='o'>,</span> <span class='n'>model</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>In this class we created a <code>Model</code> subclass that increases its counter everytime the <code>getObject</code> method gets called, and returns its value. We set this model on the label component, so that each time the label gets rendered the counter gets increased.</p> <p>The link doesn’t do anything, just listen to the requests and update the page. If you run this code in your application (download the Quickstart project and copy/paste the code in the homepage for a quick experience).</p> @@ -248,7 +250,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'><</span><span class='n'>Integer</span><span class='o'>>(</span><span class='s'>"counter"</span><span class='o'>,</span> <span class='n'>model</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>As you can see, the <code>Link</code> has been replaced with the <code>AjaxFallbackLink</code>, and the <code>onClick</code> method now takes a new argument: the <code>AjaxRequestTarget</code>. If you want a component to be updated in the Ajax request, you’ll have to add them to the target. So let’s alter the file to make it possible to add the label to the request target.</p> <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span> @@ -280,7 +283,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='n'>label</span><span class='o'>);</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>We’ve moved the instantiation of the label to the beginning of the page constructor and made a local, final variable. This way we can reference the label in the event handler of the link component.</p> <p>We also had to call <code>setOutputMarkupId(true)</code> on the label to be able to update the component when the request is returned to the client browser. If we don’t, Wicket will not know how to update the markup in the client.</p> Modified: wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html (original) +++ wicket/common/site/trunk/_site/learn/examples/dropdownchoice.html Thu Apr 25 05:51:14 2013 @@ -190,11 +190,12 @@ <span class='cm'>/**</span> <span class='cm'> * Gets the list of possible managers from the database.</span> <span class='cm'> */</span> - <span class='kd'>public</span> <span class='kd'>static</span> <span class='n'>List</span><span class='o'><</span><span class='n'>Person</span><span class='o'>></span> <span class='nf'>getManagers</span><span class='o'>()</span> <span class='o'>{</span> + <span class='kd'>public</span> <span class='kd'>static</span> <span class='n'>List</span><span class='o'><</span><span class='n'>Person</span><span class='o'>></span> <span class='n'>getManagers</span><span class='o'>()</span> <span class='o'>{</span> <span class='c1'>// gets the managers from the database</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h2 id='the_assign_manager_page'>The assign manager page</h2> <p>Next we want to create a page where we assign a manager to an employee. This is how the page would look like in HTML:</p> @@ -220,7 +221,8 @@ <span class='nt'></form></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>This page has three components:</p> <ul> @@ -253,7 +255,8 @@ <span class='n'>form</span><span class='o'>.</span><span class='na'>add</span><span class='o'>(</span><span class='n'>ddc</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>In this example you see that we add the <code>DropDownChoice</code> to the form, and provide it with 3 parameters. The first is the component identifier. The second is the item that needs to be updated, in this case the <code>managedBy</code> field of the <code>employee</code>. The third parameter is a <code>LoadableDetachableModel</code> that retrieves the list of available choices.</p> <p>Note that the <code>DropDownChoice</code> component has many constructors, and that you need to read the JavaDoc documentation to pick the right one for you.</p> @@ -271,7 +274,8 @@ <span class='nt'></select></span> <span class='nt'></td></span> <span class='nt'></tr></span> -</code></pre></div> +</code></pre> +</div> <p>As you can see from this markup is that Wicket added the items of the managers list and numbered the values of the options. These are the indices of the items in the list. If the order of the list can change between requests, <em>or</em> if the list itself can change, then please use an <code>IChoiceRenderer</code>.</p> <h2 id='selecting_a_choice'>Selecting a choice</h2> @@ -301,7 +305,8 @@ <span class='n'>newEmployee</span><span class='o'>.</span><span class='na'>setManagedBy</span><span class='o'>(</span><span class='n'>manager</span><span class='o'>);</span> <span class='n'>setResponsePage</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>AssignManagerPage</span><span class='o'>(</span><span class='n'>newEmployee</span><span class='o'>));</span> -</code></pre></div> +</code></pre> +</div> <h2 id='summary'>Summary</h2> <p>This concludes the (small) example of using a <code>DropDownChoice</code> component correctly. The ideas behind Wicket are perfectly reflected in this component: work with your domain objects, bind them to your components and get on with the rest of your application.</p> Modified: wicket/common/site/trunk/_site/learn/examples/guestbook.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/guestbook.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/guestbook.html (original) +++ wicket/common/site/trunk/_site/learn/examples/guestbook.html Thu Apr 25 05:51:14 2013 @@ -214,7 +214,8 @@ <span class='k'>return</span> <span class='s'>"[Comment date = "</span> <span class='o'>+</span> <span class='n'>date</span> <span class='o'>+</span> <span class='s'>", text = "</span> <span class='o'>+</span> <span class='n'>text</span> <span class='o'>+</span> <span class='s'>"]"</span><span class='o'>;</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h2 id='guestbookjava'>GuestBook.java</h2> <p>In the file <code>GuestBook.java</code> we have put the Java component code for the guestbook page. This is the homepage for the guestbook application. The page consists of a form for entering new items to the guestbook and a list of repeating markup for showing the guestbook entries.</p> @@ -315,7 +316,8 @@ <span class='n'>commentList</span><span class='o'>.</span><span class='na'>clear</span><span class='o'>();</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>When the <code>CommentForm</code> is submitted, the <code>onSubmit()</code> method is called. Notice that nothing gets the value of the <code>TextArea</code> that was added in the <code>CommentForm</code> constructor. This is because the comment is the model and the third parameter to the <code>TextArea</code> constructor specified the property of the model to update. So all <code>onSubmit()</code> has to do is create a new comment from the model that was updated and add it to the comment list. When the page redraws, the new list will be rendered.</p> <p>We use a synchronized list as our shared static model used by <code>commentListView</code> (<code>commentList</code>) to ensure that it is only updated by one thread at a time. Remember, this is a multi-user application with a shared model!</p> @@ -358,7 +360,8 @@ <span class='nt'></wicket:remove></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <h2 id='guestbookapplicationjava'>GuestBookApplication.java</h2> <p>For completeness, we’ve included the <code>GuestBookApplication</code> class, and as a final treat the modifications to the <code>web.xml</code> file.</p> @@ -376,7 +379,8 @@ <span class='k'>return</span> <span class='n'>GuestBook</span><span class='o'>.</span><span class='na'>class</span><span class='o'>;</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h2 id='webxml'>web.xml</h2> <p>Add the following two sections (servlet and servlet-mapping) to your web.xml file for running this application.</p> @@ -388,7 +392,8 @@ <span class='nt'><param-value></span>org.apache.wicket.examples.guestbook.GuestBookApplication<span class='nt'></param-value></span> <span class='nt'></init-param></span> <span class='nt'></filter></span> -</code></pre></div> +</code></pre> +</div> </div> <div id="clearer"></div> <div id="footer"><span> Modified: wicket/common/site/trunk/_site/learn/examples/helloworld.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/helloworld.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/helloworld.html (original) +++ wicket/common/site/trunk/_site/learn/examples/helloworld.html Thu Apr 25 05:51:14 2013 @@ -191,7 +191,8 @@ <span class='k'>return</span> <span class='n'>HelloWorld</span><span class='o'>.</span><span class='na'>class</span><span class='o'>;</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>Here you can see that we define <code>wicket.examples.helloworld.HelloWorld</code> to be our home page. When the base URL of our application is requested, the markup rendered by the HelloWorld page is returned.</p> <h3 id='helloworldjava'>HelloWorld.java</h3> @@ -203,7 +204,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>"message"</span><span class='o'>,</span> <span class='s'>"Hello World!"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>The Label is constructed using two parameters:</p> <ol> @@ -226,7 +228,8 @@ <span class='nt'><span</span> <span class='na'>wicket:id=</span><span class='s'>"message"</span><span class='nt'>></span>Message goes here<span class='nt'></span></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In this file, you see two elements that need some attention:</p> <ul> @@ -264,7 +267,8 @@ <span class='nt'><url-pattern></span>/*<span class='nt'></url-pattern></span> <span class='nt'></filter-mapping></span> <span class='nt'></web-app></span> -</code></pre></div> +</code></pre> +</div> <p>In this definition you see the Wicket filter defined, which handles all requests. In order to let Wicket know which application is available, only the applicationClassName filter parameter is needed.</p> <p>Also, notice the url-mapping to /*. The Wicket filter will only process requests that are Wicket requests. If a request is not Wicket related, the filter will pass the request on to the chain. This ensures that (static) resources outside the realm of the Wicket application, such as style sheets, JavaScript files, images and so forth will be served by the container.</p> Modified: wicket/common/site/trunk/_site/learn/examples/markupinheritance.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/markupinheritance.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/markupinheritance.html (original) +++ wicket/common/site/trunk/_site/learn/examples/markupinheritance.html Thu Apr 25 05:51:14 2013 @@ -197,7 +197,8 @@ This is in the super markup.<span class='nt'><br></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In this markup you see two sentences that surround the <code><wicket:child></code> tag. All markup in this file will remain when a sub class of this page is created, only the <code><wicket:child></code> tag will be replaced with the child markup. So if we look at the following markup:</p> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><head></head></span> @@ -209,7 +210,8 @@ This is in the child markup.<span class='nt'><br></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>we can see the markup that should be included in the parent. Only the markup between the <code><wicket:extend></code> tags is included in the final page. Take a look at the following markup which is the final markup when you would use this in a Wicket application.</p> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><head></head></span> @@ -221,7 +223,8 @@ This is in the super markup.<span class='nt'><br></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>Here you can see that the <code><wicket:child /></code> tag has been expanded, and its contents filled with exactly the markup between the <code><wicket:extend></code> tags. If you want to get rid of the special Wicket tags, you can disable that on the markup settings (<a href='http://wicketframework.org/api/wicket/settings/IMarkupSettings'>IMarkupSettings</a>).</p> <h2 id='implementing_the_basepage'>Implementing the BasePage</h2> @@ -240,7 +243,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>"footer"</span><span class='o'>,</span> <span class='s'>"This is in the footer"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>The two links should go into the header, and the footer in the footer of the page. Note that the abstract keyword isn’t required, but considered a good practise. Now let’s take a look at the markup for the BasePage</p> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><head></head></span> @@ -257,7 +261,8 @@ <span class='nt'></div></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In this markup file you see the specific basic layout: we have 3 div elements:</p> <ol> @@ -282,7 +287,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>"label1"</span><span class='o'>,</span> <span class='s'>"This is in the subclass Page1"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>In this example you see that we add a new label component to the page: <code>label1</code>. This component is only available for <code>Page1</code>, as such <code>Page2</code> can define its own component hierarchy. Let’s take a look at the markup for <code>Page1</code>:</p> <div class='highlight'><pre><code class='java'><span class='o'><</span><span class='n'>html</span><span class='o'>></span> <span class='o'><</span><span class='n'>head</span><span class='o'>></</span><span class='n'>head</span><span class='o'>></span> @@ -293,7 +299,8 @@ <span class='o'></</span><span class='nl'>wicket:</span><span class='n'>extend</span><span class='o'>></span> <span class='o'></</span><span class='n'>body</span><span class='o'>></span> <span class='o'></</span><span class='n'>html</span><span class='o'>></span> -</code></pre></div> +</code></pre> +</div> <p>Here you see that we added the <code>Label</code> component in the markup between the <code><wicket:extend></code> tags. If we were to add the component outside those tags, Wicket will not be able to render the component in the final page.</p> <p>Now, let’s do the same for <code>Page2</code>.</p> @@ -306,7 +313,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>Label</span><span class='o'>(</span><span class='s'>"label2"</span><span class='o'>,</span> <span class='s'>"This is in the subclass Page2"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div><div class='highlight'><pre><code class='html'><span class='nt'><html></span> +</code></pre> +</div><div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><head></head></span> <span class='nt'><body></span> <span class='nt'><wicket:extend></span> @@ -315,7 +323,8 @@ <span class='nt'></wicket:extend></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In <code>Page2</code> you see that we have a different component structure (<code>label2</code> instead of <code>label1</code>), and as such that the pages are quite different.</p> <p>If you paste this code into a Wicket quickstart application, you can see it immediately working (don’t forget to set the homepage to <code>Page1</code> or <code>Page2</code>).</p> Modified: wicket/common/site/trunk/_site/learn/examples/navomatic.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/navomatic.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/navomatic.html (original) +++ wicket/common/site/trunk/_site/learn/examples/navomatic.html Thu Apr 25 05:51:14 2013 @@ -202,7 +202,8 @@ <span class='nt'></wicket:border></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <h3 id='border_usage'>Border usage</h3> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><body></span> @@ -211,14 +212,16 @@ <span class='nt'></span></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <h3 id='rendered_markup'>Rendered markup</h3> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><body></span> First Middle Last <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In other words, the markup around the <code><wicket:body/></code> tag in the border component is sort of “wrapped around” the body of the <code><span></code> tag where the border is used. This seems simple in this example, but keep in mind that nested components and even nested borders can appear anywhere in either markup file. This can be used to create quite complex effects with relatively little code.</p> <h3 id='navomaticapplicationjava'>NavomaticApplication.java</h3> @@ -236,7 +239,8 @@ <span class='k'>return</span> <span class='n'>Page1</span><span class='o'>.</span><span class='na'>class</span><span class='o'>;</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h3 id='page1java'>Page1.java</h3> <p>The Page1 Java and HTML files look like this:</p> @@ -249,7 +253,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>NavomaticBorder</span><span class='o'>(</span><span class='s'>"navomaticBorder"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h3 id='page1html'>Page1.html</h3> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><body></span> @@ -258,7 +263,8 @@ <span class='nt'></span></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>Notice that the NavomaticBorder component is attached to the <code><span></code> tag because the name of the component in the Java code is “navomaticBorder” and the <code><span></code> tag’s wicket:id attribute is set to “navomaticBorder”. Because the two names match, Wicket associates the NavomaticBorder Java component with the <code><span></code> tag.</p> <h3 id='page2java'>Page2.java</h3> @@ -269,7 +275,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>NavomaticBorder</span><span class='o'>(</span><span class='s'>"navomaticBorder"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h3 id='page2html'>Page2.html</h3> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><body></span> @@ -278,7 +285,8 @@ <span class='nt'></span></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <h3 id='navomaticborderjava'>NavomaticBorder.java</h3> <p>So how does NavomaticBorder work? Glad you asked. The Java code below simply adds the two BoxBorder components you see. These components are nested borders which each draw a thin black line around their contents. The rest of the magic is in the NavomaticBorder markup.</p> @@ -295,7 +303,8 @@ <span class='n'>addToBorder</span><span class='o'>(</span><span class='k'>new</span> <span class='n'>BoxBorder</span><span class='o'>(</span><span class='s'>"bodyBorder"</span><span class='o'>));</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <h3 id='navomaticborderhtml'>NavomaticBorder.html</h3> <div class='highlight'><pre><code class='html'><span class='nt'><html></span> <span class='nt'><body></span> @@ -326,7 +335,8 @@ <span class='nt'></wicket:border></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>Notice that the markup above encloses the entire contents of the markup file’s <code><body></code> with a <code><wicket:border></code> tag, as we described earlier. This lets the NavomaticBorder know how much of its markup to use when it wraps itself around the markup it finds in the context where it is used. Notice also the <code><wicket:body/></code> marker which designates where to put whatever is found inside the tag at the use context.</p> <p>Next, notice that the navigation links and the border’s <code><wicket:body/></code> are both enclosed in <code><span></code> tags which have wicket:id attributes that associate those tags with the BoxBorder components added in the NavomaticBorder constructor. These nested border components will each draw a thin black line around their contents.</p> @@ -349,7 +359,8 @@ <span class='nt'><servlet-name></span>NavomaticApplication<span class='nt'></servlet-name></span> <span class='nt'><url-pattern></span>/app/*<span class='nt'></url-pattern></span> <span class='nt'></servlet-mapping></span> -</code></pre></div> +</code></pre> +</div> </div> <div id="clearer"></div> <div id="footer"><span> Modified: wicket/common/site/trunk/_site/learn/examples/usingfragments.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/examples/usingfragments.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/examples/usingfragments.html (original) +++ wicket/common/site/trunk/_site/learn/examples/usingfragments.html Thu Apr 25 05:51:14 2013 @@ -187,7 +187,8 @@ <span class='nt'><wicket:fragment</span> <span class='na'>wicket:id=</span><span class='s'>"fragment2"</span><span class='nt'>></span>panel 2<span class='nt'></wicket:fragment></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>As you can see in this markup file, we already took care of adding the fragment markup to the page in the <code><wicket:fragment></code> tags. Each fragment can contain its own markup and components. Those components need to be added to the Fragment instance in the Java file, just as you would do with a panel and web markup container.</p> <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span> @@ -205,7 +206,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='n'>loop</span><span class='o'>);</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>The Loop will render 5 items, and the <code>populateItem</code> method will be called for each item. In each item we construct a fragment identifier that corresponds to the identifier in the <code><wicket:fragment></code>. The <code>Fragment</code> constructor takes the identifier of the markup it needs to attach to, and the fragment identifier telling it where to find the specific markup in the file.</p> <h2 id='adding_components_to_fragments'>Adding components to fragments</h2> @@ -221,7 +223,8 @@ <span class='nt'><wicket:fragment</span> <span class='na'>wicket:id=</span><span class='s'>"fragment2"</span><span class='nt'>></span>panel 2<span class='nt'></wicket:fragment></span> <span class='nt'></body></span> <span class='nt'></html></span> -</code></pre></div> +</code></pre> +</div> <p>In order to add the component to the first fragment we’ll introduce a subclass for fragment one to encapsulate the component.</p> <div class='highlight'><pre><code class='java'><span class='kn'>package</span> <span class='n'>wicket</span><span class='o'>.</span><span class='na'>quickstart</span><span class='o'>;</span> @@ -252,7 +255,8 @@ <span class='n'>add</span><span class='o'>(</span><span class='n'>loop</span><span class='o'>);</span> <span class='o'>}</span> <span class='o'>}</span> -</code></pre></div> +</code></pre> +</div> <p>The class <code>Fragment1</code> adds the label to itself. In the loop’s <code>populateItem</code> we alternate the fragments type between <code>Fragment</code> and <code>Fragment1</code>. This means that in the final page on one line you’ll see <code>"panel 1 Hello, World!"</code> and on the other line just <code>"panel 2"</code>.</p> <h2 id='summary'>Summary</h2> 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=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/projects/authroles.html (original) +++ wicket/common/site/trunk/_site/learn/projects/authroles.html Thu Apr 25 05:51:14 2013 @@ -223,7 +223,8 @@ <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> @@ -258,7 +259,8 @@ <span class='nt'><artifactId></span>wicket-auth-roles<span class='nt'></artifactId></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/velocity.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/learn/projects/velocity.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/learn/projects/velocity.html (original) +++ wicket/common/site/trunk/_site/learn/projects/velocity.html Thu Apr 25 05:51:14 2013 @@ -193,7 +193,8 @@ #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> @@ -206,7 +207,8 @@ <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> @@ -218,14 +220,16 @@ <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> @@ -238,7 +242,8 @@ <span class='nt'><artifactId></span>wicket-velocity<span class='nt'></artifactId></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/start/download.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/download.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/start/download.html (original) +++ wicket/common/site/trunk/_site/start/download.html Thu Apr 25 05:51:14 2013 @@ -234,14 +234,16 @@ <span class='nt'><artifactId></span>wicket-core<span class='nt'></artifactId></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> @@ -275,7 +277,8 @@ <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/quickstart.html URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/quickstart.html?rev=1475639&r1=1475638&r2=1475639&view=diff ============================================================================== --- wicket/common/site/trunk/_site/start/quickstart.html (original) +++ wicket/common/site/trunk/_site/start/quickstart.html Thu Apr 25 05:51:14 2013 @@ -218,7 +218,7 @@ <select id='version' onchange='changeIt();'> - <option value='6.8-SNAPSHOT'>6.8-SNAPSHOT</option> + <option value='6.8.0-SNAPSHOT'>6.8.0-SNAPSHOT</option> @@ -238,7 +238,7 @@ - <option value='6.6.0'>6.6.0</option> + <option selected='selected' value='6.7.0'>6.7.0</option> </select><span title='Wicket Version'> (?)</span>
