You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by re...@apache.org on 2026/09/16 12:29:43 UTC
(wicket) 01/01: Show the title of each example on its page
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a commit to branch reiern70/improve-examples
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 0b061d4fed6317a549671a41a641e80f6f041441
Author: reiern70 <re...@gmail.com>
AuthorDate: Tue Sep 15 17:09:40 2026 -0500
Show the title of each example on its page
Example pages linked from an index gave no hint of which example they
showed: the link text was not repeated on the page, and the browser
title was a generic, often stale, per-application string.
WicketExamplePage now renders the example's title as a heading and as
the browser title. The title is read from the resource key
<simple class name>.title, kept in a wicket-package.properties per
example application, and index pages use the same keys for their link
texts. The hard-coded <title> tags and headings duplicating the new
title are removed from the example markup, and a test checks that every
example page has a title.
Co-Authored-By: Claude Opus 5 <no...@anthropic.com>
---
.../apache/wicket/examples/WicketExamplePage.html | 2 +
.../apache/wicket/examples/WicketExamplePage.java | 64 ++++++++++-
.../wicket/examples/WicketExamplePage.properties | 16 +++
.../wicket/examples/ajax/builtin/BasePage.html | 1 -
.../wicket/examples/ajax/builtin/GuestBook.html | 1 -
.../apache/wicket/examples/ajax/builtin/Index.html | 41 +------
.../apache/wicket/examples/ajax/builtin/Index.java | 44 +++++++-
.../examples/ajax/builtin/PageablesPage.html | 1 -
.../wicket/examples/ajax/builtin/RatingsPage.html | 1 -
.../wicket/examples/ajax/builtin/TodoList.html | 1 -
.../ajax/builtin/wicket-package.properties | 69 ++++++++++++
.../wicket/examples/ajax/prototype/Index.html | 3 -
.../ajax/prototype/wicket-package.properties | 15 +++
.../ajaxhellobrowser/AjaxHelloBrowser.html | 1 -
.../ajaxhellobrowser/wicket-package.properties | 15 +++
.../AjaxHelloBrowserOnDomReady.html | 1 -
.../wicket-package.properties | 15 +++
.../wicket/examples/asemail/MailTemplate.html | 1 -
.../examples/asemail/wicket-package.properties | 15 +++
.../wicket/examples/authentication1/Home.html | 1 -
.../wicket/examples/authentication1/SignIn.html | 1 -
.../wicket/examples/authentication1/SignOut.html | 1 -
.../authentication1/wicket-package.properties | 17 +++
.../wicket/examples/authentication2/Home.html | 1 -
.../wicket/examples/authentication2/SignIn2.html | 1 -
.../wicket/examples/authentication2/SignOut.html | 1 -
.../authentication2/wicket-package.properties | 17 +++
.../wicket/examples/authentication3/BasePage.html | 1 -
.../examples/authentication3/MySignInPage.html | 1 -
.../wicket/examples/authentication3/SignOut.html | 1 -
.../authentication3/wicket-package.properties | 18 +++
.../wicket/examples/authorization/BasePage.html | 1 -
.../wicket/examples/authorization/Index.html | 24 +---
.../authorization/wicket-package.properties | 21 ++++
.../bean/validation/BeanValidationPage.html | 1 -
.../bean/validation/wicket-package.properties | 15 +++
.../apache/wicket/examples/breadcrumb/Index.html | 1 -
.../examples/breadcrumb/wicket-package.properties | 15 +++
.../apache/wicket/examples/captcha/Captcha.html | 1 -
.../examples/captcha/wicket-package.properties | 15 +++
.../apache/wicket/examples/cdi/CdiExamplePage.html | 2 -
.../apache/wicket/examples/cdi/CdiHomePage.html | 6 +-
.../wicket/examples/cdi/wicket-package.properties | 21 ++++
.../examples/compref/BookmarkablePageLinkPage.html | 2 -
.../apache/wicket/examples/compref/BorderPage.html | 2 -
.../apache/wicket/examples/compref/ButtonPage.html | 2 -
.../compref/CheckBoxMultipleChoicePage.html | 2 -
.../wicket/examples/compref/CheckBoxPage.html | 2 -
.../examples/compref/CheckBoxSelectorPage.html | 2 -
.../wicket/examples/compref/CheckGroupPage.html | 2 -
.../wicket/examples/compref/CheckGroupPage2.html | 2 -
.../examples/compref/DropDownChoicePage.html | 2 -
.../wicket/examples/compref/ExternalLinkPage.html | 2 -
.../apache/wicket/examples/compref/FormPage.html | 2 -
.../wicket/examples/compref/FragmentPage.html | 2 -
.../org/apache/wicket/examples/compref/Index.html | 58 +++++-----
.../apache/wicket/examples/compref/LabelPage.html | 2 -
.../apache/wicket/examples/compref/LinkPage.html | 2 -
.../wicket/examples/compref/ListChoicePage.html | 2 -
.../examples/compref/ListMultipleChoicePage.html | 2 -
.../examples/compref/MultiLineLabelPage.html | 2 -
.../wicket/examples/compref/PalettePage.html | 2 -
.../apache/wicket/examples/compref/PanelPage.html | 2 -
.../wicket/examples/compref/RadioChoicePage.html | 2 -
.../wicket/examples/compref/RadioGroupPage.html | 2 -
.../wicket/examples/compref/RadioGroupPage2.html | 2 -
.../apache/wicket/examples/compref/SelectPage.html | 2 -
.../wicket/examples/compref/SubmitLinkPage.html | 2 -
.../wicket/examples/compref/TabbedPanelPage.html | 2 -
.../wicket/examples/compref/TextAreaPage.html | 2 -
.../wicket/examples/compref/TextFieldPage.html | 2 -
.../examples/compref/wicket-package.properties | 42 +++++++
.../apache/wicket/examples/csp/NonceDemoPage.html | 2 -
.../wicket/examples/csp/wicket-package.properties | 15 +++
.../CustomLoadedTemplate.html | 3 +-
.../examples/customresourceloading/Index.html | 1 -
.../wicket-package.properties | 18 +++
.../wicket/examples/datetime/DateTimePage.html | 1 -
.../examples/datetime/wicket-package.properties | 15 +++
.../java/org/apache/wicket/examples/echo/Echo.html | 1 -
.../wicket/examples/echo/wicket-package.properties | 15 +++
.../org/apache/wicket/examples/encodings/Home.html | 3 -
.../examples/encodings/wicket-package.properties | 15 +++
.../apache/wicket/examples/events/BasePage.html | 1 -
.../apache/wicket/examples/events/IndexPage.html | 2 +-
.../examples/events/wicket-package.properties | 16 +++
.../wicket/examples/forminput/FormInput.html | 3 -
.../examples/forminput/wicket-package.properties | 15 +++
.../apache/wicket/examples/frames/TopFrame.html | 1 -
.../wicket/examples/guestbook/GuestBook.html | 3 -
.../examples/guestbook/wicket-package.properties | 15 +++
.../org/apache/wicket/examples/guice/HomePage.html | 1 -
.../examples/guice/wicket-package.properties | 15 +++
.../org/apache/wicket/examples/hangman/Guess.html | 1 -
.../org/apache/wicket/examples/hangman/Home.html | 3 -
.../org/apache/wicket/examples/hangman/Lose.html | 1 -
.../org/apache/wicket/examples/hangman/Win.html | 1 -
.../examples/hangman/wicket-package.properties | 18 +++
.../wicket/examples/hellobrowser/HelloBrowser.html | 1 -
.../hellobrowser/wicket-package.properties | 15 +++
.../wicket/examples/helloworld/HelloWorld.html | 3 -
.../examples/helloworld/wicket-package.properties | 15 +++
.../org/apache/wicket/examples/images/Home.html | 3 -
.../examples/images/wicket-package.properties | 15 +++
.../wicket/examples/kittenCaptcha/HomePage.html | 1 -
.../kittenCaptcha/wicket-package.properties | 15 +++
.../examples/library/AuthenticatedWebPage.html | 1 -
.../org/apache/wicket/examples/library/Home.html | 3 -
.../org/apache/wicket/examples/library/SignIn.html | 3 -
.../apache/wicket/examples/library/SignOut.html | 1 -
.../examples/library/wicket-package.properties | 19 ++++
.../wicket/examples/linkomatic/BookDetails.html | 1 -
.../apache/wicket/examples/linkomatic/Home.html | 3 -
.../apache/wicket/examples/linkomatic/Page1.html | 1 -
.../apache/wicket/examples/linkomatic/Page2.html | 1 -
.../apache/wicket/examples/linkomatic/Page3.html | 1 -
.../apache/wicket/examples/linkomatic/Popup.html | 1 -
.../examples/linkomatic/wicket-package.properties | 20 ++++
.../org/apache/wicket/examples/media/Home.html | 1 -
.../examples/media/wicket-package.properties | 15 +++
.../apache/wicket/examples/navomatic/Page1.html | 1 -
.../apache/wicket/examples/navomatic/Page2.html | 1 -
.../apache/wicket/examples/navomatic/Page3.html | 1 -
.../examples/navomatic/wicket-package.properties | 17 +++
.../org/apache/wicket/examples/niceurl/Home.html | 3 -
.../org/apache/wicket/examples/niceurl/Page1.html | 1 -
.../org/apache/wicket/examples/niceurl/Page2.html | 1 -
.../wicket/examples/niceurl/mounted/Page3.html | 1 -
.../wicket/examples/niceurl/mounted/Page4.html | 1 -
.../wicket/examples/niceurl/mounted/Page5.html | 1 -
.../examples/niceurl/wicket-package.properties | 22 ++++
.../java/org/apache/wicket/examples/pub/Home.html | 1 -
.../org/apache/wicket/examples/pub/Home_da_DK.html | 1 -
.../org/apache/wicket/examples/pub/Home_de_DE.html | 1 -
.../org/apache/wicket/examples/pub/Home_en_CA.html | 1 -
.../org/apache/wicket/examples/pub/Home_hu.html | 1 -
.../org/apache/wicket/examples/pub/Home_ko_KR.html | 1 -
.../org/apache/wicket/examples/pub/Home_nl_NL.html | 1 -
.../org/apache/wicket/examples/pub/Home_zh_CN.html | 1 -
.../wicket/examples/pub/wicket-package.properties | 15 +++
.../java/org/apache/wicket/examples/pub2/Home.html | 1 -
.../wicket/examples/pub2/wicket-package.properties | 15 +++
.../wicket/examples/repeater/ExamplePage.html | 4 -
.../org/apache/wicket/examples/repeater/Index.html | 24 ++--
.../examples/repeater/wicket-package.properties | 51 +++++++++
.../requestmapper/wicket-package.properties | 18 +++
.../examples/resourcedecoration/HomePage.html | 3 -
.../resourcedecoration/wicket-package.properties | 15 +++
.../examples/spring/common/web/BasePage.html | 1 -
.../examples/spring/wicket-package.properties | 16 +++
.../wicket/examples/sri/IntegrityDemoPage.html | 2 -
.../wicket/examples/sri/wicket-package.properties | 15 +++
.../examples/stateless/AjaxStatelessExample.html | 1 -
.../apache/wicket/examples/stateless/Index.html | 1 -
.../wicket/examples/stateless/StatefulPage.html | 1 -
.../wicket/examples/stateless/StatelessPage.html | 1 -
.../wicket/examples/stateless/StatelessPage1.html | 1 -
.../wicket/examples/stateless/StatelessPage2.html | 1 -
.../wicket/examples/stateless/StatelessPage3.html | 1 -
.../examples/stateless/wicket-package.properties | 21 ++++
.../org/apache/wicket/examples/template/Index.html | 4 -
.../wicket/examples/template/border/Page1.html | 1 -
.../wicket/examples/template/border/Page2.html | 1 -
.../template/border/wicket-package.properties | 16 +++
.../pageinheritance/wicket-package.properties | 16 +++
.../examples/template/wicket-package.properties | 15 +++
.../wicket/examples/tree/AbstractTreePage.html | 8 +-
.../wicket/examples/tree/AdvancedTreePage.html | 1 -
.../wicket/examples/tree/wicket-package.properties | 17 +++
.../unicodeconverter/UnicodeConverter.html | 1 -
.../unicodeconverter/wicket-package.properties | 15 +++
.../wicket/examples/upload/MultiUploadPage.html | 1 -
.../apache/wicket/examples/upload/UploadPage.html | 1 -
.../examples/upload/UploadToResourcePage.html | 1 -
.../examples/upload/wicket-package.properties | 17 +++
.../wicket/examples/velocity/DynamicPage.html | 1 -
.../org/apache/wicket/examples/velocity/Home.html | 5 +-
.../wicket/examples/velocity/TemplatePage.html | 1 -
.../examples/velocity/wicket-package.properties | 17 +++
.../apache/wicket/examples/websocket/HomePage.html | 9 +-
.../websocket/WebSocketBehaviorDemoPage.html | 1 -
.../WebSocketMultiTabResourceDemoPage.html | 1 -
.../websocket/WebSocketResourceDemoPage.html | 1 -
.../examples/websocket/wicket-package.properties | 19 ++++
.../org/apache/wicket/examples/wizard/Index.html | 7 +-
.../apache/wicket/examples/wizard/WizardPage.html | 1 -
.../apache/wicket/examples/wizard/WizardPage.java | 9 ++
.../examples/wizard/wicket-package.properties | 18 +++
.../examples/requestmapper/LocalizedPage.html | 1 -
.../requestmapper/RequestMapperHomePage.html | 1 -
.../packageMount/PackageMountedPage.html | 1 -
.../templates/AlternativePageFromWebContext.html | 3 -
.../customresourceloading/PageFromWebContext.html | 3 -
.../apache/wicket/examples/ExampleTitlesTest.java | 124 +++++++++++++++++++++
.../wicket/examples/ajax/builtin/IndexTest.java | 60 ++++++++++
.../wicket/examples/ajax/prototype/AjaxTest.java | 2 +-
.../wicket/examples/compref/ComprefTest.java | 2 +-
.../wicket/examples/encodings/EncodingTest.java | 2 +-
.../wicket/examples/forminput/FormInputTest.java | 2 +-
.../wicket/examples/guestbook/GuestbookTest.java | 2 +-
.../wicket/examples/hangman/HangManTest.java | 4 +-
.../wicket/examples/helloworld/HelloWorldTest.java | 2 +-
.../apache/wicket/examples/images/ImagesTest.java | 2 +-
.../wicket/examples/library/LibraryTest.java | 4 +-
.../wicket/examples/linkomatic/LinkomaticTest.java | 2 +-
.../wicket/examples/niceurl/NiceUrlTest.java | 2 +-
.../wicket/examples/repeater/RepeaterTest.java | 4 +-
.../wicket/examples/template/TemplateTest.java | 2 +-
.../org/apache/wicket/filtertest/HelloWorld.html | 3 -
.../wicket/filtertest/WithoutCPWithFPTest.java | 4 +-
.../wicket/filtertest/WithoutCPWithoutFPTest.java | 4 +-
.../wicket/filtertest/wicket-package.properties | 15 +++
212 files changed, 1350 insertions(+), 341 deletions(-)
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
index 7577163e61..cf57013742 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.html
@@ -5,6 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title wicket:id="pageTitle">Wicket Examples</title>
<link rel="shortcut icon" href="favicon.ico"
type="image/vnd.microsoft.icon" />
@@ -23,6 +24,7 @@
Source code
</a>
</div>
+ <h1 wicket:id="exampleTitle">[example title]</h1>
<div>
<wicket:child/>
</div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
index f997778661..a42a3b8dfa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java
@@ -20,16 +20,24 @@ import org.apache.wicket.examples.source.SourcesPage;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.PopupSettings;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.util.string.Strings;
/**
* Base class for all example pages.
- *
+ * <p>
+ * Shows the title of the example as the page heading and in the browser title. The title is
+ * looked up in the resource bundles under the key {@code <simple class name>.title}, usually in the
+ * {@code wicket-package.properties} of the example's package, so that an index page linking to
+ * the example can use the very same text. A page without such a key gets no heading.
+ *
* @author Jonathan Locke
*/
public class WicketExamplePage extends WebPage
@@ -96,7 +104,59 @@ public class WicketExamplePage extends WebPage
protected void explain()
{
}
-
+
+ @Override
+ protected void onInitialize()
+ {
+ super.onInitialize();
+
+ add(new Label("pageTitle", this::getPageTitle));
+ add(new Label("exampleTitle", this::getExampleTitle)
+ {
+ @Override
+ protected void onConfigure()
+ {
+ super.onConfigure();
+
+ setVisible(Strings.isEmpty(getExampleTitle()) == false);
+ }
+ });
+ }
+
+ /**
+ * @param page
+ * an example page
+ * @return the resource key of the title of the given example page
+ */
+ public static String titleKey(Class<? extends WicketExamplePage> page)
+ {
+ return page.getSimpleName() + ".title";
+ }
+
+ /**
+ * @return the resource key of the title of this example, by default the one given by
+ * {@link #titleKey(Class)} for this page's class
+ */
+ protected String getExampleTitleKey()
+ {
+ return titleKey(getClass());
+ }
+
+ private String getExampleTitle()
+ {
+ return getLocalizer().getStringIgnoreSettings(getExampleTitleKey(), this, null, null);
+ }
+
+ private String getPageTitle()
+ {
+ String exampleTitle = getExampleTitle();
+ if (Strings.isEmpty(exampleTitle))
+ {
+ return getString("examplesTitle");
+ }
+ return new StringResourceModel("pageTitle", this).setParameters(exampleTitle).getString();
+ }
+
@Override
public void renderHead(IHeaderResponse response)
{
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties
new file mode 100644
index 0000000000..ccde7dfdc6
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+examplesTitle=Wicket Examples
+pageTitle=Wicket Examples - {0}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html
index 9db6bbce41..b9c3550094 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Ajax</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.html
index 421ba1dad8..d06ac1b30b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - guestbook</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.html
index 87813e529e..b7488171e4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.html
@@ -1,42 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-<wicket:link>
-<a href="AutoCompletePage.html">Auto-Complete TextField Example</a>: shows a text field with auto complete drop down like google suggest
+<wicket:container wicket:id="examples">
+<a wicket:id="link"><wicket:container wicket:id="title">[example title]</wicket:container></a>: <wicket:container wicket:id="description">[example description]</wicket:container>
<br/><br/>
-<a href="ChoicePage.html">Drop Down Choice Example</a>: demonstrates the linked select boxes usecase
-<br/><br/>
-<a href="ClockPage.html">Clock Example</a>: demonstrates a self-updating component via AjaxSelfUpdatingTimerBehavior
-<br/><br/>
-<a href="EditableLabelPage.html">Editable Label Example</a>: shows a label that can be edited inline via ajax
-<br/><br/>
-<wicket:container wicket:id="effectsSection"><a href="EffectsPage.html">Effects Example</a>: shows how to link wicket component updates with jQuery UI effects
-<br/><br/></wicket:container>
-<a href="FormPage.html">Form Example</a>: shows ajax form processing
-<br/><br/>
-<a href="GuestBook.html">Guest book Example</a>: shows how a simple commenting system can be turned into ajax extravaganza.
-<br/><br/>
-<a href="LazyLoadingPage.html">LazyLoading Example</a>: demonstrates lazy loading of components.
-<br/><br/>
-<a href="LinksPage.html">Links Example</a>: demonstrates ajax enabled links
-<br/><br/>
-<a href="FileUploadPage.html">File Upload Example</a>: demonstrates trasnparent ajax handling of a multipart form
-<br/><br/>
-<a href="modal/ModalDialogPage.html">Modal dialog</a>: javascript modal dialog example
-<br/><br/>
-<a href="OnChangeAjaxBehaviorPage.html">On Change Ajax Updater Example</a>: demonstrates updating page with ajax when text field value is changed
-<br/><br/>
-<a href="PageablesPage.html">Pageables Example</a>: shows ajax paging
-<br/><br/>
-<a href="RatingsPage.html">Ratings example</a>: shows a rating component.
-<br/><br/>
-<a href="TabbedPanelPage.html">Tabbed Panel Example</a>: demonstrates ajax enabled tabbed panel
-<br/><br/>
-<a href="TodoList.html">Todo list Example</a>: shows ajax todo list page without writing any JavaScript
-<br/><br/>
-<a href="WorldClockPage.html">World Clock Example</a>: demonstrates a single component with AjaxTimerBehavior updating multiple components
-<br/><br/>
-<a href="AjaxDownloadPage.html">Ajax Download</a>: download initiated via Ajax
-</wicket:link>
+</wicket:container>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
index 8ed24e86a5..ba969c6f57 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.java
@@ -16,10 +16,18 @@
*/
package org.apache.wicket.examples.ajax.builtin;
+import java.util.List;
+
import org.apache.wicket.examples.AjaxEngineSelector;
import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.examples.ajax.builtin.modal.ModalDialogPage;
import org.apache.wicket.examples.homepage.HomePage;
-import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.ResourceModel;
/**
* Wicket ajax example index page
@@ -28,16 +36,42 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
*/
public class Index extends BasePage
{
+ private static final List<Class<? extends BasePage>> EXAMPLES = List.of(
+ AutoCompletePage.class, ChoicePage.class, ClockPage.class, EditableLabelPage.class,
+ EffectsPage.class, FormPage.class, GuestBook.class, LazyLoadingPage.class,
+ LinksPage.class, FileUploadPage.class, ModalDialogPage.class,
+ OnChangeAjaxBehaviorPage.class, PageablesPage.class, RatingsPage.class,
+ TabbedPanelPage.class, TodoList.class, WorldClockPage.class, AjaxDownloadPage.class);
+
/**
* Constructor.
*/
public Index()
+ {
+ IModel<List<Class<? extends BasePage>>> examples = () -> EXAMPLES.stream()
+ .filter(Index::isAvailable)
+ .toList();
+
+ add(new ListView<>("examples", examples)
+ {
+ @Override
+ protected void populateItem(ListItem<Class<? extends BasePage>> item)
+ {
+ Class<? extends BasePage> page = item.getModelObject();
+ BookmarkablePageLink<Void> link = new BookmarkablePageLink<>("link", page);
+ link.add(new Label("title", new ResourceModel(titleKey(page))));
+ item.add(link);
+ item.add(new Label("description",
+ new ResourceModel(page.getSimpleName() + ".description")));
+ }
+ });
+ }
+
+ private static boolean isAvailable(Class<? extends BasePage> page)
{
// EffectsPage needs jQuery UI, which the plain JavaScript Ajax engine does not load
- WebMarkupContainer effectsSection = new WebMarkupContainer("effectsSection");
- effectsSection.setVisible(
- AjaxEngineSelector.getEffectiveEngine() == AjaxEngineSelector.Engine.JQUERY);
- add(effectsSection);
+ return page != EffectsPage.class ||
+ AjaxEngineSelector.getEffectiveEngine() == AjaxEngineSelector.Engine.JQUERY;
}
@Override
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.html
index 9a89e7c5e7..c0dc26c0ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
-<title>ajax-test</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.html
index 562450851d..afc7139ffb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Ajax - Ratings style</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.html
index 61b27bba2c..b2b6f737fe 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Ajax - Todo list</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/wicket-package.properties
new file mode 100644
index 0000000000..61edf879a5
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/wicket-package.properties
@@ -0,0 +1,69 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Ajax Examples
+
+AutoCompletePage.title=Auto-Complete TextField Example
+AutoCompletePage.description=shows a text field with auto complete drop down like google suggest
+
+ChoicePage.title=Drop Down Choice Example
+ChoicePage.description=demonstrates the linked select boxes usecase
+
+ClockPage.title=Clock Example
+ClockPage.description=demonstrates a self-updating component via AjaxSelfUpdatingTimerBehavior
+
+EditableLabelPage.title=Editable Label Example
+EditableLabelPage.description=shows a label that can be edited inline via ajax
+
+EffectsPage.title=Effects Example
+EffectsPage.description=shows how to link wicket component updates with jQuery UI effects
+
+FormPage.title=Form Example
+FormPage.description=shows ajax form processing
+
+GuestBook.title=Guest book Example
+GuestBook.description=shows how a simple commenting system can be turned into ajax extravaganza.
+
+LazyLoadingPage.title=LazyLoading Example
+LazyLoadingPage.description=demonstrates lazy loading of components.
+
+LinksPage.title=Links Example
+LinksPage.description=demonstrates ajax enabled links
+
+FileUploadPage.title=File Upload Example
+FileUploadPage.description=demonstrates transparent ajax handling of a multipart form
+
+ModalDialogPage.title=Modal dialog
+ModalDialogPage.description=javascript modal dialog example
+
+OnChangeAjaxBehaviorPage.title=On Change Ajax Updater Example
+OnChangeAjaxBehaviorPage.description=demonstrates updating page with ajax when text field value is changed
+
+PageablesPage.title=Pageables Example
+PageablesPage.description=shows ajax paging
+
+RatingsPage.title=Ratings example
+RatingsPage.description=shows a rating component.
+
+TabbedPanelPage.title=Tabbed Panel Example
+TabbedPanelPage.description=demonstrates ajax enabled tabbed panel
+
+TodoList.title=Todo list Example
+TodoList.description=shows ajax todo list page without writing any JavaScript
+
+WorldClockPage.title=World Clock Example
+WorldClockPage.description=demonstrates a single component with AjaxTimerBehavior updating multiple components
+
+AjaxDownloadPage.title=Ajax Download
+AjaxDownloadPage.description=download initiated via Ajax
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
index 3b2521c0b1..d40f2d6eee 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - Prototype.js / component render</title>
-</wicket:head>
<body>
<wicket:extend>
<p>Counting link using Ajax: <a href="#" wicket:id="link">Click me!</a></p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/wicket-package.properties
new file mode 100644
index 0000000000..fed45c14e8
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=AJAX with Prototype.js
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html
index 309f3d7c50..cab987adb2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - hellobrowser</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/wicket-package.properties
new file mode 100644
index 0000000000..d8b15e3e05
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+AjaxHelloBrowser.title=Ajax Browser Info
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.html
index 2e68c8b85d..88ccea70e8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - hellobrowser</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/wicket-package.properties
new file mode 100644
index 0000000000..e95b98f0de
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+AjaxHelloBrowserOnDomReady.title=Ajax Browser Info (OnDomReady)
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
index beafee41b6..cdeb79aaa7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Render mail templates</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/wicket-package.properties
new file mode 100644
index 0000000000..41fa2f937c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+MailTemplate.title=Mail Templates
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
index 9dc22a84b8..2a0b486b9d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
index 4fc6979c21..09026315fe 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
index 83c1a1fe35..4f73e2983d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/wicket-package.properties
new file mode 100644
index 0000000000..91dbfa19c3
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Simple Authentication
+SignIn.title=Simple Authentication - Sign In
+SignOut.title=Simple Authentication - Sign Out
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
index 94021161ba..21d376df35 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
index 81cb600857..1e24479890 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
index 83c1a1fe35..4f73e2983d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/wicket-package.properties
new file mode 100644
index 0000000000..fcb437c460
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Cookie Based Authentication
+SignIn2.title=Cookie Based Authentication - Sign In
+SignOut.title=Cookie Based Authentication - Sign Out
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
index e8103aadd9..7eb43a9c0b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Authentication</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
index 81cb600857..1e24479890 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
index 8f6b382b40..2c0a6b61ac 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/wicket-package.properties
new file mode 100644
index 0000000000..5547962e0b
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/wicket-package.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Page Authentication
+AdminPage.title=Page Authentication - Admin
+MySignInPage.title=Page Authentication - Sign In
+SignOut.title=Page Authentication - Sign Out
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
index 2a5205f8be..7eb43a9c0b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Authorization Roles</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.html
index ca0fb88f47..d8963ee50a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.html
@@ -21,30 +21,18 @@
<br />
<div>
- <a href="#" wicket:id="adminBookmarkableLink">
- go to bookmarkable admin page, protected with Wicket meta data
- </a>
+ <a href="#" wicket:id="adminBookmarkableLink"><wicket:message key="AdminBookmarkablePage.title"/></a>
<br />
- <a href="#" wicket:id="adminInternalLink">
- go to internal admin page, protected with Wicket meta data
- </a>
+ <a href="#" wicket:id="adminInternalLink"><wicket:message key="AdminInternalPage.title"/></a>
<br />
- <a href="#" wicket:id="panelsPageLink">
- go to panels page, protected with Wicket meta data
- </a>
+ <a href="#" wicket:id="panelsPageLink"><wicket:message key="PanelsPage.title"/></a>
</div>
<br />
<div>
- <a href="#" wicket:id="adminAnnotBookmarkableLink">
- go to bookmarkable admin page, protected with annotations
- </a>
+ <a href="#" wicket:id="adminAnnotBookmarkableLink"><wicket:message key="AdminAnnotationsBookmarkablePage.title"/></a>
<br />
- <a href="#" wicket:id="adminAnnotInternalLink">
- go to internal admin page, protected with annotations
- </a>
+ <a href="#" wicket:id="adminAnnotInternalLink"><wicket:message key="AdminAnnotationsInternalPage.title"/></a>
<br />
- <a href="#" wicket:id="panelsAnnotPageLink">
- go to panels page, protected with annotations
- </a>
+ <a href="#" wicket:id="panelsAnnotPageLink"><wicket:message key="AnnotationsPanelsPage.title"/></a>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/wicket-package.properties
new file mode 100644
index 0000000000..815f3c6c49
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/wicket-package.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Authorization
+AdminBookmarkablePage.title=Bookmarkable admin page, protected with Wicket meta data
+AdminInternalPage.title=Internal admin page, protected with Wicket meta data
+PanelsPage.title=Panels page, protected with Wicket meta data
+AdminAnnotationsBookmarkablePage.title=Bookmarkable admin page, protected with annotations
+AdminAnnotationsInternalPage.title=Internal admin page, protected with annotations
+AnnotationsPanelsPage.title=Panels page, protected with annotations
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.html
index a6b1f9e38a..6c7cac39ff 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
-<title>Wicket Examples - Bean Validation</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/wicket-package.properties
new file mode 100644
index 0000000000..9fb71f0783
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+BeanValidationPage.title=Bean Validation
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
index 8c5e08d597..6b50eaac29 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - bread crumb</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/wicket-package.properties
new file mode 100644
index 0000000000..694e3aa33a
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Bread Crumbs
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html
index 3fd0432db8..f81bf9712e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.html
@@ -3,7 +3,6 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org" xml:lang="en" lang="en">
<head>
- <title>Wicket Examples - Captcha</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/wicket-package.properties
new file mode 100644
index 0000000000..5372f356a3
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Captcha.title=Captcha
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html
index 7ac00b59ef..6d505ab278 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html
@@ -3,12 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org" xml:lang="en" lang="en">
<head>
- <title>Wicket Examples - Context, Dependencies, and Injection Integration</title>
</head>
<body>
<wicket:extend>
- <h2>Welcome to Context, Dependencies, and Injection Integration Examples</h2>
<p><wicket:link><a href="CdiHomePage.html">[go back]</a></wicket:link></p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.html
index d750a114ee..3c2286f5dd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.html
@@ -4,13 +4,13 @@
<wicket:link>
<ul>
<li>
- <a href="InjectionPage.html">Injection Example</a>
+ <a href="InjectionPage.html"><wicket:message key="InjectionPage.title"/></a>
</li>
<li>
- <a href="ConversationPage1.html">Conversation Propagation Example</a>
+ <a href="ConversationPage1.html"><wicket:message key="ConversationPage1.title"/></a>
</li>
<li>
- <a href="AutoConversationPage1.html">Automatic Conversation Management Example</a>
+ <a href="AutoConversationPage1.html"><wicket:message key="AutoConversationPage1.title"/></a>
</li>
</ul>
</wicket:link>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/wicket-package.properties
new file mode 100644
index 0000000000..7051375245
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/wicket-package.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+CdiHomePage.title=Context, Dependencies, and Injection Integration
+InjectionPage.title=Injection Example
+ConversationPage1.title=Conversation Propagation Example
+ConversationPage2.title=Conversation Propagation Example - Page 2
+ConversationPage3.title=Conversation Propagation Example - Page 3
+AutoConversationPage1.title=Automatic Conversation Management Example
+AutoConversationPage2.title=Automatic Conversation Management Example - Page 2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
index 13db29eca1..48b1ec49bf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.link.BookmarkablePageLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
index f4acf8bf96..c7b9c961ff 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.border.Border</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
index 72a1f2d81f..4f4339a964 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.Button</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
index eebf478753..2a266fce6c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.CheckBoxMultipleChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
index 7fa4c07a1e..c70d708ebd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.CheckBox</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
index 703fef75b7..bdd0bbf99b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
index 4f99d8174f..4899ce0b7c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
index 23f7fc735e..d94b46eeb3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.CheckGroup</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
index 2da99022e1..4ba86df3b5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.DropDownChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
index 097a1bc12d..67bf087a11 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.link.ExternalLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
index 8540b461dc..165e048b2f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.Form</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
index 64c67b0064..6f7af22f1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.panel.Fragment</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
index 3a1003ae35..f14e76080b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.html
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - component reference</title>
-</wicket:head>
<body>
<wicket:extend>
- <h1>Component reference</h1>
<p class="dotted-box">
This example makes up Wicket's component reference.
@@ -19,8 +15,8 @@
Output:
<wicket:link>
<ul>
- <li><a href="LabelPage.html">wicket.markup.html.basic.Label</a></li>
- <li><a href="MultiLineLabelPage.html">wicket.markup.html.basic.MultiLineLabel</a></li>
+ <li><a href="LabelPage.html"><wicket:message key="LabelPage.title"/></a></li>
+ <li><a href="MultiLineLabelPage.html"><wicket:message key="MultiLineLabelPage.title"/></a></li>
<li><a href="XmlPage.xml">alternative markup (XML)</a></li>
</ul>
</wicket:link>
@@ -30,10 +26,10 @@
Layout and grouping:
<wicket:link>
<ul>
- <li><a href="PanelPage.html">wicket.markup.html.panel.Panel</a></li>
- <li><a href="BorderPage.html">wicket.markup.html.border.Border</a></li>
- <li><a href="TabbedPanelPage.html">wicket.markup.html.tabs.TabbedPanel (wicket-extensions)</a></li>
- <li><a href="FragmentPage.html">wicket.markup.html.panel.Fragment</a></li>
+ <li><a href="PanelPage.html"><wicket:message key="PanelPage.title"/></a></li>
+ <li><a href="BorderPage.html"><wicket:message key="BorderPage.title"/></a></li>
+ <li><a href="TabbedPanelPage.html"><wicket:message key="TabbedPanelPage.title"/></a></li>
+ <li><a href="FragmentPage.html"><wicket:message key="FragmentPage.title"/></a></li>
</ul>
</wicket:link>
</p>
@@ -42,9 +38,9 @@
Links (for more examples, see <a href="linkomatic">Link-o-matic</a>):
<wicket:link>
<ul>
- <li><a href="LinkPage.html">wicket.markup.html.link.Link</a></li>
- <li><a href="ExternalLinkPage.html">wicket.markup.html.link.ExternalLink</a></li>
- <li><a href="BookmarkablePageLinkPage.html">wicket.markup.html.link.BookmarkablePageLink</a></li>
+ <li><a href="LinkPage.html"><wicket:message key="LinkPage.title"/></a></li>
+ <li><a href="ExternalLinkPage.html"><wicket:message key="ExternalLinkPage.title"/></a></li>
+ <li><a href="BookmarkablePageLinkPage.html"><wicket:message key="BookmarkablePageLinkPage.title"/></a></li>
</ul>
</wicket:link>
</p>
@@ -53,24 +49,24 @@
Forms (for more examples, see <a href="forminput">FormInput</a>):
<wicket:link>
<ul>
- <li><a href="FormPage.html">wicket.markup.html.form.Form</a></li>
- <li><a href="ButtonPage.html">wicket.markup.html.form.Button</a></li>
- <li><a href="SubmitLinkPage.html">wicket.markup.html.form.SubmitLink</a></li>
- <li><a href="TextFieldPage.html">wicket.markup.html.form.TextField</a></li>
- <li><a href="TextAreaPage.html">wicket.markup.html.form.TextArea</a></li>
- <li><a href="CheckBoxPage.html">wicket.markup.html.form.CheckBox</a></li>
- <li><a href="CheckGroupPage.html">wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector</a></li>
- <li><a href="CheckGroupPage2.html">Embedded wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector</a></li>
- <li><a href="CheckBoxMultipleChoicePage.html">wicket.markup.html.form.CheckBoxMultipleChoice</a></li>
- <li><a href="CheckBoxSelectorPage.html">wicket.markup.html.form.CheckBoxSelector</a></li>
- <li><a href="DropDownChoicePage.html">wicket.markup.html.form.DropDownChoice</a></li>
- <li><a href="ListChoicePage.html">wicket.markup.html.form.ListChoice</a></li>
- <li><a href="RadioChoicePage.html">wicket.markup.html.form.RadioChoice</a></li>
- <li><a href="RadioGroupPage.html">wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</a></li>
- <li><a href="RadioGroupPage2.html">Embedded wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</a></li>
- <li><a href="ListMultipleChoicePage.html">wicket.markup.html.form.ListMultipleChoice</a></li>
- <li><a href="SelectPage.html">wicket.extensions.markup.html.form.select.Select</a></li>
- <li><a href="PalettePage.html">wicket.extensions.markup.html.palette.Palette</a></li>
+ <li><a href="FormPage.html"><wicket:message key="FormPage.title"/></a></li>
+ <li><a href="ButtonPage.html"><wicket:message key="ButtonPage.title"/></a></li>
+ <li><a href="SubmitLinkPage.html"><wicket:message key="SubmitLinkPage.title"/></a></li>
+ <li><a href="TextFieldPage.html"><wicket:message key="TextFieldPage.title"/></a></li>
+ <li><a href="TextAreaPage.html"><wicket:message key="TextAreaPage.title"/></a></li>
+ <li><a href="CheckBoxPage.html"><wicket:message key="CheckBoxPage.title"/></a></li>
+ <li><a href="CheckGroupPage.html"><wicket:message key="CheckGroupPage.title"/></a></li>
+ <li><a href="CheckGroupPage2.html"><wicket:message key="CheckGroupPage2.title"/></a></li>
+ <li><a href="CheckBoxMultipleChoicePage.html"><wicket:message key="CheckBoxMultipleChoicePage.title"/></a></li>
+ <li><a href="CheckBoxSelectorPage.html"><wicket:message key="CheckBoxSelectorPage.title"/></a></li>
+ <li><a href="DropDownChoicePage.html"><wicket:message key="DropDownChoicePage.title"/></a></li>
+ <li><a href="ListChoicePage.html"><wicket:message key="ListChoicePage.title"/></a></li>
+ <li><a href="RadioChoicePage.html"><wicket:message key="RadioChoicePage.title"/></a></li>
+ <li><a href="RadioGroupPage.html"><wicket:message key="RadioGroupPage.title"/></a></li>
+ <li><a href="RadioGroupPage2.html"><wicket:message key="RadioGroupPage2.title"/></a></li>
+ <li><a href="ListMultipleChoicePage.html"><wicket:message key="ListMultipleChoicePage.title"/></a></li>
+ <li><a href="SelectPage.html"><wicket:message key="SelectPage.title"/></a></li>
+ <li><a href="PalettePage.html"><wicket:message key="PalettePage.title"/></a></li>
</ul>
</wicket:link>
</p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
index 3d4ae024aa..ad39accbb2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.basic.Label</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
index 36aef86e76..c6152ed587 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.link.Link</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
index 1dfc55fa25..8e89fc4092 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.ListChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
index e419d4f4a2..d3a560f424 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.ListMultipleChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
index 34e58421ff..93b7e15016 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.basic.MultiLineLabel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
index af70106b42..2d4b7621eb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.html
@@ -2,12 +2,10 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.extensions.markup.html.form.palette.Palette</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
index c2cccd9dc5..35a9817de5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.panel.Panel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
index 8f76f165f7..6540dc8c66 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.RadioChoice</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
index dac6ea8890..9d0e8f13e9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
index 4f88b6f585..f27ffda933 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
index 480c3ff6b7..fdd824f61d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>org.apache.wicket.extensions.markup.html.form.select.Select</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
index fdbc87a7cf..6d162e0ac8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.SubmitLink</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
index 494eaf27c6..4899aed031 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.tabs.TabbedPanel</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
index e6288add56..377a9d1a20 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.TextArea</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
index 54dde76876..6e42d9c309 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.html
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - component reference</title>
</head>
<body>
<wicket:extend>
- <h1>wicket.markup.html.form.TextField</h1>
<wicket:link><a href="Index.html">[back to the reference]</a></wicket:link>
<p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/wicket-package.properties
new file mode 100644
index 0000000000..87e0aab4d7
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/wicket-package.properties
@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Component Reference
+LabelPage.title=wicket.markup.html.basic.Label
+MultiLineLabelPage.title=wicket.markup.html.basic.MultiLineLabel
+PanelPage.title=wicket.markup.html.panel.Panel
+BorderPage.title=wicket.markup.html.border.Border
+TabbedPanelPage.title=wicket.markup.html.tabs.TabbedPanel (wicket-extensions)
+FragmentPage.title=wicket.markup.html.panel.Fragment
+LinkPage.title=wicket.markup.html.link.Link
+ExternalLinkPage.title=wicket.markup.html.link.ExternalLink
+BookmarkablePageLinkPage.title=wicket.markup.html.link.BookmarkablePageLink
+FormPage.title=wicket.markup.html.form.Form
+ButtonPage.title=wicket.markup.html.form.Button
+SubmitLinkPage.title=wicket.markup.html.form.SubmitLink
+TextFieldPage.title=wicket.markup.html.form.TextField
+TextAreaPage.title=wicket.markup.html.form.TextArea
+CheckBoxPage.title=wicket.markup.html.form.CheckBox
+CheckGroupPage.title=wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector
+CheckGroupPage2.title=Embedded wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector
+CheckBoxMultipleChoicePage.title=wicket.markup.html.form.CheckBoxMultipleChoice
+CheckBoxSelectorPage.title=wicket.markup.html.form.CheckBoxSelector
+DropDownChoicePage.title=wicket.markup.html.form.DropDownChoice
+ListChoicePage.title=wicket.markup.html.form.ListChoice
+RadioChoicePage.title=wicket.markup.html.form.RadioChoice
+RadioGroupPage.title=wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio
+RadioGroupPage2.title=Embedded wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio
+ListMultipleChoicePage.title=wicket.markup.html.form.ListMultipleChoice
+SelectPage.title=wicket.extensions.markup.html.form.select.Select
+PalettePage.title=wicket.extensions.markup.html.palette.Palette
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.html
index d22b416a78..c9c8152967 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.html
@@ -1,10 +1,8 @@
<html xmlns:wicket="http://wicket.apache.org" xml:lang="en" lang="en">
<head>
- <title>CSP Nonce Demo</title>
</head>
<body>
<wicket:extend>
- <h3>CSP Nonce Demo</h3>
<p>This example demonstrates the CSP protection offered by Wicket. In a modern browser, you will see 2 reports sent back to the application about CSP violations.</p>
<div wicket:id="testNonceScript" class="test-nonce-script"></div>
<div wicket:id="testNoNonceScript" class="test-no-nonce-script"></div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/csp/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/wicket-package.properties
new file mode 100644
index 0000000000..e590125a7c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+NonceDemoPage.title=CSP Nonce Demo
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
index 53cd399769..0d8db0b610 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomLoadedTemplate.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta charset="utf-8"/>
-<title>Home | Apache Wicket</title>
+<title wicket:id="pageTitle">Wicket Examples</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="shortcut icon" href="favicon.ico"
@@ -23,6 +23,7 @@
Source code
</a>
</div>
+ <h1 wicket:id="exampleTitle">[example title]</h1>
<p>
This page was loaded by a component specific override. You can use that - with care - if you have
to implement custom loading strategies that are very local to the component. For instance, a custom
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
index ed77b89a5e..1ff98e603b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - custom resource loading</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/wicket-package.properties
new file mode 100644
index 0000000000..4693639587
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/wicket-package.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Custom Template Loading
+PageFromWebContext.title=Template loaded from the web context
+AlternativePageFromWebContext.title=Template loaded from the web context, disregarding package and locale
+PageWithCustomLoading.title=Template loaded by the page itself
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html
index 19b021afaa..4b81c3a64c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.html
@@ -3,7 +3,6 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org" xml:lang="en" lang="en">
<head>
- <title>Wicket Examples - DateTime</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/wicket-package.properties
new file mode 100644
index 0000000000..cbf95e1d13
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+DateTimePage.title=Dates and Times
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
index 80fa519750..1fd71b08d2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - echo</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/wicket-package.properties
new file mode 100644
index 0000000000..a7138bb7c4
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Echo.title=Echo
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
index 037d36c702..b6ed59b234 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.html
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - encodings</title>
-</wicket:head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/wicket-package.properties
new file mode 100644
index 0000000000..4fad18d8d4
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Encodings
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
index ea6236f00a..43ad2f5e23 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Events</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.html
index 2dd5cb0727..fb3f18d7ae 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.html
@@ -1,7 +1,7 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
<wicket:link>
- <a href="DecoupledAjaxUpdatePage.html">Decoupled Ajax Update</a>
+ <a href="DecoupledAjaxUpdatePage.html"><wicket:message key="DecoupledAjaxUpdatePage.title"/></a>
</wicket:link>
</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/events/wicket-package.properties
new file mode 100644
index 0000000000..fffe98d22b
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/wicket-package.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+IndexPage.title=Events
+DecoupledAjaxUpdatePage.title=Decoupled Ajax Update
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
index d251783a33..eaacb6f764 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
@@ -16,9 +16,6 @@
limitations under the License.
-->
<html xmlns:wicket="http://wicket.apache.org" xmlns="http://www.w3.org/1999/html">
-<wicket:head>
- <title>Wicket Examples - forminput</title>
-</wicket:head>
<body>
<wicket:extend>
<form wicket:id="inputForm" class="inputForm">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/wicket-package.properties
new file mode 100644
index 0000000000..c8f39dddaa
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FormInput.title=Form Input
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
index 5401e16153..fb0caac1b1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Top Frame</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
index acb0dcdc69..79813fdcca 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - guestbook</title>
-</wicket:head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/wicket-package.properties
new file mode 100644
index 0000000000..bf09d487a7
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+GuestBook.title=Guestbook
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
index 574e607f68..21a0a21c32 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - guice</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/wicket-package.properties
new file mode 100644
index 0000000000..6adbc7b182
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Guice Integration
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html
index 6c8d470ae8..8c36e00d74 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org/wicket">
<head>
- <title>Wicket Examples - hangman</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
index c72a11a612..ef6f39bf56 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - hangman</title>
-</wicket:head>
<body>
<wicket:extend>
<p>This software plays a game of hangman.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
index 7622a5a130..9dbf4ce0cf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - hangman</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
index a529d175a6..a9f1ec8598 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - hangman</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/wicket-package.properties
new file mode 100644
index 0000000000..56a78aced5
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/wicket-package.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Hangman
+Guess.title=Hangman
+Win.title=Hangman - You Win
+Lose.title=Hangman - You Lose
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
index 9569b8724e..1867aede8e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - hellobrowser</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/wicket-package.properties
new file mode 100644
index 0000000000..486f49cf58
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HelloBrowser.title=Browser Info
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
index 6fb7d10237..35a542527d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.html
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - helloworld</title>
-</wicket:head>
<body>
<wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/wicket-package.properties
new file mode 100644
index 0000000000..ae9800e59c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HelloWorld.title=Hello World
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
index 18ef0bea55..38511028a5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - images</title>
-</wicket:head>
<body>
<wicket:extend>
<img src = "Image1.gif"/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/images/wicket-package.properties
new file mode 100644
index 0000000000..79b7bdff0d
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Images
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
index d083c35b53..4b6d3b5628 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.html
@@ -2,7 +2,6 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Kitten-Captch</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/wicket-package.properties
new file mode 100644
index 0000000000..76005b3680
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Kitten Captcha
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html
index da77611e6c..85de1b5825 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - library</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html
index bb02151429..0b4200710d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - library</title>
-</wicket:head>
<wicket:extend>
<table width = "100%">
<tr>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html
index ff0814ea5c..cd93a19407 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - library</title>
-</wicket:head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
index 83c1a1fe35..4f73e2983d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/wicket-package.properties
new file mode 100644
index 0000000000..c2192c83fb
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/wicket-package.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Library
+BookDetails.title=Library - Book Details
+EditBook.title=Library - Edit Book
+SignIn.title=Library - Sign In
+SignOut.title=Library - Sign Out
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html
index e57ee498a1..bdc8156083 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
index fef2c3b4cb..c749686e05 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - linkomatic</title>
-</wicket:head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html
index 37d27d03fa..3bdc1ca4f9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html
index 4aba44089b..0d7b73259e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html
index 04f94e4eb8..0c85074cf2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html
index d666b614b3..b8d9ed1546 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/wicket-package.properties
new file mode 100644
index 0000000000..f21c2f6e8f
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/wicket-package.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Link-o-matic
+Page1.title=Link-o-matic - Page 1
+Page2.title=Link-o-matic - Page 2
+Page3.title=Link-o-matic - Page 3
+BookDetails.title=Link-o-matic - Book Details
+Popup.title=Link-o-matic - Popup
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
index 489edc21b6..88955dd18b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - videos</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/media/wicket-package.properties
new file mode 100644
index 0000000000..22967a20cf
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=HTML5 Media Tags
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
index 48c67c7262..3ecbf0c116 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - navomatic</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
index f2d60e66c5..c471ef60fd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - navomatic</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
index 268e107609..54a6c66a10 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - navomatic</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/wicket-package.properties
new file mode 100644
index 0000000000..6df8d3aec5
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Page1.title=Nav-o-matic - Page 1
+Page2.title=Nav-o-matic - Page 2
+Page3.title=Nav-o-matic - Page 3
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html
index d0cdf00f7b..a0ff794b7d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org">
- <wicket:head>
- <title>Wicket Examples - niceurl</title>
- </wicket:head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html
index 58f9b55ea0..125429d8fc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html
index 1f0de3f574..ef2bd8c283 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html
index a766510ee0..bbf76765cc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html
index 293618b44e..69324dd5e6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html
index 7fe533985d..027cdcd685 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/wicket-package.properties
new file mode 100644
index 0000000000..a03e0e7ade
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/wicket-package.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Nice URLs
+Page1.title=Nice URLs - Page 1
+Page2.title=Nice URLs - Page 2
+Page2PP.title=Nice URLs - Page 2, parameters encoded with placeholders in the segments
+Page2UP.title=Nice URLs - Page 2, parameters encoded in the segments in Wicket 1.4 style
+Page3.title=Nice URLs - Page 3
+Page4.title=Nice URLs - Page 4
+Page5.title=Nice URLs - Page 5
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html
index 107b2683ef..8100deafe5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html
index 33b438ab04..12de667925 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_da_DK.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html
index c4f565bd77..7cc5016b8a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_de_DE.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html
index 0f1353b20d..96dd55bf6b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_en_CA.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html
index 1ee79fea6e..f5d14aa1ae 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_hu.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html
index 3698877a6c..d959bf1eaf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_ko_KR.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket 예제 - 호프집</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html
index 7f60cc7a3e..11b0011766 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_nl_NL.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html
index 4f33078bca..77ade2a4b2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home_zh_CN.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/wicket-package.properties
new file mode 100644
index 0000000000..3aa12b77d0
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Localization
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html
index 5e822dfce0..8d4d50199a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - pub</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/wicket-package.properties
new file mode 100644
index 0000000000..80340b7340
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Alternative Localization
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html
index 6e38c4f733..024f679687 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html
@@ -1,12 +1,8 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - repeater views</title>
-</wicket:head>
<body>
<wicket:extend>
- <h2>Welcome to Repeater View Examples</h2>
<p><wicket:link><a href="Index.html">[go back]</a></wicket:link></p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.html
index 0158e677b4..cdbce9a46f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.html
@@ -4,17 +4,17 @@ Repeaters are components that can render their body markup multiple times. These
<br/><br/>
<wicket:link>
-<a href="RepeatingPage.html">OrderedRepeatingView Example - basic example of a repeater view</a><br/>
-<a href="RefreshingPage.html">RefreshingView Example - basic view that recreates its items every request</a><br/>
-<a href="FormPage.html">Contacts Editor - based on the previous example, but with editable values.</a><br/>
-<a href="SimplePage.html">Simple DataView Example - simple example of a dataview</a><br/>
-<a href="PagingPage.html">Paging DataView Example - builds on previous to demonstrate paging and page navigation</a><br/>
-<a href="SortingPage.html">Sorting DataView Example - builds on previous to demonstrate sorting</a><br/>
-<a href="OIRPage.html">DataView and optimized item removal - demonstrates a dataview with a different IItemReuseStrategy implementation</a><br/>
-<a href="DataGridPage.html">DataGridView Example - a view that generates grids where rows are representing by items of the data provider and columns are represented by an array of ICellPopulators objects</a><br/>
-<a href="DataTablePage.html">DataTable Example - demonstrates data table component that wraps dataview to offer easy paging and sorting</a><br/>
-<a href="DataTableFilterToolbarPage.html">DataTable Example - demonstrates data table component with a FilterToolbar on its data set</a><br/>
-<a href="GridViewPage.html">GridView Example - demonstrates a grid view</a><br/>
-<a href="AjaxDataTablePage.html">AjaxFallbackDataTable Example - demonstrates an AJAX enabled datatable component</a><br/><br/>
+<a href="RepeatingPage.html"><wicket:message key="RepeatingPage.title"/></a> - <wicket:message key="RepeatingPage.description"/><br/>
+<a href="RefreshingPage.html"><wicket:message key="RefreshingPage.title"/></a> - <wicket:message key="RefreshingPage.description"/><br/>
+<a href="FormPage.html"><wicket:message key="FormPage.title"/></a> - <wicket:message key="FormPage.description"/><br/>
+<a href="SimplePage.html"><wicket:message key="SimplePage.title"/></a> - <wicket:message key="SimplePage.description"/><br/>
+<a href="PagingPage.html"><wicket:message key="PagingPage.title"/></a> - <wicket:message key="PagingPage.description"/><br/>
+<a href="SortingPage.html"><wicket:message key="SortingPage.title"/></a> - <wicket:message key="SortingPage.description"/><br/>
+<a href="OIRPage.html"><wicket:message key="OIRPage.title"/></a> - <wicket:message key="OIRPage.description"/><br/>
+<a href="DataGridPage.html"><wicket:message key="DataGridPage.title"/></a> - <wicket:message key="DataGridPage.description"/><br/>
+<a href="DataTablePage.html"><wicket:message key="DataTablePage.title"/></a> - <wicket:message key="DataTablePage.description"/><br/>
+<a href="DataTableFilterToolbarPage.html"><wicket:message key="DataTableFilterToolbarPage.title"/></a> - <wicket:message key="DataTableFilterToolbarPage.description"/><br/>
+<a href="GridViewPage.html"><wicket:message key="GridViewPage.title"/></a> - <wicket:message key="GridViewPage.description"/><br/>
+<a href="AjaxDataTablePage.html"><wicket:message key="AjaxDataTablePage.title"/></a> - <wicket:message key="AjaxDataTablePage.description"/><br/><br/>
</wicket:link>
</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/wicket-package.properties
new file mode 100644
index 0000000000..788b748afd
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/wicket-package.properties
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Repeaters
+
+RepeatingPage.title=OrderedRepeatingView Example
+RepeatingPage.description=basic example of a repeater view
+
+RefreshingPage.title=RefreshingView Example
+RefreshingPage.description=basic view that recreates its items every request
+
+FormPage.title=Contacts Editor
+FormPage.description=based on the previous example, but with editable values.
+
+SimplePage.title=Simple DataView Example
+SimplePage.description=simple example of a dataview
+
+PagingPage.title=Paging DataView Example
+PagingPage.description=builds on previous to demonstrate paging and page navigation
+
+SortingPage.title=Sorting DataView Example
+SortingPage.description=builds on previous to demonstrate sorting
+
+OIRPage.title=DataView and optimized item removal
+OIRPage.description=demonstrates a dataview with a different IItemReuseStrategy implementation
+
+DataGridPage.title=DataGridView Example
+DataGridPage.description=a view that generates grids where rows are representing by items of the data provider and columns are represented by an array of ICellPopulators objects
+
+DataTablePage.title=DataTable Example
+DataTablePage.description=demonstrates data table component that wraps dataview to offer easy paging and sorting
+
+DataTableFilterToolbarPage.title=DataTable with FilterToolbar Example
+DataTableFilterToolbarPage.description=demonstrates data table component with a FilterToolbar on its data set
+
+GridViewPage.title=GridView Example
+GridViewPage.description=demonstrates a grid view
+
+AjaxDataTablePage.title=AjaxFallbackDataTable Example
+AjaxDataTablePage.description=demonstrates an AJAX enabled datatable component
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/wicket-package.properties
new file mode 100644
index 0000000000..ff73db4c8c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/wicket-package.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+RequestMapperHomePage.title=Request Mappers
+LocalizedPage.title=Request Mappers - Localized Page
+HttpsPage.title=Request Mappers - HTTPS Page
+PackageMountedPage.title=Request Mappers - A page mounted with PackageMapper
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html
index e1e189a6b6..0dfadf34df 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.html
@@ -1,7 +1,4 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
- <wicket:head>
- <title>Resource Aggregation Example Application</title>
- </wicket:head>
<body>
<wicket:extend>
<br/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/wicket-package.properties
new file mode 100644
index 0000000000..a6c1ac8069
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Resource Aggregation
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
index 97628a01ba..11ae4b1966 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/BasePage.html
@@ -16,7 +16,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket/Spring Integration Examples</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/wicket-package.properties
new file mode 100644
index 0000000000..089552c068
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/wicket-package.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Spring Integration
+AnnotPage.title=Spring Integration - Annotations Approach
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
index b08911a34c..056b5173ca 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.html
@@ -1,10 +1,8 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>SRI Demo</title>
</head>
<body>
<wicket:extend>
- <h3>SRI Demo</h3>
<div id="sri">
<p class="sri-false color-red">Integrity test NOT passed</p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/sri/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/wicket-package.properties
new file mode 100644
index 0000000000..788926f865
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+IntegrityDemoPage.title=SRI Demo
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.html
index 369fb60741..bc3338c80d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Stateless Wicket</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
index 9c458e512d..f654b958f4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
index 5ab4d3b9ca..9af429fbbf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
index 7c3cac1e9b..aeb33c91c2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
index 7c3cac1e9b..aeb33c91c2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
index 6ae389e4cf..80964c5c6a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
index 6ae389e4cf..80964c5c6a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - stateless</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/wicket-package.properties
new file mode 100644
index 0000000000..d5b1b4174d
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/wicket-package.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Stateless
+StatelessPage.title=Default stateless page
+StatelessPage1.title=Query strategy mounted stateless page
+StatelessPage2.title=Mixed strategy mounted stateless page
+StatelessPage3.title=Stateless page that stores state in URL
+StatefulPage.title=Stateful page
+AjaxStatelessExample.title=Stateless AJAX Example
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
index 94837fd496..2a8d02b3dd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.html
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - template</title>
-</wicket:head>
<body>
<wicket:extend>
- <h1>Template example</h1>
<p class="dotted-box">
This example shows two different ways of building your page up from shared parts.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
index 59fab6a563..47cdfbe8ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title wicket:id="title">title comes here</title>
<link rel="stylesheet" type="text/css" href="template/style.css"/>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
index e05156e4cc..5f527772e0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Template example, page 2</title>
<link rel="stylesheet" type="text/css" href="template/style.css"/>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/wicket-package.properties
new file mode 100644
index 0000000000..1dd49381c7
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/wicket-package.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Page1.title=Templating using a border - Page 1
+Page2.title=Templating using a border - Page 2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/wicket-package.properties
new file mode 100644
index 0000000000..a7b938c710
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/wicket-package.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Page1.title=Templating using markup inheritance - Page 1
+Page2.title=Templating using markup inheritance - Page 2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/wicket-package.properties
new file mode 100644
index 0000000000..5961bdfd84
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Template Example
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.html
index b0200c3cbf..99211a391f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.html
@@ -18,17 +18,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" >
<head>
- <title>Wicket Examples - trees</title>
</head>
<body>
<wicket:extend>
- <h2>Welcome to Tree Examples</h2>
<wicket:link>
- <a href="BeginnersTreePage.html">Beginner's tee</a>
- <a href="NestedTreePage.html">Advanced nested tree</a>
- <a href="TableTreePage.html">Advanced tabular tree</a>
+ <a href="BeginnersTreePage.html"><wicket:message key="BeginnersTreePage.title"/></a>
+ <a href="NestedTreePage.html"><wicket:message key="NestedTreePage.title"/></a>
+ <a href="TableTreePage.html"><wicket:message key="TableTreePage.title"/></a>
</wicket:link>
<wicket:child/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.html
index 140e2fda2d..50a535d16e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.html
@@ -18,7 +18,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" >
<head>
- <title>Wicket Examples - trees</title>
<style>
.tree p {
margin: 0px;
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/wicket-package.properties
new file mode 100644
index 0000000000..8569c93366
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+BeginnersTreePage.title=Beginner's tree
+NestedTreePage.title=Advanced nested tree
+TableTreePage.title=Advanced tabular tree
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
index 4ab4c2c356..42d7f59742 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - unicodeconverter</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/wicket-package.properties
new file mode 100644
index 0000000000..5752bfd557
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+UnicodeConverter.title=Unicode Converter
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html
index 1125a2b1dd..539971b958 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - upload</title>
<style>
legend { border: 1px solid #e9601a; background-color: #bbb; color: #fff; padding: 4px;}
fieldset { border: 1px solid #e9601a; padding: 10px; margin-top: 10px;}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
index d5c2b76017..d79811f7ae 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - upload</title>
<style>
legend { border: 1px solid #e9601a; background-color: #bbb; color: #fff; padding: 4px;}
fieldset { border: 1px solid #e9601a; padding: 10px; margin-top: 10px;}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadToResourcePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadToResourcePage.html
index ba2097cddf..65d228e53a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadToResourcePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadToResourcePage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - upload</title>
<style>
legend { border: 1px solid #e9601a; background-color: #bbb; color: #fff; padding: 4px;}
fieldset { border: 1px solid #e9601a; padding: 10px; margin-top: 10px;}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/wicket-package.properties
new file mode 100644
index 0000000000..d9b71a7734
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+UploadPage.title=Single File Upload
+MultiUploadPage.title=Multiple File Upload
+UploadToResourcePage.title=Multiple (AJAX) Upload to a Resource
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
index aa0aeaee26..ef7ceba75a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Contrib Examples - Template Page</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
index 7d4c3f939c..d2d4470e8b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - Velocity</title>
</head>
<body>
<wicket:extend>
@@ -19,10 +18,10 @@
<wicket:link>
<ul>
<li>
- <a href="TemplatePage.html">People directory example: type in your own Velocity template</a>
+ <a href="TemplatePage.html"><wicket:message key="TemplatePage.title"/></a>: type in your own Velocity template
</li>
<li>
- <a href="DynamicPage.html">Generic editor example: nesting Wicket components</a><br/>
+ <a href="DynamicPage.html"><wicket:message key="DynamicPage.title"/></a>: nesting Wicket components<br/>
</li>
</ul>
</wicket:link>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
index 8cae5ae56a..2345a0cff2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.html
@@ -1,6 +1,5 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Contrib Examples - Template Page</title>
</head>
<body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/wicket-package.properties
new file mode 100644
index 0000000000..e39257fb10
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/wicket-package.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Home.title=Velocity
+TemplatePage.title=People directory example
+DynamicPage.title=Generic editor example
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/HomePage.html
index 0207e5262f..3cdfb09f3d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/HomePage.html
@@ -19,17 +19,16 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8" />
- <title>Apache Wicket Native WebSocket demos</title>
</head>
<body>
<wicket:extend>
<wicket:link>
<ul>
- <li><a href="WebSocketBehaviorDemoPage.html">demo with WebSocketBehavior</a></li>
- <li><a href="WebSocketResourceDemoPage.html">demo with WebSocketResource</a></li>
- <li><a href="WebSocketMultiTabResourceDemoPage.html">demo with WebSocketResource and multiple tabs</a></li>
- <li><a href="WebSocketPushUpdateProgressDemoPage.html">Update a component via server-side initiated notifications</a></li>
+ <li><a href="WebSocketBehaviorDemoPage.html"><wicket:message key="WebSocketBehaviorDemoPage.title"/></a></li>
+ <li><a href="WebSocketResourceDemoPage.html"><wicket:message key="WebSocketResourceDemoPage.title"/></a></li>
+ <li><a href="WebSocketMultiTabResourceDemoPage.html"><wicket:message key="WebSocketMultiTabResourceDemoPage.title"/></a></li>
+ <li><a href="WebSocketPushUpdateProgressDemoPage.html"><wicket:message key="WebSocketPushUpdateProgressDemoPage.title"/></a></li>
</ul>
</wicket:link>
</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.html
index b9b0e92f7e..e390096809 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketBehaviorDemoPage.html
@@ -19,7 +19,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8" />
- <title>WebSocketBehavior demo - Apache Wicket Native WebSocket</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketMultiTabResourceDemoPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketMultiTabResourceDemoPage.html
index 7414e2d375..36b4118e9e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketMultiTabResourceDemoPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketMultiTabResourceDemoPage.html
@@ -19,7 +19,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8" />
- <title>WebSocketResource demo - Apache Wicket Native WebSocket</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketResourceDemoPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketResourceDemoPage.html
index 7414e2d375..36b4118e9e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketResourceDemoPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/WebSocketResourceDemoPage.html
@@ -19,7 +19,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8" />
- <title>WebSocketResource demo - Apache Wicket Native WebSocket</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/wicket-package.properties
new file mode 100644
index 0000000000..ba4042e66c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/websocket/wicket-package.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HomePage.title=Native WebSocket Demos
+WebSocketBehaviorDemoPage.title=Demo with WebSocketBehavior
+WebSocketResourceDemoPage.title=Demo with WebSocketResource
+WebSocketMultiTabResourceDemoPage.title=Demo with WebSocketResource and multiple tabs
+WebSocketPushUpdateProgressDemoPage.title=Update a component via server-side initiated notifications
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
index 0c73f2e653..aa965e6594 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - wizard</title>
</head>
<body>
<wicket:extend>
@@ -10,13 +9,13 @@
<ul>
<li>
- <a wicket:id="staticWizardLink" href="#">static wizard using plain text steps</a>
+ <a wicket:id="staticWizardLink" href="#"><wicket:message key="StaticWizard.title"/></a>
</li>
<li>
- <a wicket:id="staticWizardWithPanelsLink" href="#">static wizard using panel steps</a>
+ <a wicket:id="staticWizardWithPanelsLink" href="#"><wicket:message key="StaticWizardWithPanels.title"/></a>
</li>
<li>
- <a wicket:id="newUserWizardLink" href="#">wizard for creating a new user</a>
+ <a wicket:id="newUserWizardLink" href="#"><wicket:message key="NewUserWizard.title"/></a>
</li>
</ul>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
index 3c9ba8d309..dfb2e4d136 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.html
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - wizard</title>
</head>
<body>
<wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
index ab568b1b22..c32403dc3d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
@@ -33,6 +33,8 @@ import org.apache.wicket.util.lang.Args;
*/
public class WizardPage extends WicketExamplePage
{
+ private final Class<? extends Wizard> wizardClass;
+
/**
* Construct.
*
@@ -44,6 +46,7 @@ public class WizardPage extends WicketExamplePage
public <C extends Wizard> WizardPage(Class<C> wizardClass)
{
Args.notNull(wizardClass, "wizardClass");
+ this.wizardClass = wizardClass;
try
{
Constructor<? extends Wizard> ctor = wizardClass.getConstructor(String.class);
@@ -56,6 +59,12 @@ public class WizardPage extends WicketExamplePage
}
}
+ @Override
+ protected String getExampleTitleKey()
+ {
+ return wizardClass.getSimpleName() + ".title";
+ }
+
@Override
public void renderHead(IHeaderResponse response)
{
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/wicket-package.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/wicket-package.properties
new file mode 100644
index 0000000000..c8046c0b32
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/wicket-package.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Index.title=Wizards
+StaticWizard.title=Static wizard using plain text steps
+StaticWizardWithPanels.title=Static wizard using panel steps
+NewUserWizard.title=Wizard for creating a new user
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
index 6610f3b6ab..29e6f4b218 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/LocalizedPage.html
@@ -17,7 +17,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Request Mappers demo</title>
</head>
<body>
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
index 376408789d..fb2cda8ba6 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.html
@@ -17,7 +17,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Request Mappers demo</title>
</head>
<body>
diff --git a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
index 93530a5425..eeadd82b0f 100644
--- a/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
+++ b/wicket-examples/src/main/resources/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.html
@@ -17,7 +17,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Request Mappers demo</title>
</head>
<body>
diff --git a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
index 4664b03b55..4a10e27900 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
+++ b/wicket-examples/src/main/webapp/WEB-INF/templates/AlternativePageFromWebContext.html
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - custom resource loading</title>
-</wicket:head>
<body>
<wicket:extend>
<p>
diff --git a/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html b/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html
index d3d61e2665..b9833a8e0d 100644
--- a/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html
+++ b/wicket-examples/src/main/webapp/WEB-INF/templates/org/apache/wicket/examples/customresourceloading/PageFromWebContext.html
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - custom resource loading</title>
-</wicket:head>
<body>
<wicket:extend>
This page was loaded from the web context. It was found by the custom resource stream locator,
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ExampleTitlesTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ExampleTitlesTest.java
new file mode 100644
index 0000000000..eebb7f2fe1
--- /dev/null
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ExampleTitlesTest.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.examples;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.io.IOException;
+import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.wicket.examples.frames.TopFrame;
+import org.apache.wicket.examples.homepage.HomePage;
+import org.apache.wicket.examples.wizard.NewUserWizard;
+import org.apache.wicket.examples.wizard.StaticWizard;
+import org.apache.wicket.examples.wizard.StaticWizardWithPanels;
+import org.apache.wicket.examples.wizard.WizardPage;
+import org.apache.wicket.resource.loader.PackageStringResourceLoader;
+import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Checks that every example page has a title to show.
+ */
+class ExampleTitlesTest extends WicketTestCase
+{
+ /** Pages that are not an example of their own, and the page titled after its wizard. */
+ private static final Set<Class<?>> UNTITLED = Set.of(HomePage.class, TopFrame.class,
+ WizardPage.class);
+
+ @Test
+ void everyExamplePageHasATitle() throws Exception
+ {
+ List<Class<? extends WicketExamplePage>> pages = examplePages();
+ assertFalse(pages.isEmpty(), "no example pages found");
+ Set<Class<?>> basePages = pages.stream()
+ .map(Class::getSuperclass)
+ .collect(Collectors.toSet());
+
+ List<String> missing = pages.stream()
+ .filter(page -> basePages.contains(page) == false)
+ .filter(page -> hasTitle(page, WicketExamplePage.titleKey(page)) == false)
+ .map(Class::getName)
+ .toList();
+
+ assertEquals(List.of(), missing);
+ }
+
+ @Test
+ void everyWizardHasATitle()
+ {
+ List<String> missing = Stream
+ .of(StaticWizard.class, StaticWizardWithPanels.class, NewUserWizard.class)
+ .filter(
+ wizard -> hasTitle(WizardPage.class, wizard.getSimpleName() + ".title") == false)
+ .map(Class::getName)
+ .toList();
+
+ assertEquals(List.of(), missing);
+ }
+
+ private static boolean hasTitle(Class<?> page, String key)
+ {
+ return new PackageStringResourceLoader().loadStringResource(page, key, Locale.ENGLISH,
+ null, null) != null;
+ }
+
+ private static List<Class<? extends WicketExamplePage>> examplePages()
+ throws IOException, URISyntaxException
+ {
+ Path root = Path.of(WicketExamplePage.class.getResource("WicketExamplePage.class").toURI())
+ .getParent();
+ try (Stream<Path> files = Files.walk(root))
+ {
+ return files.map(root::relativize)
+ .map(Path::toString)
+ .filter(file -> file.endsWith(".class"))
+ .map(file -> WicketExamplePage.class.getPackageName() + '.' +
+ file.substring(0, file.length() - ".class".length()).replace('/', '.'))
+ .<Class<?>> map(ExampleTitlesTest::load)
+ .filter(WicketExamplePage.class::isAssignableFrom)
+ .filter(type -> type != WicketExamplePage.class)
+ .filter(type -> Modifier.isAbstract(type.getModifiers()) == false)
+ .filter(type -> type.isAnonymousClass() == false)
+ .filter(type -> UNTITLED.contains(type) == false)
+ .<Class<? extends WicketExamplePage>> map(
+ type -> type.asSubclass(WicketExamplePage.class))
+ .toList();
+ }
+ }
+
+ private static Class<?> load(String name)
+ {
+ try
+ {
+ return Class.forName(name, false, ExampleTitlesTest.class.getClassLoader());
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalStateException(e);
+ }
+ }
+}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/IndexTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/IndexTest.java
new file mode 100644
index 0000000000..ed281d4196
--- /dev/null
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/IndexTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.examples.ajax.builtin;
+
+import org.apache.wicket.examples.AjaxEngineSelector;
+import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests that the ajax examples are listed and titled from the same resource.
+ */
+class IndexTest extends WicketTestCase
+{
+ @Test
+ void listsExamplesWithTheirTitle()
+ {
+ tester.startPage(Index.class);
+
+ tester.assertRenderedPage(Index.class);
+ tester.assertLabel("exampleTitle", "Ajax Examples");
+ tester.assertContains(">Wicket Examples - Ajax Examples</title>");
+ tester.assertContains("Drop Down Choice Example");
+ tester.assertContains("demonstrates the linked select boxes usecase");
+ }
+
+ @Test
+ void examplePageShowsTheTitleItIsListedWith()
+ {
+ tester.startPage(ClockPage.class);
+
+ tester.assertLabel("exampleTitle", "Clock Example");
+ tester.assertContains(">Wicket Examples - Clock Example</title>");
+ }
+
+ @Test
+ void hidesEffectsExampleWithoutJQuery()
+ {
+ tester.startPage(Index.class);
+ tester.assertContains("Effects Example");
+
+ AjaxEngineSelector.setSessionEngine(AjaxEngineSelector.Engine.VANILLA);
+ tester.startPage(tester.getLastRenderedPage());
+
+ tester.assertContainsNot("Effects Example");
+ }
+}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
index d07e41d3f5..e12cb5a882 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/prototype/AjaxTest.java
@@ -38,7 +38,7 @@ public class AjaxTest extends WicketTestCase
Index page = new Index();
tester.startPage(page);
- tester.assertContains("Wicket Examples - Prototype.js / component render");
+ tester.assertContains("Wicket Examples - AJAX with Prototype.js");
assertEquals(0, page.get("counter").getDefaultModelObject());
tester.startPage(page);
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
index 0ebca5cff2..74ea6a9799 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/compref/ComprefTest.java
@@ -33,6 +33,6 @@ public class ComprefTest extends WicketTestCase
public void test_1() {
tester.startPage(Index.class);
- tester.assertContains("Wicket Examples - component reference");
+ tester.assertContains("Wicket Examples - Component Reference");
}
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
index 9944d1d342..2cd67078cd 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/encodings/EncodingTest.java
@@ -31,7 +31,7 @@ public class EncodingTest extends WicketTestCase
@Test
public void test_1() {
tester.startPage(Home.class);
- tester.assertContains("Wicket Examples - encodings");
+ tester.assertContains("Wicket Examples - Encodings");
// the non-printable characters are: ���
tester.assertContains("Hello world! Test: ���");
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
index 4941a69616..ebd0bc6376 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/forminput/FormInputTest.java
@@ -33,6 +33,6 @@ class FormInputTest extends WicketTestCase
{
tester.startPage(FormInput.class);
- tester.assertContains("Wicket Examples - forminput");
+ tester.assertContains("Wicket Examples - Form Input");
}
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
index ba5f8970b7..ccf6c073cd 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
@@ -47,7 +47,7 @@ public class GuestbookTest extends WicketTestCase
@Test
public void test_1() {
tester.startPage(GuestBook.class);
- tester.assertContains("Wicket Examples - guestbook");
+ tester.assertContains("Wicket Examples - Guestbook");
// check if the list of comments is empty
tester.assertComponent("comments", ListView.class);
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
index 4d8425b1ec..9aa662e414 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/hangman/HangManTest.java
@@ -141,7 +141,7 @@ public class HangManTest
{
tester.startPage(Home.class, new PageParameters().set("word", "hangman"));
tester.assertComponent("start", Link.class);
- tester.assertContains("Wicket Examples - hangman");
+ tester.assertContains("Wicket Examples - Hangman");
tester.clickLink("start");
tester.assertLabel("guessesRemaining", "5");
clickLetter(tester, 'f');
@@ -171,7 +171,7 @@ public class HangManTest
{
tester.startPage(Home.class, new PageParameters().set("word", "hangman"));
tester.assertComponent("start", Link.class);
- tester.assertContains("Wicket Examples - hangman");
+ tester.assertContains("Wicket Examples - Hangman");
tester.clickLink("start");
tester.assertLabel("guessesRemaining", "5");
clickLetter(tester, 'f');
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
index 54e4da8799..f428c70ea0 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/helloworld/HelloWorldTest.java
@@ -31,7 +31,7 @@ public class HelloWorldTest extends WicketTestCase
@Test
public void testHelloWorld() {
tester.startPage(HelloWorld.class);
- tester.assertContains("Wicket Examples - helloworld");
+ tester.assertContains("Wicket Examples - Hello World");
tester.assertLabel("message", "Hello World!");
}
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
index 4c231472a7..e04beb7a22 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/images/ImagesTest.java
@@ -34,7 +34,7 @@ public class ImagesTest
try
{
tester.startPage(Home.class);
- tester.assertContains("Wicket Examples - images");
+ tester.assertContains("Wicket Examples - Images");
}
finally
{
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
index 04f97cb82c..0fe47acdee 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/library/LibraryTest.java
@@ -35,7 +35,7 @@ public class LibraryTest
try
{
tester.startPage(SignIn.class);
- tester.assertContains("Wicket Examples - library");
+ tester.assertContains("Wicket Examples - Library - Sign In");
tester.assertContains("Username and password are both");
FormTester formTester = tester.newFormTester("signInPanel:signInForm");
@@ -44,7 +44,7 @@ public class LibraryTest
formTester.submit();
tester.assertRenderedPage(Home.class);
- tester.assertContains("Wicket Examples - library");
+ tester.assertContains("Wicket Examples - Library<");
tester.assertLabel("books:0:author", "Effective Java (Joshua Bloch)");
}
finally
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
index 67c3e6eaba..0d892d475d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/linkomatic/LinkomaticTest.java
@@ -31,6 +31,6 @@ public class LinkomaticTest extends WicketTestCase
public void testLinkomatic()
{
tester.startPage(Home.class);
- tester.assertContains("Wicket Examples - linkomatic");
+ tester.assertContains("Wicket Examples - Link-o-matic");
}
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
index 2c2cf8e34c..caa375d119 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/niceurl/NiceUrlTest.java
@@ -53,7 +53,7 @@ public class NiceUrlTest
@Test
public void testHomePage()
{
- tester.assertContains("Wicket Examples - niceurl");
+ tester.assertContains("Wicket Examples - Nice URLs");
tester.assertContains("This example displays how you can work with 'nice' urls for bookmarkable pages.");
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
index ad439ea239..f689e613e8 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
@@ -35,7 +35,7 @@ public class RepeaterTest
try
{
tester.startPage(Index.class);
- tester.assertContains("Wicket Examples - repeater views");
+ tester.assertContains("Wicket Examples - Repeaters");
checkPage(tester, RepeatingPage.class);
checkPage(tester, RefreshingPage.class);
@@ -57,7 +57,7 @@ public class RepeaterTest
private void checkPage(WicketTester tester, Class<? extends WebPage> page)
{
tester.startPage(page);
- tester.assertContains("Wicket Examples - repeater views");
+ tester.assertVisible("exampleTitle");
tester.assertContains("Selected Contact: ");
tester.assertContains("No Contact Selected");
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
index a71e95f8da..0c51a106db 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/template/TemplateTest.java
@@ -33,7 +33,7 @@ public class TemplateTest
WicketTester tester = new WicketTester(new TemplateApplication());
tester.startPage(tester.getApplication().getHomePage());
String doc = tester.getLastResponse().getDocument();
- tester.assertContains("Wicket Examples - template");
+ tester.assertContains("Wicket Examples - Template Example");
tester.assertContains("This example shows two different ways of building your page up from shared parts.");
tester.startPage(org.apache.wicket.examples.template.pageinheritance.Page1.class);
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.html b/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.html
index 3658c0e1ac..0ddb9cb063 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.html
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/HelloWorld.html
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml" >
-<wicket:head>
- <title>Wicket Examples - helloworld</title>
-</wicket:head>
<body>
<wicket:extend>
<span wicket:id="message" id="message">Message goes here</span>
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
index 83356e2f1a..251ee89729 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithFPTest.java
@@ -61,7 +61,7 @@ public class WithoutCPWithFPTest extends WicketWebTestCase
public void testHelloWorld() throws Exception
{
WebResponse response = beginAt("/filtertest/hello?message=Test");
- assertEquals("Wicket Examples - helloworld", response.getTitle());
+ assertEquals("Wicket Examples - Hello World", response.getTitle());
assertEquals("Message is: 'Test'", response.getElementWithID("message").getText());
}
@@ -72,7 +72,7 @@ public class WithoutCPWithFPTest extends WicketWebTestCase
public void testWithSlash() throws Exception
{
WebResponse response = beginAt("/filtertest/hello?message=Test%2FWith%20a%20Slash");
- assertEquals("Wicket Examples - helloworld", response.getTitle());
+ assertEquals("Wicket Examples - Hello World", response.getTitle());
assertEquals("Message is: 'Test/With a Slash'", response.getElementWithID("message")
.getText());
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
index 2d85321931..eae5db3a9d 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/WithoutCPWithoutFPTest.java
@@ -61,7 +61,7 @@ public class WithoutCPWithoutFPTest extends WicketWebTestCase
public void testHelloWorld() throws Exception
{
WebResponse response = beginAt("/hello?message=Test");
- assertEquals("Wicket Examples - helloworld", response.getTitle());
+ assertEquals("Wicket Examples - Hello World", response.getTitle());
assertEquals("Message is: 'Test'", response.getElementWithID("message").getText());
}
@@ -74,7 +74,7 @@ public class WithoutCPWithoutFPTest extends WicketWebTestCase
public void testWithSlash() throws Exception
{
WebResponse response = beginAt("/hello?message=Test%2FWith%20a%20Slash");
- assertEquals("Wicket Examples - helloworld", response.getTitle());
+ assertEquals("Wicket Examples - Hello World", response.getTitle());
assertEquals("Message is: 'Test/With a Slash'", response.getElementWithID("message")
.getText());
}
diff --git a/wicket-examples/src/test/java/org/apache/wicket/filtertest/wicket-package.properties b/wicket-examples/src/test/java/org/apache/wicket/filtertest/wicket-package.properties
new file mode 100644
index 0000000000..ae9800e59c
--- /dev/null
+++ b/wicket-examples/src/test/java/org/apache/wicket/filtertest/wicket-package.properties
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HelloWorld.title=Hello World