Repository: wicket Updated Branches: refs/heads/master 059ef309e -> aec25d3c1
fixed cross-references for 7.x Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aec25d3c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aec25d3c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aec25d3c Branch: refs/heads/master Commit: aec25d3c109878e94d2d88eb7bb5c29ebd0649f9 Parents: 059ef30 Author: Andrea Del Bene <[email protected]> Authored: Tue Apr 28 14:50:01 2015 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Tue Apr 28 14:50:01 2015 +0200 ---------------------------------------------------------------------- wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc | 2 +- wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc | 2 +- wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc | 2 +- wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc | 2 +- wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc | 2 +- wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc | 4 ++-- wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc | 2 +- wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc | 2 +- .../src/docs/guide/requestProcessing/requestProcessing_3.gdoc | 2 +- wicket-user-guide/src/docs/guide/resources/resources_1.gdoc | 2 +- wicket-user-guide/src/docs/guide/resources/resources_10.gdoc | 2 +- wicket-user-guide/src/docs/guide/resources/resources_4.gdoc | 2 +- wicket-user-guide/src/docs/guide/security/security_2.gdoc | 4 ++-- wicket-user-guide/src/docs/guide/testing/testing_1.gdoc | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc b/wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc index 755fbbf..99f56e9 100644 --- a/wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc +++ b/wicket-user-guide/src/docs/guide/ajax/ajax_2.gdoc @@ -18,7 +18,7 @@ Building an entire site using AJAX can be risky as some clients may not support h3. AJAX Checkbox -Class @org.apache.wicket.ajax.markup.html.form.AjaxCheckBox@ is a checkbox component that updates its model via AJAX when user changes its value. Its AJAX callback method is @onUpdate(AjaxRequestTarget target)@. The component extends standard checkbox component @CheckBox@ adding an @AjaxFormComponentUpdatingBehavior@ to itself (we will see this behavior later in [paragraph 18.3.3|guide:ajax_3]). +Class @org.apache.wicket.ajax.markup.html.form.AjaxCheckBox@ is a checkbox component that updates its model via AJAX when user changes its value. Its AJAX callback method is @onUpdate(AjaxRequestTarget target)@. The component extends standard checkbox component @CheckBox@ adding an @AjaxFormComponentUpdatingBehavior@ to itself (we will see this behavior later in [paragraph 19.3.3|guide:ajax_3]). h3. AJAX editable labels http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc index ec55703..ce4ac69 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc @@ -27,7 +27,7 @@ The entire infrastructure of feedback messages is built on top of the Java inter The topics of internationalization will be covered in [chapter 14|guide:i18n]. For now we will give just few notions needed to understand the examples from this chapter. {note} -By default resource bundles are stored into properties files but we can easily configure other sources as described later in [paragraph 14.2|guide:i18n_2]. +By default resource bundles are stored into properties files but we can easily configure other sources as described later in [paragraph 15.2|guide:i18n_2]. Default feedback messages (like the one above for required fields) are stored in the file Application. properties placed inside Wicket the org.apache.wicket package. Opening this file we can find the key and the localized value of the message: http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc index 08f5f34..b99ccf4 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc @@ -82,7 +82,7 @@ public class RegExpPatternConverter implements IConverter<Pattern> { } {code} -Methods declared by interface IConverter take as input a Locale parameter in order to deal with locale-sensitive data and conversions. We will learn more about locales and internationalization in [paragraph 14|guide:i18n]. +Methods declared by interface IConverter take as input a Locale parameter in order to deal with locale-sensitive data and conversions. We will learn more about locales and internationalization in [paragraph 15|guide:i18n]. Once we have implemented our custom converter, we must override method newConverterLocator() inside our application class and tell it to add our new converter to the default set: http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc index 26fddd8..4f6dd73 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc @@ -67,7 +67,7 @@ public class TemperatureDegreeField extends FormComponentPanel<Double> { } {code} -Inside the onInitialize method we have created a read-only model for the label that displays the letter corresponding to the user's temperature scale. To determinate which temperature scale is in use, we retrieve the Locale from the session by calling Component's getLocale() method (we will talk more about this method in [paragraph 14|guide:i18n]). Then, if locale is the one corresponding to the United States, the chosen scale will be Fahrenheit, otherwise it will be considered as Celsius. +Inside the onInitialize method we have created a read-only model for the label that displays the letter corresponding to the user's temperature scale. To determinate which temperature scale is in use, we retrieve the Locale from the session by calling Component's getLocale() method (we will talk more about this method in [paragraph 15|guide:i18n]). Then, if locale is the one corresponding to the United States, the chosen scale will be Fahrenheit, otherwise it will be considered as Celsius. In the final part of onInitialize() we add the two components to our custom form component. You may have noticed that we have explicitly set the type of model object for the text field to double. This is necessary as the starting model object is a null reference and this prevents the component from automatically determining the type of its model object. http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc b/wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc index 81522c8..46c7eb8 100644 --- a/wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc +++ b/wicket-user-guide/src/docs/guide/i18n/i18n_1.gdoc @@ -24,4 +24,4 @@ For example a bundle with MyBundle as base name and localized for Mandarin Chine The list of these candidate names is generated starting from the most specific one and subtracting an optional parameter at each step. The last name of the list corresponds to the default resource bundle which is the most general name and is equal to the base name. Once that getBundle has generated the list of candidate names, it will iterate over them to find the first one for which is possible to load a class or a properties file. The class must be a subclass of @ResourceBundle@ having as class name the full name used in the current iteration. If such a class is not found, getBundle will try to locate a properties file having a file name equals to the current full name (Java will automatically append extension .properties to the full name). For example given the resource bundle of the previous example, Java will search first for class org.foo.MyBundle_zh_CH_cmn and then for file MyBundle_zh_CH_cmn.properties inside package org.foo. If no file is found for any of the candidate name s, a MissingResourceException will be thrown. Bundles contains local-dependent string resources identified by a key that is unique in the given bundle. So once we have obtained a valid bundle we can access these objects with method getString (String key). -As we have seen before working with feedback messages, in Wicket most of the times we will work with properties files rather than with bundle classes. In [paragraph 12.2|guide:forms2_2] we used a properties file having as base name the class name of the application class and without any information about the locale. This file is the default resource bundle for a Wicket application. In [paragraph 14.3|guide:i18n_3] we will explore the algorithm used in Wicket to locate the available bundles for a given component. Once we have learnt how to leverage this algorithm, we will be able to split our bundles into more files organized in a logical hierarchy. +As we have seen before working with feedback messages, in Wicket most of the times we will work with properties files rather than with bundle classes. In [paragraph 12.2|guide:forms2_2] we used a properties file having as base name the class name of the application class and without any information about the locale. This file is the default resource bundle for a Wicket application. In [paragraph 15.3|guide:i18n_3] we will explore the algorithm used in Wicket to locate the available bundles for a given component. Once we have learnt how to leverage this algorithm, we will be able to split our bundles into more files organized in a logical hierarchy. http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc b/wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc index 499aa0e..9866502 100644 --- a/wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc +++ b/wicket-user-guide/src/docs/guide/i18n/i18n_2.gdoc @@ -60,7 +60,7 @@ To use XML bundles in Wicket we don't need to put in place any additional config h3. Reading bundles from code -Class Component makes reading bundles very easy with method getString(String key). This method searches for a resource with the given key looking into the resource bundles visited by the lookup algorithm illustrated in [paragraph 14.3|guide:i18n_3]. For example if we have a greeting message with key greetingMessage in our application's resource bundle, we can read it from our component code with this instruction: +Class Component makes reading bundles very easy with method getString(String key). This method searches for a resource with the given key looking into the resource bundles visited by the lookup algorithm illustrated in [paragraph 15.3|guide:i18n_3]. For example if we have a greeting message with key greetingMessage in our application's resource bundle, we can read it from our component code with this instruction: {code} getString("greetingMessage"); @@ -91,7 +91,7 @@ AbstractReadOnlyModel<String> model = new AbstractReadOnlyModel<String>() { add(new Label("greetingMessage", model)); {code} -Class @org.apache.wicket.model.AbstractReadOnlyModel@ is a convenience class for implementing read-only models. In this project we have implemented a custom read-only model for illustrative purposes only because Wicket already provides built-in models for the same task. We will see them in paragraph [paragraph 14.5|guide:i18n_5]. +Class @org.apache.wicket.model.AbstractReadOnlyModel@ is a convenience class for implementing read-only models. In this project we have implemented a custom read-only model for illustrative purposes only because Wicket already provides built-in models for the same task. We will see them in paragraph [paragraph 15.5|guide:i18n_5]. The rest of the code of the home page builds the stateless form and the drop-down menu used to change the locale. http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc b/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc index a38b67d..2d6fc36 100644 --- a/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc +++ b/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc @@ -84,7 +84,7 @@ Wicket implements the default lookup algorithm using the strategy pattern. The c # *PackageStringResourceLoader:* searches into package bundles. # *ClassStringResourceLoader:* searches into bundles of a given class. By default the target class is the application class. # *ValidatorStringResourceLoader:* searches for resources into validator's bundles. A list of validators is provided by the form component that failed validation. -# *InitializerStringResourceLoader:* this resource allows internationalization to interact with the initialization mechanism of the framework that will be illustrated in [paragraph 17.3|guide:advanced_3]. +# *InitializerStringResourceLoader:* this resource allows internationalization to interact with the initialization mechanism of the framework that will be illustrated in [paragraph 18.3|guide:advanced_3]. Developer can customize lookup algorithm removing default resource loaders or adding custom implementations to the list of the resource loaders in use. This task can be accomplished using method getStringResourceLoaders of setting class @org.apache.wicket.settings.ResourceSettings@: http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc b/wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc index be06e61..3e4b437 100644 --- a/wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc +++ b/wicket-user-guide/src/docs/guide/i18n/i18n_5.gdoc @@ -4,7 +4,7 @@ Internationalization is another good chance to taste the power of models. Wicket h3. ResourceModel -Model @org.apache.wicket.model.ResourceModel@ acts just like the read-only model we have implemented in [paragraph 14.3|guide:i18n_3]. It simply retrieves a string resource corresponding to a given key: +Model @org.apache.wicket.model.ResourceModel@ acts just like the read-only model we have implemented in [paragraph 15.3|guide:i18n_3]. It simply retrieves a string resource corresponding to a given key: {code} //build a ResourceModel for key 'greetingMessage' http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc index 7f491cf..37b5932 100644 --- a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc +++ b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc @@ -40,7 +40,7 @@ The RequestCycle is also responsible for generating the URL value (as CharSequen * a page class, via the @urlFor(Class<C> pageClass, PageParameters parameters)@ method * an IRequestHandler via the @urlFor(IRequestHandler handler)@ method -* a ResourceReference via the @urlFor(ResourceReference reference, PageParameters params)@ method (resource entities will be introduced in [chapter 15|guide:resources]). +* a ResourceReference via the @urlFor(ResourceReference reference, PageParameters params)@ method (resource entities will be introduced in [chapter 16|guide:resources]). The overloaded @urlFor@ method from above also has a corresponding version that returns an instance of @org.apache.wicket.request.Url@ instead of a @CharSequence@. This version has the prefix 'map' in its name (i.e. it has @mapUrlFor@ as full name). http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/resources/resources_1.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/resources/resources_1.gdoc b/wicket-user-guide/src/docs/guide/resources/resources_1.gdoc index 8bf9c5a..5847bb3 100644 --- a/wicket-user-guide/src/docs/guide/resources/resources_1.gdoc +++ b/wicket-user-guide/src/docs/guide/resources/resources_1.gdoc @@ -6,4 +6,4 @@ Resources can be static or dynamic. Static resources don't entail any computatio An example of dynamic resource is the built-in class CaptchaImageResource in package @org.apache.wicket.extensions.markup.html.captcha@ which generates a captcha image each time is rendered. -As we will see in [paragraph 15.10|guide:resources_10], developers can build custom resources extending base class @org.apache.wicket.request.resource.AbstractResource@. +As we will see in [paragraph 16.10|guide:resources_10], developers can build custom resources extending base class @org.apache.wicket.request.resource.AbstractResource@. http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/resources/resources_10.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/resources/resources_10.gdoc b/wicket-user-guide/src/docs/guide/resources/resources_10.gdoc index 45d78f4..a841416 100644 --- a/wicket-user-guide/src/docs/guide/resources/resources_10.gdoc +++ b/wicket-user-guide/src/docs/guide/resources/resources_10.gdoc @@ -2,7 +2,7 @@ In Wicket the best way to add dynamic functionalities to our application (such as csv export, a pdf generated on the fly, etc...) is implementing a custom resource. In this paragraph as example of custom resource we will build a basic RSS feeds generator which can be used to publish feeds on our site (project CustomResourceMounting). Instead of generating a RSS feed by hand we will use Rome framework and its utility classes. -As hinted above in [paragraph 15.1|guide:resources_1], class @AbstractResource@ can be used as base class to implement new resources. This class defines abstract method @newResourceResponse@ which is invoked when the resource is requested. The following is the code of our RSS feeds generator: +As hinted above in [paragraph 16.1|guide:resources_1], class @AbstractResource@ can be used as base class to implement new resources. This class defines abstract method @newResourceResponse@ which is invoked when the resource is requested. The following is the code of our RSS feeds generator: {code} public class RSSProducerResource extends AbstractResource { http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/resources/resources_4.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/resources/resources_4.gdoc b/wicket-user-guide/src/docs/guide/resources/resources_4.gdoc index 769659b..a051718 100644 --- a/wicket-user-guide/src/docs/guide/resources/resources_4.gdoc +++ b/wicket-user-guide/src/docs/guide/resources/resources_4.gdoc @@ -1,6 +1,6 @@ -Wicket comes with interface @org.apache.wicket.markup.html.IHeaderContributor@ which allows components and behaviors (which will be introduced later in [paragraph 17.1|guide:advanced_1]) to contribute to the header section of their page. The only method defined in this interface is @renderHead(IHeaderResponse response)@ where @IHeaderResponse@ is an interface which defines method @render(HeaderItem item)@ to write static resources or free-form text into the header section of the page. +Wicket comes with interface @org.apache.wicket.markup.html.IHeaderContributor@ which allows components and behaviors (which will be introduced later in [paragraph 18.1|guide:advanced_1]) to contribute to the header section of their page. The only method defined in this interface is @renderHead(IHeaderResponse response)@ where @IHeaderResponse@ is an interface which defines method @render(HeaderItem item)@ to write static resources or free-form text into the header section of the page. Header entries are instances of abstract class @org.apache.wicket.markup.head.HeaderItem@. Wicket provides a set of built-in implementations of this class suited for the most common types of resources. With the exception of @PriorityHeaderItem@, every implementation of @HeaderItem@ is an abstract factory class: http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/security/security_2.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/security/security_2.gdoc b/wicket-user-guide/src/docs/guide/security/security_2.gdoc index 46e9984..6739a72 100644 --- a/wicket-user-guide/src/docs/guide/security/security_2.gdoc +++ b/wicket-user-guide/src/docs/guide/security/security_2.gdoc @@ -70,7 +70,7 @@ By default @SimplePageAuthorizationStrategy@ checks for permissions only on page h3. Role-based strategies -At the end of [paragraph 21.1|guide:security_1] we have introduced AbstractAuthenticatedWebSession's method getRoles which is provided to support role-based authorization returning the set of roles granted to the current user. +At the end of [paragraph 22.1|guide:security_1] we have introduced AbstractAuthenticatedWebSession's method getRoles which is provided to support role-based authorization returning the set of roles granted to the current user. In Wicket roles are simple strings like âBASIC_USERâ or âADMINâ (they don't need to be capitalized) and they are handled with class @org.apache.wicket.authroles.authorization.strategies.role.Roles@. This class extends standard HashSet collection adding some functionalities to check whether the set contains one or more roles. Class @Roles@ already defines roles Roles.USER and Roles.ADMIN. @@ -116,7 +116,7 @@ Roles can be adopted to apply security restrictions on our pages and components. The difference between these two strategies is that @MetaDataRoleAuthorizationStrategy@ handles role-based authorizations with Wicket metadata while @AnnotationsRoleAuthorizationStrategy@ uses Java annotations. {note} -Application class @AuthenticatedWebApplication@ already sets @MetaDataRoleAuthorizationStrategy@ and @AnnotationsRoleAuthorizationStrategy@ as its own authorization strategies (it uses a compound strategy as we will see in [paragraph 21.2|guide:security_2]). +Application class @AuthenticatedWebApplication@ already sets @MetaDataRoleAuthorizationStrategy@ and @AnnotationsRoleAuthorizationStrategy@ as its own authorization strategies (it uses a compound strategy as we will see in [paragraph 22.2|guide:security_2]). The code that we will see in the next examples is for illustrative purpose only. If our application class inherits from @AuthenticatedWebApplication@ we won't need to configure anything to use these two strategies. {note} http://git-wip-us.apache.org/repos/asf/wicket/blob/aec25d3c/wicket-user-guide/src/docs/guide/testing/testing_1.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/testing/testing_1.gdoc b/wicket-user-guide/src/docs/guide/testing/testing_1.gdoc index 3fbb7fc..64fd44e 100644 --- a/wicket-user-guide/src/docs/guide/testing/testing_1.gdoc +++ b/wicket-user-guide/src/docs/guide/testing/testing_1.gdoc @@ -238,7 +238,7 @@ tester.executeBehavior(ajaxBehavior)); h3. Using a custom servlet context -In [paragraph 15.13|guide:resources_13] we have seen how to configure our application to store resource files into a custom folder placed inside webapp root folder (see project @CustomFolder4MarkupExample@). +In [paragraph 16.13|guide:resources_13] we have seen how to configure our application to store resource files into a custom folder placed inside webapp root folder (see project @CustomFolder4MarkupExample@). In order to write testing code for applications that use this kind of customization, we must tell @WicketTester@ which folder to use as webapp root. This is necessary as under test environment we don't have any web server, hence it's impossible for @WicketTester@ to retrieve this parameter from servlet context.
