Repository: wicket Updated Branches: refs/heads/master 8ff5eb558 -> 5a4a6a7d8
Other formatting fixes. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5a4a6a7d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5a4a6a7d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5a4a6a7d Branch: refs/heads/master Commit: 5a4a6a7d8be0639005d25231d35ef60050af74d8 Parents: 8ff5eb5 Author: Andrea Del Bene <[email protected]> Authored: Fri Jan 13 15:45:53 2017 +0100 Committer: Andrea Del Bene <[email protected]> Committed: Fri Jan 13 15:45:53 2017 +0100 ---------------------------------------------------------------------- .../src/main/asciidoc/bestpractices/bestpractices_12.adoc | 2 +- .../src/main/asciidoc/bestpractices/bestpractices_4.adoc | 2 +- .../src/main/asciidoc/bestpractices/bestpractices_5.adoc | 4 ++-- wicket-user-guide/src/main/asciidoc/contributing.adoc | 2 +- wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc | 2 +- wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc | 4 ++-- wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc | 2 +- wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc | 4 ++-- .../src/main/asciidoc/internals/autocomponents.adoc | 2 +- wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc | 2 +- .../src/main/asciidoc/monitoring/monitoring_1.adoc | 2 +- .../src/main/asciidoc/monitoring/monitoring_2.adoc | 2 +- .../src/main/asciidoc/resources/resources_17.adoc | 2 +- wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc | 2 +- wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc | 2 +- wicket-user-guide/src/main/asciidoc/security/security_5.adoc | 2 +- wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc | 6 +++--- wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc | 2 +- .../main/asciidoc/versioningCaching/versioningCaching_2.adoc | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc index 1aa9260..3cd7a23 100644 --- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc +++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc @@ -67,4 +67,4 @@ public class MyPage extends WebPage { } ---- -The label in listing 16 is clearly encapsulated in a component without using a factory. Now you can easily create inline implementations and override _isVisible()_ or other stuff. Naturally, you might claim [I need a factory to initialize some values in the component, e.g. a Spring service.] For this you can create a implementation of _IComponentInstantiationListener_. This listener gets called on the super-constructor of every component. The most popular implementation of this interface is the _SpringComponentInjector_ which injects Spring beans in components when the fields are annotated with _\_SpringBean_. You can easliy write and add your own implementation of _IComponentInstantiationListener_. So there is no reason for using a factory anymore. More information about the instanciation listener is located in Wicket's JavaDoc. +The label in listing 16 is clearly encapsulated in a component without using a factory. Now you can easily create inline implementations and override _isVisible()_ or other stuff. Naturally, you might claim "I need a factory to initialize some values in the component, e.g. a Spring service". For this you can create a implementation of _IComponentInstantiationListener_. This listener gets called on the super-constructor of every component. The most popular implementation of this interface is the _SpringComponentInjector_ which injects Spring beans in components when the fields are annotated with _\_SpringBean_. You can easliy write and add your own implementation of _IComponentInstantiationListener_. So there is no reason for using a factory anymore. More information about the instanciation listener is located in Wicket's JavaDoc. http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_4.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_4.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_4.adoc index f4fffef..122e42f 100644 --- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_4.adoc +++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_4.adoc @@ -16,4 +16,4 @@ else { } ---- -Instead of constructing _LoginBoxPanel_ conditionally, it is recommended to always add the panel and control the visibility by overriding _isVisible()_. So the component _LoginBoxPanel_ is responsible for displaying itself. We move the responsibility into the same component which executes the login. Brilliant! Cleanly encapsulated business logic. There is no decision from outside, the component handles all the logic. You can see another example in [Implement visibilities of components correctly] . +Instead of constructing _LoginBoxPanel_ conditionally, it is recommended to always add the panel and control the visibility by overriding _isVisible()_. So the component _LoginBoxPanel_ is responsible for displaying itself. We move the responsibility into the same component which executes the login. Brilliant! Cleanly encapsulated business logic. There is no decision from outside, the component handles all the logic. You can see another example in "Implement visibilities of components correctly" . http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_5.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_5.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_5.adoc index ed1a4f2..ecd0095 100644 --- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_5.adoc +++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_5.adoc @@ -13,7 +13,7 @@ loginBox.setVisible(MySession.get().isNotLoggedIn()); add(loginBox); ---- -Listing 6 shows a poor implementation, because a decision about the visibility is made while instanciating the component. Again, in Wicket instances of components exist for several requests. To reuse the same instance you have to call _loginBox.setVisible(false)_. This is very unhandy, because we always have to call _setVisible()_ and manage the visibility. Furthermore you are going to duplicate the states, because visible is equal to [not logged in] So we have two saved states, one for the business aspect [not logged in] and one for the technical aspect [visible] Both is always equal. This approach is error-prone and fragile, because we always have to pay attention to setting the correct information every time. But this is often forgotten because the logic is widely spread over the code. The solution is the Hollywood principle: [Don't call us, we'll call you.] Take a look at the following diagram illustrating an application flow with some calls. We avoid three calls through the http://en.wikipedia.org/wiki/Hollywood_Principle[Hollywood-Principle] and we just have to instanciate the _LoginBoxPanel_. +Listing 6 shows a poor implementation, because a decision about the visibility is made while instanciating the component. Again, in Wicket instances of components exist for several requests. To reuse the same instance you have to call _loginBox.setVisible(false)_. This is very unhandy, because we always have to call _setVisible()_ and manage the visibility. Furthermore you are going to duplicate the states, because visible is equal to "not logged in" So we have two saved states, one for the business aspect "not logged in" and one for the technical aspect "visible" Both is always equal. This approach is error-prone and fragile, because we always have to pay attention to setting the correct information every time. But this is often forgotten because the logic is widely spread over the code. The solution is the Hollywood principle: "Don't call us, we'll call you". Take a look at the following diagram illustrating an application flow with some calls. We avoid three calls through the ht tp://en.wikipedia.org/wiki/Hollywood_Principle[Hollywood-Principle] and we just have to instanciate the _LoginBoxPanel_. image::../img/login_calls_hollywood.png[] @@ -30,7 +30,7 @@ public class LoginBoxPanel { }; ---- -Now the control over visibility has been inverted, the _LoginBoxPanel_ decides on its visibility autonomously. For each call of _isVisible()_ there is a refreshed interpretion of the login state. Hence, there is no additional state that might be outdated. The logic is centralized in one line code and not spread throughout the application. Furthermore, you can easily identify that the technical aspect _isVisible()_ correlates to the business aspect [logged in] The same rules can be applied to the method _isEnabled()_. If _isEnabled()_ returns false the components get displayed in gray. Forms which are within an inactive or invisible component do not get executed. +Now the control over visibility has been inverted, the _LoginBoxPanel_ decides on its visibility autonomously. For each call of _isVisible()_ there is a refreshed interpretion of the login state. Hence, there is no additional state that might be outdated. The logic is centralized in one line code and not spread throughout the application. Furthermore, you can easily identify that the technical aspect _isVisible()_ correlates to the business aspect "logged in" The same rules can be applied to the method _isEnabled()_. If _isEnabled()_ returns false the components get displayed in gray. Forms which are within an inactive or invisible component do not get executed. Note that there are cases in which you cannot avoid to call the methods _setVisible()_ and _setEnabled()_. An example: The user presses a button to display an inlined registration form. In general, you can apply the following rules: data driven components override these methods and delegates to the data model. User triggered events call the method _setVisible(boolean)_. You can also override these methods with inline implementations: http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/contributing.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/contributing.adoc b/wicket-user-guide/src/main/asciidoc/contributing.adoc index 6115ebc..61c220b 100644 --- a/wicket-user-guide/src/main/asciidoc/contributing.adoc +++ b/wicket-user-guide/src/main/asciidoc/contributing.adoc @@ -11,7 +11,7 @@ git clone https://github.com/apache/wicket.git * Edit the _.adoc_ files in `wicket/wicket-user-guide/src/main/asciidoctor` folder -* To preview your changes run [mvn clean package -P guide] in the `wicket/wicket-user-guide` folder (in eclipse use a run configuration) +* To preview your changes run _mvn clean package -P guide_ in the `wicket/wicket-user-guide` folder (in eclipse use a run configuration) * Navigate to _wicket/wicket-user-guide/target/guide/8.x_ and open one of the following files a browser / pdf viewer: ** _guide/single.html_ (single page version) http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc index 50abd02..9f8a7ed 100644 --- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc +++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc @@ -147,7 +147,7 @@ form.add(new CheckBoxMultipleChoice("checkGroup", new ListModel<String>(new Arra image::../img/grouped-checkbox2.png[] -=== How to implement a [Select all] checkbox +=== How to implement a "Select all" checkbox A nice feature we can offer to users when we have a group of checkboxes is a âspecialâ checkbox which selects/unselects all the other options of the group: http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc index e8e3c79..a29f14d 100644 --- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc +++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc @@ -1,7 +1,7 @@ -Checkboxes work well when we have a small amount of options to display, but they quickly become chaotic as the number of options increases. To overcome this limit we can use the <select> tag switching it to multiple-choice mode with attribute multiple= [multiple] +Checkboxes work well when we have a small amount of options to display, but they quickly become chaotic as the number of options increases. To overcome this limit we can use the <select> tag switching it to multiple-choice mode with attribute multiple="multiple" image::../img/list-multiple-choices.png[] @@ -31,7 +31,7 @@ form.add(new ListMultipleChoice("fruits", new ListModel<String>(new ArrayList<St image::../img/list-multiple-choices2.png[] -This component must be bound to a <select> tag but the attribute multiple= [multiple] is not required as it will automatically be added by the component. +This component must be bound to a <select> tag but the attribute multiple="multiple" is not required as it will automatically be added by the component. The number of visible rows can be set with the setMaxRows(int maxRows) method. http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc index 206ed76..925574e 100644 --- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc @@ -133,7 +133,7 @@ _The value of '${label}' is not exactly ${exact} characters long._ ==== CreditCardValidator -Checks if input is a valid credit card number. This validator supports some of the most popular credit cards (like âAmerican Express ["MasterCard] , âVisaâ or âDiners Clubâ). +Checks if input is a valid credit card number. This validator supports some of the most popular credit cards (like âAmerican Expressâ, âMasterCardâ , âVisaâ or âDiners Clubâ). *Message:* http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc index cc1954d..d669895 100644 --- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc +++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc @@ -1,7 +1,7 @@ -Wicket supports file uploading with the FileUploadField component which must be used with the <input> tag whose type attribute must be set to [file] In order to send a file on form submission we must enable multipart mode calling MultiPart(true)on our form. +Wicket supports file uploading with the FileUploadField component which must be used with the <input> tag whose type attribute must be set to "file" In order to send a file on form submission we must enable multipart mode calling MultiPart(true)on our form. In the next example (project UploadSingleFile) we will see a form which allows users to upload a file into the temporary directory of the server (path /tmp on Unix/Linux systems): @@ -79,6 +79,6 @@ public void init() === Upload multiple files -If we need to upload multiple files at once and our clients support HTML5, we can still use FileUploadField adding attribute [multiple] to its tag. If we can not rely on HTML5, we can use the MultiFileUploadField component which allows the user to upload an arbitrary number of files using a JavaScript-based solution. +If we need to upload multiple files at once and our clients support HTML5, we can still use FileUploadField adding attribute "multiple" to its tag. If we can not rely on HTML5, we can use the MultiFileUploadField component which allows the user to upload an arbitrary number of files using a JavaScript-based solution. An example showing how to use this component can be found in Wicket module wicket-examples in file MultiUploadPage.java. The live example is hosted on the {wicket_examples_url}/upload/multi[examples site]. http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc index 9c8b8ec..2124a30 100644 --- a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc +++ b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc @@ -43,7 +43,7 @@ Usually we won't need to change the default configuration of _IMarkupFilters_S, === Auto components resolvers -Even if Wicket encourages developers to use just standard HTML in their markup code, in this guide we have seen a number of [special] tags (those starting with _wicket:_) that help us for specific tasks (e.g. _wicket:enclosure_ tag). Wicket handles most of these tags creating a corresponding special component called _auto_ component. This kind of components are resolved in two steps: +Even if Wicket encourages developers to use just standard HTML in their markup code, in this guide we have seen a number of "special" tags (those starting with _wicket:_) that help us for specific tasks (e.g. _wicket:enclosure_ tag). Wicket handles most of these tags creating a corresponding special component called _auto_ component. This kind of components are resolved in two steps: 1. first their tag is identified by a _IMarkupFilters_ which also takes care of assigning a unique tag id. 2. then during rendering phase when an auto-component is found a new component is created for it using one of the registered _org.apache.wicket.markup.resolver.IComponentResolver_: http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc b/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc index 41d56af..39774a4 100644 --- a/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc @@ -97,7 +97,7 @@ If our IDE is Eclipse the import procedure is a little more complex. Before open mvn eclipse:eclipse ---- - Now to import our project into Eclipse we must create a classpath variable called M2_REPO that must point to your local Maven repository. This can be done selecting âWindow/Preferencesâ and searching for âClasspath Variablesâ. The folder containing our local Maven repository is usually under our user folder and is called .m2 (for example under Unix system is /home/<myUserName>/.m2/repository): +Now to import our project into Eclipse we must create a classpath variable called M2_REPO that must point to your local Maven repository. This can be done selecting âWindow/Preferencesâ and searching for âClasspath Variablesâ. The folder containing our local Maven repository is usually under our user folder and is called .m2 (for example under Unix system is /home/<myUserName>/.m2/repository): image::../img/eclipse-classpath-variables.png[] http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_1.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_1.adoc b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_1.adoc index 588dceb..1912c04 100644 --- a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_1.adoc +++ b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_1.adoc @@ -83,4 +83,4 @@ WARNING: *IMPORTANT INFORMATION* It is only possible to collect metrics for *one wicket filter per webapp* - don't declare more then one if you want to use wicket-metrics The WicketFilterInitAspect is required so that the application can be resolved - otherwise runtime exceptions will be thrown If you use the SessionCountListener you have to clear the session store if you restart the server - otherwise physically stored session will corrupt the data, because the count is initialized with 0. -If you have set wicket-metrics as dependency you can open [wicket-metrics.template.xml] to get a full template of the [aop.xml]. For the weaver options refer to the AspectJ LTW configuration documentation: https://eclipse.org/aspectj/doc/next/devguide/ltw-configuration.html +If you have set wicket-metrics as dependency you can open _wicket-metrics.template.xml_ to get a full template of the _aop.xml_. For the weaver options refer to the AspectJ LTW configuration documentation: https://eclipse.org/aspectj/doc/next/devguide/ltw-configuration.html http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_2.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_2.adoc b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_2.adoc index 7244fb8..73a9e2a 100644 --- a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_2.adoc @@ -53,7 +53,7 @@ this. - (6) pip install Django==1.5 -- (7) pip install [django-tagging<0.4] +- (7) pip install "django-tagging<0.4" - (8) sudo pip install carbon - (9) pip install whisper http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/resources/resources_17.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/resources/resources_17.adoc b/wicket-user-guide/src/main/asciidoc/resources/resources_17.adoc index 1fc8173..73bf797 100644 --- a/wicket-user-guide/src/main/asciidoc/resources/resources_17.adoc +++ b/wicket-user-guide/src/main/asciidoc/resources/resources_17.adoc @@ -3,7 +3,7 @@ Another way to receive external image resources is to use the corresponding comp The ExternalImage and ExternalSource components which are available since Wicket 7.2.0 / Wicket 8.0.0 fulfill that task. -The following example demonstrates the usage of a CompoundPropertyModel with the model object [ImageSrc] The model object, bound to surrounding component / page, contains an attribute named [url] which is read by the component: +The following example demonstrates the usage of a CompoundPropertyModel with the model object _ImageSrc_ The model object, bound to surrounding component / page, contains an attribute named _url_ which is read by the component: Java: [source,java] http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc b/wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc index cc1b6ed..6a4bc3e 100644 --- a/wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc +++ b/wicket-user-guide/src/main/asciidoc/resources/resources_3.adoc @@ -145,7 +145,7 @@ In some components like in the inline image resource references are going to be === Media tags - resource references with content range support -Since Wicket 7.0.0 the PackageResource and the PackageResourceReference support [Range] HTTP header for the request and [Content-Range] / [Accept-Range] HTTP headers for the response, which are used for videos / audio tags. The [Range] header allows the client to only request a specific byte range of the resource. The server provides the [Content-Range] and tells the client which bytes are going to be send. +Since Wicket 7.0.0 the PackageResource and the PackageResourceReference support _Range_ HTTP header for the request and _Content-Range_ / _Accept-Range_ HTTP headers for the response, which are used for videos / audio tags. The _Range_ header allows the client to only request a specific byte range of the resource. The server provides the _Content-Range_ and tells the client which bytes are going to be send. If you want the resource not to be load into memory apply readBuffered(false) - this way the stream is written directly to the response. (_org.apache.wicket.resource.ITextResourceCompressor_ will not be applied if readBuffered is set to false) http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc b/wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc index cde2c40..33b82a1 100644 --- a/wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc +++ b/wicket-user-guide/src/main/asciidoc/resources/resources_8.adoc @@ -58,7 +58,7 @@ The following code is taken from the Application class of the project: } ---- -As you can see in the code above the [bucket] that will contain JavaScript tags is called _ .[footer-container] To make a use of it the developer have to add a special component called _HeaderResponseContainer_ in his page: +As you can see in the code above the _bucket_ that will contain JavaScript tags is called _ .[footer-container] To make a use of it the developer have to add a special component called _HeaderResponseContainer_ in his page: [source,java] ---- http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/security/security_5.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/security/security_5.adoc b/wicket-user-guide/src/main/asciidoc/security/security_5.adoc index ed02541..1026edf 100644 --- a/wicket-user-guide/src/main/asciidoc/security/security_5.adoc +++ b/wicket-user-guide/src/main/asciidoc/security/security_5.adoc @@ -18,7 +18,7 @@ By default Wicket applications use as package resource guard class _SecurePackag To modify the set of allowed files formats we can add one or more patterns with method _addPattern(String)_. The rules to write a pattern are the following: -* patterns start with either a [+] or a [-] In the first case the pattern will add one or more file to the set while starting a pattern with a â-â we exclude all the files matching the given pattern. For example pattern â-web.xmlâ excludes all web.xml files in all directories. +* patterns start with either a "+" or a "-" In the first case the pattern will add one or more file to the set while starting a pattern with a â-â we exclude all the files matching the given pattern. For example pattern â-web.xmlâ excludes all web.xml files in all directories. * wildcard character â\*â is supported as placeholder for zero or more characters. For example pattern â+\*.mp4â adds all the mp4 files inside all directories. * subdirectories are supported as well. For example pattern â+documents/\*.pdfâ adds all pdf files under âdocumentsâ directory. Character â\*â can be used with directories to specify a nesting level. For example â+documents/\*/\*.pdfâ adds all pdf files placed one level below âdocumentsâ directory. * a double wildcard character â\*\*â indicates zero or more subdirectories. For example pattern â+documents/\*\*/\*.pdfâ adds all pdf files placed inside âdocumentsâ directory or inside any of its subdirectories. http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc b/wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc index 6fa97c4..d92c683 100644 --- a/wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc +++ b/wicket-user-guide/src/main/asciidoc/testing/testing_1.adoc @@ -38,7 +38,7 @@ That's only a taste of what _WicketTester_ can do. In the next paragraphs we wil A click on a Wicket link can be simulated with method _clickLink_ which takes in input the link component or the page-relative path to it. -To see an example of usage of clickLink, let's consider again project _LifeCycleStagesRevisited_. As we know from chapter 5 the home page of the project alternately displays two different labels (âFirst labelâ and âSecond labelâ), swapping between them each time button [reload] is clicked. The code from its test case checks that label has actually changed after button [reload] has been pressed: +To see an example of usage of clickLink, let's consider again project _LifeCycleStagesRevisited_. As we know from chapter 5 the home page of the project alternately displays two different labels (âFirst labelâ and âSecond labelâ), swapping between them each time button "reload" is clicked. The code from its test case checks that label has actually changed after button "reload" has been pressed: [source,java] ---- @@ -59,7 +59,7 @@ public void switchLabelTest(){ //... ---- -In the code above we have used _clickLink_ to click on the [reload] button and force page to be rendered again. In addition, we have used also method _assertLabel_ that checks if a given label contains the expected text. +In the code above we have used _clickLink_ to click on the "reload" button and force page to be rendered again. In addition, we have used also method _assertLabel_ that checks if a given label contains the expected text. By default _clickLink_ assumes that AJAX is enabled on client side. To switch AJAX off we can use another version of this method that takes in input the path to the link component and a boolean flag that indicates if AJAX must be enabled (true) or not (false). @@ -79,7 +79,7 @@ WicketTester provides also a set of methods to test the states of a component. T * *assertVisible(String path)/assertInvisible(String path)*: they test component visibility. * *assertRequired(String path)*: checks if a form component is required. -In the test case from project _CustomDatepickerAjax_ we used _assertEnabled_/_assertDisabled_ to check if button [update] really disables our datepicker: +In the test case from project _CustomDatepickerAjax_ we used _assertEnabled_/_assertDisabled_ to check if button "update" really disables our datepicker: [source,java] ---- http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc b/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc index bcbb7d1..853b14f 100644 --- a/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc +++ b/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc @@ -5,7 +5,7 @@ Having structured URLs in our site is a basic requirement if we want to build an === Mounting a single page -With Wicket we can mount a page to a given path in much the same way as we map a servlet filter to a desired path inside file web.xml (see <<helloWorld.adoc#_configuration_of_wicket_applications,paragraph 4.2>>). Using mountPage(String path, Class <T> pageClass) method of the WepApplication class we tell Wicket to respond with a new instance of pageClass whenever a user navigates to the given path. In the application class of the project MountedPagesExample we mount MountedPage to the [/pageMount] path: +With Wicket we can mount a page to a given path in much the same way as we map a servlet filter to a desired path inside file web.xml (see <<helloWorld.adoc#_configuration_of_wicket_applications,paragraph 4.2>>). Using mountPage(String path, Class <T> pageClass) method of the WepApplication class we tell Wicket to respond with a new instance of pageClass whenever a user navigates to the given path. In the application class of the project MountedPagesExample we mount MountedPage to the "/pageMount" path: [source,java] ---- http://git-wip-us.apache.org/repos/asf/wicket/blob/5a4a6a7d/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc b/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc index b23535f..de22018 100644 --- a/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc @@ -47,7 +47,7 @@ If we press the back button the page version previously rendered (and serialized image::../img/browser-back.png[] -NOTE: For more details about page storing you can take a look at paragraph [Page storing] from chapter [Wicket Internals] The content of this paragraph is from wiki page https://cwiki.apache.org/confluence/display/WICKET/Page+Storage. +NOTE: For more details about page storing you can take a look at paragraph "Page storing" from chapter "Wicket Internals" The content of this paragraph is from wiki page https://cwiki.apache.org/confluence/display/WICKET/Page+Storage. As we have stated at the beginning of this chapter, page versions are stored using Java serialization, therefore every object referenced inside a page must be serializable. In <<modelsforms.adoc#_model_chaining,paragraph 11.6>> we will see how to overcome this limit and work with non-serializable objects in our components using detachable Wicket models.
