You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2017/05/18 15:29:56 UTC
wicket git commit: Minor fix for formatting issues
Repository: wicket
Updated Branches:
refs/heads/master 58b0e73d8 -> 86fe8a955
Minor fix for formatting issues
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/86fe8a95
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/86fe8a95
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/86fe8a95
Branch: refs/heads/master
Commit: 86fe8a955c5003d044c91670c1e929d8c544f3cb
Parents: 58b0e73
Author: Andrea Del Bene <an...@innoteam.it>
Authored: Thu May 18 17:29:34 2017 +0200
Committer: Andrea Del Bene <an...@innoteam.it>
Committed: Thu May 18 17:29:34 2017 +0200
----------------------------------------------------------------------
.../src/main/asciidoc/helloWorld/helloWorld_3.adoc | 3 +--
wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc | 4 +++-
wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc | 5 ++++-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/86fe8a95/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_3.adoc b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_3.adoc
index 71374e9..7137589 100644
--- a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_3.adoc
@@ -55,8 +55,7 @@ Here is the HTML markup for _HomePage_ (file HomePage.html):
We can see that the _wicket:id_ attribute is set according to the value of the component id. If we run this example we will see the text _Hello WicketWorld!_ Inside a _<div>_ tag.
-NOTE: _Label_ replaces the original content of its tag (in our example _ <<_Label's message goes here>>
-_) with the string passed as value (_Hello WicketWorld!_ in our example).
+NOTE: _Label_ replaces the original content of its tag (in our example _[Label's message goes here]_) with the string passed as value (_Hello WicketWorld!_ in our example)
WARNING: If we specify a _wicket:id_ attribute for a tag without adding the corresponding component in our Java code, Wicket will throw a _ComponentNotFound_ Exception. On the contrary if we add a component in our Java code without specifying a corresponding _wicket:id_ attribute in our markup, Wicket will throw a _WicketRuntimeException_.
http://git-wip-us.apache.org/repos/asf/wicket/blob/86fe8a95/wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc b/wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc
index b4b0a31..ebce17b 100644
--- a/wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/http2push/http2push_1.adoc
@@ -12,7 +12,8 @@ For the setup you need to follow those steps:
1. Setup your server to use HTTP/2 and follow the instructions provided by the vendor specific documentation. (Because of HTTP/2 a HTTPS setup is also required)
2. Add the respective dependency for your web server to provide the push functionality.
-[source,java]
+
+[source,xml]
----
<dependency>
<groupId>org.apache.wicket.experimental.wicket8</groupId>
@@ -26,6 +27,7 @@ For the setup you need to follow those steps:
[arabic, start=3]
1. Use the PushHeader Item like in this example page:
Example:
+
[source,java]
----
public class HTTP2Page extends WebPage
http://git-wip-us.apache.org/repos/asf/wicket/blob/86fe8a95/wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc b/wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc
index 017f37c..0cddaa0 100644
--- a/wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/http2push/http2push_2.adoc
@@ -2,7 +2,8 @@
To create a server specific http/2 push support of the Wicket PushBuilder API just follow these steps:
1. Add the following dependency to your projects pom.xml (and of course adjust the version)
-[source,java]
+
+[source,xml]
----
<dependency>
<groupId>org.apache.wicket.experimental.wicket8</groupId>
@@ -17,6 +18,7 @@ To create a server specific http/2 push support of the Wicket PushBuilder API ju
2. Add a single line with the name of the _IInitializer_ class example: _org.apache.wicket.http2.Initializer_ to the created file
3. Implement your own server specific PushBuilder class which implements the interface _org.apache.wicket.http2.markup.head.PushBuilder_ This is an example how it was done for jetty:
+
[source,java]
----
public class Jetty9PushBuilder implements PushBuilder
@@ -38,6 +40,7 @@ public class Jetty9PushBuilder implements PushBuilder
----
[arabic, start=5]
1. Implement the class within the package _org.apache.wicket.http2.Initializer_ and add your own server specific PushBuilder class to the Http2Settings. This is an example how it was done for jetty:
+
[source,java]
----
public class Initializer implements IInitializer