Repository: wicket Updated Branches: refs/heads/grails-maven-integration bd18b9b11 -> 071e5a06a
changes for WICKET-5713 and WICKET-5124 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/071e5a06 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/071e5a06 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/071e5a06 Branch: refs/heads/grails-maven-integration Commit: 071e5a06a99a56914482a5fd1418a256bb1d5906 Parents: bd18b9b Author: Andrea Del Bene <[email protected]> Authored: Thu Apr 9 16:58:30 2015 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Thu Apr 9 16:58:30 2015 +0200 ---------------------------------------------------------------------- wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc | 6 +++--- wicket-user-guide/src/docs/guide/resources/resources_6.gdoc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/071e5a06/wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc b/wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc index aaa38b4..0c6c3a6 100644 --- a/wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc +++ b/wicket-user-guide/src/docs/guide/advanced/advanced_3.gdoc @@ -2,7 +2,7 @@ Some components or resources may need to be configured before being used in our applications. While so far we used Application's init method to initialize these kinds of entities, Wicket offers a more flexible and modular way to configure our classes. -During application's bootstrap Wicket searches for any properties file named wicket.properties placed in one of the classpath roots visible to the application. When one of these files is found, the initializer defined inside it will be executed. An initializer is an implementation of interface @org.apache.wicket.IInitializer@ and is defined inside wicket.properties with a line like this: +During application's bootstrap Wicket searches for any properties file placed in one of the '/META-INF/wicket/' folder visible to the application classpath. When one of these files is found, the initializer defined inside it will be executed. An initializer is an implementation of interface @org.apache.wicket.IInitializer@ and is defined inside a properties with a line like this: {code} initializer=org.wicketTutorial.MyInitializer @@ -23,7 +23,7 @@ public class MyInitializer implements IInitializer{ } {code} -Only one initializer can be defined in a single wicket.properties file. To overcome this limit we can create a main initializer that in turn executes every initializer we need: +Only one initializer can be defined in a single properties file. To overcome this limit we can create a main initializer that in turn executes every initializer we need: {code} public class MainInitializer implements IInitializer{ @@ -35,4 +35,4 @@ public class MainInitializer implements IInitializer{ } //destroy... } -{code} \ No newline at end of file +{code} http://git-wip-us.apache.org/repos/asf/wicket/blob/071e5a06/wicket-user-guide/src/docs/guide/resources/resources_6.gdoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/docs/guide/resources/resources_6.gdoc b/wicket-user-guide/src/docs/guide/resources/resources_6.gdoc index 1cf2d0e..eac1339 100644 --- a/wicket-user-guide/src/docs/guide/resources/resources_6.gdoc +++ b/wicket-user-guide/src/docs/guide/resources/resources_6.gdoc @@ -1,6 +1,6 @@ -Class @ResourceReference@ allows to specify the resources it depends on overriding method @getDependencies()@. The method returns an iterator over the set of @HeaderItems@ that must be rendered before the resource referenced by @ResourceReference@ can be used. This can be really helpful when our resources are JavaScript or CSS libraries that in turn depend on other libraries. +Class @ResourceReference@ allows to specify the resources it depends on overriding method @getDependencies()@. The method returns a list of @HeaderItem@s that must be rendered before the resource referenced by @ResourceReference@ can be used. This can be really helpful when our resources are JavaScript or CSS libraries that in turn depend on other libraries. For example we can use this method to ensure that a custom reference to JQueryUI library will find JQuery already loaded in the page: @@ -10,7 +10,7 @@ Url jqueyuiUrl = Url.parse("https://ajax.googleapis.com/ajax/libs/jqueryui/"; + UrlResourceReference jqueryuiRef = new UrlResourceReference(jqueyuiUrl){ @Override - public Iterable<? extends HeaderItem> getDependencies() { + public List<HeaderItem> getDependencies() { Application application = Application.get(); ResourceReference jqueryRef = application.getJavaScriptLibrarySettings(). getJQueryReference(); @@ -22,4 +22,4 @@ UrlResourceReference jqueryuiRef = new UrlResourceReference(jqueyuiUrl){ Please note that in the code above we have built a resource reference using a URL to the desired library instead of a package resource holding the physical file. -The same method @getDependencies()@ is defined also for class @HeaderItem@. \ No newline at end of file +The same method @getDependencies()@ is defined also for class @HeaderItem@.
