Author: solomax
Date: Thu Feb 2 12:18:49 2017
New Revision: 1781378
URL: http://svn.apache.org/viewvc?rev=1781378&view=rev
Log:
[OPENMEETINGS-1546] secure hash seems to work after wicket update
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/pom.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1781378&r1=1781377&r2=1781378&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Thu Feb 2 12:18:49 2017
@@ -78,8 +78,8 @@ import org.apache.wicket.RuntimeConfigur
import org.apache.wicket.ThreadContext;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
-import
org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import
org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
+import org.apache.wicket.core.request.handler.ListenerRequestHandler;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -175,7 +175,7 @@ public class Application extends Authent
@Override
public Url mapHandler(IRequestHandler requestHandler) {
- if (requestHandler instanceof
ListenerInterfaceRequestHandler || requestHandler instanceof
BookmarkableListenerInterfaceRequestHandler) {
+ if (requestHandler instanceof ListenerRequestHandler ||
requestHandler instanceof BookmarkableListenerRequestHandler) {
return null;
} else {
return super.mapHandler(requestHandler);
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1781378&r1=1781377&r2=1781378&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Thu Feb 2 12:18:49 2017
@@ -40,10 +40,10 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
- <wicket.version>8.0.0-M3</wicket.version>
- <wicketju.version>8.0.0-M3</wicketju.version>
- <wickets.version>8.0.0-M3</wickets.version>
- <wicketws.version>8.0.0-M3</wicketws.version>
+ <wicket.version>8.0.0-SNAPSHOT</wicket.version>
+ <wicketju.version>8.0.0-SNAPSHOT</wicketju.version>
+ <wickets.version>8.0.0-SNAPSHOT</wickets.version>
+ <wicketws.version>8.0.0-SNAPSHOT</wicketws.version>
<red5-server.version>1.0.8-RELEASE</red5-server.version>
<red5-client.version>1.0.8-RELEASE</red5-client.version>
<spring.version>4.3.5.RELEASE</spring.version>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1781378&r1=1781377&r2=1781378&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Thu Feb 2 12:18:49 2017
@@ -78,8 +78,8 @@ import org.apache.wicket.RuntimeConfigur
import org.apache.wicket.ThreadContext;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
-import
org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
-import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
+import
org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
+import org.apache.wicket.core.request.handler.ListenerRequestHandler;
import org.apache.wicket.core.request.mapper.MountedMapper;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -175,7 +175,7 @@ public class Application extends Authent
@Override
public Url mapHandler(IRequestHandler requestHandler) {
- if (requestHandler instanceof
ListenerInterfaceRequestHandler || requestHandler instanceof
BookmarkableListenerInterfaceRequestHandler) {
+ if (requestHandler instanceof ListenerRequestHandler ||
requestHandler instanceof BookmarkableListenerRequestHandler) {
return null;
} else {
return super.mapHandler(requestHandler);
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1781378&r1=1781377&r2=1781378&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Thu Feb 2 12:18:49 2017
@@ -40,10 +40,10 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
- <wicket.version>8.0.0-M3</wicket.version>
- <wicketju.version>8.0.0-M3</wicketju.version>
- <wickets.version>8.0.0-M3</wickets.version>
- <wicketws.version>8.0.0-M3</wicketws.version>
+ <wicket.version>8.0.0-SNAPSHOT</wicket.version>
+ <wicketju.version>8.0.0-SNAPSHOT</wicketju.version>
+ <wickets.version>8.0.0-SNAPSHOT</wickets.version>
+ <wicketws.version>8.0.0-SNAPSHOT</wicketws.version>
<red5-server.version>1.0.8-RELEASE</red5-server.version>
<red5-client.version>1.0.8-RELEASE</red5-client.version>
<spring.version>4.3.5.RELEASE</spring.version>
