You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/11/11 12:35:36 UTC

svn commit: r1638067 [3/3] - in /wicket/common/site/trunk/_site/guide/guide: ./ pages/ src/docs/guide/ src/docs/guide/nativewebsockets/

Modified: wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/whyLearn_4.html Tue Nov 11 11:35:28 2014
@@ -199,7 +199,7 @@ Wicket is not the only component oriente
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_1.html Tue Nov 11 11:35:28 2014
@@ -197,7 +197,7 @@ Every WicketStuff module can be download
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_2.html Tue Nov 11 11:35:28 2014
@@ -216,7 +216,7 @@ textArea.add(<span class="java&#45;keywo
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_3.html Tue Nov 11 11:35:28 2014
@@ -207,7 +207,7 @@ function addJsClass() {
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_4.html Tue Nov 11 11:35:28 2014
@@ -201,7 +201,7 @@ add(<span class="java&#45;keyword">new</
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_5.html Tue Nov 11 11:35:28 2014
@@ -200,7 +200,7 @@ add(grid);</pre></div><p class="paragrap
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/pages/wicketstuff_6.html Tue Nov 11 11:35:28 2014
@@ -216,7 +216,7 @@ To write/read objects to response/from r
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/redirects.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/redirects.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/redirects.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/redirects.html Tue Nov 11 11:35:28 2014
@@ -227,7 +227,7 @@ Quite a few teams have already got stuck
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/repeaters.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/repeaters.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/repeaters.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/repeaters.html Tue Nov 11 11:35:28 2014
@@ -352,7 +352,7 @@ Wicket provides also component PageableL
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/requestProcessing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/requestProcessing.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/requestProcessing.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/requestProcessing.html Tue Nov 11 11:35:28 2014
@@ -331,7 +331,7 @@ processing of an Ajax request Wicket wil
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/resources.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/resources.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/resources.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/resources.html Tue Nov 11 11:35:28 2014
@@ -456,7 +456,7 @@ In this chapter we have learnt how to ma
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/security.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/security.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/security.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/security.html Tue Nov 11 11:35:28 2014
@@ -461,7 +461,7 @@ Application class <code>AuthenticatedWeb
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/single.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/single.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/single.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/single.html Tue Nov 11 11:35:28 2014
@@ -3459,7 +3459,7 @@ Writing a web application is not just ab
 <a href="http://en.wikipedia.org/wiki/WebSocket" target="blank">WebSockets</a> is a technology that provides full-duplex communications channels over a single TCP connection.
 This means that once the browser establish a web socket connection to the server the server can push data back to the browser without the browser explicitly asking again and again whether there is something new for it.<p class="paragraph"/>Wicket Native WebSockets modules provide functionality to integrate with the non-standard APIs provided by different web containers (like <a href="http://tomcat.apache.org/" target="blank">Apache Tomcat</a> and <a href="http://www.eclipse.org/jetty/" target="blank">Jetty</a>) and standard <a href="https://www.jcp.org/en/jsr/detail?id=356" target="blank">JSR356</a> implementations.<p class="paragraph"/><blockquote class="warning">
 Native WebSocket works only when both the browser and the web containers support WebSocket technology. There are no plans to add support to fallback to long-polling, streaming or any other technology that simulates two way communication. Use it only if you really know that you will run your application in an environment that supports WebSockets.
-Currently supported web containers are Jetty 7.5+ and Tomcat 7.0.27+.
+Currently supported web containers are Jetty 7.5+ , Tomcat 7.0.27+ and JBoss WildFly 8.0.0+.
 Supported browsers can be found at <a href="http://caniuse.com/#search=websocket" target="blank">caniuse.com</a>.
 </blockquote>
 
@@ -3467,7 +3467,7 @@ Supported browsers can be found at <a hr
 
 <h2 id="nativewebsockets_1">20.1 How does it work ?</h2>
 Each of the modules provide a specialization of <code>org.apache.wicket.protocol.http.WicketFilter</code> that registers implementation specific endpoint when an HTTP request is <a href="http://en.wikipedia.org/wiki/WebSocket#WebSocket_protocol_handshake" target="blank">upgraded</a> to WebSocket one. Later Wicket uses this endpoint to write data back to the browser and read data sent by it.<p class="paragraph"/>WebSockets communication can be used in a Wicket page by using <code>org.apache.wicket.protocol.ws.api.WebSocketBehavior</code> or in a IResource by exteding <code>org.apache.wicket.protocol.ws.api.WebSocketResource</code>.
-When a client is connected it is being registered in a application scoped registry using as a key the application name, the client session id, and the id of the page or the resource name that registered it. Later when the server needs to push a message it can use this registry to filter out which clients need to receive the message.<p class="paragraph"/>When a message is received from the client Wicket wraps it in <code>IWebSocketMessage</code> and calls WebSocketBehavior#<strong class="bold">onMessage()</strong> or WebSocketResource#<strong class="bold">onMessage()</strong> where the application logic can react on it.
+When a client is connected it is being registered in a application scoped registry using as a key the application name, the client http session id, and the id of the page or the resource name that registered it. Later when the server needs to push a message it can use this registry to filter out which clients need to receive the message.<p class="paragraph"/>When a message is received from the client Wicket wraps it in <code>IWebSocketMessage</code> and calls WebSocketBehavior#<strong class="bold">onMessage()</strong> or WebSocketResource#<strong class="bold">onMessage()</strong> where the application logic can react on it.
 The server can push plain text and binary data to the client, but it can also add components for re-render, prepend/append JavaScript as it can do with <a href="../guide/single.html#ajax" class="guide">Ajax</a>.
 
 
@@ -3491,19 +3491,22 @@ The server can push plain text and binar
   &#60;version&#62;...&#60;/version&#62;
 &#60;/dependency&#62;</pre></div>
 <ul class="minus">
-<li>for Tomcat 7.0.27+ (first, non-JSR356 implementation)</li>
+<li>for Tomcat 7.0.27+ (the old, non-JSR356 implementation)</li>
 </ul><p class="paragraph"/><div class="code"><pre>&#60;dependency&#62;
   &#60;groupId&#62;org.apache.wicket&#60;/groupId&#62;
   &#60;artifactId&#62;wicket&#45;<span class="java&#45;keyword">native</span>&#45;websocket&#45;tomcat&#60;/artifactId&#62;
   &#60;version&#62;...&#60;/version&#62;
 &#60;/dependency&#62;</pre></div>
 <ul class="minus">
-<li>for JSR356 complaint implementations (at the moment are supported: Tomcat 8.x, Tomcat 7.0.47+, Jetty 9.1.x and JBoss Wildfly 8.0.Final)</li>
+<li>for JSR356 complaint implementations (at the moment are supported: Tomcat 8.0+, Tomcat 7.0.47+, Jetty 9.1.0+ and JBoss Wildfly 8.0.0+)</li>
 </ul><p class="paragraph"/><div class="code"><pre>&#60;dependency&#62;
   &#60;groupId&#62;org.apache.wicket&#60;/groupId&#62;
   &#60;artifactId&#62;wicket&#45;<span class="java&#45;keyword">native</span>&#45;websocket&#45;javax&#60;/artifactId&#62;
   &#60;version&#62;...&#60;/version&#62;
 &#60;/dependency&#62;</pre></div><p class="paragraph"/><blockquote class="note">
+All web containers providing JSR356 implementation are built with Java 7. This is the reason why <code>wicket-native-websocket-javax</code> module is available only with Wicket 7.x. If your application runs with JRE 7.x then you can
+use <code>wicket-native-websocket-javax</code> together with the latest version of Wicket 6.x. Beware that the API/implementation of <code>wicket-native-websocket-javax</code> may change before Wicket 7.0.0 is released!
+</blockquote><p class="paragraph"/><blockquote class="note">
 The examples above show snippets for Maven's pom.xml but the application can use any other dependency management tool like <a href="http://www.gradle.org/" target="blank">Gradle</a>, <a href="http://www.scala-sbt.org/" target="blank">SBT</a>, &#8230;
 </blockquote>
 <ul class="star">
@@ -3559,7 +3562,7 @@ Once a page that contributes <code>(Base
 
 <h2 id="nativewebsockets_4">20.4 Testing</h2>
 The module provides <code>org.apache.wicket.protocol.ws.util.tester.WebSocketTester</code> which gives you the possibility to emulate sending and receiving messages without the need to run in a real web container, as WicketTester does this for HTTP requests.
-Check <a href="https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java?source=c" target="blank">WebSocketTesterBehaviorTest</a>  and <a href="https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java" target="blank">WebSocketTesterResourceTest</a> for an examples.
+Check <a href="https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java?source=c" target="blank">WebSocketTesterBehaviorTest</a>  and <a href="https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java" target="blank">WebSocketTesterResourceTest</a> for examples.
 
 
 
@@ -3571,7 +3574,7 @@ Wicket-Atmosphere experimental module pr
 <h2 id="nativewebsockets_6">20.6 FAQ</h2>
 <ol>
 <li>Request and session scoped beans do not work.</li>
-</ol><p class="paragraph"/>The Web Socket communication is not processed by Servlet Filters and Listeners and thus the Dependency Injection libraries have no chance to export the request and session beans.
+</ol><p class="paragraph"/>The Web Socket communication is not processed by Servlet Filters and Listeners and thus the Dependency Injection libraries have no chance to export the request and session bean proxies.
 
 
 <h1 id="security">21 Security with Wicket</h1>
@@ -4787,7 +4790,7 @@ and attach it to a ticket in Apache Wick
         <div id="footer">
             
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
             
         </div>

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets.gdoc?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets.gdoc Tue Nov 11 11:35:28 2014
@@ -5,6 +5,6 @@ Wicket Native WebSockets modules provide
 
 {warning}
 Native WebSocket works only when both the browser and the web containers support WebSocket technology. There are no plans to add support to fallback to long-polling, streaming or any other technology that simulates two way communication. Use it only if you really know that you will run your application in an environment that supports WebSockets.
-Currently supported web containers are Jetty 7.5+ and Tomcat 7.0.27+.
+Currently supported web containers are Jetty 7.5+ , Tomcat 7.0.27+ and JBoss WildFly 8.0.0+.
 Supported browsers can be found at [caniuse.com|http://caniuse.com/#search=websocket].
 {warning}

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_1.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_1.gdoc?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_1.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_1.gdoc Tue Nov 11 11:35:28 2014
@@ -1,7 +1,7 @@
 Each of the modules provide a specialization of @org.apache.wicket.protocol.http.WicketFilter@ that registers implementation specific endpoint when an HTTP request is [upgraded|http://en.wikipedia.org/wiki/WebSocket#WebSocket_protocol_handshake] to WebSocket one. Later Wicket uses this endpoint to write data back to the browser and read data sent by it. 
 
 WebSockets communication can be used in a Wicket page by using @org.apache.wicket.protocol.ws.api.WebSocketBehavior@ or in a IResource by exteding @org.apache.wicket.protocol.ws.api.WebSocketResource@.
-When a client is connected it is being registered in a application scoped registry using as a key the application name, the client session id, and the id of the page or the resource name that registered it. Later when the server needs to push a message it can use this registry to filter out which clients need to receive the message.
+When a client is connected it is being registered in a application scoped registry using as a key the application name, the client http session id, and the id of the page or the resource name that registered it. Later when the server needs to push a message it can use this registry to filter out which clients need to receive the message.
 
 When a message is received from the client Wicket wraps it in @IWebSocketMessage@ and calls WebSocketBehavior#*onMessage()* or WebSocketResource#*onMessage()* where the application logic can react on it.
 The server can push plain text and binary data to the client, but it can also add components for re-render, prepend/append JavaScript as it can do with [Ajax|guide:ajax].

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc Tue Nov 11 11:35:28 2014
@@ -20,7 +20,7 @@ Depending on the web container that is u
 </dependency>
 {code}
 
-- for Tomcat 7.0.27+ (first, non-JSR356 implementation)
+- for Tomcat 7.0.27+ (the old, non-JSR356 implementation)
 {code}
 <dependency>
   <groupId>org.apache.wicket</groupId>
@@ -29,7 +29,7 @@ Depending on the web container that is u
 </dependency>
 {code}
 
-- for JSR356 complaint implementations (at the moment are supported: Tomcat 8.x, Tomcat 7.0.47+, Jetty 9.1.x and JBoss Wildfly 8.0.Final)
+- for JSR356 complaint implementations (at the moment are supported: Tomcat 8.0+, Tomcat 7.0.47+, Jetty 9.1.0+ and JBoss Wildfly 8.0.0+)
 {code}
 <dependency>
   <groupId>org.apache.wicket</groupId>
@@ -39,6 +39,11 @@ Depending on the web container that is u
 {code}
 
 {note}
+All web containers providing JSR356 implementation are built with Java 7. This is the reason why @wicket-native-websocket-javax@ module is available only with Wicket 7.x. If your application runs with JRE 7.x then you can
+use @wicket-native-websocket-javax@ together with the latest version of Wicket 6.x. Beware that the API/implementation of @wicket-native-websocket-javax@ may change before Wicket 7.0.0 is released!
+{note}
+
+{note}
 The examples above show snippets for Maven's pom.xml but the application can use any other dependency management tool like [Gradle|http://www.gradle.org/], [SBT|http://www.scala-sbt.org/], ...
 {note}
 

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_4.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_4.gdoc?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_4.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_4.gdoc Tue Nov 11 11:35:28 2014
@@ -1,2 +1,2 @@
 The module provides @org.apache.wicket.protocol.ws.util.tester.WebSocketTester@ which gives you the possibility to emulate sending and receiving messages without the need to run in a real web container, as WicketTester does this for HTTP requests.
-Check [WebSocketTesterBehaviorTest|https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java?source=c]  and [WebSocketTesterResourceTest|https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java] for an examples.
+Check [WebSocketTesterBehaviorTest|https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterBehaviorTest.java?source=c]  and [WebSocketTesterResourceTest|https://github.com/apache/wicket/blob/master/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterResourceTest.java] for examples.

Modified: wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_6.gdoc
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_6.gdoc?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_6.gdoc (original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/nativewebsockets/nativewebsockets_6.gdoc Tue Nov 11 11:35:28 2014
@@ -1,2 +1,2 @@
 # Request and session scoped beans do not work.
-The Web Socket communication is not processed by Servlet Filters and Listeners and thus the Dependency Injection libraries have no chance to export the request and session beans.
\ No newline at end of file
+The Web Socket communication is not processed by Servlet Filters and Listeners and thus the Dependency Injection libraries have no chance to export the request and session bean proxies.
\ No newline at end of file

Modified: wicket/common/site/trunk/_site/guide/guide/testing.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/testing.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/testing.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/testing.html Tue Nov 11 11:35:28 2014
@@ -430,7 +430,7 @@ formTester.submit(<span class="java&#45;
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/testingspring.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/testingspring.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/testingspring.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/testingspring.html Tue Nov 11 11:35:28 2014
@@ -324,7 +324,7 @@ Since the development of many web applic
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/urls.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/urls.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/urls.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/urls.html Tue Nov 11 11:35:28 2014
@@ -369,7 +369,7 @@ setResponsePage(MountedPageWithPlacehold
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/versioningCaching.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/versioningCaching.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/versioningCaching.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/versioningCaching.html Tue Nov 11 11:35:28 2014
@@ -293,7 +293,7 @@ Page '&#60;page class&#62;' is not state
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/whyLearn.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/whyLearn.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/whyLearn.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/whyLearn.html Tue Nov 11 11:35:28 2014
@@ -247,7 +247,7 @@ Wicket is not the only component oriente
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>

Modified: wicket/common/site/trunk/_site/guide/guide/wicketstuff.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/wicketstuff.html?rev=1638067&r1=1638066&r2=1638067&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/wicketstuff.html (original)
+++ wicket/common/site/trunk/_site/guide/guide/wicketstuff.html Tue Nov 11 11:35:28 2014
@@ -324,7 +324,7 @@ To write/read objects to response/from r
 <div id="footer">
     
 Copyright &copy; 2013-2014 — <a href="http://www.apache.org/" target="_blank">The Apache Software Foundation</a> 
-                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-03)</b>
+                      — <b style="color:#E8590A !important;">(Generated on: 2014-11-11)</b>
 
     
 </div>