You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/01/28 03:15:22 UTC

svn commit: r1561927 - /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java

Author: solomax
Date: Tue Jan 28 02:15:22 2014
New Revision: 1561927

URL: http://svn.apache.org/r1561927
Log:
NoVersionMapper is back in charge

Modified:
    openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java

Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1561927&r1=1561926&r2=1561927&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java Tue Jan 28 02:15:22 2014
@@ -50,6 +50,7 @@ import org.apache.wicket.Page;
 import org.apache.wicket.RestartResponseException;
 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.mapper.MountedMapper;
 import org.apache.wicket.markup.MarkupFactory;
@@ -119,9 +120,8 @@ public class Application extends Authent
 		
 		Bootstrap.install(Application.get(), new BootstrapSettings());
 		
-		mountPage("notinited", NotInitedPage.class);
-		//getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
-		//getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
+		getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
+		getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
 		mountPage("swf", SwfPage.class);
 		mountPage("install", InstallWizardPage.class);
 		mountPage("signin", getSignInPageClass());
@@ -150,7 +150,7 @@ public class Application extends Authent
 		
 		@Override
 		public Url mapHandler(IRequestHandler requestHandler) {
-			if (requestHandler instanceof ListenerInterfaceRequestHandler) {
+			if (requestHandler instanceof ListenerInterfaceRequestHandler || requestHandler instanceof BookmarkableListenerInterfaceRequestHandler) {
 				return null;
 			} else {
 				return super.mapHandler(requestHandler);