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/23 16:09:35 UTC
(wicket) branch master updated (98588987aa -> 6550afd842)
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
from 98588987aa Bump org.codehaus.mojo:build-helper-maven-plugin from 3.6.1 to 3.6.2 (#1607)
new f64a9ce2af Let every example describe itself, and build the indexes from that
new 6550afd842 Validate the number in the editable label example
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../wicket/examples/ExampleApplicationsPanel.html | 6 +
.../wicket/examples/ExampleApplicationsPanel.java | 112 ++++++++
.../apache/wicket/examples/ExampleIndexPanel.html | 9 +
.../apache/wicket/examples/ExampleIndexPanel.java | 273 +++++++++++++++++++
.../org/apache/wicket/examples/ExamplePages.java | 200 ++++++++++++++
.../apache/wicket/examples/ExamplesIndexPage.html | 8 +
...bstractTreePage.java => ExamplesIndexPage.java} | 28 +-
.../WicketExamplePage$BackToIndexPanel.html | 6 +
.../apache/wicket/examples/WicketExamplePage.html | 4 +
.../apache/wicket/examples/WicketExamplePage.java | 282 +++++++++++++++++++-
...age.properties => WicketExamplePage.properties} | 7 +-
.../examples/ajax/builtin/AjaxDownloadPage.html | 4 -
.../builtin/AjaxDownloadPage.properties} | 5 +-
.../examples/ajax/builtin/AutoCompletePage.html | 2 -
.../builtin/AutoCompletePage.properties} | 5 +-
.../wicket/examples/ajax/builtin/BasePage.html | 12 -
.../wicket/examples/ajax/builtin/BasePage.java | 12 +-
.../wicket/examples/ajax/builtin/ChoicePage.html | 5 -
.../builtin/ChoicePage.properties} | 5 +-
.../wicket/examples/ajax/builtin/ClockPage.html | 5 -
.../builtin/ClockPage.properties} | 5 +-
.../examples/ajax/builtin/EditableLabelPage.html | 1 +
.../examples/ajax/builtin/EditableLabelPage.java | 46 +++-
.../builtin/EditableLabelPage.properties} | 5 +-
.../builtin/EffectsPage.properties} | 5 +-
.../examples/ajax/builtin/FileUploadPage.html | 26 +-
.../builtin/FileUploadPage.properties} | 5 +-
.../ajax/builtin/FormComponentPanelPage.html | 5 -
.../builtin/FormComponentPanelPage.properties} | 5 +-
.../wicket/examples/ajax/builtin/FormPage.html | 4 +-
.../examples/ajax/builtin/FormPage.properties | 3 +
.../wicket/examples/ajax/builtin/GuestBook.html | 1 -
.../builtin/GuestBook.properties} | 5 +-
.../apache/wicket/examples/ajax/builtin/Index.html | 40 +--
.../apache/wicket/examples/ajax/builtin/Index.java | 26 +-
.../builtin/Index.properties} | 2 +-
.../examples/ajax/builtin/LazyLoadingPage.html | 7 -
.../builtin/LazyLoadingPage.properties} | 4 +-
.../builtin/LinksPage.properties} | 5 +-
.../builtin/OnChangeAjaxBehaviorPage.properties | 2 +
.../examples/ajax/builtin/PageablesPage.html | 1 -
.../builtin/PageablesPage.properties} | 3 +-
.../wicket/examples/ajax/builtin/RatingsPage.html | 23 +-
.../examples/ajax/builtin/RatingsPage.properties | 17 ++
.../builtin/TabbedPanelPage.properties} | 5 +-
.../wicket/examples/ajax/builtin/TodoList.html | 1 -
.../builtin/TodoList.properties} | 5 +-
.../examples/ajax/builtin/WorldClockPage.html | 6 -
.../builtin/WorldClockPage.properties} | 5 +-
.../ajax/builtin/modal/ModalDialogPage.properties | 2 +
.../wicket/examples/ajax/prototype/Index.html | 3 -
.../prototype/Index.properties} | 2 +-
.../ajaxhellobrowser/AjaxHelloBrowser.html | 1 -
.../ajaxhellobrowser/AjaxHelloBrowser.java | 14 +
.../AjaxHelloBrowser.properties} | 2 +-
.../AjaxHelloBrowserOnDomReady.html | 1 -
.../AjaxHelloBrowserOnDomReady.java | 14 +
.../AjaxHelloBrowserOnDomReady.properties} | 2 +-
.../wicket/examples/asemail/MailTemplate.html | 1 -
.../wicket/examples/asemail/MailTemplate.java | 14 +
.../MailTemplate.properties} | 2 +-
.../wicket/examples/authentication1/Home.html | 1 -
.../wicket/examples/authentication1/Home.java | 14 +
.../{library => authentication1}/Home.properties | 2 +-
.../wicket/examples/authentication1/SignIn.html | 1 -
.../SignIn.properties} | 2 +-
.../wicket/examples/authentication1/SignOut.html | 4 +-
.../wicket/examples/authentication1/SignOut.java | 84 +++---
.../SignOut.properties} | 2 +-
.../wicket/examples/authentication2/Home.html | 1 -
.../wicket/examples/authentication2/Home.java | 15 ++
.../{library => authentication2}/Home.properties | 2 +-
.../wicket/examples/authentication2/SignIn2.html | 5 +-
.../SignIn2.properties} | 5 +-
.../wicket/examples/authentication2/SignOut.html | 4 +-
.../wicket/examples/authentication2/SignOut.java | 6 +
.../SignOut.properties} | 2 +-
.../wicket/examples/authentication3/AdminPage.html | 10 -
.../AdminPage.properties} | 4 +-
.../wicket/examples/authentication3/BasePage.html | 10 -
.../wicket/examples/authentication3/BasePage.java | 5 +
.../wicket/examples/authentication3/HomePage.html | 10 -
.../wicket/examples/authentication3/HomePage.java | 15 ++
.../HomePage.properties} | 5 +-
.../examples/authentication3/MySignInPage.html | 5 +-
.../MySignInPage.properties} | 6 +-
.../wicket/examples/authentication3/SignOut.html | 11 -
.../wicket/examples/authentication3/SignOut.java | 69 +++--
.../SignOut.properties} | 5 +-
.../wicket/examples/authorization/BasePage.html | 10 -
.../wicket/examples/authorization/BasePage.java | 6 +-
.../wicket/examples/authorization/Index.html | 24 +-
.../wicket/examples/authorization/Index.java | 31 ++-
.../Index.properties} | 2 +-
.../AdminAnnotationsBookmarkablePage.properties} | 4 +-
.../pages/AdminAnnotationsInternalPage.properties} | 2 +-
.../pages/AdminBookmarkablePage.properties} | 4 +-
.../pages/AdminInternalPage.properties} | 4 +-
.../pages/AnnotationsPanelsPage.properties} | 2 +-
.../pages/PanelsPage.properties} | 2 +-
.../bean/validation/BeanValidationPage.html | 1 -
.../bean/validation/BeanValidationPage.properties | 1 +
.../apache/wicket/examples/breadcrumb/Index.html | 1 -
.../Index.properties} | 2 +-
.../apache/wicket/examples/captcha/Captcha.html | 2 -
.../apache/wicket/examples/captcha/Captcha.java | 14 +
.../Captcha.properties} | 5 +-
.../wicket/examples/cdi/AutoConversationPage1.html | 7 +-
.../AutoConversationPage1.properties} | 4 +-
.../wicket/examples/cdi/AutoConversationPage2.html | 8 +-
.../AutoConversationPage2.properties} | 5 +-
.../apache/wicket/examples/cdi/CdiExamplePage.html | 18 --
.../apache/wicket/examples/cdi/CdiExamplePage.java | 6 +-
.../apache/wicket/examples/cdi/CdiHomePage.html | 26 +-
.../apache/wicket/examples/cdi/CdiHomePage.java | 68 +++--
.../CdiHomePage.properties} | 2 +-
.../wicket/examples/cdi/ConversationPage1.html | 32 +--
.../ConversationPage1.properties} | 4 +-
.../wicket/examples/cdi/ConversationPage2.html | 34 +--
.../ConversationPage2.properties} | 5 +-
.../wicket/examples/cdi/ConversationPage3.html | 21 +-
.../ConversationPage3.properties} | 5 +-
.../apache/wicket/examples/cdi/InjectionPage.html | 28 +-
.../InjectionPage.properties} | 5 +-
.../examples/compref/BookmarkablePageLinkPage.html | 3 -
.../examples/compref/BookmarkablePageLinkPage.java | 3 +-
.../BookmarkablePageLinkPage.properties} | 6 +-
.../apache/wicket/examples/compref/BorderPage.html | 3 -
.../apache/wicket/examples/compref/BorderPage.java | 3 +-
.../BorderPage.properties} | 6 +-
.../apache/wicket/examples/compref/ButtonPage.html | 3 -
.../apache/wicket/examples/compref/ButtonPage.java | 3 +-
.../ButtonPage.properties} | 6 +-
.../compref/CheckBoxMultipleChoicePage.html | 3 -
.../compref/CheckBoxMultipleChoicePage.java | 3 +-
.../CheckBoxMultipleChoicePage.properties} | 6 +-
.../wicket/examples/compref/CheckBoxPage.html | 3 -
.../wicket/examples/compref/CheckBoxPage.java | 3 +-
.../CheckBoxPage.properties} | 6 +-
.../examples/compref/CheckBoxSelectorPage.html | 101 ++++---
.../examples/compref/CheckBoxSelectorPage.java | 289 ++++++++++-----------
.../CheckBoxSelectorPage.properties} | 6 +-
.../wicket/examples/compref/CheckGroupPage.html | 3 -
.../wicket/examples/compref/CheckGroupPage.java | 3 +-
.../CheckGroupPage.properties} | 6 +-
.../wicket/examples/compref/CheckGroupPage2.html | 3 -
.../wicket/examples/compref/CheckGroupPage2.java | 169 ++++++------
...lPage.properties => CheckGroupPage2.properties} | 4 +-
.../Page1.java => compref/ComprefPage.java} | 30 ++-
.../examples/compref/DropDownChoicePage.html | 3 -
.../examples/compref/DropDownChoicePage.java | 3 +-
.../examples/compref/DropDownChoicePage.properties | 3 +
.../wicket/examples/compref/ExternalLinkPage.html | 3 -
.../wicket/examples/compref/ExternalLinkPage.java | 3 +-
.../ExternalLinkPage.properties} | 6 +-
.../apache/wicket/examples/compref/FormPage.html | 3 -
.../apache/wicket/examples/compref/FormPage.java | 3 +-
.../FormPage.properties} | 4 +-
.../wicket/examples/compref/FragmentPage.html | 3 -
.../wicket/examples/compref/FragmentPage.java | 3 +-
.../FragmentPage.properties} | 6 +-
.../org/apache/wicket/examples/compref/Index.html | 69 +----
.../org/apache/wicket/examples/compref/Index.java | 4 +-
.../Index.properties} | 8 +-
.../apache/wicket/examples/compref/LabelPage.html | 3 -
.../apache/wicket/examples/compref/LabelPage.java | 3 +-
.../wicket/examples/compref/LabelPage.properties | 3 +
.../apache/wicket/examples/compref/LinkPage.html | 3 -
.../apache/wicket/examples/compref/LinkPage.java | 3 +-
.../LinkPage.properties} | 4 +-
.../wicket/examples/compref/ListChoicePage.html | 3 -
.../wicket/examples/compref/ListChoicePage.java | 3 +-
.../ListChoicePage.properties} | 6 +-
.../examples/compref/ListMultipleChoicePage.html | 3 -
.../examples/compref/ListMultipleChoicePage.java | 3 +-
.../ListMultipleChoicePage.properties} | 6 +-
.../examples/compref/MultiLineLabelPage.html | 3 -
.../examples/compref/MultiLineLabelPage.java | 3 +-
.../MultiLineLabelPage.properties} | 6 +-
.../wicket/examples/compref/PalettePage.html | 3 -
.../wicket/examples/compref/PalettePage.java | 3 +-
.../PalettePage.properties} | 6 +-
.../apache/wicket/examples/compref/PanelPage.html | 3 -
.../apache/wicket/examples/compref/PanelPage.java | 3 +-
.../PanelPage.properties} | 6 +-
.../wicket/examples/compref/RadioChoicePage.html | 3 -
.../wicket/examples/compref/RadioChoicePage.java | 3 +-
.../RadioChoicePage.properties} | 6 +-
.../wicket/examples/compref/RadioGroupPage.html | 3 -
.../wicket/examples/compref/RadioGroupPage.java | 3 +-
.../RadioGroupPage.properties} | 6 +-
.../wicket/examples/compref/RadioGroupPage2.html | 3 -
.../wicket/examples/compref/RadioGroupPage2.java | 159 ++++++------
.../RadioGroupPage2.properties} | 6 +-
.../apache/wicket/examples/compref/SelectPage.html | 3 -
.../apache/wicket/examples/compref/SelectPage.java | 3 +-
.../SelectPage.properties} | 6 +-
.../wicket/examples/compref/SubmitLinkPage.html | 3 -
.../wicket/examples/compref/SubmitLinkPage.java | 3 +-
.../SubmitLinkPage.properties} | 6 +-
.../wicket/examples/compref/TabbedPanelPage.html | 3 -
.../wicket/examples/compref/TabbedPanelPage.java | 3 +-
.../TabbedPanelPage.properties} | 6 +-
.../wicket/examples/compref/TextAreaPage.html | 3 -
.../wicket/examples/compref/TextAreaPage.java | 3 +-
.../TextAreaPage.properties} | 6 +-
.../wicket/examples/compref/TextFieldPage.html | 3 -
.../wicket/examples/compref/TextFieldPage.java | 3 +-
.../examples/compref/TextFieldPage.properties | 3 +
.../apache/wicket/examples/csp/NonceDemoPage.html | 4 +-
.../wicket/examples/csp/NonceDemoPage.properties | 2 +
.../AlternativePageFromWebContext.properties} | 4 +-
.../CustomLoadedTemplate.html | 19 +-
.../examples/customresourceloading/Index.html | 1 -
.../examples/customresourceloading/Index.java | 14 +
.../Index.properties} | 2 +-
.../PageFromWebContext.properties} | 2 +-
.../PageWithCustomLoading.properties | 16 ++
.../wicket/examples/datetime/DateTimePage.html | 1 -
.../wicket/examples/datetime/DateTimePage.java | 7 +-
.../examples/datetime/DateTimePage.properties | 1 +
.../java/org/apache/wicket/examples/echo/Echo.html | 1 -
.../Home.properties => echo/Echo.properties} | 2 +-
.../org/apache/wicket/examples/encodings/Home.html | 3 -
.../{library => encodings}/Home.properties | 2 +-
.../apache/wicket/examples/events/BasePage.html | 11 -
.../apache/wicket/examples/events/BasePage.java | 9 +-
.../DecoupledAjaxUpdatePage.properties} | 2 +-
.../apache/wicket/examples/events/IndexPage.html | 12 +-
.../apache/wicket/examples/events/IndexPage.java | 60 +++--
.../IndexPage.properties} | 2 +-
.../wicket/examples/forminput/FormInput.html | 3 -
.../wicket/examples/forminput/FormInput.properties | 1 +
.../apache/wicket/examples/frames/TopFrame.html | 1 -
.../apache/wicket/examples/frames/TopFrame.java | 6 +
.../wicket/examples/guestbook/GuestBook.html | 3 -
.../GuestBook.properties} | 2 +-
.../org/apache/wicket/examples/guice/HomePage.html | 12 +-
.../org/apache/wicket/examples/guice/HomePage.java | 14 +
.../HomePage.properties} | 4 +-
.../org/apache/wicket/examples/hangman/Guess.html | 1 -
.../Home.properties => hangman/Guess.properties} | 2 +-
.../org/apache/wicket/examples/hangman/Home.html | 10 +-
.../examples/{library => hangman}/Home.properties | 3 +-
.../org/apache/wicket/examples/hangman/Lose.html | 1 -
.../Home.properties => hangman/Lose.properties} | 2 +-
.../org/apache/wicket/examples/hangman/Win.html | 1 -
.../Home.properties => hangman/Win.properties} | 2 +-
.../wicket/examples/hellobrowser/HelloBrowser.html | 1 -
.../wicket/examples/hellobrowser/HelloBrowser.java | 14 +
.../HelloBrowser.properties} | 2 +-
.../wicket/examples/helloworld/HelloWorld.html | 3 -
.../HelloWorld.properties} | 2 +-
.../AuthenticationIndex.java} | 13 +-
.../AuthenticationIndex.properties} | 12 +-
.../Home.java => homepage/BrowserInfoIndex.java} | 13 +-
.../BrowserInfoIndex.properties} | 17 +-
.../Home.java => homepage/CaptchaIndex.java} | 13 +-
.../CaptchaIndex.properties} | 8 +-
.../examples/homepage/HomePageApplication.java | 6 +
.../Home.java => homepage/InjectionIndex.java} | 13 +-
.../InjectionIndex.properties} | 10 +-
.../Home.java => homepage/LocalizationIndex.java} | 13 +-
.../LocalizationIndex.properties} | 9 +-
.../Home.java => homepage/TemplatingIndex.java} | 13 +-
.../TemplatingIndex.properties} | 10 +-
.../org/apache/wicket/examples/images/Home.html | 3 -
.../examples/{library => images}/Home.properties | 2 +-
.../wicket/examples/kittenCaptcha/HomePage.html | 1 -
.../wicket/examples/kittenCaptcha/HomePage.java | 14 +
.../HomePage.properties} | 2 +-
.../examples/library/AuthenticatedWebPage.html | 2 -
.../examples/library/AuthenticatedWebPage.java | 6 +
.../wicket/examples/library/BookDetails.properties | 1 +
.../wicket/examples/library/EditBook.properties | 1 +
.../org/apache/wicket/examples/library/Home.html | 3 -
.../apache/wicket/examples/library/Home.properties | 1 +
.../org/apache/wicket/examples/library/SignIn.html | 7 +-
.../wicket/examples/library/SignIn.properties | 2 +
.../apache/wicket/examples/library/SignOut.html | 2 -
.../apache/wicket/examples/library/SignOut.java | 84 +++---
.../{Home.properties => SignOut.properties} | 2 +-
.../wicket/examples/linkomatic/BookDetails.html | 3 -
.../wicket/examples/linkomatic/BookDetails.java | 6 +
.../BookDetails.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Home.html | 3 -
.../{library => linkomatic}/Home.properties | 2 +-
.../apache/wicket/examples/linkomatic/Page1.html | 3 -
.../apache/wicket/examples/linkomatic/Page1.java | 6 +
.../Page1.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Page2.html | 3 -
.../apache/wicket/examples/linkomatic/Page2.java | 6 +
.../Page2.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Page3.html | 3 -
.../apache/wicket/examples/linkomatic/Page3.java | 6 +
.../Page3.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Popup.html | 1 -
.../Popup.properties} | 2 +-
.../org/apache/wicket/examples/media/Home.html | 4 +-
.../examples/{library => media}/Home.properties | 3 +-
.../apache/wicket/examples/navomatic/Page1.html | 1 -
.../Home.properties => navomatic/Page1.properties} | 2 +-
.../apache/wicket/examples/navomatic/Page2.html | 1 -
.../Home.properties => navomatic/Page2.properties} | 2 +-
.../apache/wicket/examples/navomatic/Page3.html | 1 -
.../Home.properties => navomatic/Page3.properties} | 2 +-
.../org/apache/wicket/examples/niceurl/Home.html | 7 -
.../examples/{library => niceurl}/Home.properties | 3 +-
.../org/apache/wicket/examples/niceurl/Page1.html | 3 -
.../org/apache/wicket/examples/niceurl/Page1.java | 7 +-
.../Home.properties => niceurl/Page1.properties} | 2 +-
.../org/apache/wicket/examples/niceurl/Page2.html | 3 -
.../org/apache/wicket/examples/niceurl/Page2.java | 8 +-
.../Home.properties => niceurl/Page2.properties} | 2 +-
.../Page2PP.properties} | 4 +-
.../Page2UP.properties} | 4 +-
.../wicket/examples/niceurl/mounted/Page3.html | 3 -
.../wicket/examples/niceurl/mounted/Page3.java | 7 +-
.../mounted/Page3.properties} | 2 +-
.../wicket/examples/niceurl/mounted/Page4.html | 3 -
.../wicket/examples/niceurl/mounted/Page4.java | 7 +-
.../mounted/Page4.properties} | 2 +-
.../wicket/examples/niceurl/mounted/Page5.html | 3 -
.../wicket/examples/niceurl/mounted/Page5.java | 7 +-
.../mounted/Page5.properties} | 2 +-
.../java/org/apache/wicket/examples/pub/Home.html | 1 -
.../java/org/apache/wicket/examples/pub/Home.java | 14 +
.../org/apache/wicket/examples/pub/Home.properties | 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 -
.../java/org/apache/wicket/examples/pub2/Home.html | 1 -
.../java/org/apache/wicket/examples/pub2/Home.java | 196 +++++++-------
.../apache/wicket/examples/pub2/Home.properties | 1 +
.../examples/repeater/AjaxDataTablePage.html | 10 -
.../AjaxDataTablePage.properties} | 6 +-
.../wicket/examples/repeater/DataGridPage.html | 6 -
.../DataGridPage.properties} | 6 +-
.../repeater/DataTableFilterToolbarPage.html | 3 -
.../DataTableFilterToolbarPage.properties} | 6 +-
.../wicket/examples/repeater/DataTablePage.html | 12 -
.../repeater/DataTablePage.utf8.properties | 4 +
.../wicket/examples/repeater/ExamplePage.html | 16 --
.../wicket/examples/repeater/ExamplePage.java | 7 +
.../apache/wicket/examples/repeater/FormPage.html | 4 -
.../{ajax/builtin => repeater}/FormPage.properties | 9 +-
.../wicket/examples/repeater/GridViewPage.html | 3 -
.../GridViewPage.properties} | 7 +-
.../org/apache/wicket/examples/repeater/Index.html | 17 +-
.../org/apache/wicket/examples/repeater/Index.java | 5 +-
.../Index.properties} | 4 +-
.../apache/wicket/examples/repeater/OIRPage.html | 7 -
.../wicket/examples/repeater/OIRPage.properties | 18 ++
.../wicket/examples/repeater/PagingPage.html | 3 -
.../PagingPage.properties} | 6 +-
.../wicket/examples/repeater/RefreshingPage.html | 3 +-
.../RefreshingPage.properties} | 6 +-
.../wicket/examples/repeater/RepeatingPage.html | 5 -
.../RepeatingPage.properties} | 6 +-
.../wicket/examples/repeater/SimplePage.html | 2 -
.../SimplePage.properties} | 6 +-
.../wicket/examples/repeater/SortingPage.html | 4 -
...Page.utf8.properties => SortingPage.properties} | 13 +-
.../HttpsPage.properties} | 2 +-
.../LocalizedPage.properties} | 2 +-
.../RequestMapperHomePage.properties} | 2 +-
.../packageMount/PackageMountedPage.properties} | 4 +-
.../examples/resourcedecoration/HomePage.html | 3 -
.../HomePage.properties} | 2 +-
.../examples/spring/annot/web/AnnotPage.html | 8 +-
.../annot/web/AnnotPage.properties} | 4 +-
.../examples/spring/common/web/BasePage.html | 1 -
.../examples/spring/common/web/HomePage.html | 3 +-
.../examples/spring/common/web/HomePage.java | 15 ++
.../common/web/HomePage.properties} | 5 +-
.../wicket/examples/sri/IntegrityDemoPage.html | 2 -
.../IntegrityDemoPage.properties} | 2 +-
.../examples/stateless/AjaxStatelessExample.html | 1 -
.../AjaxStatelessExample.properties} | 2 +-
.../apache/wicket/examples/stateless/Index.html | 1 -
.../Home.properties => stateless/Index.properties} | 2 +-
.../wicket/examples/stateless/StatefulPage.html | 1 -
.../StatefulPage.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage.html | 1 -
.../StatelessPage.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage1.html | 1 -
.../StatelessPage1.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage2.html | 1 -
.../StatelessPage2.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage3.html | 1 -
.../StatelessPage3.properties} | 2 +-
.../org/apache/wicket/examples/template/Index.html | 17 --
.../org/apache/wicket/examples/template/Index.java | 14 +
.../Index.properties} | 4 +-
.../wicket/examples/template/border/Page1.html | 1 -
.../border/Page1.properties} | 2 +-
.../wicket/examples/template/border/Page2.html | 1 -
.../border/Page2.properties} | 2 +-
.../pageinheritance/Page1.properties} | 2 +-
.../pageinheritance/Page2.properties} | 2 +-
.../wicket/examples/tree/AbstractTreePage.html | 41 +--
.../wicket/examples/tree/AbstractTreePage.java | 8 +
.../wicket/examples/tree/AdvancedTreePage.html | 1 -
.../BeginnersTreePage.properties} | 2 +-
.../NestedTreePage.properties} | 2 +-
.../TableTreePage.properties} | 2 +-
.../unicodeconverter/UnicodeConverter.html | 1 -
.../UnicodeConverter.properties} | 2 +-
.../org/apache/wicket/examples/upload/Index.html | 8 +
.../wicket/examples/{compref => upload}/Index.java | 14 +-
.../Home.properties => upload/Index.properties} | 2 +-
.../wicket/examples/upload/MultiUploadPage.html | 7 -
.../wicket/examples/upload/MultiUploadPage.java | 6 +
.../examples/upload/MultiUploadPage.properties | 3 +
.../wicket/examples/upload/UploadApplication.java | 3 +-
.../apache/wicket/examples/upload/UploadPage.html | 7 -
.../apache/wicket/examples/upload/UploadPage.java | 6 +
.../wicket/examples/upload/UploadPage.properties | 3 +
.../examples/upload/UploadToResourcePage.html | 5 -
.../examples/upload/UploadToResourcePage.java | 6 +
.../UploadToResourcePage.properties} | 5 +-
.../wicket/examples/velocity/DynamicPage.html | 1 -
.../DynamicPage.properties} | 5 +-
.../org/apache/wicket/examples/velocity/Home.html | 12 +-
.../org/apache/wicket/examples/velocity/Home.java | 8 +
.../examples/{library => velocity}/Home.properties | 2 +-
.../wicket/examples/velocity/TemplatePage.html | 1 -
.../TemplatePage.properties} | 5 +-
.../apache/wicket/examples/websocket/HomePage.html | 10 +-
.../apache/wicket/examples/websocket/HomePage.java | 5 +
.../HomePage.properties} | 2 +-
.../websocket/WebSocketBehaviorDemoPage.html | 1 -
.../WebSocketBehaviorDemoPage.properties} | 2 +-
.../WebSocketMultiTabResourceDemoPage.html | 1 -
.../WebSocketMultiTabResourceDemoPage.properties} | 2 +-
...WebSocketPushUpdateProgressDemoPage.properties} | 2 +-
.../websocket/WebSocketResourceDemoPage.html | 1 -
.../WebSocketResourceDemoPage.properties} | 2 +-
.../org/apache/wicket/examples/wizard/Index.html | 15 +-
.../org/apache/wicket/examples/wizard/Index.java | 15 +-
.../Index.properties} | 5 +-
.../examples/wizard/NewUserWizard.properties | 2 +
.../StaticWizard.properties} | 3 +-
.../StaticWizardWithPanels.properties} | 3 +-
.../apache/wicket/examples/wizard/WizardPage.html | 2 -
.../apache/wicket/examples/wizard/WizardPage.java | 15 ++
.../apache/wicket/examples/homepage/HomePage.html | 99 ++++---
.../examples/requestmapper/LocalizedPage.html | 1 -
.../requestmapper/RequestMapperHomePage.html | 1 -
.../packageMount/PackageMountedPage.html | 1 -
.../resources/org/apache/wicket/examples/style.css | 27 ++
.../templates/AlternativePageFromWebContext.html | 3 -
.../customresourceloading/PageFromWebContext.html | 3 -
.../wicket/examples/ExampleIndexPanelTest.java | 128 +++++++++
.../apache/wicket/examples/ExampleTitlesTest.java | 121 +++++++++
.../ajax/builtin/EditableLabelPageTest.java | 71 +++++
.../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 | 19 +-
.../wicket/examples/repeater/RepeaterTest.java | 4 +-
.../wicket/examples/template/TemplateTest.java | 2 +-
.../org/apache/wicket/filtertest/HelloWorld.html | 3 -
.../wicket/filtertest/HelloWorld.properties} | 2 +-
.../wicket/filtertest/WithoutCPWithFPTest.java | 4 +-
.../wicket/filtertest/WithoutCPWithoutFPTest.java | 4 +-
478 files changed, 3157 insertions(+), 2061 deletions(-)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.html
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.java
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.html
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.java
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExamplePages.java
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{tree/AbstractTreePage.java => ExamplesIndexPage.java} (58%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage$BackToIndexPanel.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => WicketExamplePage.properties} (88%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/AjaxDownloadPage.properties} (82%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/AutoCompletePage.properties} (76%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/ChoicePage.properties} (72%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/ClockPage.properties} (70%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/EditableLabelPage.properties} (89%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/EffectsPage.properties} (88%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/FileUploadPage.properties} (67%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/FormComponentPanelPage.properties} (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/GuestBook.properties} (87%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => ajax/builtin/Index.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{compref/DropDownChoicePage.properties => ajax/builtin/LazyLoadingPage.properties} (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/LinksPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => ajax/builtin/PageablesPage.properties} (93%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.properties
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/TabbedPanelPage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => ajax/builtin/TodoList.properties} (89%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => ajax/builtin/WorldClockPage.properties} (64%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => ajax/prototype/Index.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => ajaxhellobrowser/AjaxHelloBrowser.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => asemail/MailTemplate.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => authentication1}/Home.properties (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => authentication1/SignIn.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => authentication1/SignOut.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => authentication2}/Home.properties (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authentication2/SignIn2.properties} (87%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => authentication2/SignOut.properties} (94%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => authentication3/AdminPage.properties} (83%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authentication3/HomePage.properties} (88%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authentication3/MySignInPage.properties} (87%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authentication3/SignOut.properties} (93%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => authorization/Index.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authorization/pages/AdminAnnotationsBookmarkablePage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => authorization/pages/AdminAnnotationsInternalPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authorization/pages/AdminBookmarkablePage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => authorization/pages/AdminInternalPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => authorization/pages/AnnotationsPanelsPage.properties} (94%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => authorization/pages/PanelsPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => breadcrumb/Index.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => captcha/Captcha.properties} (85%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => cdi/AutoConversationPage1.properties} (72%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => cdi/AutoConversationPage2.properties} (62%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => cdi/CdiHomePage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => cdi/ConversationPage1.properties} (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => cdi/ConversationPage2.properties} (60%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => cdi/ConversationPage3.properties} (77%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => cdi/InjectionPage.properties} (87%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/BookmarkablePageLinkPage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/BorderPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/ButtonPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/CheckBoxMultipleChoicePage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/CheckBoxPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/CheckBoxSelectorPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/CheckGroupPage.properties} (84%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/compref/{LabelPage.properties => CheckGroupPage2.properties} (84%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{linkomatic/Page1.java => compref/ComprefPage.java} (65%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/ExternalLinkPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => compref/FormPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/FragmentPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => compref/Index.properties} (84%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => compref/LinkPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/ListChoicePage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/ListMultipleChoicePage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/MultiLineLabelPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/PalettePage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/PanelPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/RadioChoicePage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/RadioGroupPage.properties} (89%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/RadioGroupPage2.properties} (88%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/SelectPage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/SubmitLinkPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/TabbedPanelPage.properties} (90%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => compref/TextAreaPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => customresourceloading/AlternativePageFromWebContext.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => customresourceloading/Index.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => customresourceloading/PageFromWebContext.properties} (94%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.properties
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => echo/Echo.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => encodings}/Home.properties (97%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => events/DecoupledAjaxUpdatePage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => events/IndexPage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => guestbook/GuestBook.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => guice/HomePage.properties} (56%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => hangman/Guess.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => hangman}/Home.properties (77%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => hangman/Lose.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => hangman/Win.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => hellobrowser/HelloBrowser.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => helloworld/HelloWorld.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/AuthenticationIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => homepage/AuthenticationIndex.properties} (58%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/BrowserInfoIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{repeater/DataTablePage.utf8.properties => homepage/BrowserInfoIndex.properties} (63%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/CaptchaIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => homepage/CaptchaIndex.properties} (76%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/InjectionIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => homepage/InjectionIndex.properties} (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/LocalizationIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => homepage/LocalizationIndex.properties} (84%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{authentication1/Home.java => homepage/TemplatingIndex.java} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => homepage/TemplatingIndex.properties} (67%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => images}/Home.properties (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => kittenCaptcha/HomePage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/library/{Home.properties => SignOut.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => linkomatic/BookDetails.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => linkomatic}/Home.properties (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => linkomatic/Page1.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => linkomatic/Page2.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => linkomatic/Page3.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => linkomatic/Popup.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => media}/Home.properties (77%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => navomatic/Page1.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => navomatic/Page2.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => navomatic/Page3.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => niceurl}/Home.properties (87%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => niceurl/Page1.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => niceurl/Page2.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => niceurl/Page2PP.properties} (90%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => niceurl/Page2UP.properties} (90%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => niceurl/mounted/Page3.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => niceurl/mounted/Page4.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => niceurl/mounted/Page5.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/AjaxDataTablePage.properties} (62%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/DataGridPage.properties} (68%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/DataTableFilterToolbarPage.properties} (77%)
delete mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{ajax/builtin => repeater}/FormPage.properties (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => repeater/GridViewPage.properties} (86%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/Index.properties} (80%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.properties
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/PagingPage.properties} (72%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/RefreshingPage.properties} (71%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/RepeatingPage.properties} (74%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => repeater/SimplePage.properties} (75%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/repeater/{DataTablePage.utf8.properties => SortingPage.properties} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => requestmapper/HttpsPage.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => requestmapper/LocalizedPage.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => requestmapper/RequestMapperHomePage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => requestmapper/packageMount/PackageMountedPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => resourcedecoration/HomePage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => spring/annot/web/AnnotPage.properties} (58%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => spring/common/web/HomePage.properties} (86%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => sri/IntegrityDemoPage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/AjaxStatelessExample.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/Index.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/StatefulPage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/StatelessPage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/StatelessPage1.properties} (94%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/StatelessPage2.properties} (94%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => stateless/StatelessPage3.properties} (94%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => template/Index.properties} (51%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{pub/Home.properties => template/border/Page1.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => template/border/Page2.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => template/pageinheritance/Page1.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => template/pageinheritance/Page2.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => tree/BeginnersTreePage.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => tree/NestedTreePage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => tree/TableTreePage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => unicodeconverter/UnicodeConverter.properties} (97%)
create mode 100644 wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.html
copy wicket-examples/src/main/java/org/apache/wicket/examples/{compref => upload}/Index.java (78%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => upload/Index.properties} (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{bean/validation/BeanValidationPage.properties => upload/UploadToResourcePage.properties} (73%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => velocity/DynamicPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library => velocity}/Home.properties (97%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => velocity/TemplatePage.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => websocket/HomePage.properties} (96%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => websocket/WebSocketBehaviorDemoPage.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => websocket/WebSocketMultiTabResourceDemoPage.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => websocket/WebSocketPushUpdateProgressDemoPage.properties} (92%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => websocket/WebSocketResourceDemoPage.properties} (95%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{datetime/DateTimePage.properties => wizard/Index.properties} (91%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/SignIn.properties => wizard/StaticWizard.properties} (93%)
copy wicket-examples/src/main/java/org/apache/wicket/examples/{library/Home.properties => wizard/StaticWizardWithPanels.properties} (94%)
create mode 100644 wicket-examples/src/test/java/org/apache/wicket/examples/ExampleIndexPanelTest.java
create mode 100644 wicket-examples/src/test/java/org/apache/wicket/examples/ExampleTitlesTest.java
create mode 100644 wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPageTest.java
create mode 100644 wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/IndexTest.java
copy wicket-examples/src/{main/java/org/apache/wicket/examples/library/Home.properties => test/java/org/apache/wicket/filtertest/HelloWorld.properties} (97%)
(wicket) 01/02: Let every example describe itself, and build the indexes from that
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit f64a9ce2af146f570b928552d8b9548219354221
Author: reiern70 <re...@gmail.com>
AuthorDate: Tue Sep 22 15:20:55 2026 -0500
Let every example describe itself, and build the indexes from that
An example page linked from an index gave no hint of which example it showed:
the link text was not repeated on the page, and the browser title was a
generic, often stale, per-application string. What an index said about an
example was written down away from the example itself, the prose introducing
it was hardcoded English in its markup, and every index repeated the list of
examples it linked to, once in Java and once again in HTML. Adding an example
meant editing four files, and the copies drifted apart.
Each example now says everything about itself in a bundle of its own, named
after it - ClockPage in ClockPage.properties - under title, description,
explanation, order, group and index. WicketExamplePage reads those through a
resource loader that stops at the class it is asked about, so an example that
says nothing about itself is not handed the title of the base page it happens
to extend. It renders the title as the page heading and as the browser title,
and the explanation under it, for every example at once, and the hardcoded
titles and headings that used to duplicate them are gone from the markup.
ExampleIndexPanel then builds an index out of whatever ExamplePages finds next
to it rather than out of a list. Nine indexes use it, compref included, which
keeps its four sections through the group keys. Where the examples of a subject
are separate applications and so can be neither found on the classpath nor
linked to by class - authentication, browser info, localization, captchas,
templating, dependency injection - ExampleApplicationsPanel lists them by path
instead, which is what lets the main menu be a list of subjects rather than of
deployments.
Navigation was written out per package as well. It is now one trail on
WicketExamplePage: back to the main menu, then to the index the example is
listed on when that is somewhere else, each link naming where it goes. An index
that belongs to another application is linked by path, because linking to it by
class asks the application the reader is in to render it under that
application's own mount, and every relative link on it then points into the
wrong application.
A test checks that every example page has a title, and another that the index
lists what the bundles say it should.
Also fixes a NullPointerException in the date and time example, which read the
client time zone in onInitialize. Wicket runs that while mapping the page's
URL, before setGatherExtendedBrowserInfo has had a chance to collect it, so the
example died on the first request and never recovered at all with JavaScript
off. It now falls back to the server's zone, which the reader can still change
from the drop-down.
---
.../wicket/examples/ExampleApplicationsPanel.html | 6 +
.../wicket/examples/ExampleApplicationsPanel.java | 112 ++++++++
.../apache/wicket/examples/ExampleIndexPanel.html | 9 +
.../apache/wicket/examples/ExampleIndexPanel.java | 273 +++++++++++++++++++
.../org/apache/wicket/examples/ExamplePages.java | 200 ++++++++++++++
.../apache/wicket/examples/ExamplesIndexPage.html | 8 +
...bstractTreePage.java => ExamplesIndexPage.java} | 28 +-
.../WicketExamplePage$BackToIndexPanel.html | 6 +
.../apache/wicket/examples/WicketExamplePage.html | 4 +
.../apache/wicket/examples/WicketExamplePage.java | 282 +++++++++++++++++++-
...age.properties => WicketExamplePage.properties} | 7 +-
.../examples/ajax/builtin/AjaxDownloadPage.html | 4 -
.../builtin/AjaxDownloadPage.properties} | 5 +-
.../examples/ajax/builtin/AutoCompletePage.html | 2 -
.../builtin/AutoCompletePage.properties} | 5 +-
.../wicket/examples/ajax/builtin/BasePage.html | 12 -
.../wicket/examples/ajax/builtin/BasePage.java | 12 +-
.../wicket/examples/ajax/builtin/ChoicePage.html | 5 -
.../builtin/ChoicePage.properties} | 5 +-
.../wicket/examples/ajax/builtin/ClockPage.html | 5 -
.../builtin/ClockPage.properties} | 5 +-
.../builtin/EditableLabelPage.properties} | 5 +-
.../builtin/EffectsPage.properties} | 5 +-
.../examples/ajax/builtin/FileUploadPage.html | 26 +-
.../builtin/FileUploadPage.properties} | 5 +-
.../ajax/builtin/FormComponentPanelPage.html | 5 -
.../builtin/FormComponentPanelPage.properties} | 5 +-
.../wicket/examples/ajax/builtin/FormPage.html | 4 +-
.../examples/ajax/builtin/FormPage.properties | 3 +
.../wicket/examples/ajax/builtin/GuestBook.html | 1 -
.../builtin/GuestBook.properties} | 5 +-
.../apache/wicket/examples/ajax/builtin/Index.html | 40 +--
.../apache/wicket/examples/ajax/builtin/Index.java | 26 +-
.../builtin/Index.properties} | 2 +-
.../examples/ajax/builtin/LazyLoadingPage.html | 7 -
.../builtin/LazyLoadingPage.properties} | 4 +-
.../builtin/LinksPage.properties} | 5 +-
.../builtin/OnChangeAjaxBehaviorPage.properties | 2 +
.../examples/ajax/builtin/PageablesPage.html | 1 -
.../builtin/PageablesPage.properties} | 3 +-
.../wicket/examples/ajax/builtin/RatingsPage.html | 23 +-
.../examples/ajax/builtin/RatingsPage.properties | 17 ++
.../builtin/TabbedPanelPage.properties} | 5 +-
.../wicket/examples/ajax/builtin/TodoList.html | 1 -
.../builtin/TodoList.properties} | 5 +-
.../examples/ajax/builtin/WorldClockPage.html | 6 -
.../builtin/WorldClockPage.properties} | 5 +-
.../ajax/builtin/modal/ModalDialogPage.properties | 2 +
.../wicket/examples/ajax/prototype/Index.html | 3 -
.../prototype/Index.properties} | 2 +-
.../ajaxhellobrowser/AjaxHelloBrowser.html | 1 -
.../ajaxhellobrowser/AjaxHelloBrowser.java | 14 +
.../AjaxHelloBrowser.properties} | 2 +-
.../AjaxHelloBrowserOnDomReady.html | 1 -
.../AjaxHelloBrowserOnDomReady.java | 14 +
.../AjaxHelloBrowserOnDomReady.properties} | 2 +-
.../wicket/examples/asemail/MailTemplate.html | 1 -
.../wicket/examples/asemail/MailTemplate.java | 14 +
.../MailTemplate.properties} | 2 +-
.../wicket/examples/authentication1/Home.html | 1 -
.../wicket/examples/authentication1/Home.java | 14 +
.../{library => authentication1}/Home.properties | 2 +-
.../wicket/examples/authentication1/SignIn.html | 1 -
.../SignIn.properties} | 2 +-
.../wicket/examples/authentication1/SignOut.html | 4 +-
.../wicket/examples/authentication1/SignOut.java | 84 +++---
.../SignOut.properties} | 2 +-
.../wicket/examples/authentication2/Home.html | 1 -
.../wicket/examples/authentication2/Home.java | 15 ++
.../{library => authentication2}/Home.properties | 2 +-
.../wicket/examples/authentication2/SignIn2.html | 5 +-
.../SignIn2.properties} | 5 +-
.../wicket/examples/authentication2/SignOut.html | 4 +-
.../wicket/examples/authentication2/SignOut.java | 6 +
.../SignOut.properties} | 2 +-
.../wicket/examples/authentication3/AdminPage.html | 10 -
.../AdminPage.properties} | 4 +-
.../wicket/examples/authentication3/BasePage.html | 10 -
.../wicket/examples/authentication3/BasePage.java | 5 +
.../wicket/examples/authentication3/HomePage.html | 10 -
.../wicket/examples/authentication3/HomePage.java | 15 ++
.../HomePage.properties} | 5 +-
.../examples/authentication3/MySignInPage.html | 5 +-
.../MySignInPage.properties} | 6 +-
.../wicket/examples/authentication3/SignOut.html | 11 -
.../wicket/examples/authentication3/SignOut.java | 69 +++--
.../SignOut.properties} | 5 +-
.../wicket/examples/authorization/BasePage.html | 10 -
.../wicket/examples/authorization/BasePage.java | 6 +-
.../wicket/examples/authorization/Index.html | 24 +-
.../wicket/examples/authorization/Index.java | 31 ++-
.../Index.properties} | 2 +-
.../AdminAnnotationsBookmarkablePage.properties} | 4 +-
.../pages/AdminAnnotationsInternalPage.properties} | 2 +-
.../pages/AdminBookmarkablePage.properties} | 4 +-
.../pages/AdminInternalPage.properties} | 4 +-
.../pages/AnnotationsPanelsPage.properties} | 2 +-
.../pages/PanelsPage.properties} | 2 +-
.../bean/validation/BeanValidationPage.html | 1 -
.../bean/validation/BeanValidationPage.properties | 1 +
.../apache/wicket/examples/breadcrumb/Index.html | 1 -
.../Index.properties} | 2 +-
.../apache/wicket/examples/captcha/Captcha.html | 2 -
.../apache/wicket/examples/captcha/Captcha.java | 14 +
.../Captcha.properties} | 5 +-
.../wicket/examples/cdi/AutoConversationPage1.html | 7 +-
.../AutoConversationPage1.properties} | 4 +-
.../wicket/examples/cdi/AutoConversationPage2.html | 8 +-
.../AutoConversationPage2.properties} | 5 +-
.../apache/wicket/examples/cdi/CdiExamplePage.html | 18 --
.../apache/wicket/examples/cdi/CdiExamplePage.java | 6 +-
.../apache/wicket/examples/cdi/CdiHomePage.html | 26 +-
.../apache/wicket/examples/cdi/CdiHomePage.java | 68 +++--
.../CdiHomePage.properties} | 2 +-
.../wicket/examples/cdi/ConversationPage1.html | 32 +--
.../ConversationPage1.properties} | 4 +-
.../wicket/examples/cdi/ConversationPage2.html | 34 +--
.../ConversationPage2.properties} | 5 +-
.../wicket/examples/cdi/ConversationPage3.html | 21 +-
.../ConversationPage3.properties} | 5 +-
.../apache/wicket/examples/cdi/InjectionPage.html | 28 +-
.../InjectionPage.properties} | 5 +-
.../examples/compref/BookmarkablePageLinkPage.html | 3 -
.../examples/compref/BookmarkablePageLinkPage.java | 3 +-
.../BookmarkablePageLinkPage.properties} | 6 +-
.../apache/wicket/examples/compref/BorderPage.html | 3 -
.../apache/wicket/examples/compref/BorderPage.java | 3 +-
.../BorderPage.properties} | 6 +-
.../apache/wicket/examples/compref/ButtonPage.html | 3 -
.../apache/wicket/examples/compref/ButtonPage.java | 3 +-
.../ButtonPage.properties} | 6 +-
.../compref/CheckBoxMultipleChoicePage.html | 3 -
.../compref/CheckBoxMultipleChoicePage.java | 3 +-
.../CheckBoxMultipleChoicePage.properties} | 6 +-
.../wicket/examples/compref/CheckBoxPage.html | 3 -
.../wicket/examples/compref/CheckBoxPage.java | 3 +-
.../CheckBoxPage.properties} | 6 +-
.../examples/compref/CheckBoxSelectorPage.html | 101 ++++---
.../examples/compref/CheckBoxSelectorPage.java | 289 ++++++++++-----------
.../CheckBoxSelectorPage.properties} | 6 +-
.../wicket/examples/compref/CheckGroupPage.html | 3 -
.../wicket/examples/compref/CheckGroupPage.java | 3 +-
.../CheckGroupPage.properties} | 6 +-
.../wicket/examples/compref/CheckGroupPage2.html | 3 -
.../wicket/examples/compref/CheckGroupPage2.java | 169 ++++++------
...lPage.properties => CheckGroupPage2.properties} | 4 +-
.../Page1.java => compref/ComprefPage.java} | 30 ++-
.../examples/compref/DropDownChoicePage.html | 3 -
.../examples/compref/DropDownChoicePage.java | 3 +-
.../examples/compref/DropDownChoicePage.properties | 3 +
.../wicket/examples/compref/ExternalLinkPage.html | 3 -
.../wicket/examples/compref/ExternalLinkPage.java | 3 +-
.../ExternalLinkPage.properties} | 6 +-
.../apache/wicket/examples/compref/FormPage.html | 3 -
.../apache/wicket/examples/compref/FormPage.java | 3 +-
.../FormPage.properties} | 4 +-
.../wicket/examples/compref/FragmentPage.html | 3 -
.../wicket/examples/compref/FragmentPage.java | 3 +-
.../FragmentPage.properties} | 6 +-
.../org/apache/wicket/examples/compref/Index.html | 69 +----
.../org/apache/wicket/examples/compref/Index.java | 4 +-
.../Index.properties} | 8 +-
.../apache/wicket/examples/compref/LabelPage.html | 3 -
.../apache/wicket/examples/compref/LabelPage.java | 3 +-
.../wicket/examples/compref/LabelPage.properties | 3 +
.../apache/wicket/examples/compref/LinkPage.html | 3 -
.../apache/wicket/examples/compref/LinkPage.java | 3 +-
.../LinkPage.properties} | 4 +-
.../wicket/examples/compref/ListChoicePage.html | 3 -
.../wicket/examples/compref/ListChoicePage.java | 3 +-
.../ListChoicePage.properties} | 6 +-
.../examples/compref/ListMultipleChoicePage.html | 3 -
.../examples/compref/ListMultipleChoicePage.java | 3 +-
.../ListMultipleChoicePage.properties} | 6 +-
.../examples/compref/MultiLineLabelPage.html | 3 -
.../examples/compref/MultiLineLabelPage.java | 3 +-
.../MultiLineLabelPage.properties} | 6 +-
.../wicket/examples/compref/PalettePage.html | 3 -
.../wicket/examples/compref/PalettePage.java | 3 +-
.../PalettePage.properties} | 6 +-
.../apache/wicket/examples/compref/PanelPage.html | 3 -
.../apache/wicket/examples/compref/PanelPage.java | 3 +-
.../PanelPage.properties} | 6 +-
.../wicket/examples/compref/RadioChoicePage.html | 3 -
.../wicket/examples/compref/RadioChoicePage.java | 3 +-
.../RadioChoicePage.properties} | 6 +-
.../wicket/examples/compref/RadioGroupPage.html | 3 -
.../wicket/examples/compref/RadioGroupPage.java | 3 +-
.../RadioGroupPage.properties} | 6 +-
.../wicket/examples/compref/RadioGroupPage2.html | 3 -
.../wicket/examples/compref/RadioGroupPage2.java | 159 ++++++------
.../RadioGroupPage2.properties} | 6 +-
.../apache/wicket/examples/compref/SelectPage.html | 3 -
.../apache/wicket/examples/compref/SelectPage.java | 3 +-
.../SelectPage.properties} | 6 +-
.../wicket/examples/compref/SubmitLinkPage.html | 3 -
.../wicket/examples/compref/SubmitLinkPage.java | 3 +-
.../SubmitLinkPage.properties} | 6 +-
.../wicket/examples/compref/TabbedPanelPage.html | 3 -
.../wicket/examples/compref/TabbedPanelPage.java | 3 +-
.../TabbedPanelPage.properties} | 6 +-
.../wicket/examples/compref/TextAreaPage.html | 3 -
.../wicket/examples/compref/TextAreaPage.java | 3 +-
.../TextAreaPage.properties} | 6 +-
.../wicket/examples/compref/TextFieldPage.html | 3 -
.../wicket/examples/compref/TextFieldPage.java | 3 +-
.../examples/compref/TextFieldPage.properties | 3 +
.../apache/wicket/examples/csp/NonceDemoPage.html | 4 +-
.../wicket/examples/csp/NonceDemoPage.properties | 2 +
.../AlternativePageFromWebContext.properties} | 4 +-
.../CustomLoadedTemplate.html | 19 +-
.../examples/customresourceloading/Index.html | 1 -
.../examples/customresourceloading/Index.java | 14 +
.../Index.properties} | 2 +-
.../PageFromWebContext.properties} | 2 +-
.../PageWithCustomLoading.properties | 16 ++
.../wicket/examples/datetime/DateTimePage.html | 1 -
.../wicket/examples/datetime/DateTimePage.java | 7 +-
.../examples/datetime/DateTimePage.properties | 1 +
.../java/org/apache/wicket/examples/echo/Echo.html | 1 -
.../Home.properties => echo/Echo.properties} | 2 +-
.../org/apache/wicket/examples/encodings/Home.html | 3 -
.../{library => encodings}/Home.properties | 2 +-
.../apache/wicket/examples/events/BasePage.html | 11 -
.../apache/wicket/examples/events/BasePage.java | 9 +-
.../DecoupledAjaxUpdatePage.properties} | 2 +-
.../apache/wicket/examples/events/IndexPage.html | 12 +-
.../apache/wicket/examples/events/IndexPage.java | 60 +++--
.../IndexPage.properties} | 2 +-
.../wicket/examples/forminput/FormInput.html | 3 -
.../wicket/examples/forminput/FormInput.properties | 1 +
.../apache/wicket/examples/frames/TopFrame.html | 1 -
.../apache/wicket/examples/frames/TopFrame.java | 6 +
.../wicket/examples/guestbook/GuestBook.html | 3 -
.../GuestBook.properties} | 2 +-
.../org/apache/wicket/examples/guice/HomePage.html | 12 +-
.../org/apache/wicket/examples/guice/HomePage.java | 14 +
.../HomePage.properties} | 4 +-
.../org/apache/wicket/examples/hangman/Guess.html | 1 -
.../Home.properties => hangman/Guess.properties} | 2 +-
.../org/apache/wicket/examples/hangman/Home.html | 10 +-
.../examples/{library => hangman}/Home.properties | 3 +-
.../org/apache/wicket/examples/hangman/Lose.html | 1 -
.../Home.properties => hangman/Lose.properties} | 2 +-
.../org/apache/wicket/examples/hangman/Win.html | 1 -
.../Home.properties => hangman/Win.properties} | 2 +-
.../wicket/examples/hellobrowser/HelloBrowser.html | 1 -
.../wicket/examples/hellobrowser/HelloBrowser.java | 14 +
.../HelloBrowser.properties} | 2 +-
.../wicket/examples/helloworld/HelloWorld.html | 3 -
.../HelloWorld.properties} | 2 +-
.../AuthenticationIndex.java} | 13 +-
.../AuthenticationIndex.properties} | 12 +-
.../Home.java => homepage/BrowserInfoIndex.java} | 13 +-
.../BrowserInfoIndex.properties} | 17 +-
.../Home.java => homepage/CaptchaIndex.java} | 13 +-
.../CaptchaIndex.properties} | 8 +-
.../examples/homepage/HomePageApplication.java | 6 +
.../Home.java => homepage/InjectionIndex.java} | 13 +-
.../InjectionIndex.properties} | 10 +-
.../Home.java => homepage/LocalizationIndex.java} | 13 +-
.../LocalizationIndex.properties} | 9 +-
.../Home.java => homepage/TemplatingIndex.java} | 13 +-
.../TemplatingIndex.properties} | 10 +-
.../org/apache/wicket/examples/images/Home.html | 3 -
.../examples/{library => images}/Home.properties | 2 +-
.../wicket/examples/kittenCaptcha/HomePage.html | 1 -
.../wicket/examples/kittenCaptcha/HomePage.java | 14 +
.../HomePage.properties} | 2 +-
.../examples/library/AuthenticatedWebPage.html | 2 -
.../examples/library/AuthenticatedWebPage.java | 6 +
.../wicket/examples/library/BookDetails.properties | 1 +
.../wicket/examples/library/EditBook.properties | 1 +
.../org/apache/wicket/examples/library/Home.html | 3 -
.../apache/wicket/examples/library/Home.properties | 1 +
.../org/apache/wicket/examples/library/SignIn.html | 7 +-
.../wicket/examples/library/SignIn.properties | 2 +
.../apache/wicket/examples/library/SignOut.html | 2 -
.../apache/wicket/examples/library/SignOut.java | 84 +++---
.../{Home.properties => SignOut.properties} | 2 +-
.../wicket/examples/linkomatic/BookDetails.html | 3 -
.../wicket/examples/linkomatic/BookDetails.java | 6 +
.../BookDetails.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Home.html | 3 -
.../{library => linkomatic}/Home.properties | 2 +-
.../apache/wicket/examples/linkomatic/Page1.html | 3 -
.../apache/wicket/examples/linkomatic/Page1.java | 6 +
.../Page1.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Page2.html | 3 -
.../apache/wicket/examples/linkomatic/Page2.java | 6 +
.../Page2.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Page3.html | 3 -
.../apache/wicket/examples/linkomatic/Page3.java | 6 +
.../Page3.properties} | 2 +-
.../apache/wicket/examples/linkomatic/Popup.html | 1 -
.../Popup.properties} | 2 +-
.../org/apache/wicket/examples/media/Home.html | 4 +-
.../examples/{library => media}/Home.properties | 3 +-
.../apache/wicket/examples/navomatic/Page1.html | 1 -
.../Home.properties => navomatic/Page1.properties} | 2 +-
.../apache/wicket/examples/navomatic/Page2.html | 1 -
.../Home.properties => navomatic/Page2.properties} | 2 +-
.../apache/wicket/examples/navomatic/Page3.html | 1 -
.../Home.properties => navomatic/Page3.properties} | 2 +-
.../org/apache/wicket/examples/niceurl/Home.html | 7 -
.../examples/{library => niceurl}/Home.properties | 3 +-
.../org/apache/wicket/examples/niceurl/Page1.html | 3 -
.../org/apache/wicket/examples/niceurl/Page1.java | 7 +-
.../Home.properties => niceurl/Page1.properties} | 2 +-
.../org/apache/wicket/examples/niceurl/Page2.html | 3 -
.../org/apache/wicket/examples/niceurl/Page2.java | 8 +-
.../Home.properties => niceurl/Page2.properties} | 2 +-
.../Page2PP.properties} | 4 +-
.../Page2UP.properties} | 4 +-
.../wicket/examples/niceurl/mounted/Page3.html | 3 -
.../wicket/examples/niceurl/mounted/Page3.java | 7 +-
.../mounted/Page3.properties} | 2 +-
.../wicket/examples/niceurl/mounted/Page4.html | 3 -
.../wicket/examples/niceurl/mounted/Page4.java | 7 +-
.../mounted/Page4.properties} | 2 +-
.../wicket/examples/niceurl/mounted/Page5.html | 3 -
.../wicket/examples/niceurl/mounted/Page5.java | 7 +-
.../mounted/Page5.properties} | 2 +-
.../java/org/apache/wicket/examples/pub/Home.html | 1 -
.../java/org/apache/wicket/examples/pub/Home.java | 14 +
.../org/apache/wicket/examples/pub/Home.properties | 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 -
.../java/org/apache/wicket/examples/pub2/Home.html | 1 -
.../java/org/apache/wicket/examples/pub2/Home.java | 196 +++++++-------
.../apache/wicket/examples/pub2/Home.properties | 1 +
.../examples/repeater/AjaxDataTablePage.html | 10 -
.../AjaxDataTablePage.properties} | 6 +-
.../wicket/examples/repeater/DataGridPage.html | 6 -
.../DataGridPage.properties} | 6 +-
.../repeater/DataTableFilterToolbarPage.html | 3 -
.../DataTableFilterToolbarPage.properties} | 6 +-
.../wicket/examples/repeater/DataTablePage.html | 12 -
.../repeater/DataTablePage.utf8.properties | 4 +
.../wicket/examples/repeater/ExamplePage.html | 16 --
.../wicket/examples/repeater/ExamplePage.java | 7 +
.../apache/wicket/examples/repeater/FormPage.html | 4 -
.../{ajax/builtin => repeater}/FormPage.properties | 9 +-
.../wicket/examples/repeater/GridViewPage.html | 3 -
.../GridViewPage.properties} | 7 +-
.../org/apache/wicket/examples/repeater/Index.html | 17 +-
.../org/apache/wicket/examples/repeater/Index.java | 5 +-
.../Index.properties} | 4 +-
.../apache/wicket/examples/repeater/OIRPage.html | 7 -
.../wicket/examples/repeater/OIRPage.properties | 18 ++
.../wicket/examples/repeater/PagingPage.html | 3 -
.../PagingPage.properties} | 6 +-
.../wicket/examples/repeater/RefreshingPage.html | 3 +-
.../RefreshingPage.properties} | 6 +-
.../wicket/examples/repeater/RepeatingPage.html | 5 -
.../RepeatingPage.properties} | 6 +-
.../wicket/examples/repeater/SimplePage.html | 2 -
.../SimplePage.properties} | 6 +-
.../wicket/examples/repeater/SortingPage.html | 4 -
...Page.utf8.properties => SortingPage.properties} | 13 +-
.../HttpsPage.properties} | 2 +-
.../LocalizedPage.properties} | 2 +-
.../RequestMapperHomePage.properties} | 2 +-
.../packageMount/PackageMountedPage.properties} | 4 +-
.../examples/resourcedecoration/HomePage.html | 3 -
.../HomePage.properties} | 2 +-
.../examples/spring/annot/web/AnnotPage.html | 8 +-
.../annot/web/AnnotPage.properties} | 4 +-
.../examples/spring/common/web/BasePage.html | 1 -
.../examples/spring/common/web/HomePage.html | 3 +-
.../examples/spring/common/web/HomePage.java | 15 ++
.../common/web/HomePage.properties} | 5 +-
.../wicket/examples/sri/IntegrityDemoPage.html | 2 -
.../IntegrityDemoPage.properties} | 2 +-
.../examples/stateless/AjaxStatelessExample.html | 1 -
.../AjaxStatelessExample.properties} | 2 +-
.../apache/wicket/examples/stateless/Index.html | 1 -
.../Home.properties => stateless/Index.properties} | 2 +-
.../wicket/examples/stateless/StatefulPage.html | 1 -
.../StatefulPage.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage.html | 1 -
.../StatelessPage.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage1.html | 1 -
.../StatelessPage1.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage2.html | 1 -
.../StatelessPage2.properties} | 2 +-
.../wicket/examples/stateless/StatelessPage3.html | 1 -
.../StatelessPage3.properties} | 2 +-
.../org/apache/wicket/examples/template/Index.html | 17 --
.../org/apache/wicket/examples/template/Index.java | 14 +
.../Index.properties} | 4 +-
.../wicket/examples/template/border/Page1.html | 1 -
.../border/Page1.properties} | 2 +-
.../wicket/examples/template/border/Page2.html | 1 -
.../border/Page2.properties} | 2 +-
.../pageinheritance/Page1.properties} | 2 +-
.../pageinheritance/Page2.properties} | 2 +-
.../wicket/examples/tree/AbstractTreePage.html | 41 +--
.../wicket/examples/tree/AbstractTreePage.java | 8 +
.../wicket/examples/tree/AdvancedTreePage.html | 1 -
.../BeginnersTreePage.properties} | 2 +-
.../NestedTreePage.properties} | 2 +-
.../TableTreePage.properties} | 2 +-
.../unicodeconverter/UnicodeConverter.html | 1 -
.../UnicodeConverter.properties} | 2 +-
.../org/apache/wicket/examples/upload/Index.html | 8 +
.../wicket/examples/{compref => upload}/Index.java | 14 +-
.../Home.properties => upload/Index.properties} | 2 +-
.../wicket/examples/upload/MultiUploadPage.html | 7 -
.../wicket/examples/upload/MultiUploadPage.java | 6 +
.../examples/upload/MultiUploadPage.properties | 3 +
.../wicket/examples/upload/UploadApplication.java | 3 +-
.../apache/wicket/examples/upload/UploadPage.html | 7 -
.../apache/wicket/examples/upload/UploadPage.java | 6 +
.../wicket/examples/upload/UploadPage.properties | 3 +
.../examples/upload/UploadToResourcePage.html | 5 -
.../examples/upload/UploadToResourcePage.java | 6 +
.../UploadToResourcePage.properties} | 5 +-
.../wicket/examples/velocity/DynamicPage.html | 1 -
.../DynamicPage.properties} | 5 +-
.../org/apache/wicket/examples/velocity/Home.html | 12 +-
.../org/apache/wicket/examples/velocity/Home.java | 8 +
.../examples/{library => velocity}/Home.properties | 2 +-
.../wicket/examples/velocity/TemplatePage.html | 1 -
.../TemplatePage.properties} | 5 +-
.../apache/wicket/examples/websocket/HomePage.html | 10 +-
.../apache/wicket/examples/websocket/HomePage.java | 5 +
.../HomePage.properties} | 2 +-
.../websocket/WebSocketBehaviorDemoPage.html | 1 -
.../WebSocketBehaviorDemoPage.properties} | 2 +-
.../WebSocketMultiTabResourceDemoPage.html | 1 -
.../WebSocketMultiTabResourceDemoPage.properties} | 2 +-
...WebSocketPushUpdateProgressDemoPage.properties} | 2 +-
.../websocket/WebSocketResourceDemoPage.html | 1 -
.../WebSocketResourceDemoPage.properties} | 2 +-
.../org/apache/wicket/examples/wizard/Index.html | 15 +-
.../org/apache/wicket/examples/wizard/Index.java | 15 +-
.../Index.properties} | 5 +-
.../examples/wizard/NewUserWizard.properties | 2 +
.../StaticWizard.properties} | 3 +-
.../StaticWizardWithPanels.properties} | 3 +-
.../apache/wicket/examples/wizard/WizardPage.html | 2 -
.../apache/wicket/examples/wizard/WizardPage.java | 15 ++
.../apache/wicket/examples/homepage/HomePage.html | 99 ++++---
.../examples/requestmapper/LocalizedPage.html | 1 -
.../requestmapper/RequestMapperHomePage.html | 1 -
.../packageMount/PackageMountedPage.html | 1 -
.../resources/org/apache/wicket/examples/style.css | 27 ++
.../templates/AlternativePageFromWebContext.html | 3 -
.../customresourceloading/PageFromWebContext.html | 3 -
.../wicket/examples/ExampleIndexPanelTest.java | 128 +++++++++
.../apache/wicket/examples/ExampleTitlesTest.java | 121 +++++++++
.../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 | 19 +-
.../wicket/examples/repeater/RepeaterTest.java | 4 +-
.../wicket/examples/template/TemplateTest.java | 2 +-
.../org/apache/wicket/filtertest/HelloWorld.html | 3 -
.../wicket/filtertest/HelloWorld.properties} | 2 +-
.../wicket/filtertest/WithoutCPWithFPTest.java | 4 +-
.../wicket/filtertest/WithoutCPWithoutFPTest.java | 4 +-
475 files changed, 3045 insertions(+), 2055 deletions(-)
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.html
new file mode 100644
index 0000000000..9753711605
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.html
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+<ul class="examples">
+ <li wicket:id="examples"><a wicket:id="link"><wicket:container wicket:id="title">[example title]</wicket:container></a><wicket:container wicket:id="describe">: <wicket:container wicket:id="description">[example description]</wicket:container></wicket:container></li>
+</ul>
+</wicket:panel>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.java
new file mode 100644
index 0000000000..7b43407699
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleApplicationsPanel.java
@@ -0,0 +1,112 @@
+/*
+ * 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 java.util.Arrays;
+import java.util.List;
+
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.string.Strings;
+
+/**
+ * Lists examples that are applications of their own, for an index that gathers a few of them under
+ * one entry of the main menu.
+ * <p>
+ * {@link ExampleIndexPanel} cannot do this: each of these examples is a separate application with
+ * its own filter mapping in {@code web.xml}, so they are reached by path rather than as pages of
+ * the application the index belongs to, and their titles are not on this application's classpath
+ * to be read. The index page therefore says in its own bundle which paths it gathers and what to
+ * call them:
+ *
+ * <pre>
+ * examples=authentication1,authentication2
+ * authentication1.title=authentication-1
+ * authentication1.description=A very simple authentication example.
+ * </pre>
+ *
+ * @see ExampleIndexPanel
+ */
+public class ExampleApplicationsPanel extends Panel
+{
+ private static final long serialVersionUID = 1L;
+
+ private final Class<? extends WicketExamplePage> index;
+
+ /**
+ * @param id
+ * component id
+ * @param index
+ * the index page this panel is shown on, whose bundle lists the examples
+ */
+ public ExampleApplicationsPanel(final String id,
+ final Class<? extends WicketExamplePage> index)
+ {
+ super(id);
+
+ this.index = index;
+ }
+
+ @Override
+ protected void onInitialize()
+ {
+ super.onInitialize();
+
+ IModel<List<String>> examples = this::examples;
+
+ add(new ListView<>("examples", examples)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<String> item)
+ {
+ String path = item.getModelObject();
+
+ ExternalLink link = new ExternalLink("link", RequestCycle.get()
+ .getUrlRenderer()
+ .renderContextRelativeUrl(path));
+ link.add(new Label("title", string(path, "title")));
+ item.add(link);
+
+ String description = string(path, "description");
+ WebMarkupContainer describe = new WebMarkupContainer("describe");
+ describe.setVisible(Strings.isEmpty(description) == false);
+ describe.add(new Label("description", description));
+ item.add(describe);
+ }
+ });
+ }
+
+ private List<String> examples()
+ {
+ String examples = WicketExamplePage.string(index, "examples", this);
+ return Strings.isEmpty(examples) ? List.of()
+ : Arrays.stream(examples.split(",")).map(String::trim).toList();
+ }
+
+ private String string(final String path, final String key)
+ {
+ return WicketExamplePage.string(index, path + '.' + key, this);
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.html
new file mode 100644
index 0000000000..65d6e505b6
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.html
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+<wicket:container wicket:id="groups">
+<p wicket:id="heading" class="examples-heading">[group]</p>
+<ul class="examples">
+ <li wicket:id="examples"><a wicket:id="link"><wicket:container wicket:id="title">[example title]</wicket:container></a><wicket:container wicket:id="describe">: <wicket:container wicket:id="description">[example description]</wicket:container></wicket:container></li>
+</ul>
+</wicket:container>
+</wicket:panel>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.java
new file mode 100644
index 0000000000..cbde29e775
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExampleIndexPanel.java
@@ -0,0 +1,273 @@
+/*
+ * 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 java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.AbstractLink;
+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.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.string.Strings;
+
+/**
+ * Lists the examples of a package, each as a link to it followed by its description.
+ * <p>
+ * The list is not written down anywhere: it is whatever {@link ExamplePages} finds next to the
+ * index page, so a new example is added by adding it - the index picks it up. What the index shows
+ * of an example is what the example's own bundle says, as described on {@link WicketExamplePage}:
+ * <ul>
+ * <li>{@code title} - the link text. An example without one is left out, on the assumption that it
+ * is a page the example uses rather than an example of its own.</li>
+ * <li>{@code description} - shown after the link, optional.</li>
+ * <li>{@code order} - a number, optional. Examples that carry one come first, in that order; the
+ * rest follow alphabetically by title. Only worth setting where the examples build on each other
+ * and should be read in sequence.</li>
+ * <li>{@code index=false} - for an example that needs a title of its own but is not one to start
+ * at, such as the second page of an example that spans several.</li>
+ * <li>{@code group} - which group of the index the example belongs to, optional.</li>
+ * </ul>
+ * An index that groups its examples lists the groups in its own bundle, in the order they are to
+ * be shown, and gives each a heading:
+ *
+ * <pre>
+ * groups=output,layout,links,forms
+ * group.output=Output
+ * </pre>
+ *
+ * Examples naming no group, or one the index does not list, come last under no heading. An index
+ * that says nothing about groups shows a single ungrouped list, which is the usual case.
+ *
+ * @see ExamplePages
+ */
+public class ExampleIndexPanel extends Panel
+{
+ private static final long serialVersionUID = 1L;
+
+ private final Class<? extends WicketExamplePage> index;
+
+ private final Class<?> type;
+
+ private final boolean recursive;
+
+ /**
+ * Lists the example pages of the index page's own package.
+ *
+ * @param id
+ * component id
+ * @param index
+ * the index page this panel is shown on
+ */
+ public ExampleIndexPanel(final String id, final Class<? extends WicketExamplePage> index)
+ {
+ this(id, index, false);
+ }
+
+ /**
+ * @param id
+ * component id
+ * @param index
+ * the index page this panel is shown on
+ * @param recursive
+ * whether to list the examples of sub packages too
+ */
+ public ExampleIndexPanel(final String id, final Class<? extends WicketExamplePage> index,
+ final boolean recursive)
+ {
+ this(id, index, WicketExamplePage.class, recursive);
+ }
+
+ /**
+ * @param id
+ * component id
+ * @param index
+ * the index page this panel is shown on
+ * @param type
+ * the type an example has to be of, for an index over something other than pages
+ * @param recursive
+ * whether to list the examples of sub packages too
+ */
+ public ExampleIndexPanel(final String id, final Class<? extends WicketExamplePage> index,
+ final Class<?> type, final boolean recursive)
+ {
+ super(id);
+
+ this.index = index;
+ this.type = type;
+ this.recursive = recursive;
+ }
+
+ @Override
+ protected void onInitialize()
+ {
+ super.onInitialize();
+
+ IModel<List<Group>> groups = this::groups;
+
+ add(new ListView<>("groups", groups)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<Group> group)
+ {
+ String heading = group.getModelObject().heading();
+
+ group.add(new Label("heading", heading)
+ .setVisible(Strings.isEmpty(heading) == false));
+ group.add(new ListView<Class<?>>("examples", group.getModelObject().examples())
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<Class<?>> item)
+ {
+ populateExample(item);
+ }
+ });
+ }
+ });
+ }
+
+ /**
+ * @param id
+ * component id
+ * @param example
+ * an example found next to the index
+ * @return the link to it, a {@link BookmarkablePageLink} by default
+ */
+ protected AbstractLink link(final String id, final Class<?> example)
+ {
+ return new BookmarkablePageLink<>(id, example.asSubclass(Page.class));
+ }
+
+ /**
+ * @param example
+ * an example found next to the index
+ * @return whether to list it, {@code true} by default
+ */
+ protected boolean include(final Class<?> example)
+ {
+ return true;
+ }
+
+ private void populateExample(final ListItem<Class<?>> item)
+ {
+ Class<?> example = item.getModelObject();
+
+ AbstractLink link = link("link", example);
+ link.add(new Label("title", title(example)));
+ item.add(link);
+
+ String description = string(example, "description");
+ WebMarkupContainer describe = new WebMarkupContainer("describe");
+ describe.setVisible(Strings.isEmpty(description) == false);
+ describe.add(new Label("description", description));
+ item.add(describe);
+ }
+
+ private List<Group> groups()
+ {
+ List<Class<?>> examples = examples();
+ List<String> declared = declaredGroups();
+
+ List<Group> groups = new ArrayList<>();
+ for (String name : declared)
+ {
+ add(groups, WicketExamplePage.string(index, "group." + name, this),
+ examples.stream().filter(example -> name.equals(group(example))).toList());
+ }
+ add(groups, null, examples.stream()
+ .filter(example -> declared.contains(group(example)) == false)
+ .toList());
+ return groups;
+ }
+
+ private static void add(final List<Group> groups, final String heading,
+ final List<Class<?>> examples)
+ {
+ if (examples.isEmpty() == false)
+ {
+ groups.add(new Group(heading, examples));
+ }
+ }
+
+ private List<String> declaredGroups()
+ {
+ String groups = WicketExamplePage.string(index, "groups", this);
+ return Strings.isEmpty(groups) ? List.of()
+ : Arrays.stream(groups.split(",")).map(String::trim).toList();
+ }
+
+ private List<Class<?>> examples()
+ {
+ List<Class<?>> found = ExamplePages.inPackage(index.getPackageName(), type, recursive);
+
+ Set<Class<?>> extended = found.stream()
+ .map(Class::getSuperclass)
+ .collect(Collectors.toSet());
+
+ Comparator<Class<?>> order = Comparator.<Class<?>> comparingInt(this::order)
+ .thenComparing(this::title);
+
+ return found.stream()
+ .filter(example -> example != index)
+ .filter(example -> extended.contains(example) == false)
+ .filter(example -> Strings.isEmpty(title(example)) == false)
+ .filter(example -> "false".equals(string(example, "index")) == false)
+ .filter(this::include)
+ .sorted(order)
+ .toList();
+ }
+
+ private int order(final Class<?> example)
+ {
+ String order = string(example, "order");
+ return Strings.isEmpty(order) ? Integer.MAX_VALUE : Integer.parseInt(order.trim());
+ }
+
+ private String group(final Class<?> example)
+ {
+ String group = string(example, "group");
+ return group == null ? "" : group.trim();
+ }
+
+ private String title(final Class<?> example)
+ {
+ return string(example, "title");
+ }
+
+ private String string(final Class<?> example, final String key)
+ {
+ return WicketExamplePage.string(example, key, this);
+ }
+
+ private record Group(String heading, List<Class<?>> examples) implements Serializable
+ {
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplePages.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplePages.java
new file mode 100644
index 0000000000..162891da13
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplePages.java
@@ -0,0 +1,200 @@
+/*
+ * 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 java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.stream.Stream;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * Finds the examples that live in a package, so that an index can list what it links to without
+ * naming each of them.
+ * <p>
+ * An example is a public, concrete, top-level class of the wanted type - a {@link
+ * WicketExamplePage} for most indexes, a {@code Wizard} for the one the wizard example keeps.
+ * A page has to be bookmarkable on top of that, having a public constructor taking either nothing
+ * or {@link PageParameters}, because that is what an index links to it with. Everything else in
+ * the package is skipped, as is a class that cannot be loaded at all, so that an example whose
+ * optional dependency is missing from the deployment does not take the index down with it.
+ *
+ * @see ExampleIndexPanel
+ */
+public final class ExamplePages
+{
+ private static final String CLASS_SUFFIX = ".class";
+
+ private static final ConcurrentMap<String, List<Class<?>>> CACHE = new ConcurrentHashMap<>();
+
+ private ExamplePages()
+ {
+ }
+
+ /**
+ * Lists the examples of a package in no particular order. The result is cached, the classpath
+ * of a running application being fixed.
+ *
+ * @param packageName
+ * the package to look in
+ * @param type
+ * the type an example has to be of
+ * @param recursive
+ * whether to descend into sub packages
+ * @return the examples found, never {@code null}
+ */
+ public static List<Class<?>> inPackage(final String packageName, final Class<?> type,
+ final boolean recursive)
+ {
+ return CACHE.computeIfAbsent(
+ packageName + (recursive ? "/**:" : "/*:") + type.getName(),
+ key -> scan(packageName, type, recursive));
+ }
+
+ private static List<Class<?>> scan(final String packageName, final Class<?> type,
+ final boolean recursive)
+ {
+ List<Class<?>> examples = new ArrayList<>();
+ for (String name : classNames(packageName, recursive))
+ {
+ Class<?> candidate = load(name);
+ if (candidate != null && isExample(candidate, type))
+ {
+ examples.add(candidate);
+ }
+ }
+ return List.copyOf(examples);
+ }
+
+ private static List<String> classNames(final String packageName, final boolean recursive)
+ {
+ String path = packageName.replace('.', '/');
+ List<String> names = new ArrayList<>();
+ try
+ {
+ Enumeration<URL> roots = classLoader().getResources(path);
+ while (roots.hasMoreElements())
+ {
+ collect(roots.nextElement(), packageName, path, recursive, names);
+ }
+ }
+ catch (IOException | URISyntaxException e)
+ {
+ throw new WicketRuntimeException("could not scan package " + packageName, e);
+ }
+ return names;
+ }
+
+ private static void collect(final URL root, final String packageName, final String path,
+ final boolean recursive, final List<String> names) throws IOException, URISyntaxException
+ {
+ if ("file".equals(root.getProtocol()))
+ {
+ Path directory = Path.of(root.toURI());
+ try (Stream<Path> files = Files.walk(directory, recursive ? Integer.MAX_VALUE : 1))
+ {
+ files.filter(Files::isRegularFile)
+ .map(file -> directory.relativize(file).toString())
+ .filter(file -> file.endsWith(CLASS_SUFFIX))
+ .map(file -> packageName + '.' + strip(file).replace(File.separatorChar, '.'))
+ .forEach(names::add);
+ }
+ }
+ else if ("jar".equals(root.getProtocol()))
+ {
+ JarURLConnection connection = (JarURLConnection)root.openConnection();
+ connection.setUseCaches(false);
+ try (JarFile jar = connection.getJarFile())
+ {
+ String prefix = path + '/';
+ for (Enumeration<JarEntry> entries = jar.entries(); entries.hasMoreElements();)
+ {
+ String entry = entries.nextElement().getName();
+ if (entry.startsWith(prefix) && entry.endsWith(CLASS_SUFFIX))
+ {
+ String relative = entry.substring(prefix.length());
+ if (recursive || relative.indexOf('/') < 0)
+ {
+ names.add(packageName + '.' + strip(relative).replace('/', '.'));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private static String strip(final String file)
+ {
+ return file.substring(0, file.length() - CLASS_SUFFIX.length());
+ }
+
+ private static boolean isExample(final Class<?> candidate, final Class<?> type)
+ {
+ int modifiers = candidate.getModifiers();
+ return type.isAssignableFrom(candidate) && candidate != type &&
+ candidate.getEnclosingClass() == null && Modifier.isPublic(modifiers) &&
+ Modifier.isAbstract(modifiers) == false &&
+ (Page.class.isAssignableFrom(candidate) == false || isBookmarkable(candidate));
+ }
+
+ private static boolean isBookmarkable(final Class<?> candidate)
+ {
+ for (Constructor<?> constructor : candidate.getConstructors())
+ {
+ Class<?>[] parameters = constructor.getParameterTypes();
+ if (parameters.length == 0 ||
+ (parameters.length == 1 && parameters[0] == PageParameters.class))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static Class<?> load(final String name)
+ {
+ try
+ {
+ return Class.forName(name, false, classLoader());
+ }
+ catch (ClassNotFoundException | LinkageError e)
+ {
+ return null;
+ }
+ }
+
+ private static ClassLoader classLoader()
+ {
+ return ExamplePages.class.getClassLoader();
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.html
new file mode 100644
index 0000000000..359d94e970
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.html
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+ <wicket:extend>
+ <div wicket:id="examples">[examples]</div>
+ </wicket:extend>
+</body>
+</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.java
similarity index 58%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.java
index 2824b2c588..514de80650 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ExamplesIndexPage.java
@@ -14,26 +14,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.tree;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.request.resource.CssResourceReference;
+package org.apache.wicket.examples;
/**
- * @author Sven Meier
+ * An index that gathers a few examples which are applications of their own under one entry of the
+ * main menu, so that the menu stays a list of subjects rather than of deployments.
+ * <p>
+ * A group is a subclass with nothing in it and a bundle saying what it gathers, as described on
+ * {@link ExampleApplicationsPanel}. The markup is here, so a group has none of its own.
+ *
+ * @see ExampleApplicationsPanel
*/
-public abstract class AbstractTreePage extends WicketExamplePage
+public abstract class ExamplesIndexPage extends WicketExamplePage
{
-
private static final long serialVersionUID = 1L;
- @Override
- public void renderHead(IHeaderResponse response)
+ /**
+ * Construct.
+ */
+ public ExamplesIndexPage()
{
- super.renderHead(response);
- response.render(CssHeaderItem
- .forReference(new CssResourceReference(AbstractTreePage.class, "tree.css")));
+ add(new ExampleApplicationsPanel("examples", getClass()));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage$BackToIndexPanel.html b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage$BackToIndexPanel.html
new file mode 100644
index 0000000000..9fbc3e888d
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage$BackToIndexPanel.html
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+<div class="navigation">
+<p wicket:id="indexes"><a wicket:id="back">[go back]</a></p>
+</div>
+</wicket:panel>
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..fbd8b577bf 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,9 @@
Source code
</a>
</div>
+ <h1 wicket:id="exampleTitle">[example title]</h1>
+ <div wicket:id="explanation" class="explanation">[what this example shows]</div>
+ <wicket:container wicket:id="navigation">[navigation]</wicket:container>
<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..29b70c9c13 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
@@ -16,26 +16,77 @@
*/
package org.apache.wicket.examples;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.examples.homepage.HomePage;
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.ExternalLink;
import org.apache.wicket.markup.html.link.PopupSettings;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
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.resource.loader.ComponentStringResourceLoader;
+import org.apache.wicket.util.string.Strings;
/**
* Base class for all example pages.
- *
+ * <p>
+ * Every example describes itself in a bundle of its own, named after it - {@code ClockPage} in
+ * {@code ClockPage.properties} - under three keys:
+ * <ul>
+ * <li>{@code title} - shown as the page heading and in the browser title, and used as the link
+ * text by an index listing the example. A page without one gets no heading.</li>
+ * <li>{@code description} - shown by an index after the link, optional.</li>
+ * <li>{@code explanation} - what the example shows, rendered under the heading, optional.</li>
+ * <li>{@code order} - where the example comes in its index, optional.</li>
+ * </ul>
+ * Saying it once in the example's own bundle is what lets {@link ExampleIndexPanel} build an index
+ * out of whatever examples it finds, rather than out of a list someone has to keep up to date, and
+ * it is what makes the prose of an example translatable at all.
+ * <p>
+ * <b>{@code explanation} is written into the page as it stands, without escaping</b>, so that it
+ * can carry the markup the prose needs - a {@code <br/>}, a list, a {@code <tt>}. That is safe
+ * only because these bundles are authored with the example, in this source tree. Never render
+ * anything a user supplies through it.
+ *
* @author Jonathan Locke
+ * @see ExampleIndexPanel
*/
public class WicketExamplePage extends WebPage
{
private static final long serialVersionUID = 1L;
+ /**
+ * Reads an example's own bundle, and only that one: no superclass of it, no package it sits
+ * in. An example that says nothing about itself is meant to say nothing, and must not end up
+ * borrowing the title of the base page it happens to extend.
+ */
+ /** Where the main menu is, relative to the context root. */
+ private static final String MAIN_INDEX = "index.html";
+
+ private static final ComponentStringResourceLoader OWN_BUNDLE = new ComponentStringResourceLoader()
+ {
+ @Override
+ protected boolean isStopResourceSearch(Class<?> clazz)
+ {
+ return true;
+ }
+ };
+
/**
* Constructor
*/
@@ -96,7 +147,234 @@ 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);
+ }
+ });
+ add(new Label("explanation", this::getExampleExplanation)
+ {
+ @Override
+ protected void onConfigure()
+ {
+ super.onConfigure();
+
+ setVisible(Strings.isEmpty(getExampleExplanation()) == false);
+ }
+ }.setEscapeModelStrings(false));
+ add(new BackToIndexPanel("navigation", getIndexPage(), getIndexPath()));
+ }
+
+ /**
+ * @return whether to show the way back at all, {@code true} for every example but the frameset
+ * one, which is not a page a reader navigates away from
+ */
+ protected boolean showNavigation()
+ {
+ return true;
+ }
+
+ /**
+ * @return the index this example is listed on beyond the main menu, {@code null} when the main
+ * menu lists it directly
+ */
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return null;
+ }
+
+ /**
+ * @return where {@link #getIndexPage()} is, relative to the context root, when it is a page of
+ * another of the example applications; {@code null} when it is a page of this one and
+ * can be linked to by class
+ */
+ protected String getIndexPath()
+ {
+ return null;
+ }
+
+ /**
+ * @return what this example shows, by default the {@code explanation} its own bundle gives
+ */
+ protected String getExampleExplanation()
+ {
+ return string(getClass(), "explanation", this);
+ }
+
+ /**
+ * @param example
+ * the example to read the title of
+ * @param context
+ * the component reading it
+ * @return a model of the example's title, for use as the body of a link to it
+ */
+ public static IModel<String> title(Class<?> example, Component context)
+ {
+ return () -> string(example, "title", context);
+ }
+
+ /**
+ * Reads what an example says about itself, for the locale, style and variation of the
+ * component asking.
+ *
+ * @param example
+ * the example to read from, a page or - as the wizard example does it - a component
+ * a page is named after
+ * @param key
+ * {@code title}, {@code description} or {@code order}
+ * @param context
+ * the component reading it
+ * @return the value, or {@code null} when the example's own bundle does not have the key
+ */
+ public static String string(Class<?> example, String key, Component context)
+ {
+ return string(example, key, context.getLocale(), context.getStyle(),
+ context.getVariation());
+ }
+
+ /**
+ * @param example
+ * the example to read from
+ * @param key
+ * {@code title}, {@code description} or {@code order}
+ * @param locale
+ * the locale to read it for
+ * @param style
+ * the style to read it for, may be {@code null}
+ * @param variation
+ * the variation to read it for, may be {@code null}
+ * @return the value, or {@code null} when the example's own bundle does not have the key
+ */
+ public static String string(Class<?> example, String key, Locale locale, String style,
+ String variation)
+ {
+ return OWN_BUNDLE.loadStringResource(example, key, locale, style, variation);
+ }
+
+ /**
+ * The way back out of an example: to the index of all the examples first, then to the one the
+ * example itself is listed on when that is somewhere else. Each link names where it goes, so
+ * that a reader two levels deep can tell the two apart.
+ * <p>
+ * Every link is rendered as a plain URL rather than as a link to a page class, because most
+ * of these indexes belong to another of the example applications: the main menu is the home
+ * page of its own application, and a group index is a page of that same one. Linking to such a
+ * page by class would ask the application the reader is currently in to render it, under that
+ * application's own mount, and every relative link on it would then point into the wrong
+ * application.
+ */
+ private static final class BackToIndexPanel extends Panel
+ {
+ private static final long serialVersionUID = 1L;
+
+ private final Class<? extends WicketExamplePage> index;
+
+ private final String path;
+
+ private BackToIndexPanel(final String id, final Class<? extends WicketExamplePage> index,
+ final String path)
+ {
+ super(id);
+
+ this.index = index;
+ this.path = path;
+
+ IModel<List<Step>> trail = this::trail;
+
+ add(new ListView<>("indexes", trail)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<Step> item)
+ {
+ Step step = item.getModelObject();
+
+ IModel<String> label = new StringResourceModel("back",
+ BackToIndexPanel.this).setParameters(step.label());
+
+ item.add(step.page() == null
+ ? new ExternalLink("back", step.href()).setBody(label)
+ : new BookmarkablePageLink<Void>("back", step.page()).setBody(label));
+ }
+ });
+ }
+
+ @Override
+ protected void onConfigure()
+ {
+ super.onConfigure();
+
+ setVisible(trail().isEmpty() == false);
+ }
+
+ private List<Step> trail()
+ {
+ WicketExamplePage page = (WicketExamplePage)getPage();
+ if (page.showNavigation() == false)
+ {
+ return List.of();
+ }
+ Class<?> here = page.getClass();
+ List<Step> trail = new ArrayList<>();
+ if (here != HomePage.class)
+ {
+ trail.add(new Step(getString("mainIndex"), null, url(MAIN_INDEX)));
+ }
+ if (index != null && index != here)
+ {
+ trail.add(path == null
+ ? new Step(string(index, "title", this), index, null)
+ : new Step(string(index, "title", this), null, url(path)));
+ }
+ return trail;
+ }
+
+ private String url(final String path)
+ {
+ return RequestCycle.get().getUrlRenderer().renderContextRelativeUrl(path);
+ }
+ }
+
+ /**
+ * One step of the way back: what to call it, and where it is - as a page when it belongs to
+ * the same application, and as a plain URL when it does not.
+ */
+ private record Step(String label, Class<? extends WicketExamplePage> page, String href)
+ implements Serializable
+ {
+ }
+
+ /**
+ * @return the title of this example, by default the one its own bundle gives
+ */
+ protected String getExampleTitle()
+ {
+ return string(getClass(), "title", this);
+ }
+
+ 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/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties
similarity index 88%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties
index 6a4447b3d5..3d3bc7ed10 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.properties
@@ -12,6 +12,7 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+examplesTitle=Wicket Examples
+pageTitle=Wicket Examples - {0}
+back=go back to {0}
+mainIndex=main index
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.html
index 5e30257b53..3b3a88123b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.html
@@ -5,10 +5,6 @@
<body>
<wicket:extend>
-<p>
- All links below initiate a download of a resource via Ajax (failing every third time):
-</p>
-
<ul>
<li>for <a wicket:id="download">modern browsers</a>.</li>
<li>in an <a wicket:id="downloadIframe">iframe</a>.</li>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.properties
similarity index 82%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.properties
index 4d499b1343..92659bdd32 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxDownloadPage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Ajax Download
+description=download initiated via Ajax
+explanation=<p> All links below initiate a download of a resource via Ajax (failing every third time): </p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.html
index 1f087f5357..5145266050 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.html
@@ -4,8 +4,6 @@
<wicket:extend>
- The text field below will autocomplete country names. It utilizes AutoCompleteTextField in wicket-extensions.<br/><br/>
-
<form wicket:id="form">
Country: <input type="text" wicket:id="ac" size="50"/>
<br/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.properties
similarity index 76%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.properties
index 4d499b1343..7cf7e1ddb7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Auto-Complete TextField Example
+description=shows a text field with auto complete drop down like google suggest
+explanation=The text field below will autocomplete country names. It utilizes AutoCompleteTextField in wicket-extensions.
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
deleted file mode 100644
index 9db6bbce41..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - Ajax</title>
-</head>
-<body>
- <wicket:extend>
- <a href="Index.html" wicket:id="back">[go back]</a><p/>
- <wicket:child/>
- </wicket:extend>
-</body>
-</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
index f962b99056..78aeb0b17c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
@@ -17,8 +17,6 @@
package org.apache.wicket.examples.ajax.builtin;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.examples.homepage.HomePage;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
/**
@@ -26,15 +24,9 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
*/
public class BasePage extends WicketExamplePage
{
- /**
- * Constructor
- */
- public BasePage()
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
{
- add(new BookmarkablePageLink<>("back", getBackPage()));
- }
-
- protected Class<? extends WicketExamplePage> getBackPage() {
return Index.class;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html
index 27c44bfbb4..3788aa5089 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.html
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates a AjaxFormComponentUpdatingBehavior.
-
-Whenever the Make select box value is changed it will submit the new value to server via ajax and update the choices in the Model select box.
-
-<br/><br/>
<form wicket:id="form">
<select wicket:id="makes"></select>
<select wicket:id="models"></select>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.properties
similarity index 72%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.properties
index 4d499b1343..e161f6cf51 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Drop Down Choice Example
+description=demonstrates the linked select boxes usecase
+explanation=This example demonstrates a AjaxFormComponentUpdatingBehavior. Whenever the Make select box value is changed it will submit the new value to server via ajax and update the choices in the Model select box.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.html
index 694fd1fedb..909096ca60 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.html
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates a AjaxSelfUpdatingTimerBehavior.
-This behavior can be attached to any component to make it update itself every x number of milliseconds.
-The clock below is updated every five seconds.
-
-<br/><br/>
The server time now is: <span wicket:id="clock" class="dotted-box">[clock]</span>
</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.properties
similarity index 70%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.properties
index 4d499b1343..918fe56545 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ClockPage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Clock Example
+description=demonstrates a self-updating component via AjaxSelfUpdatingTimerBehavior
+explanation=This example demonstrates a AjaxSelfUpdatingTimerBehavior. This behavior can be attached to any component to make it update itself every x number of milliseconds. The clock below is updated every five seconds.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.properties
similarity index 89%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.properties
index 6a4447b3d5..297da92d2b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Editable Label Example
+description=shows a label that can be edited inline via ajax
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.properties
similarity index 88%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.properties
index 6a4447b3d5..d6e0a0bb97 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EffectsPage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Effects Example
+description=shows how to link wicket component updates with jQuery UI effects
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html
index 1027051db2..e52772bcd6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html
@@ -1,16 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<html xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend xmlns:wicket="http://wicket.apache.org">
-
- Demonstrates Wicket's ability to transparently handle multipart forms via AJAX.<br/><br/>The only difference
- between this example and other non-AJAX upload examples is the option to trigger the form submit via an AjaxButton,
- everything else is handled transparently by Wicket.<br/><br/>
-
- <div wicket:id="singleFileUpload"></div>
- <br/>
- <div wicket:id="multipleFileUpload"></div>
-
-</wicket:extend>
-</body>
+<?xml version="1.0" encoding="UTF-8" ?>
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend xmlns:wicket="http://wicket.apache.org">
+
+ <div wicket:id="singleFileUpload"></div>
+ <br/>
+ <div wicket:id="multipleFileUpload"></div>
+
+</wicket:extend>
+</body>
</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.properties
similarity index 67%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.properties
index 4d499b1343..69981c9053 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=File Upload Example
+description=demonstrates transparent ajax handling of a multipart form
+explanation=Demonstrates Wicket's ability to transparently handle multipart forms via AJAX.<br/><br/>The only difference between this example and other non-AJAX upload examples is the option to trigger the form submit via an AjaxButton, everything else is handled transparently by Wicket.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.html
index d3ec8f96c4..a11f3a0bc8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.html
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates a AjaxFormComponentUpdatingBehavior in combination with a FormComponentPanel.
-
-Whenever the input numbers are changed it will submit the new value to the server via Ajax and update the result.
-
-<br/><br/>
<form wicket:id="form">
<span wicket:id="multiply">[multiply]</span>
= <span wicket:id="multiplyLabel">[result]</span>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.properties
index 4d499b1343..f14bc27235 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormComponentPanelPage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Form Component Panel Example
+description=demonstrates the form component panel usecase
+explanation=This example demonstrates a AjaxFormComponentUpdatingBehavior in combination with a FormComponentPanel. Whenever the input numbers are changed it will submit the new value to the server via ajax and update the result.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.html
index 059138e2b3..90e0d4ea13 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.html
@@ -4,9 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org"
xml:lang="en" lang="en">
<wicket:extend>
- <br/>
- Start typing in the text fields and see the form being validated as you type. If there are no validation errors the form is automatically submitted. Ajax requests are throttled down to once per second, so they will not overload the server.
- <br/>
+
<div wicket:id="feedbackErrors">[[ feedback ]]</div>
<form wicket:id="form" class="validation">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties
index 480e4cead9..30aa63caea 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties
@@ -12,6 +12,9 @@
# 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.
+title=Form Example
+description=shows ajax form processing
+explanation=<br/> Start typing in the text fields and see the form being validated as you type. If there are no validation errors the form is automatically submitted. Ajax requests are throttled down to once per second, so they will not overload the server.
label.name=Name
label.email=Email
Required=${label} is required
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/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.properties
similarity index 87%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.properties
index 6a4447b3d5..432932cc38 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/GuestBook.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Guest book Example
+description=shows how a simple commenting system can be turned into ajax extravaganza.
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 74574a775a..b300a7aff9 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,44 +1,6 @@
<?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
-<br/><br/>
-<a href="ChoicePage.html">Drop Down Choice Example</a>: demonstrates the linked select boxes usecase
-<br/><br/>
-<a href="FormComponentPanelPage.html">Form Component Panel Example</a>: demonstrates the form component panel 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>
+<div wicket:id="examples">[examples]</div>
</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..bf0a9ddee8 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
@@ -17,9 +17,8 @@
package org.apache.wicket.examples.ajax.builtin;
import org.apache.wicket.examples.AjaxEngineSelector;
+import org.apache.wicket.examples.ExampleIndexPanel;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.examples.homepage.HomePage;
-import org.apache.wicket.markup.html.WebMarkupContainer;
/**
* Wicket ajax example index page
@@ -33,16 +32,19 @@ public class Index extends BasePage
*/
public Index()
{
- // 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);
- }
+ add(new ExampleIndexPanel("examples", Index.class, true)
+ {
+ private static final long serialVersionUID = 1L;
- @Override
- protected Class<? extends WicketExamplePage> getBackPage() {
- return HomePage.class;
+ @Override
+ protected boolean include(Class<?> page)
+ {
+ // EffectsPage needs jQuery UI, which the plain JavaScript Ajax engine does not load
+ return page != EffectsPage.class ||
+ AjaxEngineSelector.getEffectiveEngine() == AjaxEngineSelector.Engine.JQUERY;
+ }
+ });
}
-}
\ No newline at end of file
+
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.properties
index 3a8bc87792..3ee7cc2f2f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Ajax Examples
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.html
index 576b194f3c..b72e9f685b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.html
@@ -1,13 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-<p>
-This example demonstrates the AjaxLazyLoadPanel
-It will lazy load a panel after the page is first fully rendered.
-So panels that can take a while too create can be lazy created
-by an ajax call after the page is rendered.
-</p>
-
<div wicket:id="nonblocking">
<h2>Non-blocking lazy panels</h2>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.properties
index 0065f0e42a..f7b273d059 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LazyLoadingPage.properties
@@ -12,4 +12,6 @@
# 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.
-site.null=[make your selection]
+title=LazyLoading Example
+description=demonstrates lazy loading of components.
+explanation=<p> This example demonstrates the AjaxLazyLoadPanel It will lazy load a panel after the page is first fully rendered. So panels that can take a while too create can be lazy created by an ajax call after the page is rendered. </p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.properties
index 6a4447b3d5..304627d16d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/LinksPage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Links Example
+description=demonstrates ajax enabled links
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.properties
index 6d8719c6d0..dea70ac853 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/OnChangeAjaxBehaviorPage.properties
@@ -12,6 +12,8 @@
# 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.
+title=On Change Ajax Updater Example
+description=demonstrates updating page with ajax when text field value is changed
onChange.help = Start typing a country name into a Country field below.
onChange.input = You typed
onChange.country = Country name
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/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.properties
index 0ddaf4243b..14afee7f37 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/PageablesPage.properties
@@ -12,4 +12,5 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Pageables Example
+description=shows ajax paging
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..7edebdcc6a 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,31 +1,10 @@
<?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>
- <p>
- When if is out end to song i alone a the my with end from with your
- key. lend, day my try sang, if are you away help you friends help no.
- Own my a and, what help tune out because. Would help i'll and high
- friends and little you from on do, friends a by your me what. With
- friends be on you, is out, going. Get get do from little your your to
- of high. Does, no to it, i the a a no i from i'll help out what
- little. Get by a to with the, from song, get you, does friends
- friends i do do tune. Little from, you my, you feel try. Day alone
- you try try your i. On a, to. No sing, by my of.
- </p>
- <p>
- Going how is be. Would if, try my a my, because help. Little because
- be from alone on i from help it, get out and from, try you lend. To
- and out from end my, sang, i, by friends help because. Sad your on
- day your by the out little when, you to would song. Away to, to you
- with from are high, ears you and i stand with. Little own you no, a
- friends by out my stand, you, a feel it do. Alone out help away from,
- what me friends end your do friends, if. From by i what to a i you
- i'll the. Not a a friends lend does you.
- </p>
+
<table>
<tr>
<td>Rate this:</td>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.properties
new file mode 100644
index 0000000000..c8936e329c
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/RatingsPage.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.
+title=Ratings example
+description=shows a rating component.
+explanation=<p> When if is out end to song i alone a the my with end from with your key. lend, day my try sang, if are you away help you friends help no. Own my a and, what help tune out because. Would help i'll and high friends and little you from on do, friends a by your me what. With friends be on you, is out, going. Get get do from little your your to of high. Does, no to it, i the a a no i from i'll help out what little. Get by a to with the, from song, get you, does friends friends [...]
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.properties
index 6a4447b3d5..0ee29661f1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TabbedPanelPage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Tabbed Panel Example
+description=demonstrates ajax enabled tabbed panel
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/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.properties
similarity index 89%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.properties
index 6a4447b3d5..5351665db7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Todo list Example
+description=shows ajax todo list page without writing any JavaScript
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.html
index 694ad6fc2c..dcfd9b6255 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.html
@@ -1,11 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates a AjaxTimerBehavior as well as updating of multiple components on the page.
-<br/>
-This AjaxTimerBehavior can be attached to any component and will recieve a callback every x number of milliseconds.
-Within this callback it is very simple to update any number of components via ajax.
-
-<br/><br/>
<table cellspacing="0" cellpadding="2">
<tr>
<td class="text-right">Los Angeles:</td>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.properties
similarity index 64%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.properties
index 4d499b1343..a51356b13f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/WorldClockPage.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=World Clock Example
+description=demonstrates a single component with AjaxTimerBehavior updating multiple components
+explanation=This example demonstrates a AjaxTimerBehavior as well as updating of multiple components on the page. <br/> This AjaxTimerBehavior can be attached to any component and will recieve a callback every x number of milliseconds. Within this callback it is very simple to update any number of components via ajax.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalDialogPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalDialogPage.properties
index 99ebb91d9c..3a2bee2a15 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalDialogPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ModalDialogPage.properties
@@ -12,4 +12,6 @@
# 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.
+title=Modal dialog
+description=javascript modal dialog example
lorem = Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.properties
index 3a8bc87792..7dd669263d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/AjaxHelloBrowser.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java
index 8a44d2195e..dea2131bc4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.ajaxhellobrowser;
+import org.apache.wicket.examples.homepage.BrowserInfoIndex;
+
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Locale;
@@ -41,6 +43,18 @@ import org.apache.wicket.settings.RequestCycleSettings;
*/
public class AjaxHelloBrowser extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return BrowserInfoIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "browserinfo";
+ }
+
/**
* Constructor.
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.properties
index 3a8bc87792..11fd73445b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/AjaxHelloBrowserOnDomReady.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.java
index 509b62dcd0..31e0993833 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.ajaxhellowbrowserondomready;
+import org.apache.wicket.examples.homepage.BrowserInfoIndex;
+
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Locale;
@@ -41,6 +43,18 @@ import org.apache.wicket.settings.RequestCycleSettings;
*/
public class AjaxHelloBrowserOnDomReady extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return BrowserInfoIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "browserinfo";
+ }
+
/**
* Constructor.
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.properties
index 3a8bc87792..cdcd10d9fa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellowbrowserondomready/AjaxHelloBrowserOnDomReady.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/MailTemplate.java b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
index b39cb270c8..984da160ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.asemail;
+import org.apache.wicket.examples.homepage.TemplatingIndex;
+
import java.util.HashMap;
import java.util.Map;
@@ -45,6 +47,18 @@ import org.apache.wicket.util.template.TextTemplate;
*/
public class MailTemplate extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return TemplatingIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "templating";
+ }
+
private static final long serialVersionUID = 1L;
/**
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.properties
index 3a8bc87792..a6b69ed014 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/asemail/MailTemplate.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
index ab69186acd..d9f222fdfc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.authentication1;
+import org.apache.wicket.examples.homepage.AuthenticationIndex;
+
import org.apache.wicket.examples.WicketExamplePage;
@@ -26,5 +28,17 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class Home extends WicketExamplePage implements AuthenticatedWebPage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return AuthenticationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "authentication";
+ }
+
// Nothing in here.
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.properties
index 3a8bc87792..728cbf34be 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Simple Authentication
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.properties
index 3a8bc87792..37607f27f7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignIn.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Simple Authentication - Sign In
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..dd55765cd0 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,11 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
- <h2>Goodbye!</h2>
- <wicket:link><a href="Home.html">Home</a></wicket:link>
+ <h2>Goodbye!</h2>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
index 9b51d8c570..37fba03820 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.java
@@ -1,39 +1,45 @@
-/*
- * 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.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * Simple logout page.
- *
- * @author Jonathan Locke
- */
-public class SignOut extends WicketExamplePage
-{
- /**
- * Constructor
- *
- * @param parameters
- * Page parameters (ignored since this is the home page)
- */
- public SignOut(final PageParameters parameters)
- {
- getSession().invalidate();
- }
-}
+/*
+ * 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.authentication1;
+
+import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * Simple logout page.
+ *
+ * @author Jonathan Locke
+ */
+public class SignOut extends WicketExamplePage
+{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * Page parameters (ignored since this is the home page)
+ */
+ public SignOut(final PageParameters parameters)
+ {
+ getSession().invalidate();
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.properties
index 3a8bc87792..778c1f77f4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/SignOut.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
index d4ae8ba0d0..23a1d501a6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.examples.authentication2;
+import org.apache.wicket.examples.homepage.AuthenticationIndex;
+import org.apache.wicket.examples.WicketExamplePage;
+
/**
* Simple home page which requires authentication
*
@@ -23,6 +26,18 @@ package org.apache.wicket.examples.authentication2;
*/
public class Home extends AuthenticatedWebPage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return AuthenticationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "authentication";
+ }
+
/**
* Constructor
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.properties
index 3a8bc87792..c4c13d9161 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/Home.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Cookie Based Authentication
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..f59fc04e17 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,12 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
- <p>
- <i>Username and password are both "wicket"</i>
- </p>
+
<span wicket:id="signInPanel"/>
</wicket:extend>
</body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.properties
similarity index 87%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.properties
index 6a4447b3d5..542f130fad 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignIn2.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Cookie Based Authentication - Sign In
+explanation=<p> <i>Username and password are both "wicket"</i> </p>
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..dd55765cd0 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,11 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
- <h2>Goodbye!</h2>
- <wicket:link><a href="Home.html">Home</a></wicket:link>
+ <h2>Goodbye!</h2>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
index eb68949cdd..1fc5e4a4f9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.java
@@ -25,6 +25,12 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class SignOut extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.properties
index 3a8bc87792..d97c90db19 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication2/SignOut.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Cookie Based Authentication - Sign Out
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.html
deleted file mode 100644
index 920c3824f2..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<wicket:extend xmlns:wicket="http://wicket.apache.org">
- <h2>Welcome ADMIN!</h2>
- <p>
- This page should only be accessible if you are signed in as an administrator.
- </p>
- <p>
- <wicket:link><a href="HomePage.html">Home</a></wicket:link><br/>
- <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
- </p>
-</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.properties
similarity index 83%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.properties
index 4d499b1343..44806914aa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/AdminPage.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Page Authentication - Admin
+explanation=<p>Welcome ADMIN!</p> <p> This page should only be accessible if you are signed in as an administrator. </p>
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
deleted file mode 100644
index e8103aadd9..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - Authentication</title>
-</head>
-<body>
- <wicket:extend>
- <wicket:child/>
-</wicket:extend>
-</body>
-</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.java
index 0b6295be00..0074bd7262 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/BasePage.java
@@ -25,4 +25,9 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class BasePage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return HomePage.class;
+ }
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.html
deleted file mode 100644
index 6ffba44758..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<wicket:extend xmlns:wicket="http://wicket.apache.org">
- <h2>Welcome!</h2>
- <p>
- This page should be accessible to everyone.
- </p>
- <p>
- <wicket:link><a href="AdminPage.html">Admin Page</a></wicket:link><br/>
- <wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
- </p>
-</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.java
index 61304ea9b7..825ab6513e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.examples.authentication3;
+import org.apache.wicket.examples.homepage.AuthenticationIndex;
+import org.apache.wicket.examples.WicketExamplePage;
+
/**
* Simple home page with no authorization requirements - can be accessed by everybody.
@@ -24,4 +27,16 @@ package org.apache.wicket.examples.authentication3;
*/
public class HomePage extends BasePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return AuthenticationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "authentication";
+ }
+
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.properties
similarity index 88%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.properties
index 6a4447b3d5..d61d0d7649 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/HomePage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Page Authentication
+explanation=<p>Welcome!</p> <p> This page should be accessible to everyone. </p>
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..f59fc04e17 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,12 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
- <p>
- <i>Username and password are both "wicket"</i>
- </p>
+
<span wicket:id="signInPanel"/>
</wicket:extend>
</body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.properties
similarity index 87%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.properties
index 6a4447b3d5..6e66d35267 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/MySignInPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Page Authentication - Sign In
+explanation=<p> <i>Username and password are both "wicket"</i> </p>
+index=false
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
deleted file mode 100644
index 8f6b382b40..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - signin2</title>
-</head>
-<body>
- <wicket:extend>
- <h2>Goodbye!</h2>
- <wicket:link><a href="HomePage.html">Home</a></wicket:link>
-</wicket:extend>
-</body>
-</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
index 66cdb2ef90..d78b2ab38f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.java
@@ -1,35 +1,34 @@
-/*
- * 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.authentication3;
-
-import org.apache.wicket.examples.WicketExamplePage;
-
-/**
- * Simple logout page.
- *
- * @author Jonathan Locke
- */
-public class SignOut extends WicketExamplePage
-{
- /**
- * Constructor
- */
- public SignOut()
- {
- getSession().invalidate();
- }
-}
+/*
+ * 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.authentication3;
+
+
+/**
+ * Simple logout page.
+ *
+ * @author Jonathan Locke
+ */
+public class SignOut extends BasePage
+{
+ /**
+ * Constructor
+ */
+ public SignOut()
+ {
+ getSession().invalidate();
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.properties
index 6a4447b3d5..9c63c6c1ed 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authentication3/SignOut.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Page Authentication - Sign Out
+explanation=Goodbye!
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
deleted file mode 100644
index 2a5205f8be..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - Authorization Roles</title>
-</head>
-<body>
- <wicket:extend>
- <wicket:child/>
-</wicket:extend>
-</body>
-</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
index 6579dd3400..27aad7a3aa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/BasePage.java
@@ -23,5 +23,9 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class BasePage extends WicketExamplePage
{
-
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Index.class;
+ }
}
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..936305d319 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"></a>
<br />
- <a href="#" wicket:id="adminInternalLink">
- go to internal admin page, protected with Wicket meta data
- </a>
+ <a href="#" wicket:id="adminInternalLink"></a>
<br />
- <a href="#" wicket:id="panelsPageLink">
- go to panels page, protected with Wicket meta data
- </a>
+ <a href="#" wicket:id="panelsPageLink"></a>
</div>
<br />
<div>
- <a href="#" wicket:id="adminAnnotBookmarkableLink">
- go to bookmarkable admin page, protected with annotations
- </a>
+ <a href="#" wicket:id="adminAnnotBookmarkableLink"></a>
<br />
- <a href="#" wicket:id="adminAnnotInternalLink">
- go to internal admin page, protected with annotations
- </a>
+ <a href="#" wicket:id="adminAnnotInternalLink"></a>
<br />
- <a href="#" wicket:id="panelsAnnotPageLink">
- go to panels page, protected with annotations
- </a>
+ <a href="#" wicket:id="panelsAnnotPageLink"></a>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
index d39b0a62e2..f96c1fa172 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.examples.authorization;
+import org.apache.wicket.examples.homepage.AuthenticationIndex;
+import org.apache.wicket.examples.WicketExamplePage;
+
import org.apache.wicket.Session;
import org.apache.wicket.examples.authorization.pages.AdminAnnotationsBookmarkablePage;
import org.apache.wicket.examples.authorization.pages.AdminAnnotationsInternalPage;
@@ -38,6 +41,18 @@ import org.apache.wicket.model.PropertyModel;
*/
public class Index extends BasePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return AuthenticationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "authentication";
+ }
+
/**
* Construct.
*/
@@ -63,7 +78,8 @@ public class Index extends BasePage
});
// pages that are protected using wicket meta data
- add(new BookmarkablePageLink<>("adminBookmarkableLink", AdminBookmarkablePage.class));
+ add(new BookmarkablePageLink<>("adminBookmarkableLink", AdminBookmarkablePage.class)
+ .setBody(title(AdminBookmarkablePage.class, this)));
add(new Link<Void>("adminInternalLink")
{
@Override
@@ -71,18 +87,21 @@ public class Index extends BasePage
{
setResponsePage(new AdminInternalPage("foo"));
}
- });
- add(new BookmarkablePageLink<>("panelsPageLink", PanelsPage.class));
+ }.setBody(title(AdminInternalPage.class, this)));
+ add(new BookmarkablePageLink<>("panelsPageLink", PanelsPage.class)
+ .setBody(title(PanelsPage.class, this)));
// pages that are protected using annotations
add(new BookmarkablePageLink<Void>("adminAnnotBookmarkableLink",
- AdminAnnotationsBookmarkablePage.class));
+ AdminAnnotationsBookmarkablePage.class)
+ .setBody(title(AdminAnnotationsBookmarkablePage.class, this)));
add(new Link<Void>("adminAnnotInternalLink") {
public void onClick() {
setResponsePage(new AdminAnnotationsInternalPage("bar"));
}
- });
+ }.setBody(title(AdminAnnotationsInternalPage.class, this)));
- add(new BookmarkablePageLink<>("panelsAnnotPageLink", AnnotationsPanelsPage.class));
+ add(new BookmarkablePageLink<>("panelsAnnotPageLink", AnnotationsPanelsPage.class)
+ .setBody(title(AnnotationsPanelsPage.class, this)));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.properties
index 3a8bc87792..81fb6cd2e5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Authorization
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.properties
index 6a4447b3d5..81a1dc20a9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsBookmarkablePage.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Bookmarkable admin page, protected with annotations
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.properties
index 0ddaf4243b..00442e3f42 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminAnnotationsInternalPage.properties
@@ -12,4 +12,4 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Internal admin page, protected with annotations
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.properties
index 6a4447b3d5..f81a5e6ac1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminBookmarkablePage.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Bookmarkable admin page, protected with Wicket meta data
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.properties
index 6a4447b3d5..a856d3a14b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AdminInternalPage.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Internal admin page, protected with Wicket meta data
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.properties
index 3a8bc87792..6fbf31a786 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/AnnotationsPanelsPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Panels page, protected with annotations
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.properties
index 0ddaf4243b..c048f40fd2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/pages/PanelsPage.properties
@@ -12,4 +12,4 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Panels page, protected with Wicket meta data
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/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
index 4d499b1343..dacb0f07d2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
@@ -12,5 +12,6 @@
# 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.
+title=Bean Validation
password.needDigits=You need to have at least 2 digits in your password.
password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.properties
index 3a8bc87792..19d06a7a65 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..04896d9574 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,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 - Captcha</title>
</head>
<body>
<wicket:extend>
- <h3>Demo of Wicket's default: <em>org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource</em> </h3>
<wicket:container wicket:id="wicket"></wicket:container>
<hr/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
index 757920de58..9132e1fa06 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.captcha;
+import org.apache.wicket.examples.homepage.CaptchaIndex;
+
import org.apache.wicket.examples.WicketExamplePage;
/**
@@ -25,6 +27,18 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class Captcha extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return CaptchaIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "captchas";
+ }
+
private static final long serialVersionUID = 1L;
/**
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.properties
similarity index 85%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.properties
index 6a4447b3d5..e15b005dcc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/captcha/Captcha.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Captcha
+explanation=<p>Demo of Wicket's default: <em>org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource</em> </p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.html
index 5768bab48b..35c4cc5101 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.html
@@ -1,12 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
- <p>
- This page demonstrates automatic conversation managed. Below is a counter
- that is conversation-scoped. Click increment a couple of times and then click
- the 'Continue to next page', the counter value should persist on the
- next page.
- </p>
+
<p>
Current counter value is: <span wicket:id="count">100</span>
<a wicket:id="increment">increment</a>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.properties
similarity index 72%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.properties
index 4d499b1343..24175f8e7f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage1.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Automatic Conversation Management Example
+explanation=<p> This page demonstrates automatic conversation managed. Below is a counter that is conversation-scoped. Click increment a couple of times and then click the 'Continue to next page', the counter value should persist on the next page. </p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.html
index 1e1a9efa30..f6cb2769aa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.html
@@ -1,13 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
- <p>
- This page is not marked with ConversationalComponent. Therefore, the conversation that was
- started on the previous page is ended. Notice the conversational counter injected into this
- page initially has the same value as in the previous page, this is because the conversation
- was still active in the request that rendered this page. However, clicking 'refresh' below,
- will reset the counter to 0.
- </p>
+
<p>
Current counter value is: <span wicket:id="count">100</span>
<a wicket:id="refresh">refresh</a>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.properties
similarity index 62%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.properties
index 4d499b1343..394d1a7909 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Automatic Conversation Management Example - Page 2
+explanation=<p> This page is not marked with ConversationalComponent. Therefore, the conversation that was started on the previous page is ended. Notice the conversational counter injected into this page initially has the same value as in the previous page, this is because the conversation was still active in the request that rendered this page. However, clicking 'refresh' below, will reset the counter to 0. </p>
+index=false
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
deleted file mode 100644
index 7ac00b59ef..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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>
-
- <wicket:child/>
- </wicket:extend>
-</body>
-</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.java
index 5e7c26fb3f..2137f73f3e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiExamplePage.java
@@ -20,5 +20,9 @@ import org.apache.wicket.examples.WicketExamplePage;
public abstract class CdiExamplePage extends WicketExamplePage
{
-
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return CdiHomePage.class;
+ }
}
\ No newline at end of file
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..ca097f5903 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
@@ -1,19 +1,7 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend>
- <wicket:link>
- <ul>
- <li>
- <a href="InjectionPage.html">Injection Example</a>
- </li>
- <li>
- <a href="ConversationPage1.html">Conversation Propagation Example</a>
- </li>
- <li>
- <a href="AutoConversationPage1.html">Automatic Conversation Management Example</a>
- </li>
- </ul>
- </wicket:link>
-</wicket:extend>
-</body>
-</html>
\ No newline at end of file
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+ <div wicket:id="examples">[examples]</div>
+</wicket:extend>
+</body>
+</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.java
index 40f928bdab..6ff196aba7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.java
@@ -1,25 +1,43 @@
-/*
- * 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.cdi;
-
-
-public class CdiHomePage extends CdiExamplePage
-{
- public CdiHomePage()
- {
- }
-}
+/*
+ * 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.cdi;
+
+import org.apache.wicket.examples.homepage.InjectionIndex;
+import org.apache.wicket.examples.WicketExamplePage;
+
+import org.apache.wicket.examples.ExampleIndexPanel;
+
+
+public class CdiHomePage extends CdiExamplePage
+{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return InjectionIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "injection";
+ }
+
+ public CdiHomePage()
+ {
+ add(new ExampleIndexPanel("examples", CdiHomePage.class));
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.properties
index 0ddaf4243b..1a8e47a5b0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiHomePage.properties
@@ -12,4 +12,4 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Context, Dependencies, and Injection Integration
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.html
index ab098bd39e..35c4cc5101 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.html
@@ -1,20 +1,14 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend>
- <p>
- This page demonstrates conversational propagation between
- non-bookmarkable pages. Below is a counter that is
- conversation-scoped. Click increment a couple of times and then click
- the 'Continue to next page', the counter value should persist on the
- next page.
- </p>
- <p>
- Current counter value is: <span wicket:id="count">100</span>
- <a wicket:id="increment">increment</a>
- </p>
- <p>
- <a wicket:id="next">Continue to next page</a>
- </p>
-</wicket:extend>
-</body>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+
+ <p>
+ Current counter value is: <span wicket:id="count">100</span>
+ <a wicket:id="increment">increment</a>
+ </p>
+ <p>
+ <a wicket:id="next">Continue to next page</a>
+ </p>
+</wicket:extend>
+</body>
</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.properties
index 4d499b1343..f44f84458f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage1.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Conversation Propagation Example
+explanation=<p> This page demonstrates conversational propagation between non-bookmarkable pages. Below is a counter that is conversation-scoped. Click increment a couple of times and then click the 'Continue to next page', the counter value should persist on the next page. </p>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.html
index f6739f3898..35c4cc5101 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.html
@@ -1,22 +1,14 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend>
- <p>
- This page was reached via a non-bookmarkable link so conversation was propagated.
- Notice the conversational counter injected into this page has the same value as in the
- previous page, this is because it is the same counter instance.
- </p>
- <p>
- The 'Continue to next page' link below is a bookmarkable link. Conversations do not propagate
- across bookmarkable links, so the counter on the next page will have the starting value of zero.
- </p>
- <p>
- Current counter value is: <span wicket:id="count">100</span>
- <a wicket:id="increment">increment</a>
- </p>
- <p>
- <a wicket:id="next">Continue to next page</a>
- </p>
-</wicket:extend>
-</body>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+
+ <p>
+ Current counter value is: <span wicket:id="count">100</span>
+ <a wicket:id="increment">increment</a>
+ </p>
+ <p>
+ <a wicket:id="next">Continue to next page</a>
+ </p>
+</wicket:extend>
+</body>
</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.properties
similarity index 60%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.properties
index 4d499b1343..08236b1832 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage2.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Conversation Propagation Example - Page 2
+explanation=<p> This page was reached via a non-bookmarkable link so conversation was propagated. Notice the conversational counter injected into this page has the same value as in the previous page, this is because it is the same counter instance. </p> <p> The 'Continue to next page' link below is a bookmarkable link. Conversations do not propagate across bookmarkable links, so the counter on the next page will have the starting value of zero. </p>
+index=false
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.html
index 4d5b32ae28..27e4af8ad6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.html
@@ -1,13 +1,10 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend>
- <p>
- This page was reached via a bookmarkable link, which means the conversation
- was not propagated. This is why the counter has a fresh value of zero.
- </p>
- <p>
- Current counter value is: <span wicket:id="count">100</span>
- </p>
-</wicket:extend>
-</body>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+
+ <p>
+ Current counter value is: <span wicket:id="count">100</span>
+ </p>
+</wicket:extend>
+</body>
</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.properties
similarity index 77%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.properties
index 4d499b1343..ed4861d30c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationPage3.properties
@@ -12,5 +12,6 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Conversation Propagation Example - Page 3
+explanation=<p> This page was reached via a bookmarkable link, which means the conversation was not propagated. This is why the counter has a fresh value of zero. </p>
+index=false
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.html
index 459ee2ee07..0237360cda 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.html
@@ -1,16 +1,14 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-<body>
-<wicket:extend>
-<p>
- This page demonstrates injection of a application-scoped Counter service
-</p>
-<p>
- Current counter value is: <span wicket:id="count">100</span>
- <a wicket:id="increment">increment</a>
-</p>
-<p>
- Notice as you navigate away and come back to this page the value persists or is larger because it is shared across all users in application scope
-</p>
-</wicket:extend>
-</body>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+
+<p>
+ Current counter value is: <span wicket:id="count">100</span>
+ <a wicket:id="increment">increment</a>
+</p>
+<p>
+ Notice as you navigate away and come back to this page the value persists or is larger because it is shared across all users in application scope
+</p>
+</wicket:extend>
+</body>
</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.properties
similarity index 87%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.properties
index 6a4447b3d5..94fafd662c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/InjectionPage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Injection Example
+explanation=<p> This page demonstrates injection of a application-scoped Counter service </p>
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..da4e0b944a 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,13 +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>
The BookmarkablePageLink component allows you to navigate to Bookmarkable pages.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
index 7c6c3dafca..951398eab9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -26,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*
* @author Eelco Hillenius
*/
-public class BookmarkablePageLinkPage extends WicketExamplePage
+public class BookmarkablePageLinkPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.properties
index 6a4447b3d5..e3d0f4f636 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.link.BookmarkablePageLink
+order=3
+group=links
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..551ababe71 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,13 +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>
You can view Borders as kind of the opposite of Panels. You use Borders to
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
index 117d8ddfe5..7de5a4b7c7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
@@ -25,7 +24,7 @@ import org.apache.wicket.markup.html.basic.Label;
*
* @author Eelco Hillenius
*/
-public class BorderPage extends WicketExamplePage
+public class BorderPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.properties
index 6a4447b3d5..88ff59636f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.border.Border
+order=2
+group=layout
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..cb887f0a1e 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,13 +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>
Within a form, you can nest Button components. Note that you don't have to do this to
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.java
index d18fc040c7..68f44b7093 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -27,7 +26,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
*
* @author Eelco Hillenius
*/
-public class ButtonPage extends WicketExamplePage
+public class ButtonPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.properties
index 6a4447b3d5..dbdfa09ce1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ButtonPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.Button
+order=2
+group=forms
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..af37542cf4 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,13 +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>
A CheckBoxMultipleChoice component lets users select multiple values from a group of checkboxes.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
index cd20bdd41d..6db7d3cc46 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -34,7 +33,7 @@ import org.apache.wicket.util.io.IClusterable;
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class CheckBoxMultipleChoicePage extends WicketExamplePage
+public class CheckBoxMultipleChoicePage extends ComprefPage
{
/** available sites for selection. */
private static final List<String> SITES = Arrays.asList("The Server Side", "Java Lobby",
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.properties
index 6a4447b3d5..1e622272c8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxMultipleChoicePage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.CheckBoxMultipleChoice
+order=9
+group=forms
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..4073ffd8e2 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,13 +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>
A Checkbox can be used to work with boolean values. If the checkbox is checked, it
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
index ebfbc55a1c..5fea9f04ec 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.util.io.IClusterable;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -29,7 +28,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
*
* @author Eelco Hillenius
*/
-public class CheckBoxPage extends WicketExamplePage
+public class CheckBoxPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.properties
index 6a4447b3d5..fc80238e4c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.CheckBox
+order=6
+group=forms
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..5160829fdb 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,52 +1,49 @@
-<?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>
- A CheckBoxSelector selects and deselects all Check components under the same CheckGroup as itself
- </p>
- <p>
- <form wicket:id="form">
- CheckGroup:<br/>
- <div wicket:id="checkgroup">
- <input type="checkbox" wicket:id="check1"/> 1
- <input type="checkbox" wicket:id="check2"/> 2
- <input type="checkbox" wicket:id="check3"/> 3
- <input type="checkbox" wicket:id="check4"/> 4
- <input type="checkbox" wicket:id="groupSelector"/> select all
- </div>
- <input type="checkbox" wicket:id="groupSelectorOutside"/> select all (outside group)
- <hr/>
- CheckboxMultipleChoice:
- <div wicket:id="choice"/>
- <input type="checkbox" wicket:id="choiceSelector"/> select all
- <hr/>
- Loose Checkboxes:
- <input type="checkbox" wicket:id="looseCheck1"/> 1
- <input type="checkbox" wicket:id="looseCheck2"/> 2
- <input type="checkbox" wicket:id="looseCheck3"/> 3
- <input type="checkbox" wicket:id="looseCheck4"/> 4
- <input type="checkbox" wicket:id="looseSelector"/> select all
-
- <hr/>
- Extensible Selector:
- <ul>
- <li wicket:id="list">
- <input type="checkbox" wicket:id="check"/><wicket:label for="check"/>
- </li>
- </ul>
- <input type="checkbox" wicket:id="extensibleSelector"/> select all
- <input type="submit" value="add a choice" wicket:id="addChoice"/>
- <input type="submit" value="remove a choice" wicket:id="removeChoice"/>
- </form>
- </p>
- </wicket:extend>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <head>
+ </head>
+ <body>
+ <wicket:extend>
+
+
+ <p>
+ A CheckBoxSelector selects and deselects all Check components under the same CheckGroup as itself
+ </p>
+ <p>
+ <form wicket:id="form">
+ CheckGroup:<br/>
+ <div wicket:id="checkgroup">
+ <input type="checkbox" wicket:id="check1"/> 1
+ <input type="checkbox" wicket:id="check2"/> 2
+ <input type="checkbox" wicket:id="check3"/> 3
+ <input type="checkbox" wicket:id="check4"/> 4
+ <input type="checkbox" wicket:id="groupSelector"/> select all
+ </div>
+ <input type="checkbox" wicket:id="groupSelectorOutside"/> select all (outside group)
+ <hr/>
+ CheckboxMultipleChoice:
+ <div wicket:id="choice"/>
+ <input type="checkbox" wicket:id="choiceSelector"/> select all
+ <hr/>
+ Loose Checkboxes:
+ <input type="checkbox" wicket:id="looseCheck1"/> 1
+ <input type="checkbox" wicket:id="looseCheck2"/> 2
+ <input type="checkbox" wicket:id="looseCheck3"/> 3
+ <input type="checkbox" wicket:id="looseCheck4"/> 4
+ <input type="checkbox" wicket:id="looseSelector"/> select all
+
+ <hr/>
+ Extensible Selector:
+ <ul>
+ <li wicket:id="list">
+ <input type="checkbox" wicket:id="check"/><wicket:label for="check"/>
+ </li>
+ </ul>
+ <input type="checkbox" wicket:id="extensibleSelector"/> select all
+ <input type="submit" value="add a choice" wicket:id="addChoice"/>
+ <input type="submit" value="remove a choice" wicket:id="removeChoice"/>
+ </form>
+ </p>
+ </wicket:extend>
+</body>
+</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
index aab653dc0e..4aafb42b44 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.java
@@ -1,145 +1,144 @@
-/*
- * 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.compref;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Check;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
-import org.apache.wicket.markup.html.form.CheckBoxSelector;
-import org.apache.wicket.markup.html.form.CheckGroup;
-import org.apache.wicket.markup.html.form.CheckGroupSelector;
-import org.apache.wicket.markup.html.form.CheckboxMultipleChoiceSelector;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * An example page for {@link CheckBoxSelector}
- */
-public class CheckBoxSelectorPage extends WicketExamplePage
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor
- *
- * @param parameters
- * Page parameters
- */
- public CheckBoxSelectorPage(final PageParameters parameters)
- {
- super(parameters);
-
- final Form<?> form = new Form<>("form");
- add(form);
- final CheckGroup<Integer> checkgroup = new CheckGroup<>("checkgroup", Arrays.asList(
- 1, 2, 3, 4));
- form.add(checkgroup);
- checkgroup.add(new Check<>("check1", Model.of(1)));
- checkgroup.add(new Check<>("check2", Model.of(2)));
- checkgroup.add(new Check<>("check3", Model.of(3)));
- checkgroup.add(new Check<>("check4", Model.of(4)));
- // one selector inside the checkgroup...
- checkgroup.add(new CheckGroupSelector("groupSelector"));
-
- // ...and one selector outside the checkgroup
- form.add(new CheckGroupSelector("groupSelectorOutside", checkgroup));
-
- final CheckBoxMultipleChoice<Integer> choice = new CheckBoxMultipleChoice<>(
- "choice", Model.ofList(new ArrayList<>()), Arrays.asList(1, 2, 3, 4));
- form.add(choice);
- form.add(new CheckboxMultipleChoiceSelector("choiceSelector", choice));
-
- final CheckBox loose1 = new CheckBox("looseCheck1", Model.of(Boolean.FALSE));
- final CheckBox loose2 = new CheckBox("looseCheck2", Model.of(Boolean.FALSE));
- final CheckBox loose3 = new CheckBox("looseCheck3", Model.of(Boolean.FALSE));
- final CheckBox loose4 = new CheckBox("looseCheck4", Model.of(Boolean.FALSE));
- form.add(loose1, loose2, loose3, loose4);
- form.add(new CheckBoxSelector("looseSelector", loose1, loose2, loose3, loose4));
-
- // and one which will get more choices later
- final List<Integer> extensibleChoices = new ArrayList<>(Arrays.asList(1, 2, 3));
- final Set<Integer> selected = new HashSet<>();
- final ListView<Integer> listView = new ListView<Integer>("list", extensibleChoices) {
- @Override
- protected void populateItem(final ListItem<Integer> item) {
- final CheckBox check = new CheckBox("check", new Model<Boolean>() {
- @Override
- public Boolean getObject() {
- return selected.contains(item.getModelObject());
- }
-
- @Override
- public void setObject(Boolean object) {
- if (object) {
- selected.add(item.getModelObject());
- } else {
- selected.remove(item.getModelObject());
- }
- }
- });
- check.setLabel(() -> item.getModelObject().toString());
- item.add(check);
- }
- };
- listView.setReuseItems(true);
- form.add(listView);
- form.add(new Button("addChoice") {
- @Override
- public void onSubmit() {
- extensibleChoices.add(extensibleChoices.get(extensibleChoices.size() - 1) + 1);
- }
- });
- form.add(new Button("removeChoice") {
-
- @Override
- protected void onConfigure()
- {
- super.onConfigure();
-
- setEnabled(extensibleChoices.size() > 1);
- }
-
- public void onSubmit()
- {
-
- Integer integer = extensibleChoices.get(extensibleChoices.size() - 1);
- extensibleChoices.remove(integer);
- selected.remove(integer);
- }
- });
-
- final CheckBoxSelector extensibleSelector = new CheckBoxSelector("extensibleSelector") {
- @Override
- protected Iterable<? extends CheckBox> getCheckBoxes()
- {
- return collectCheckBoxes(listView);
- }
- };
- form.add(extensibleSelector);
- }
-}
+/*
+ * 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.compref;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Check;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
+import org.apache.wicket.markup.html.form.CheckBoxSelector;
+import org.apache.wicket.markup.html.form.CheckGroup;
+import org.apache.wicket.markup.html.form.CheckGroupSelector;
+import org.apache.wicket.markup.html.form.CheckboxMultipleChoiceSelector;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * An example page for {@link CheckBoxSelector}
+ */
+public class CheckBoxSelectorPage extends ComprefPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * Page parameters
+ */
+ public CheckBoxSelectorPage(final PageParameters parameters)
+ {
+ super(parameters);
+
+ final Form<?> form = new Form<>("form");
+ add(form);
+ final CheckGroup<Integer> checkgroup = new CheckGroup<>("checkgroup", Arrays.asList(
+ 1, 2, 3, 4));
+ form.add(checkgroup);
+ checkgroup.add(new Check<>("check1", Model.of(1)));
+ checkgroup.add(new Check<>("check2", Model.of(2)));
+ checkgroup.add(new Check<>("check3", Model.of(3)));
+ checkgroup.add(new Check<>("check4", Model.of(4)));
+ // one selector inside the checkgroup...
+ checkgroup.add(new CheckGroupSelector("groupSelector"));
+
+ // ...and one selector outside the checkgroup
+ form.add(new CheckGroupSelector("groupSelectorOutside", checkgroup));
+
+ final CheckBoxMultipleChoice<Integer> choice = new CheckBoxMultipleChoice<>(
+ "choice", Model.ofList(new ArrayList<>()), Arrays.asList(1, 2, 3, 4));
+ form.add(choice);
+ form.add(new CheckboxMultipleChoiceSelector("choiceSelector", choice));
+
+ final CheckBox loose1 = new CheckBox("looseCheck1", Model.of(Boolean.FALSE));
+ final CheckBox loose2 = new CheckBox("looseCheck2", Model.of(Boolean.FALSE));
+ final CheckBox loose3 = new CheckBox("looseCheck3", Model.of(Boolean.FALSE));
+ final CheckBox loose4 = new CheckBox("looseCheck4", Model.of(Boolean.FALSE));
+ form.add(loose1, loose2, loose3, loose4);
+ form.add(new CheckBoxSelector("looseSelector", loose1, loose2, loose3, loose4));
+
+ // and one which will get more choices later
+ final List<Integer> extensibleChoices = new ArrayList<>(Arrays.asList(1, 2, 3));
+ final Set<Integer> selected = new HashSet<>();
+ final ListView<Integer> listView = new ListView<Integer>("list", extensibleChoices) {
+ @Override
+ protected void populateItem(final ListItem<Integer> item) {
+ final CheckBox check = new CheckBox("check", new Model<Boolean>() {
+ @Override
+ public Boolean getObject() {
+ return selected.contains(item.getModelObject());
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ if (object) {
+ selected.add(item.getModelObject());
+ } else {
+ selected.remove(item.getModelObject());
+ }
+ }
+ });
+ check.setLabel(() -> item.getModelObject().toString());
+ item.add(check);
+ }
+ };
+ listView.setReuseItems(true);
+ form.add(listView);
+ form.add(new Button("addChoice") {
+ @Override
+ public void onSubmit() {
+ extensibleChoices.add(extensibleChoices.get(extensibleChoices.size() - 1) + 1);
+ }
+ });
+ form.add(new Button("removeChoice") {
+
+ @Override
+ protected void onConfigure()
+ {
+ super.onConfigure();
+
+ setEnabled(extensibleChoices.size() > 1);
+ }
+
+ public void onSubmit()
+ {
+
+ Integer integer = extensibleChoices.get(extensibleChoices.size() - 1);
+ extensibleChoices.remove(integer);
+ selected.remove(integer);
+ }
+ });
+
+ final CheckBoxSelector extensibleSelector = new CheckBoxSelector("extensibleSelector") {
+ @Override
+ protected Iterable<? extends CheckBox> getCheckBoxes()
+ {
+ return collectCheckBoxes(listView);
+ }
+ };
+ form.add(extensibleSelector);
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.properties
index 6a4447b3d5..9fa334becf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckBoxSelectorPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.CheckBoxSelector
+order=10
+group=forms
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..1f3c617192 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,13 +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>
A CheckBoxGroup and CheckBoxComponnet components let users select multiple values from a group of checkboxes. These components are more flexible then the CheckBoxMultipleChoice component in that individual checkboxes are full components, unlike with CheckBoxMultipleChoice, and thus can be used anywhere in the markup.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
index 738920e28c..57ebff1e9d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.java
@@ -18,7 +18,6 @@ package org.apache.wicket.examples.compref;
import java.util.ArrayList;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Check;
import org.apache.wicket.markup.html.form.CheckGroup;
@@ -35,7 +34,7 @@ import org.apache.wicket.model.PropertyModel;
*
* @author ivaynberg
*/
-public class CheckGroupPage extends WicketExamplePage
+public class CheckGroupPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.properties
similarity index 84%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.properties
index 6a4447b3d5..d9baa3ea44 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector
+order=7
+group=forms
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..129d521f7d 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,13 +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>
A CheckBoxGroup and CheckBoxComponnet components let users select multiple values from a group of checkboxes. These components are more flexible then the CheckBoxMultipleChoice component in that individual checkboxes are full components, unlike with CheckBoxMultipleChoice, and thus can be used anywhere in the markup.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
index 7ae1e79689..078a684b0c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.java
@@ -1,85 +1,84 @@
-/*
- * 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.compref;
-
-import java.util.ArrayList;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Check;
-import org.apache.wicket.markup.html.form.CheckGroup;
-import org.apache.wicket.markup.html.form.CheckGroupSelector;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
-
-/**
- * CheckGroup and Check components example page
- *
- * @author ivaynberg
- */
-public class CheckGroupPage2 extends WicketExamplePage
-{
- /**
- * Constructor
- */
- public CheckGroupPage2()
- {
- final CheckGroup<Person> group = new CheckGroup<>("group", new ArrayList<Person>());
- final CheckGroup<Person> group2 = new CheckGroup<>("group2", new ArrayList<Person>());
- Form<?> form = new Form<Void>("form")
- {
- @Override
- protected void onSubmit()
- {
- info("selection 1 person(s): " + group.getDefaultModelObjectAsString());
- info("selection 2 person(s): " + group2.getDefaultModelObjectAsString());
- }
- };
-
- add(form);
- form.add(group);
- group.add(group2);
-
- group2.add(new CheckGroupSelector("groupselector", group));
- group2.add(new CheckGroupSelector("groupselector2", group2));
- ListView<Person> persons = new ListView<Person>("persons",
- ComponentReferenceApplication.getPersons())
- {
- @Override
- protected void populateItem(ListItem<Person> item)
- {
- IModel<Person> personModel = item.getModel();
- item.add(new Check<>("checkbox", personModel, group));
- item.add(new Check<>("checkbox2", personModel, group2));
- item.add(new Label("name",
- new PropertyModel<>(item.getDefaultModel(), "name")));
- item.add(new Label("lastName", new PropertyModel<String>(personModel,
- "lastName")));
- }
-
- };
-
- group2.add(persons);
-
- add(new FeedbackPanel("feedback"));
- }
-}
+/*
+ * 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.compref;
+
+import java.util.ArrayList;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Check;
+import org.apache.wicket.markup.html.form.CheckGroup;
+import org.apache.wicket.markup.html.form.CheckGroupSelector;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+
+/**
+ * CheckGroup and Check components example page
+ *
+ * @author ivaynberg
+ */
+public class CheckGroupPage2 extends ComprefPage
+{
+ /**
+ * Constructor
+ */
+ public CheckGroupPage2()
+ {
+ final CheckGroup<Person> group = new CheckGroup<>("group", new ArrayList<Person>());
+ final CheckGroup<Person> group2 = new CheckGroup<>("group2", new ArrayList<Person>());
+ Form<?> form = new Form<Void>("form")
+ {
+ @Override
+ protected void onSubmit()
+ {
+ info("selection 1 person(s): " + group.getDefaultModelObjectAsString());
+ info("selection 2 person(s): " + group2.getDefaultModelObjectAsString());
+ }
+ };
+
+ add(form);
+ form.add(group);
+ group.add(group2);
+
+ group2.add(new CheckGroupSelector("groupselector", group));
+ group2.add(new CheckGroupSelector("groupselector2", group2));
+ ListView<Person> persons = new ListView<Person>("persons",
+ ComponentReferenceApplication.getPersons())
+ {
+ @Override
+ protected void populateItem(ListItem<Person> item)
+ {
+ IModel<Person> personModel = item.getModel();
+ item.add(new Check<>("checkbox", personModel, group));
+ item.add(new Check<>("checkbox2", personModel, group2));
+ item.add(new Label("name",
+ new PropertyModel<>(item.getDefaultModel(), "name")));
+ item.add(new Label("lastName", new PropertyModel<String>(personModel,
+ "lastName")));
+ }
+
+ };
+
+ group2.add(persons);
+
+ add(new FeedbackPanel("feedback"));
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.properties
similarity index 84%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.properties
index 9deb6b628a..e6d38641e1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/CheckGroupPage2.properties
@@ -12,4 +12,6 @@
# 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.
-label.current.locale=Did you know your current browser''s locale is {0}?
+title=Embedded wicket.markup.html.form.CheckGroup, wicket.markup.html.form.Check, and wicket.markup.html.form.CheckGroupSelector
+order=8
+group=forms
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComprefPage.java
similarity index 65%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComprefPage.java
index e003d8a125..2452a9fdbc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComprefPage.java
@@ -14,27 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.linkomatic;
+package org.apache.wicket.examples.compref;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-
/**
- * Trivial bookmarkable page.
- *
- * @author Jonathan Locke
+ * Base for the pages of the component reference, each of which is listed on {@link Index}.
*/
-public class Page1 extends WicketExamplePage
+public abstract class ComprefPage extends WicketExamplePage
{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public ComprefPage()
+ {
+ }
/**
- * Constructor
- *
+ * Construct.
+ *
* @param parameters
+ * page parameters
*/
- public Page1(PageParameters parameters)
+ public ComprefPage(PageParameters parameters)
{
+ super(parameters);
}
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Index.class;
+ }
}
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..44b0547e5d 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,13 +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>
A DropDownChoice component is used to let users select an option from a list of
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
index d191bf0b58..68f07917e3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.GroupedDropDownChoice;
@@ -38,7 +37,7 @@ import org.apache.wicket.util.io.IClusterable;
*
* @author Eelco Hillenius
*/
-public class DropDownChoicePage extends WicketExamplePage
+public class DropDownChoicePage extends ComprefPage
{
/** available sites for selection. */
private static final List<String> SITES = Arrays.asList("The Server Side", "Java Lobby", "Java.Net");
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties
index 0065f0e42a..d7338dcacd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.properties
@@ -12,4 +12,7 @@
# 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.
+title=wicket.markup.html.form.DropDownChoice
+order=11
+group=forms
site.null=[make your selection]
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..d3be420fe6 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,13 +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>
External links take you outside the scope of Wicket. They can come in handy when you keep your
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java
index 69e86de3f6..fdf0a7ec5e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.ExternalLink;
@@ -25,7 +24,7 @@ import org.apache.wicket.markup.html.link.ExternalLink;
*
* @author Eelco Hillenius
*/
-public class ExternalLinkPage extends WicketExamplePage
+public class ExternalLinkPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.properties
index 6a4447b3d5..547468a602 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ExternalLinkPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.link.ExternalLink
+order=2
+group=links
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..2b0fe0423a 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,13 +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>
A Form is a component that has special interaction with nested form components.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java
index 8c21116932..09f75ab834 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -26,7 +25,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
*
* @author Eelco Hillenius
*/
-public class FormPage extends WicketExamplePage
+public class FormPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.properties
index 0ddaf4243b..c6c108534a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FormPage.properties
@@ -12,4 +12,6 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=wicket.markup.html.form.Form
+order=1
+group=forms
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..1787bd1b07 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,13 +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>
Use fragments for inline panels..<br />
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java
index e8a7bf60f7..9398bfd131 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -27,7 +26,7 @@ import org.apache.wicket.markup.html.panel.Fragment;
*
* @author Eelco Hillenius
*/
-public class FragmentPage extends WicketExamplePage
+public class FragmentPage extends ComprefPage
{
/**
* A fragment,
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.properties
index 6a4447b3d5..e2fbd9ae4a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/FragmentPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.panel.Fragment
+order=4
+group=layout
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..1829b40741 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,79 +1,20 @@
<?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.
It lists the main component set of Wicket, and shows
you how to use them with short examples. Read the comments on
the pages <i>and</i> in the Java sources.
+ <br/>
+ For more link examples see <a href="../linkomatic">Link-o-matic</a>, and for more form
+ examples see <a href="../forminput">FormInput</a>. The Label example is also available with
+ <wicket:link><a href="XmlPage.xml">alternative markup (XML)</a></wicket:link>.
</p>
- <p>
- 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="XmlPage.xml">alternative markup (XML)</a></li>
- </ul>
- </wicket:link>
- </p>
-
- <p>
- 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>
- </ul>
- </wicket:link>
- </p>
-
- <p>
- 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>
- </ul>
- </wicket:link>
- </p>
-
- <p>
- 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>
- </ul>
- </wicket:link>
- </p>
+ <div wicket:id="examples">[examples]</div>
</wicket:extend>
</body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
index a9c20858d5..cf9c9c3394 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.compref;
+import org.apache.wicket.examples.ExampleIndexPanel;
import org.apache.wicket.examples.WicketExamplePage;
/**
@@ -30,5 +31,6 @@ public class Index extends WicketExamplePage
*/
public Index()
{
+ add(new ExampleIndexPanel("examples", Index.class));
}
-}
\ No newline at end of file
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.properties
similarity index 84%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.properties
index 4d499b1343..6fbb6f4a77 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.properties
@@ -12,5 +12,9 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Component Reference
+groups=output,layout,links,forms
+group.output=Output
+group.layout=Layout and grouping
+group.links=Links
+group.forms=Forms
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..81751afda4 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,13 +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>
You use a label to display strings on your page.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
index 68d5331a80..513465a8a4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
@@ -18,7 +18,6 @@ package org.apache.wicket.examples.compref;
import java.util.Date;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -30,7 +29,7 @@ import org.apache.wicket.model.StringResourceModel;
*
* @author Eelco Hillenius
*/
-public class LabelPage extends WicketExamplePage
+public class LabelPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties
index 9deb6b628a..6333de0879 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.properties
@@ -12,4 +12,7 @@
# 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.
+title=wicket.markup.html.basic.Label
+order=1
+group=output
label.current.locale=Did you know your current browser''s locale is {0}?
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..2b0a3f45aa 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,13 +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>
Links are your basic call back mechanism. You can attach links to any element you want.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
index 096bfea529..3c0090464a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.PropertyModel;
@@ -27,7 +26,7 @@ import org.apache.wicket.model.PropertyModel;
*
* @author Eelco Hillenius
*/
-public class LinkPage extends WicketExamplePage
+public class LinkPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.properties
index 0ddaf4243b..a737b6b6af 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LinkPage.properties
@@ -12,4 +12,6 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=wicket.markup.html.link.Link
+order=1
+group=links
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..e116fa9baa 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,13 +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>
A ListChoice component lets users select a single value from a scrollable list.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
index 21bc4bf5ad..6a7b903e55 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.wicket.util.io.IClusterable;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.ListChoice;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -32,7 +31,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
*
* @author Eelco Hillenius
*/
-public class ListChoicePage extends WicketExamplePage
+public class ListChoicePage extends ComprefPage
{
/** available sites for selection. */
private static final List<String> SITES = Arrays.asList("The Server Side", "Java Lobby", "Java.Net");
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.properties
index 6a4447b3d5..9d9c808e94 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListChoicePage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.ListChoice
+order=12
+group=forms
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..7012f1325a 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,13 +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>
A ListChoice component lets users select a multiple values from a scrollable list.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
index 867ebb5bee..d912c8e6d2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -34,7 +33,7 @@ import org.apache.wicket.util.string.Strings;
*
* @author Eelco Hillenius
*/
-public class ListMultipleChoicePage extends WicketExamplePage
+public class ListMultipleChoicePage extends ComprefPage
{
/** available sites for selection. */
private static final List<String> SITES = Arrays.asList("The Server Side", "Java Lobby", "Java.Net");
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.properties
index 6a4447b3d5..b17a2325ac 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ListMultipleChoicePage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.ListMultipleChoice
+order=16
+group=forms
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..8e2f4f66ee 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,13 +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>
Unlike Label, MultiLineLabel shows text that spans multiple lines by inserting
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.java
index ec54dd628d..46541e8ff5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
@@ -25,7 +24,7 @@ import org.apache.wicket.markup.html.basic.MultiLineLabel;
*
* @author Eelco Hillenius
*/
-public class MultiLineLabelPage extends WicketExamplePage
+public class MultiLineLabelPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.properties
index 6a4447b3d5..83a1d16862 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/MultiLineLabelPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.basic.MultiLineLabel
+order=2
+group=output
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..bbd734aa67 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,13 +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>
The Palette component.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
index 71387a90e2..0666938836 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java
@@ -19,7 +19,6 @@ package org.apache.wicket.examples.compref;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.extensions.markup.html.form.palette.theme.DefaultTheme;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -38,7 +37,7 @@ import org.apache.wicket.request.resource.CssResourceReference;
*
* @author ivaynberg
*/
-public class PalettePage extends WicketExamplePage
+public class PalettePage extends ComprefPage
{
private static final long serialVersionUID = 1L;
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.properties
index 6a4447b3d5..3fdddc0f2d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.extensions.markup.html.palette.Palette
+order=18
+group=forms
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..0c7d71357e 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,13 +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>
Use panels to group markup and components.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.java
index b093e4a646..f6b768b5d7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
/**
* Page with examples on {@link org.apache.wicket.markup.html.panel.Panel}.
*
* @author Eelco Hillenius
*/
-public class PanelPage extends WicketExamplePage
+public class PanelPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.properties
index 6a4447b3d5..72614b6529 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PanelPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.panel.Panel
+order=1
+group=layout
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..66e87b5f04 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,13 +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>
A RadioChoice component lets users select a single value from a group of radio buttons.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
index bec789a4c7..892280ea29 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.wicket.util.io.IClusterable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -34,7 +33,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
*
* @author Eelco Hillenius
*/
-public class RadioChoicePage extends WicketExamplePage
+public class RadioChoicePage extends ComprefPage
{
/** available sites for selection. */
private static final List<String> SITES = Arrays.asList("The Server Side", "Java Lobby", "Java.Net");
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.properties
index 6a4447b3d5..cb63a39c6b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioChoicePage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.RadioChoice
+order=13
+group=forms
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..9d42a2f824 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,13 +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>
A RadioGroup and Radio components let users select a single value from a group of radio buttons. These components are more flexible then the RadioChoice component in that individual radio choices are full components, unlike with RadioChoice, and thus can be used anywhere in the markup.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
index 79d7189ea8..d725a31225 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.Radio;
@@ -34,7 +33,7 @@ import org.apache.wicket.model.PropertyModel;
*
* @author ivaynberg
*/
-public class RadioGroupPage extends WicketExamplePage
+public class RadioGroupPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.properties
similarity index 89%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.properties
index 6a4447b3d5..d8040648d4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio
+order=14
+group=forms
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..dd1a79ab0b 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,13 +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>
A RadioGroup and Radio components let users select a single value from a group of radio buttons. These components are more flexible then the RadioChoice component in that individual radio choices are full components, unlike with RadioChoice, and thus can be used anywhere in the markup.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
index b5e8998c4d..7820da42bf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.java
@@ -1,80 +1,79 @@
-/*
- * 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.compref;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.Radio;
-import org.apache.wicket.markup.html.form.RadioGroup;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-
-
-/**
- * RadioGroup and Radio components example page
- *
- * @author ivaynberg
- */
-public class RadioGroupPage2 extends WicketExamplePage
-{
- /**
- * Constructor
- */
- public RadioGroupPage2()
- {
-
- final RadioGroup<Person> group = new RadioGroup<>("group", new Model<Person>());
- final RadioGroup<Person> group2 = new RadioGroup<>("group2", new Model<Person>());
- Form<?> form = new Form<Void>("form")
- {
- @Override
- protected void onSubmit()
- {
- info("selection group1: " + group.getDefaultModelObjectAsString());
- info("selection group2: " + group2.getDefaultModelObjectAsString());
- }
- };
-
- add(form);
- form.add(group);
- group.add(group2);
-
- ListView<Person> persons = new ListView<Person>("persons",
- ComponentReferenceApplication.getPersons())
- {
- @Override
- protected void populateItem(ListItem<Person> item)
- {
- IModel<Person> model = item.getModel();
- item.add(new Radio<>("radio", model, group));
- item.add(new Radio<>("radio2", model, group2));
- item.add(new Label("name", new PropertyModel<>(model, "name")));
- item.add(new Label("lastName", new PropertyModel<String>(model, "lastName")));
- }
- };
-
- group2.add(persons);
-
- add(new FeedbackPanel("feedback"));
- }
-
-}
+/*
+ * 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.compref;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+
+
+/**
+ * RadioGroup and Radio components example page
+ *
+ * @author ivaynberg
+ */
+public class RadioGroupPage2 extends ComprefPage
+{
+ /**
+ * Constructor
+ */
+ public RadioGroupPage2()
+ {
+
+ final RadioGroup<Person> group = new RadioGroup<>("group", new Model<Person>());
+ final RadioGroup<Person> group2 = new RadioGroup<>("group2", new Model<Person>());
+ Form<?> form = new Form<Void>("form")
+ {
+ @Override
+ protected void onSubmit()
+ {
+ info("selection group1: " + group.getDefaultModelObjectAsString());
+ info("selection group2: " + group2.getDefaultModelObjectAsString());
+ }
+ };
+
+ add(form);
+ form.add(group);
+ group.add(group2);
+
+ ListView<Person> persons = new ListView<Person>("persons",
+ ComponentReferenceApplication.getPersons())
+ {
+ @Override
+ protected void populateItem(ListItem<Person> item)
+ {
+ IModel<Person> model = item.getModel();
+ item.add(new Radio<>("radio", model, group));
+ item.add(new Radio<>("radio2", model, group2));
+ item.add(new Label("name", new PropertyModel<>(model, "name")));
+ item.add(new Label("lastName", new PropertyModel<String>(model, "lastName")));
+ }
+ };
+
+ group2.add(persons);
+
+ add(new FeedbackPanel("feedback"));
+ }
+
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.properties
similarity index 88%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.properties
index 6a4447b3d5..d5f9f927d7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/RadioGroupPage2.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Embedded wicket.markup.html.form.RadioGroup and wicket.markup.html.form.Radio
+order=15
+group=forms
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..4ee11c58fc 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,13 +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>
A ListChoice component lets users select a multiple values from a scrollable list.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
index edc4c3cdeb..f764e879be 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.markup.html.form.select.IOptionRenderer;
import org.apache.wicket.extensions.markup.html.form.select.Select;
import org.apache.wicket.extensions.markup.html.form.select.SelectOption;
@@ -40,7 +39,7 @@ import org.apache.wicket.util.io.IClusterable;
* @author Igor Vaynberg (ivaynberg)
* @author Eelco Hillenius
*/
-public class SelectPage extends WicketExamplePage
+public class SelectPage extends ComprefPage
{
/** available choices for large selection box. */
private static final List<String> MANY_CHOICES = Arrays.asList("Choice1", "Choice2",
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.properties
index 6a4447b3d5..b258493130 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.extensions.markup.html.form.select.Select
+order=17
+group=forms
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..832a58d088 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,13 +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>
A SubmitLink is a special link that acts like a submit button.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java
index b98b88bebd..5a32ad5ffd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.compref;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnEventHeaderItem;
import org.apache.wicket.markup.html.form.Form;
@@ -29,7 +28,7 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
*
* @author Eelco Hillenius
*/
-public class SubmitLinkPage extends WicketExamplePage
+public class SubmitLinkPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.properties
similarity index 92%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.properties
index 6a4447b3d5..0e4dfce897 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SubmitLinkPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.SubmitLink
+order=3
+group=forms
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..ab8119e611 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,13 +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>
A tabbed panel that switches child panels to reflect the selected tab. Images and css styles are from <a href="http://www.alistapart.com/articles/slidingdoors/" target="_new">this</a> sliding doors article at alistapart.com.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
index 06db52f2b0..c1db96302a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
@@ -37,7 +36,7 @@ import org.apache.wicket.model.Model;
* @author igor
*
*/
-public class TabbedPanelPage extends WicketExamplePage
+public class TabbedPanelPage extends ComprefPage
{
private static final long serialVersionUID = 1L;
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.properties
similarity index 90%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.properties
index 6a4447b3d5..72fb22cd7c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TabbedPanelPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.tabs.TabbedPanel (wicket-extensions)
+order=3
+group=layout
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..19a748c3b0 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,13 +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>
A TextArea is like a TextField, but is used for multiple rows of text.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
index 486a0f5c9f..7d5a1f6449 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.util.io.IClusterable;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -29,7 +28,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
*
* @author Eelco Hillenius
*/
-public class TextAreaPage extends WicketExamplePage
+public class TextAreaPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.properties
index 6a4447b3d5..21c48a33ee 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextAreaPage.properties
@@ -12,6 +12,6 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=wicket.markup.html.form.TextArea
+order=5
+group=forms
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..4da042391d 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,13 +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>
A Textfield is used to transfer a single line of text. As other form components, textfields
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
index f06b400296..55ad405214 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.compref;
import org.apache.wicket.util.io.IClusterable;
-import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -29,7 +28,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
*
* @author Eelco Hillenius
*/
-public class TextFieldPage extends WicketExamplePage
+public class TextFieldPage extends ComprefPage
{
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
index 355bdb4c28..8ad5a7d879 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.properties
@@ -12,4 +12,7 @@
# 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.
+title=wicket.markup.html.form.TextField
+order=4
+group=forms
form.integer.IConverter='${label}' is not an integer
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..71181f6c32 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,11 +1,9 @@
<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>
<div class="injected-style"><wicket:message key="styleInjectionContainer"/></div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.properties
index 4d9eb017ad..edac8f3ca6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/csp/NonceDemoPage.properties
@@ -12,6 +12,8 @@
# 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.
+title=CSP Nonce Demo
+explanation=<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>
testNonceScript = This text should be replaced: fail
testNoNonceScript = This text should not be replaced: success
styleInjectionContainer = This text should not be red
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.properties
similarity index 91%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.properties
index 6a4447b3d5..1e2cc8f540 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Template loaded from the web context, disregarding package and locale
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..0bf75ed664 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,20 +23,9 @@
Source code
</a>
</div>
- <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
- component that loads it's template from a database and for which you don't want the application
- to have to know about it's differing loading resource.
- </p>
- <p>
- This example loads the custom template just once, though it may reload when resource polling is
- turned on and the template changes. If you want a load the template every time a page (or panel)
- is requested, you can additionally let your container implement IMarkupCacheKeyProvider, and then
- return null in the implementation of getCacheKey; Wicket will not cache templates without a
- cache key. This functionality can be used to e.g. when you want to load templates from a database,
- and you know that the actual templates can be different from request to request.
- </p>
+ <h1 wicket:id="exampleTitle">[example title]</h1>
+ <div wicket:id="explanation" class="explanation">[what this example shows]</div>
+ <wicket:container wicket:id="navigation">[navigation]</wicket:container>
</div>
</main>
</body>
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/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
index 97662cb9bd..817d757946 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.customresourceloading;
+import org.apache.wicket.examples.homepage.TemplatingIndex;
+
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -27,6 +29,18 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
*/
public class Index extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return TemplatingIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "templating";
+ }
+
/**
* Constructor.
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.properties
index 3a8bc87792..507dfaa50d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Custom Template Loading
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.properties
index 3a8bc87792..fff877a8bf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Template loaded from the web context
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.properties
new file mode 100644
index 0000000000..138b56d451
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.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.
+title=Template loaded by the page itself
+explanation=<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 component that loads it's template from a database and for which you don't want the application to have to know about it's differing loading resource. </p> <p> This example loads the custom template just once, though it may reload when resource polling is turned on and the temp [...]
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/DateTimePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java
index e3e0b9773b..f0ed205e1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.java
@@ -26,6 +26,7 @@ import java.time.format.FormatStyle;
import java.time.format.TextStyle;
import java.util.List;
import java.util.Locale;
+import java.util.TimeZone;
import java.util.stream.Collectors;
import org.apache.wicket.Session;
@@ -203,8 +204,10 @@ public class DateTimePage extends WicketExamplePage
{
super.onInitialize();
- clientZone = ((WebClientInfo)Session.get().getClientInfo()).getProperties().getTimeZone()
- .toZoneId();
+ TimeZone reported = ((WebClientInfo)Session.get().getClientInfo()).getProperties()
+ .getTimeZone();
+
+ clientZone = reported == null ? ZoneId.systemDefault() : reported.toZoneId();
}
/**
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
index 6a4447b3d5..7f49ae35f3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
@@ -12,6 +12,7 @@
# 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.
+title=Dates and Times
locale=Locale
default=default
clientZone=Client timezone
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.properties
index 3a8bc87792..fac223652d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.properties
index 3a8bc87792..c23e218d71 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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
deleted file mode 100644
index ea6236f00a..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title>Wicket Examples - Events</title>
-</head>
-<body>
-<wicket:extend>
- <a href="Index.html" wicket:id="back">[go back]</a><p/>
- <wicket:child/>
-</wicket:extend>
-</body>
-</html>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
index 839f3b23f2..b721e9439a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/BasePage.java
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.events;
import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
/**
@@ -25,11 +24,9 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
*/
public abstract class BasePage extends WicketExamplePage
{
- /**
- * Constructor
- */
- public BasePage()
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
{
- add(new BookmarkablePageLink<>("back", IndexPage.class).setAutoEnable(true));
+ return IndexPage.class;
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.properties
index 3a8bc87792..6a54d8ae56 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Decoupled Ajax Update
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..fd9deb3096 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,5 @@
-<wicket:extend xmlns:wicket="http://wicket.apache.org">
-
-<wicket:link>
- <a href="DecoupledAjaxUpdatePage.html">Decoupled Ajax Update</a>
-</wicket:link>
-
-</wicket:extend>
\ No newline at end of file
+<wicket:extend xmlns:wicket="http://wicket.apache.org">
+
+<div wicket:id="examples">[examples]</div>
+
+</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.java
index 317ed66f03..da54b5b5c2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.java
@@ -1,26 +1,34 @@
-/*
- * 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.events;
-
-
-/**
- * @author igor
- */
-public class IndexPage extends BasePage
-{
-
-}
+/*
+ * 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.events;
+
+import org.apache.wicket.examples.ExampleIndexPanel;
+
+
+/**
+ * @author igor
+ */
+public class IndexPage extends BasePage
+{
+ /**
+ * Construct.
+ */
+ public IndexPage()
+ {
+ add(new ExampleIndexPanel("examples", IndexPage.class));
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.properties
index 3a8bc87792..e1c2ec85ae 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/IndexPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Events
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/FormInput.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
index 3474afbc6d..df8c18b5f6 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.properties
@@ -12,6 +12,7 @@
# 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.
+title=Form Input
inputForm.urlProperty.IConverter='${label}' is not a valid URL
inputForm.phoneNumberUS.IConverter='${label}' is not a valid US phone number
use.locale=Use locale:
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/frames/TopFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java
index ad1c5132f4..243f6648d0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/TopFrame.java
@@ -25,6 +25,12 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class TopFrame extends WicketExamplePage
{
+ @Override
+ protected boolean showNavigation()
+ {
+ return false;
+ }
+
/**
* Constructor
*/
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.properties
index 3a8bc87792..1f93a1e68b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..b85b7ce86d 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,20 +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 - guice</title>
</head>
<body>
<wicket:extend>
- <p>
- This page uses <a href="http://code.google.com/p/google-guice/">Google Guice</a>.
- There is a service interface called <code>IMyService</code>, with an implementation POJO called <code>MyService</code>.
- Guice is used to wire the implementation into the <code>Page</code> using an <code>@Inject</code> annotation. You can use this
- annotation on the fields of any <code>Component</code> subclass.
- </p>
- <p>
- The value of the <code>Label</code> component below will be updated with the return value from one of the service's methods when you click the link.
- </p>
- <hr />
+
<blockquote>
Value: <b wicket:id="message" id="message">Message goes here</b>
<br />
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
index 560e866aad..2064bbbbcd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.guice;
+import org.apache.wicket.examples.homepage.InjectionIndex;
+
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.guice.service.IMyService;
import org.apache.wicket.markup.html.basic.Label;
@@ -30,6 +32,18 @@ import com.google.inject.Inject;
*/
public class HomePage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return InjectionIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "injection";
+ }
+
@Inject
private IMyService service;
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.properties
similarity index 56%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.properties
index 4d499b1343..3775586a16 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Guice Integration
+explanation=<p> This page uses <a href="http://code.google.com/p/google-guice/">Google Guice</a>. There is a service interface called <code>IMyService</code>, with an implementation POJO called <code>MyService</code>. Guice is used to wire the implementation into the <code>Page</code> using an <code>@Inject</code> annotation. You can use this annotation on the fields of any <code>Component</code> subclass. </p> <p> The value of the <code>Label</code> component below will be updated with [...]
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.properties
index 3a8bc87792..7fdccbe694 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Hangman
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..9b143164e2 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,15 +1,7 @@
<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.
- <br />
- A word is chosen at random and displayed as a series of blanks.
- <br />
- You then have 5 opportunities to pick letters from the list of available letters.
- </p>
+
<p><a wicket:id="start" id="start" href="#">Start Hangman</a></p>
</wicket:extend>
</body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.properties
similarity index 77%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.properties
index 3a8bc87792..78ad64d20a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.properties
@@ -12,4 +12,5 @@
# 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.
-noBookTitle=None
+title=Hangman
+explanation=<p>This software plays a game of hangman. <br /> A word is chosen at random and displayed as a series of blanks. <br /> You then have 5 opportunities to pick letters from the list of available letters. </p>
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.properties
index 3a8bc87792..6d1da63ca4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Hangman - You Lose
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.properties
index 3a8bc87792..dc4f531cbe 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Hangman - You Win
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/HelloBrowser.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java
index d901e5fa84..7f441b30cb 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.hellobrowser;
+import org.apache.wicket.examples.homepage.BrowserInfoIndex;
+
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Locale;
@@ -37,6 +39,18 @@ import org.apache.wicket.protocol.http.request.WebClientInfo;
*/
public class HelloBrowser extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return BrowserInfoIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "browserinfo";
+ }
+
/**
* Construct.
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.properties
index 3a8bc87792..02fca2cd4d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.properties
index 3a8bc87792..101d8f29c7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorld.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Hello World
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.java
index ab69186acd..fd4f4a2283 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class AuthenticationIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.properties
similarity index 58%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.properties
index 4d499b1343..462ead9670 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/AuthenticationIndex.properties
@@ -12,5 +12,13 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Authentication and authorization
+examples=authentication1,authentication2,authentication3,authorization
+authentication1.title=authentication-1
+authentication1.description=A very simple authentication example.
+authentication2.title=authentication-2
+authentication2.description=A little bit more advanced authentication example (using cookies).
+authentication3.title=authentication-3
+authentication3.description=Demonstrates authentication for pages.
+authorization.title=authorization
+authorization.description=Demonstrates authorization for pages and components.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.java
index ab69186acd..f7d44504bd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class BrowserInfoIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.properties
similarity index 63%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.properties
index 318486e8c9..caa21e1df8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/BrowserInfoIndex.properties
@@ -12,12 +12,11 @@
# 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.
-
-# NOTE: this file has to be encoded in UTF-8 !!!
-actions = Actions
-id = ID
-firstName = First Name
-lastName = Last Name
-homePhone = Home Phone
-cellPhone = Cell Phone
-bornDate = Birthday
\ No newline at end of file
+title=Browser info
+examples=hellobrowser,ajaxhellobrowser,ajaxhellobrowserondomready
+hellobrowser.title=Browser Info
+hellobrowser.description=Extracts client info by redirecting to a temporary page.
+ajaxhellobrowser.title=Ajax Browser Info
+ajaxhellobrowser.description=Extracts client info by using Ajax.
+ajaxhellobrowserondomready.title=Ajax Browser Info (OnDomReady)
+ajaxhellobrowserondomready.description=Extracts client info by using Ajax (using on DOM ready).
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.java
index ab69186acd..4d2da8a659 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class CaptchaIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.properties
similarity index 76%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.properties
index 4d499b1343..5914277f14 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/CaptchaIndex.properties
@@ -12,5 +12,9 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Captcha
+examples=captcha,kitten-captcha
+captcha.title=Captcha
+captcha.description=Image-based "captcha" to distinguish humans from spammers.
+kitten-captcha.title=Kitten captcha
+kitten-captcha.description=Another approach to captchas.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java
index 462eda9c6a..838081cc3f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java
@@ -39,5 +39,11 @@ public class HomePageApplication extends WicketExampleApplication
super.init();
mountPage("index.html", HomePage.class);
+ mountPage("authentication", AuthenticationIndex.class);
+ mountPage("browserinfo", BrowserInfoIndex.class);
+ mountPage("localization", LocalizationIndex.class);
+ mountPage("captchas", CaptchaIndex.class);
+ mountPage("templating", TemplatingIndex.class);
+ mountPage("injection", InjectionIndex.class);
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.java
index ab69186acd..9089efa20e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class InjectionIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.properties
index 4d499b1343..2ae35f4b67 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/InjectionIndex.properties
@@ -12,5 +12,11 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Dependency injection
+examples=spring,guice,cdi
+spring.title=Spring
+spring.description=Demonstrates integration options with the Spring framework.
+guice.title=Guice
+guice.description=Integration with the Google Guice IoC container.
+cdi.title=CDI
+cdi.description=Context Dependency and Injection integration.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.java
index ab69186acd..09ab1e4989 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class LocalizationIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.properties
similarity index 84%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.properties
index 6a4447b3d5..75e5bacdf3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/LocalizationIndex.properties
@@ -12,6 +12,9 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Localization
+examples=pub,pub2
+pub.title=Pub
+pub.description=Localization.
+pub2.title=Pub 2
+pub2.description=Alternative localization.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.java
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.java
index ab69186acd..53a860284c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/authentication1/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.java
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.authentication1;
-
-import org.apache.wicket.examples.WicketExamplePage;
+package org.apache.wicket.examples.homepage;
+import org.apache.wicket.examples.ExamplesIndexPage;
/**
- * Simple home page, which requires authentication
- *
- * @author Jonathan Locke
+ * Gathers a few examples that are applications of their own under one entry of the main menu.
*/
-public class Home extends WicketExamplePage implements AuthenticatedWebPage
+public class TemplatingIndex extends ExamplesIndexPage
{
- // Nothing in here.
+ private static final long serialVersionUID = 1L;
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.properties
similarity index 67%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.properties
index 4d499b1343..4c37b2c7e7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/TemplatingIndex.properties
@@ -12,5 +12,11 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Templating
+examples=template,mailtemplate,customresourceloading
+template.title=Template
+template.description=Markup inheritance and borders.
+mailtemplate.title=Mail template
+mailtemplate.description=Generate mail templates out of Page, Panel or TextTemplate.
+customresourceloading.title=Custom template loading
+customresourceloading.description=Demonstrates custom template loading.
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.properties
index 3a8bc87792..b487a0dfcc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
index f20e2c834f..b9d1545005 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.kittenCaptcha;
+import org.apache.wicket.examples.homepage.CaptchaIndex;
+
import java.awt.Dimension;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -29,6 +31,18 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class HomePage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return CaptchaIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "captchas";
+ }
+
private static final long serialVersionUID = 1L;
private final KittenCaptchaPanel captcha;
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.properties
index 3a8bc87792..a5425e3324 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..9842d92e06 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,13 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - library</title>
</head>
<body>
<wicket:extend>
<p>
- <wicket:link><a href = "Home.html">Home</a></wicket:link> 
<wicket:link><a href="SignOut.html">Sign Out</a></wicket:link>
<br />
<div class="library-content">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
index b6676550d1..26c34e5226 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
@@ -32,6 +32,12 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class AuthenticatedWebPage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Get downcast session object
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.properties
index f652625695..0e52f64c2b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.properties
@@ -12,6 +12,7 @@
# 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.
+title=Library - Book Details
noBookTitle=None
funny=Funny
boring=Boring
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
index 62063ed9f3..85829c658e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.properties
@@ -12,6 +12,7 @@
# 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.
+title=Library - Edit Book
title.Required=You must include a valid, non-empty title
author.Required=You must include a valid, non-empty author
title.StringValidator.maximum=The value '${label}' is longer than ${maximum} characters.
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/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
index 3a8bc87792..4b4ad25f96 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
@@ -12,4 +12,5 @@
# 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.
+title=Library
noBookTitle=None
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..b4d4e551e4 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,14 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
- <title>Wicket Examples - library</title>
-</wicket:head>
<body>
<wicket:extend>
- <p>
- <i>Username and password are both "wicket"</i>
- </p>
+
<span wicket:id = "signInPanel"/>
</wicket:extend>
</body>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
index 0ddaf4243b..d1277ddead 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
@@ -12,4 +12,6 @@
# 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.
+title=Library - Sign In
+explanation=<p> <i>Username and password are both "wicket"</i> </p>
couldNotAuthenticate=Invalid username or password
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..3754ce18b9 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,11 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - signin2</title>
</head>
<body>
<wicket:extend>
<h2>Goodbye!</h2>
- <wicket:link><a href="Home.html">Home</a></wicket:link>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
index d72265f620..a359b87f93 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.java
@@ -1,39 +1,45 @@
-/*
- * 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.library;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * Simple logout page.
- *
- * @author Jonathan Locke
- */
-public class SignOut extends WicketExamplePage
-{
- /**
- * Constructor
- *
- * @param parameters
- * Page parameters (ignored since this is the home page)
- */
- public SignOut(final PageParameters parameters)
- {
- getSession().invalidate();
- }
-}
+/*
+ * 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.library;
+
+import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * Simple logout page.
+ *
+ * @author Jonathan Locke
+ */
+public class SignOut extends WicketExamplePage
+{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * Page parameters (ignored since this is the home page)
+ */
+ public SignOut(final PageParameters parameters)
+ {
+ getSession().invalidate();
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.properties
index 3a8bc87792..a10a5a2149 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignOut.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..f2836874cb 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
<wicket:extend>
<h2>Title: <span wicket:id = "title">Huckleberry Finn</span></h2>
-
- <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.java
index a307836ce4..43fd2dba33 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.java
@@ -27,6 +27,12 @@ import org.apache.wicket.markup.html.basic.Label;
*/
public final class BookDetails extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.properties
index 3a8bc87792..310c9f76ef 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/BookDetails.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Link-o-matic - Book Details
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.properties
index 3a8bc87792..78aa651cfd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Link-o-matic
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..e92e396cdb 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
<wicket:extend>
<h2>Welcome to Page1</h2>
-
- <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
index e003d8a125..9216ad6490 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
@@ -27,6 +27,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page1 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.properties
index 3a8bc87792..fc8bc73b32 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Link-o-matic - Page 1
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..ccb282f9bb 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - linkomatic</title>
</head>
<body>
<wicket:extend>
<h2>Welcome to Page2</h2>
-
- <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
index 093c277f21..5cdec11bee 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
@@ -27,6 +27,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page2 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.properties
index 3a8bc87792..29f483523e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Link-o-matic - Page 2
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..c3873656d0 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>
@@ -11,8 +10,6 @@
<p>
Your ExternalPageLink parameter "bookmarkparameter" has the value "<span wicket:id = "bookmarkparameter">-1</span>"
</p>
-
- <p><wicket:link><a href="Home.html">[go back]</a></wicket:link></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
index 749971cc67..842952d535 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
@@ -28,6 +28,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page3 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.properties
index 3a8bc87792..b41def927a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Link-o-matic - Page 3
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.properties
index 3a8bc87792..96f19231c9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Popup.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..b5e938a8f4 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,11 +1,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - videos</title>
</head>
<body>
<wicket:extend>
- <h2>Below there are three types of videos to show the basic functionality of Wicket's media implementation</h2>
- <h3>The implementation features full support of video / audio / source / track tags.</h3>
+
<div>
<!-- Video 1 -->
<video wicket:id="video1" ></video>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.properties
similarity index 77%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.properties
index 3a8bc87792..7fba059bb7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.properties
@@ -12,4 +12,5 @@
# 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.
-noBookTitle=None
+title=HTML5 Media Tags
+explanation=<p>Below there are three types of videos to show the basic functionality of Wicket's media implementation</p> <p>The implementation features full support of video / audio / source / track tags.</p>
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.properties
index 3a8bc87792..00a244c53a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page1.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nav-o-matic - Page 1
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.properties
index 3a8bc87792..788d24cdb7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page2.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nav-o-matic - Page 2
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.properties
index 3a8bc87792..96557f4bfe 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/Page3.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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..697c1aa165 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,15 +1,8 @@
<html xmlns:wicket="http://wicket.apache.org">
- <wicket:head>
- <title>Wicket Examples - niceurl</title>
- </wicket:head>
<body>
<wicket:extend>
- <p>
- This example displays how you can work with 'nice' urls for bookmarkable pages.
- </p>
-
<p>
These links refer to pages that were mounted one by one <br />
<a wicket:id="page1Link">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.properties
similarity index 87%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.properties
index 3a8bc87792..1eb6ec3276 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.properties
@@ -12,4 +12,5 @@
# 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.
-noBookTitle=None
+title=Nice URLs
+explanation=<p> This example displays how you can work with 'nice' urls for bookmarkable pages. </p>
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..e92e396cdb 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
<wicket:extend>
<h2>Welcome to Page1</h2>
-
- <p><a wicket:id="homeLink" href="#">[go back]</a></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
index 3117780f9f..c460251efe 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
@@ -28,6 +28,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page1 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
@@ -35,6 +41,5 @@ public class Page1 extends WicketExamplePage
*/
public Page1(PageParameters parameters)
{
- add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.properties
index 3a8bc87792..f0c3cab8c8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nice URLs - Page 1
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..d7a6bd6fae 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>
@@ -8,8 +7,6 @@
<h2>Welcome to Page2</h2>
- <p><a wicket:id="homeLink" href="#">[go back]</a></p>
-
param1: <span wicket:id="p1">param1</span><br/>
param2: <span wicket:id="p2">param2</span><br/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
index d856113bd9..64ae2d122c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
@@ -31,6 +31,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page2 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
private final Random random = new Random();
/**
@@ -54,7 +60,5 @@ public class Page2 extends WicketExamplePage
BookmarkablePageLink<?> link = new BookmarkablePageLink<>("refreshLink", getClass(), params);
add(link);
-
- add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.properties
index 3a8bc87792..efa39b4e10 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nice URLs - Page 2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.properties
similarity index 90%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.properties
index 6a4447b3d5..3caa3f9b14 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2PP.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Nice URLs - Page 2, parameters encoded with placeholders in the segments
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.properties
similarity index 90%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.properties
index 6a4447b3d5..bcddc7dea1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2UP.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Nice URLs - Page 2, parameters encoded in the segments in Wicket 1.4 style
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..ff281da3f1 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
<wicket:extend>
<h2>Welcome to Page3</h2>
-
- <p><a wicket:id="homeLink" href="#">[go back]</a></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
index b159b347ef..015b9b0cf1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
@@ -29,6 +29,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page3 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
@@ -36,6 +42,5 @@ public class Page3 extends WicketExamplePage
*/
public Page3(PageParameters parameters)
{
- add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.properties
index 3a8bc87792..967af28b1b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nice URLs - Page 3
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..34cdeeb792 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,14 +1,11 @@
<html xmlns:wicket="http://wicket.apache.org">
<head>
- <title>Wicket Examples - niceurl</title>
</head>
<body>
<wicket:extend>
<h2>Welcome to Page4</h2>
-
- <p><a wicket:id="homeLink" href="#">[go back]</a></p>
</wicket:extend>
</body>
</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
index 9b4f8f5beb..b5b42ca600 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
@@ -29,6 +29,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class Page4 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
/**
* Constructor
*
@@ -36,6 +42,5 @@ public class Page4 extends WicketExamplePage
*/
public Page4(PageParameters parameters)
{
- add(new BookmarkablePageLink<>("homeLink", Home.class));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.properties
index 3a8bc87792..eedad6b0f3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Nice URLs - Page 4
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..48618a39a7 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>
@@ -8,8 +7,6 @@
<h2>Welcome to Page2</h2>
- <p><a wicket:id="homeLink" href="#">[go back]</a></p>
-
param1: <span wicket:id="p1">param1</span><br/>
param2: <span wicket:id="p2">param2</span><br/>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
index d40480c308..8f44252220 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
@@ -34,6 +34,12 @@ import org.apache.wicket.util.string.StringValue;
*/
public class Page5 extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Home.class;
+ }
+
private final Random random = new Random();
/**
@@ -66,7 +72,6 @@ public class Page5 extends WicketExamplePage
BookmarkablePageLink<?> link = new BookmarkablePageLink<>("refreshLink", Page5.class, params);
add(link);
- add(new BookmarkablePageLink<>("homeLink", Home.class));
}
/**
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.properties
index 3a8bc87792..aa2801ba0b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
index c4bcdbb9d8..39aa95f5ed 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.pub;
+import org.apache.wicket.examples.homepage.LocalizationIndex;
+
import java.util.Locale;
import org.apache.wicket.examples.WicketExamplePage;
@@ -37,6 +39,18 @@ import org.apache.wicket.util.value.ValueMap;
*/
public final class Home extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return LocalizationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "localization";
+ }
+
/**
* Constructor
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties
index dd54b1f274..e6ca659f49 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties
@@ -12,4 +12,5 @@
# 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.
+title=Localization
salutation=${user}, dude!
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/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/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
index 13d7010836..e6c6fed11c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java
@@ -1,91 +1,105 @@
-/*
- * 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.pub2;
-
-import java.util.Locale;
-
-import org.apache.wicket.examples.WicketExamplePage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.value.ValueMap;
-
-
-/**
- * Demonstrates localization.
- *
- * @author Jonathan Locke
- * @author Eelco Hillenius
- */
-public final class Home extends WicketExamplePage
-{
- /**
- * Constructor
- *
- * @param parameters
- * Page parameters (ignored since this is the home page)
- */
- public Home(final PageParameters parameters)
- {
- // create a dummy object to serve as our substitution model
- ValueMap map = new ValueMap();
- map.put("user", "Jonathan");
-
- // Here, we create a model that knows how to get localized strings.
- // It uses the page's resource (Home_cc_LC.properties) and gets the
- // text with resource key 'salution'. For the US, this is:
- // salutation=${user}, dude!
- // variable ${user} will be regconized as a property variable, and will
- // be substituted with the given model (the wrapped map). Hence,
- // ${user} will be replaced by map.get('user'), which is 'Jonathan'.
- StringResourceModel labelModel = new StringResourceModel("salutation", this,
- new Model<>(map));
-
- // Add the label with the dynamic model
- add(new Label("salutation", labelModel));
-
- // Add a couple of links to be able to play around with the session
- // locale
- add(new SetLocaleLink("goCanadian", Locale.CANADA));
- add(new SetLocaleLink("goUS", Locale.US));
- add(new SetLocaleLink("goDutch", Locale.of("nl", "NL")));
- add(new SetLocaleLink("goGerman", Locale.of("de", "DE")));
- add(new SetLocaleLink("goChinese", Locale.of("zh", "CN")));
- add(new SetLocaleLink("goDanish", Locale.of("da", "DK")));
- add(new SetLocaleLink("goKorean", Locale.of("ko", "KR")));
- add(new SetLocaleLink("goHungarian", Locale.of("hu")));
- }
-
- private static class SetLocaleLink extends Link<Void> {
-
- private final Locale locale;
-
- private SetLocaleLink(String id, Locale locale)
- {
- super(id);
- this.locale = locale;
- }
-
- @Override
- public void onClick()
- {
- getSession().setLocale(locale);
- }
- }
-}
+/*
+ * 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.pub2;
+
+import org.apache.wicket.examples.homepage.LocalizationIndex;
+
+import java.util.Locale;
+
+import org.apache.wicket.examples.WicketExamplePage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.value.ValueMap;
+
+
+/**
+ * Demonstrates localization.
+ *
+ * @author Jonathan Locke
+ * @author Eelco Hillenius
+ */
+public final class Home extends WicketExamplePage
+{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return LocalizationIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "localization";
+ }
+
+ /**
+ * Constructor
+ *
+ * @param parameters
+ * Page parameters (ignored since this is the home page)
+ */
+ public Home(final PageParameters parameters)
+ {
+ // create a dummy object to serve as our substitution model
+ ValueMap map = new ValueMap();
+ map.put("user", "Jonathan");
+
+ // Here, we create a model that knows how to get localized strings.
+ // It uses the page's resource (Home_cc_LC.properties) and gets the
+ // text with resource key 'salution'. For the US, this is:
+ // salutation=${user}, dude!
+ // variable ${user} will be regconized as a property variable, and will
+ // be substituted with the given model (the wrapped map). Hence,
+ // ${user} will be replaced by map.get('user'), which is 'Jonathan'.
+ StringResourceModel labelModel = new StringResourceModel("salutation", this,
+ new Model<>(map));
+
+ // Add the label with the dynamic model
+ add(new Label("salutation", labelModel));
+
+ // Add a couple of links to be able to play around with the session
+ // locale
+ add(new SetLocaleLink("goCanadian", Locale.CANADA));
+ add(new SetLocaleLink("goUS", Locale.US));
+ add(new SetLocaleLink("goDutch", Locale.of("nl", "NL")));
+ add(new SetLocaleLink("goGerman", Locale.of("de", "DE")));
+ add(new SetLocaleLink("goChinese", Locale.of("zh", "CN")));
+ add(new SetLocaleLink("goDanish", Locale.of("da", "DK")));
+ add(new SetLocaleLink("goKorean", Locale.of("ko", "KR")));
+ add(new SetLocaleLink("goHungarian", Locale.of("hu")));
+ }
+
+ private static class SetLocaleLink extends Link<Void> {
+
+ private final Locale locale;
+
+ private SetLocaleLink(String id, Locale locale)
+ {
+ super(id);
+ this.locale = locale;
+ }
+
+ @Override
+ public void onClick()
+ {
+ getSession().setLocale(locale);
+ }
+ }
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.properties
index 50f8424dfd..ec6fa152c1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.properties
@@ -12,5 +12,6 @@
# 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.
+title=Alternative Localization
salutation=${user}, dude!
salespitch=This is tooootally the best beer you can get for under a buck.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
index 0407e9b786..61046f5346 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.html
@@ -1,15 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-
-This is a demo of the DataTable (DataView wrapper). Provided features:<br/>
-<ul>
-<li>Easy ordering and selection of columns from code</li>
-<li>Takes care of sorting headers automatically</li>
-<li>Takes care of page navigator automatically</li>
-<li>Takes care of adding class="odd" and class="even" to table rows</li>
-<li>Adds a navigator message</li>
-</ul>
-<br/>
<div>
<table class="dataview" cellspacing="0" wicket:id="table">[table]</table>
</div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.properties
similarity index 62%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.properties
index 4d499b1343..40b16fc3fc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=AjaxFallbackDataTable Example
+description=demonstrates an AJAX enabled datatable component
+explanation=This is a demo of the DataTable (DataView wrapper). Provided features:<br/> <ul> <li>Easy ordering and selection of columns from code</li> <li>Takes care of sorting headers automatically</li> <li>Takes care of page navigator automatically</li> <li>Takes care of adding class="odd" and class="even" to table rows</li> <li>Adds a navigator message</li> </ul>
+order=12
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
index b2458cb6e7..22a60383b0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.html
@@ -2,12 +2,6 @@
<body>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-
-This is a demo of the DataGridView (builds on top of DataView). Provided features:<br/>
-<ul>
-<li>Easy ordering and selection of columns from code</li>
-</ul>
-<br/>
<div class="gridpage">
<table cellspacing="0" cellpadding="2" border="1">
<tr wicket:id="rows">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.properties
similarity index 68%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.properties
index 4d499b1343..38489d5bc2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=DataGridView Example
+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
+explanation=This is a demo of the DataGridView (builds on top of DataView). Provided features:<br/> <ul> <li>Easy ordering and selection of columns from code</li> </ul>
+order=8
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
index c2752a1a14..f6cffc4131 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.html
@@ -1,9 +1,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
-
-This table has a toolbar filter. We can specify a valid range for contact's born date.<br/>
- <br/>
<form wicket:id="filterForm">
<fieldset class="inline-block">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.properties
similarity index 77%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.properties
index 4d499b1343..87c675f45b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=DataTable with FilterToolbar Example
+description=demonstrates data table component with a FilterToolbar on its data set
+explanation=This table has a toolbar filter. We can specify a valid range for contact's born date.
+order=10
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
index 48417e56b4..0c612ba6b7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.html
@@ -1,18 +1,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
-
-This is a demo of the DataTable (DataView wrapper). Provided features:<br/>
-<ul>
-<li>Easy ordering and selection of columns from code</li>
-<li>Takes care of sorting headers automatically</li>
-<li>Takes care of page navigator automatically</li>
-<li>Takes care of adding class="odd" and class="even" to table rows</li>
-<li>Adds a navigator message</li>
-<li>Different CSS class for certain columns</li>
-<li>Export to CSV toolbar</li>
-</ul>
-<br/>
<div>
<table class="dataview" cellspacing="0" wicket:id="table">[table]</table>
</div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
index 318486e8c9..6cd3c4bd60 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
@@ -12,6 +12,10 @@
# 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.
+title=DataTable Example
+description=demonstrates data table component that wraps dataview to offer easy paging and sorting
+explanation=This is a demo of the DataTable (DataView wrapper). Provided features:<br/> <ul> <li>Easy ordering and selection of columns from code</li> <li>Takes care of sorting headers automatically</li> <li>Takes care of page navigator automatically</li> <li>Takes care of adding class="odd" and class="even" to table rows</li> <li>Adds a navigator message</li> <li>Different CSS class for certain columns</li> <li>Export to CSV toolbar</li> </ul>
+order=9
# NOTE: this file has to be encoded in UTF-8 !!!
actions = Actions
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
deleted file mode 100644
index 6e38c4f733..0000000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-
- <wicket:child/>
- </wicket:extend>
-</body>
-</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
index 8644f75835..6fee68deba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
@@ -25,6 +25,13 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public abstract class ExamplePage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Index.class;
+ }
+
+
/**
* Get downcast session object for easy access by subclasses
*
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
index 2e1292e8a6..3eee1c00d3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.html
@@ -1,9 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This page allows to edit the entries in the address book shown in « RefreshingView Example ». It illustrates using a
-RefreshingView in a form, with a <tt>remove</tt> link along with each item.
-<br/><br/>
-
<form wicket:id="form">
<div>
<table cellspacing="0" class="dataview">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.properties
index 480e4cead9..79472f162b 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FormPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.properties
@@ -12,8 +12,7 @@
# 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.
-label.name=Name
-label.email=Email
-Required=${label} is required
-EmailAddressValidator=${label} is not a valid email address
-name.StringValidator.minimum=${label} must be at least ${minimum} characters
+title=Contacts Editor
+description=based on the previous example, but with editable values.
+explanation=This page allows to edit the entries in the address book shown in \u00ab RefreshingView Example \u00bb. It illustrates using a RefreshingView in a form, with a <tt>remove</tt> link along with each item.
+order=3
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
index d713b4c618..fbef974f22 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.html
@@ -2,9 +2,6 @@
<body>
<wicket:extend>
-This page demonstrates the GridView component
-<br/><br/>
-
<span wicket:id="navigator">[dataview navigator]</span>
<div class="gridpage">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.properties
similarity index 86%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.properties
index 6a4447b3d5..ffe4078550 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.properties
@@ -12,6 +12,7 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=GridView Example
+description=demonstrates a grid view
+explanation=This page demonstrates the GridView component
+order=11
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..fd9deb3096 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
@@ -1,20 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-Repeaters are components that can render their body markup multiple times. These components are useful for creating output that is traditionally created via loops.
-<br/><br/>
+<div wicket:id="examples">[examples]</div>
-<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/>
-</wicket:link>
</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
index 77a71743e0..94b63dde02 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.examples.repeater;
+import org.apache.wicket.examples.ExampleIndexPanel;
+
/**
- * index page - the links are in the template
+ * index page - the examples are the pages found next to it
*
* @author igor
*
@@ -30,5 +32,6 @@ public class Index extends ExamplePage
*/
public Index()
{
+ add(new ExampleIndexPanel("examples", Index.class));
}
}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.properties
similarity index 80%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.properties
index 4d499b1343..8575d3d764 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Index.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Repeaters
+explanation=Repeaters are components that can render their body markup multiple times. These components are useful for creating output that is traditionally created via loops.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
index c191a64486..bbf0ace411 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.html
@@ -1,12 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates the use of ReuseIfModelsEqualStrategy implementation of IItemReuseStrategy interface for the dataview.
-IItemReuseStrategy is responsible for how the child item components of the dataview are recycled between requests. The default strategy simply discards all previous items.
-The ReuseIfModelsEqualStrategy strategy will keep items if the model of the item matches one of the models that is to be displayed in the current request - this allows reuse of items that did not leave the page. This is useful when there is a need to keep state across requests for items that are visible within the page.
-Notice that when you click the 'toggle highlite' link the item stays highlited until it leaves the page or you click the link again. If the default strategy would have been used instead, the item would not have been highlited because it would have been replaced by a new item and thus would not have known that it should be highlited.
-<br/><br/>
-
-
<span wicket:id="navigator">[dataview navigator]</span>
<div>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.properties
new file mode 100644
index 0000000000..fc7802ea14
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.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.
+title=DataView and optimized item removal
+description=demonstrates a dataview with a different IItemReuseStrategy implementation
+explanation=This example demonstrates the use of ReuseIfModelsEqualStrategy implementation of IItemReuseStrategy interface for the dataview. IItemReuseStrategy is responsible for how the child item components of the dataview are recycled between requests. The default strategy simply discards all previous items. The ReuseIfModelsEqualStrategy strategy will keep items if the model of the item matches one of the models that is to be displayed in the current request - this allows reuse of it [...]
+order=7
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
index 3beeddbf2d..571a99d52e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.html
@@ -1,8 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This page demonstrates DataView with paging enabled as well as wicket's page navigation component. All we need to do to enable paging is to call setItemsPerPage(int) on the dataview.
-<br/><br/>
-
<span wicket:id="navigator">[dataview navigator]</span>
<div>
<table cellspacing="0" class="dataview">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.properties
similarity index 72%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.properties
index 4d499b1343..b12d6fca53 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/PagingPage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Paging DataView Example
+description=builds on previous to demonstrate paging and page navigation
+explanation=This page demonstrates DataView with paging enabled as well as wicket's page navigation component. All we need to do to enable paging is to call setItemsPerPage(int) on the dataview.
+order=5
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
index 696b679b1b..faf7910c19 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.html
@@ -1,6 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This page demonstrates a simple RefreshingView. Notice that when you click refresh or make a selection the id of item object changes because it is regenerated unlike items in the OrderedRepeatingView.
-<br/><br/>
+
<a href="#" wicket:id="refreshLink">refresh</a><br/><br/>
<div>
<table cellspacing="0" class="dataview">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.properties
similarity index 71%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.properties
index 4d499b1343..d5ff4d5f3f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=RefreshingView Example
+description=basic view that recreates its items every request
+explanation=This page demonstrates a simple RefreshingView. Notice that when you click refresh or make a selection the id of item object changes because it is regenerated unlike items in the OrderedRepeatingView.
+order=2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
index 41d326d088..f894d246ad 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.html
@@ -1,10 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This page demonstrates a simple OrderedRepeatingView.
-You simply add your items to the repeating view and its body
-markup will be used to render each one in the order added.
-<br/><br/>
-
<div>
<table cellspacing="0" class="dataview">
<tr>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.properties
similarity index 74%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.properties
index 4d499b1343..10eb69b3ad 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=OrderedRepeatingView Example
+description=basic example of a repeater view
+explanation=This page demonstrates a simple OrderedRepeatingView. You simply add your items to the repeating view and its body markup will be used to render each one in the order added.
+order=1
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
index 877fd5a3f2..732ca5a74f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.html
@@ -1,7 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This page demonstrates a very basic DataView. The implementation is exactly the same as ListView except IDataProvider is used to provide data instead of a list.
-<br/><br/>
<div>
<table cellspacing="0" class="dataview">
<tr>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.properties
similarity index 75%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.properties
index 4d499b1343..4e764cfc4f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.properties
@@ -12,5 +12,7 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Simple DataView Example
+description=simple example of a dataview
+explanation=This page demonstrates a very basic DataView. The implementation is exactly the same as ListView except IDataProvider is used to provide data instead of a list.
+order=4
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
index a2fee748ec..bc78fbe55e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.html
@@ -1,9 +1,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This example demonstrates how easy it is to implement sorting. Simply implement your data provider by extending a SortableDataProvider class and add a few OrderByLinks to the page.
-<br/><br/>
-
-
<span wicket:id="navigator">[dataview navigator]</span>
<div>
<table cellspacing="0" class="dataview">
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.properties
similarity index 73%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.properties
index 318486e8c9..f2b7d39923 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.utf8.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.properties
@@ -12,12 +12,7 @@
# 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.
-
-# NOTE: this file has to be encoded in UTF-8 !!!
-actions = Actions
-id = ID
-firstName = First Name
-lastName = Last Name
-homePhone = Home Phone
-cellPhone = Cell Phone
-bornDate = Birthday
\ No newline at end of file
+title=Sorting DataView Example
+description=builds on previous to demonstrate sorting
+explanation=This example demonstrates how easy it is to implement sorting. Simply implement your data provider by extending a SortableDataProvider class and add a few OrderByLinks to the page.
+order=6
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/HttpsPage.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/HttpsPage.properties
index 3a8bc87792..5413ca0145 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/HttpsPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Request Mappers - HTTPS Page
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.properties
index 3a8bc87792..3a803bdea0 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Request Mappers - Localized Page
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.properties
index 3a8bc87792..ce8d9831d5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Request Mappers
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.properties
index 6a4447b3d5..91e5116579 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/packageMount/PackageMountedPage.properties
@@ -12,6 +12,4 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.properties
index 3a8bc87792..6d9f402ed5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Resource Aggregation
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
index 128260bcb5..71d126ea51 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html
@@ -15,13 +15,7 @@
limitations under the License.
-->
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-<b>Annotations and Bean Proxy Approach</b><br/>
-This approach allows users to quickly and easily inject any component with bean proxies. Components simply have to annotate any fields they wish injected with @SpringBean annotation.
-Interesting classes:<br/>
-<ul>
- <li>SpringComponentInjector - an implementation of IComponentInstantiationListener that performs the injection</li>
- <li>AnnotPage - contains an annotated field whose value will be initialized with a proxy by the injector</li>
-</ul>
+
<table wicket:id="contacts" cellspacing="0" cellpadding="2" class="grid"></table>
</wicket:extend>
\ No newline at end of file
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.properties
similarity index 58%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.properties
index 4d499b1343..f7398d9d74 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Spring Integration - Annotations Approach
+explanation=<b>Annotations and Bean Proxy Approach</b><br/> This approach allows users to quickly and easily inject any component with bean proxies. Components simply have to annotate any fields they wish injected with @SpringBean annotation. Interesting classes:<br/> <ul> <li>SpringComponentInjector - an implementation of IComponentInstantiationListener that performs the injection</li> <li>AnnotPage - contains an annotated field whose value will be initialized with a proxy by the inject [...]
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/common/web/HomePage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
index 3075dd9494..bad16ba999 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.html
@@ -15,8 +15,7 @@
limitations under the License.
-->
<wicket:extend xmlns:wicket="http://wicket.apache.org">
-This examples project demonstrates how to easily integrate Wicket with Spring framework
-<br/><br/>
+
<a href="#" wicket:id="annot-link">jdk5 annotations approach</a><br/>
This approach allows us to annotate any component with SpringBean annotations, and have wicket initialize those fields with spring bean proxies
</wicket:extend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
index 39d70514c3..f55c15dfb3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.java
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.examples.spring.common.web;
+import org.apache.wicket.examples.homepage.InjectionIndex;
+import org.apache.wicket.examples.WicketExamplePage;
+
import org.apache.wicket.examples.spring.annot.web.AnnotPage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -27,6 +30,18 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
*/
public class HomePage extends BasePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return InjectionIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "injection";
+ }
+
/**
* Construct.
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.properties
similarity index 86%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.properties
index 6a4447b3d5..911f01144f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/datetime/DateTimePage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/HomePage.properties
@@ -12,6 +12,5 @@
# 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.
-locale=Locale
-default=default
-clientZone=Client timezone
+title=Spring Integration
+explanation=This examples project demonstrates how to easily integrate Wicket with Spring framework
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.properties
index 3a8bc87792..a44a488502 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/sri/IntegrityDemoPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.properties
index 3a8bc87792..b09f5e17aa 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Stateless AJAX Example
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.properties
index 3a8bc87792..b2cc04727a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Stateless
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.properties
index 3a8bc87792..adfba38311 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Stateful page
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.properties
index 3a8bc87792..eef174432f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Default stateless page
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.properties
index 3a8bc87792..47f112089f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Query strategy mounted stateless page
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.properties
index 3a8bc87792..13d9409fbf 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Mixed strategy mounted stateless page
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.properties
similarity index 94%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.properties
index 3a8bc87792..c9a5e27b47 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Stateless page that stores state in URL
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..16c54f9d47 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,25 +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.
- The first example uses what we commonly call 'markup inheritence',
- and the second example shows how to achieve roughly the same
- using borders.<br />
-   Compare the examples and decides what works best for you. You will find that markup
- inheritance is usually easier to work with, and you'll rarely have the need to work with
- borders. But in some cases borders make sense, and can be a little bit more flexible.<br />
-   Also note the use of panels and component replacement to switch the banner.
- Component replacement can be a powerful alternative to navigating between pages.
- </p>
-
<p>
<wicket:link>
<ul>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
index be219d5518..5f8b0d854a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.examples.template;
+import org.apache.wicket.examples.homepage.TemplatingIndex;
+
import org.apache.wicket.examples.WicketExamplePage;
/**
@@ -25,6 +27,18 @@ import org.apache.wicket.examples.WicketExamplePage;
*/
public class Index extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return TemplatingIndex.class;
+ }
+
+ @Override
+ protected String getIndexPath()
+ {
+ return "templating";
+ }
+
/**
* Constructor
*/
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.properties
similarity index 51%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.properties
index 4d499b1343..3dd0cd4fdd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/BeanValidationPage.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/Index.properties
@@ -12,5 +12,5 @@
# 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.
-password.needDigits=You need to have at least 2 digits in your password.
-password.validChars=Password value can contain only characters and digits.
\ No newline at end of file
+title=Template Example
+explanation=<p class="dotted-box"> This example shows two different ways of building your page up from shared parts. The first example uses what we commonly call 'markup inheritence', and the second example shows how to achieve roughly the same using borders.<br />   Compare the examples and decides what works best for you. You will find that markup inheritance is usually easier to work with, and you'll rarely have the need to work with borders. But in some cases borders make s [...]
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/pub/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.properties
index dd54b1f274..3f680ea2a3 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page1.properties
@@ -12,4 +12,4 @@
# 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.
-salutation=${user}, dude!
+title=Templating using a border - Page 1
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.properties
similarity index 95%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.properties
index 3a8bc87792..e3431ae806 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/Page2.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Templating using a border - Page 2
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.properties
index 0ddaf4243b..44098e6b2d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.properties
@@ -12,4 +12,4 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Templating using markup inheritance - Page 1
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.properties
similarity index 93%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.properties
index 0ddaf4243b..b04282e9a4 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/SignIn.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.properties
@@ -12,4 +12,4 @@
# 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.
-couldNotAuthenticate=Invalid username or password
+title=Templating using markup inheritance - Page 2
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..bc9e4bc569 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
@@ -1,38 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!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>
- </wicket:link>
-
- <wicket:child/>
+<html xmlns:wicket="http://wicket.apache.org">
+ <body>
+ <wicket:extend>
+ <div wicket:id="examples">[examples]</div>
+ <wicket:child/>
</wicket:extend>
- </body>
+ </body>
</html>
-
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
index 2824b2c588..a870c3b80c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AbstractTreePage.java
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.examples.tree;
+import org.apache.wicket.examples.ExampleIndexPanel;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -29,6 +30,13 @@ public abstract class AbstractTreePage extends WicketExamplePage
private static final long serialVersionUID = 1L;
+ /** The tree examples are listed on no index of their own, so each of them links to all. */
+ public AbstractTreePage()
+ {
+ add(new ExampleIndexPanel("examples", AbstractTreePage.class));
+ }
+
+
@Override
public void renderHead(IHeaderResponse response)
{
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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/BeginnersTreePage.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/tree/BeginnersTreePage.properties
index 3a8bc87792..d533b899d1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/BeginnersTreePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Beginner's tree
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.properties
index 3a8bc87792..18e94d1479 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/NestedTreePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Advanced nested tree
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.properties
similarity index 96%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.properties
index 3a8bc87792..92801a9afc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+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/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.properties
index 3a8bc87792..cc33260ef7 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=Unicode Converter
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.html b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.html
new file mode 100644
index 0000000000..359d94e970
--- /dev/null
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.html
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+ <wicket:extend>
+ <div wicket:id="examples">[examples]</div>
+ </wicket:extend>
+</body>
+</html>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.java
similarity index 78%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
copy to wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.java
index a9c20858d5..8667a8c1b2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Index.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.java
@@ -14,21 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.examples.compref;
+package org.apache.wicket.examples.upload;
+import org.apache.wicket.examples.ExampleIndexPanel;
import org.apache.wicket.examples.WicketExamplePage;
/**
- * Home page of the component reference example.
- *
- * @author Eelco Hillenius
+ * Index of the file upload examples.
*/
public class Index extends WicketExamplePage
{
+ private static final long serialVersionUID = 1L;
+
/**
- * Constructor
+ * Construct.
*/
public Index()
{
+ add(new ExampleIndexPanel("examples", Index.class));
}
-}
\ No newline at end of file
+}
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.properties
similarity index 97%
copy from wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
copy to wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.properties
index 3a8bc87792..00761b5177 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.properties
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/Index.properties
@@ -12,4 +12,4 @@
# 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.
-noBookTitle=None
+title=File Upload
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..049e86e8e2 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;}
@@ -13,12 +12,6 @@
<body>
<wicket:extend>
- <p>The multi upload field is based on javascript found <a target="_blank" href="http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/">here</a>.<br /><br />
- Wicket can also handle file uploads via AJAX, please see AJAX examples section. AJAX Functionality is not included in this example to keep things simple.</p>
- <p>The maximum file size of a single upload is: 90k!</p>
- <p>The maximum size of uploading several files (third demo) is: 100k!</p>
- <br/>
-
<form wicket:id="simpleUpload">
<fieldset>
<legend>Upload form</legend>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
index 68af7581d8..d2fcfb4f7a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
@@ -48,6 +48,12 @@ import org.apache.wicket.util.lang.Bytes;
*/
public class MultiUploadPage extends WicketExamplePage
{
+ @Override
+ protected Class<? extends WicketExamplePage> getIndexPage()
+ {
+ return Index.class;
+ }
... 1462 lines suppressed ...
(wicket) 02/02: Validate the number in the editable label example
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 6550afd842ff15dc807dce8f549f87dbeb4523b1
Author: reiern70 <re...@gmail.com>
AuthorDate: Wed Sep 16 14:36:49 2026 -0500
Validate the number in the editable label example
Integer.parseInt threw a NumberFormatException, which Wicket does not
treat as a conversion error, so invalid input failed the request. The
converter now throws a ConversionException, the field is required, and
errors are shown in a feedback panel.
---
.../examples/ajax/builtin/EditableLabelPage.html | 1 +
.../examples/ajax/builtin/EditableLabelPage.java | 46 ++++++++++++--
.../ajax/builtin/EditableLabelPageTest.java | 71 ++++++++++++++++++++++
3 files changed, 112 insertions(+), 6 deletions(-)
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
index 86913e89c6..2c17aa79e2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<wicket:extend xmlns:wicket="http://wicket.apache.org">
<form wicket:id="form">
+<div wicket:id="feedback"></div>
<p>
Click on the area with a green outline to begin an inplace edit. Press enter or outside the area to save, pless esc to cancel.
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
index fbfaccb5b5..ed30543a90 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.java
@@ -20,13 +20,16 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.AjaxEditableChoiceLabel;
import org.apache.wicket.extensions.ajax.markup.html.AjaxEditableLabel;
import org.apache.wicket.extensions.ajax.markup.html.AjaxEditableMultiLineLabel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.convert.IConverter;
@@ -62,18 +65,34 @@ public class EditableLabelPage extends BasePage
form.add(new AjaxEditableMultiLineLabel("text3"));
form.add(new AjaxEditableChoiceLabel<>("site", SITES));
- form.add(new AjaxEditableLabel<Integer>("number") {
+ final FeedbackPanel feedback = new FeedbackPanel("feedback");
+ feedback.setOutputMarkupId(true);
+ form.add(feedback);
+
+ AjaxEditableLabel<Integer> numberLabel = new AjaxEditableLabel<Integer>("number")
+ {
@Override
protected IConverter<?> createConverter(Class<?> type)
{
- return new IConverter<Integer>() {
+ return new IConverter<Integer>()
+ {
@Override
public Integer convertToObject(String value, Locale locale)
throws ConversionException
{
- return Integer.parseInt(value);
+ try
+ {
+ return Integer.parseInt(value);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ConversionException(e).setSourceValue(value)
+ .setTargetType(Integer.class)
+ .setConverter(this)
+ .setLocale(locale);
+ }
}
-
+
@Override
public String convertToString(Integer value, Locale locale)
{
@@ -81,8 +100,23 @@ public class EditableLabelPage extends BasePage
}
};
}
- });
-
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target)
+ {
+ super.onSubmit(target);
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target)
+ {
+ super.onError(target);
+ target.add(feedback);
+ }
+ };
+ form.add(numberLabel);
+ numberLabel.setType(Integer.class).setRequired(true).setLabel(Model.of("Number"));
form.add(new Label("refresh-counter", () -> "" + refreshCounter));
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPageTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPageTest.java
new file mode 100644
index 0000000000..fd55e467f3
--- /dev/null
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPageTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.behavior.AbstractAjaxBehavior;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.util.tester.WicketTestCase;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests the number editor of {@link EditableLabelPage}.
+ */
+class EditableLabelPageTest extends WicketTestCase
+{
+ @Test
+ void rejectsANumberThatIsNotAnInteger()
+ {
+ saveNumber("abc");
+
+ tester.assertErrorMessages("The value of 'Number' is not a valid Integer.");
+ tester.assertVisible("form:number:editor");
+ tester.assertComponentOnAjaxResponse("form:feedback");
+ }
+
+ @Test
+ void rejectsAnEmptyNumber()
+ {
+ saveNumber("");
+
+ tester.assertErrorMessages("'Number' is required.");
+ tester.assertVisible("form:number:editor");
+ }
+
+ @Test
+ void acceptsAnInteger()
+ {
+ saveNumber("7");
+
+ tester.assertNoErrorMessage();
+ tester.assertInvisible("form:number:editor");
+ tester.assertLabel("form:number:label", "0000000007");
+ }
+
+ private void saveNumber(String value)
+ {
+ tester.startPage(EditableLabelPage.class);
+ tester.executeAjaxEvent("form:number:label", "click");
+
+ FormComponent<?> editor = (FormComponent<?>)tester
+ .getComponentFromLastRenderedPage("form:number:editor");
+ tester.getRequest().setParameter(editor.getInputName(), value);
+ tester.getRequest().setParameter("save", "true");
+ tester.getRequest().setMethod(Form.METHOD_GET);
+ tester.executeBehavior((AbstractAjaxBehavior)editor.getBehaviorById(0));
+ }
+}