Repository: wicket Updated Branches: refs/heads/master 7932538b0 -> 2f388fa82
WICKET-6305 Remove all occurrences of Atmosphere in the project Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2f388fa8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2f388fa8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2f388fa8 Branch: refs/heads/master Commit: 2f388fa828ae333f2cbc53e838084dcf0ff034d2 Parents: 7932538 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jan 31 21:57:03 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jan 31 21:57:03 2017 +0100 ---------------------------------------------------------------------- README | 2 -- pom.xml | 6 ------ testing/wicket-js-tests/Gruntfile.js | 1 - .../java/org/apache/wicket/cdi/ConversationPropagator.java | 3 --- wicket-examples/src/main/webapp/META-INF/context.xml | 1 - .../src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc | 4 ++-- .../src/main/asciidoc/nativewebsockets/nativewebsockets_6.adoc | 3 --- wicket-user-guide/src/main/asciidoc/single.adoc | 6 +----- 8 files changed, 3 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/README ---------------------------------------------------------------------- diff --git a/README b/README index f755081..7b6cb1d 100644 --- a/README +++ b/README @@ -67,7 +67,6 @@ You will find the source code here: |-- wicket-experimental | |-- wicket-metrics | |-- wicket-http2 - | `-- wicket-atmosphere |-- wicket-extensions |-- wicket-guice |-- wicket-ioc @@ -122,7 +121,6 @@ Here is a list of projects in this distribution and what they do. - wicket-user-guide: the user guide of wicket - wicket-metrics: collects data of a running wicket application - wicket-http2: http/2 push support - - wicket-atmosphere: wicket atmosphere support Getting started --------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 901316f..d5beb05 100644 --- a/pom.xml +++ b/pom.xml @@ -376,12 +376,6 @@ </dependency> <dependency> <groupId>org.apache.wicket.experimental.wicket8</groupId> - <artifactId>wicket-atmosphere</artifactId> - <version>0.25-SNAPSHOT</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.wicket.experimental.wicket8</groupId> <artifactId>wicket-http2-core</artifactId> <version>0.1-SNAPSHOT</version> <type>jar</type> http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/testing/wicket-js-tests/Gruntfile.js ---------------------------------------------------------------------- diff --git a/testing/wicket-js-tests/Gruntfile.js b/testing/wicket-js-tests/Gruntfile.js index a25af40..0a00c67 100644 --- a/testing/wicket-js-tests/Gruntfile.js +++ b/testing/wicket-js-tests/Gruntfile.js @@ -77,7 +77,6 @@ module.exports = function(grunt) { extensions: extensionsJs, datetime: datetimeJs, nativeWebSocket: nativeWebSocketJs, - atmosphere: atmosphereJs, testsJs: testsJs, gymTestsJs: gymTestsJs, grunt: gruntJs, http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java index a366c8c..613f6a5 100644 --- a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java +++ b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java @@ -224,9 +224,6 @@ public class ConversationPropagator implements IRequestCycleListener } else if ("org.apache.wicket.protocol.ws.api.WebSocketRequestHandler".equals(handlerClassName)) { // injection is not supported in web sockets communication return false; - } else if ("org.apache.wicket.atmosphere.AtmosphereRequestHandler".equals(handlerClassName)) { - // injection is not supported in web sockets communication - return false; } } return true; http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/wicket-examples/src/main/webapp/META-INF/context.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/META-INF/context.xml b/wicket-examples/src/main/webapp/META-INF/context.xml index f6b2177..a42adda 100755 --- a/wicket-examples/src/main/webapp/META-INF/context.xml +++ b/wicket-examples/src/main/webapp/META-INF/context.xml @@ -16,6 +16,5 @@ limitations under the License. --> <Context> - <!-- <Loader className="org.atmosphere.util.AtmosphereClassloader"/> --> <Loader delegate="true"/> </Context> http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc b/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc index 73611d3..5a1396a 100644 --- a/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc +++ b/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_5.adoc @@ -1,3 +1,3 @@ -Wicket-Atmosphere experimental module provides integration with https://github.com/Atmosphere/atmosphere[Atmosphere] - +1. 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 bean proxies. http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_6.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_6.adoc b/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_6.adoc deleted file mode 100644 index 5a1396a..0000000 --- a/wicket-user-guide/src/main/asciidoc/nativewebsockets/nativewebsockets_6.adoc +++ /dev/null @@ -1,3 +0,0 @@ - -1. 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 bean proxies. http://git-wip-us.apache.org/repos/asf/wicket/blob/2f388fa8/wicket-user-guide/src/main/asciidoc/single.adoc ---------------------------------------------------------------------- diff --git a/wicket-user-guide/src/main/asciidoc/single.adoc b/wicket-user-guide/src/main/asciidoc/single.adoc index 050b444..5f44b52 100644 --- a/wicket-user-guide/src/main/asciidoc/single.adoc +++ b/wicket-user-guide/src/main/asciidoc/single.adoc @@ -621,13 +621,9 @@ include::nativewebsockets/nativewebsockets_3.adoc[leveloffset=+1] include::nativewebsockets/nativewebsockets_4.adoc[leveloffset=+1] -=== Differences with Wicket-Atmosphere module. - -include::nativewebsockets/nativewebsockets_5.adoc[leveloffset=+1] - === FAQ -include::nativewebsockets/nativewebsockets_6.adoc[leveloffset=+1] +include::nativewebsockets/nativewebsockets_5.adoc[leveloffset=+1] == Security with Wicket
