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 2017/03/07 09:08:58 UTC
svn commit: r1785814 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/
trunk/openmeetings-web/src/main/java/org...
Author: solomax
Date: Tue Mar 7 09:08:58 2017
New Revision: 1785814
URL: http://svn.apache.org/viewvc?rev=1785814&view=rev
Log:
no jira: screen-sharing is fixed
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/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
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=1785814&r1=1785813&r2=1785814&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 Tue Mar 7 09:08:58 2017
@@ -121,6 +121,8 @@ public class Application extends Authent
, "909", "952", "978", "981", "984", "989", "990", "999", "1151", "1155", "1157", "1158", "1194"));
}
public static final String HASH_MAPPING = "/hash";
+ public static final String SIGNIN_MAPPING = "/signin";
+ public static final String NOTINIT_MAPPING = "/notinited";
@Override
protected void init() {
@@ -152,9 +154,9 @@ public class Application extends Authent
dashboardSettings.setIncludeJQueryUI(false);
getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
- getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
+ getRootRequestMapperAsCompound().add(new NoVersionMapper(NOTINIT_MAPPING, NotInitedPage.class));
getRootRequestMapperAsCompound().add(new NoVersionMapper(HASH_MAPPING, HashPage.class));
- getRootRequestMapperAsCompound().add(new NoVersionMapper("signin", getSignInPageClass()));
+ getRootRequestMapperAsCompound().add(new NoVersionMapper(SIGNIN_MAPPING, getSignInPageClass()));
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
mountPage("reset", ResetPage.class);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1785814&r1=1785813&r2=1785814&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java Tue Mar 7 09:08:58 2017
@@ -19,6 +19,8 @@
package org.apache.openmeetings.web.util;
import static org.apache.openmeetings.web.app.Application.HASH_MAPPING;
+import static org.apache.openmeetings.web.app.Application.NOTINIT_MAPPING;
+import static org.apache.openmeetings.web.app.Application.SIGNIN_MAPPING;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.request.IRequestParameters;
@@ -51,14 +53,22 @@ public class ExtendedClientProperties ex
return new JSONObject();
}
+ private static StringBuilder cleanUrl(StringBuilder sb, String _url) {
+ for (String tail : new String[]{HASH_MAPPING, SIGNIN_MAPPING, NOTINIT_MAPPING}) {
+ if (_url.endsWith(tail)) {
+ sb.setLength(_url.length() - tail.length());
+ break;
+ }
+ }
+ return sb;
+ }
+
@Override
public void read(IRequestParameters parameters) {
super.read(parameters);
String _url = parameters.getParameterValue("codebase").toString("N/A");
StringBuilder sb = new StringBuilder(_url);
- if (_url.endsWith(HASH_MAPPING)) {
- sb.setLength(_url.length() - HASH_MAPPING.length());
- }
+ cleanUrl(sb, _url);
if (sb.charAt(sb.length() - 1) != '/') {
sb.append('/');
}
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=1785814&r1=1785813&r2=1785814&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 Tue Mar 7 09:08:58 2017
@@ -121,6 +121,8 @@ public class Application extends Authent
, "909", "952", "978", "981", "984", "989", "990", "999", "1151", "1155", "1157", "1158", "1194"));
}
public static final String HASH_MAPPING = "/hash";
+ public static final String SIGNIN_MAPPING = "/signin";
+ public static final String NOTINIT_MAPPING = "/notinited";
@Override
protected void init() {
@@ -152,9 +154,9 @@ public class Application extends Authent
dashboardSettings.setIncludeJQueryUI(false);
getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage()));
- getRootRequestMapperAsCompound().add(new NoVersionMapper("notinited", NotInitedPage.class));
+ getRootRequestMapperAsCompound().add(new NoVersionMapper(NOTINIT_MAPPING, NotInitedPage.class));
getRootRequestMapperAsCompound().add(new NoVersionMapper(HASH_MAPPING, HashPage.class));
- getRootRequestMapperAsCompound().add(new NoVersionMapper("signin", getSignInPageClass()));
+ getRootRequestMapperAsCompound().add(new NoVersionMapper(SIGNIN_MAPPING, getSignInPageClass()));
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
mountPage("reset", ResetPage.class);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java?rev=1785814&r1=1785813&r2=1785814&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java Tue Mar 7 09:08:58 2017
@@ -19,6 +19,8 @@
package org.apache.openmeetings.web.util;
import static org.apache.openmeetings.web.app.Application.HASH_MAPPING;
+import static org.apache.openmeetings.web.app.Application.NOTINIT_MAPPING;
+import static org.apache.openmeetings.web.app.Application.SIGNIN_MAPPING;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.request.IRequestParameters;
@@ -51,14 +53,22 @@ public class ExtendedClientProperties ex
return new JSONObject();
}
+ private static StringBuilder cleanUrl(StringBuilder sb, String _url) {
+ for (String tail : new String[]{HASH_MAPPING, SIGNIN_MAPPING, NOTINIT_MAPPING}) {
+ if (_url.endsWith(tail)) {
+ sb.setLength(_url.length() - tail.length());
+ break;
+ }
+ }
+ return sb;
+ }
+
@Override
public void read(IRequestParameters parameters) {
super.read(parameters);
String _url = parameters.getParameterValue("codebase").toString("N/A");
StringBuilder sb = new StringBuilder(_url);
- if (_url.endsWith(HASH_MAPPING)) {
- sb.setLength(_url.length() - HASH_MAPPING.length());
- }
+ cleanUrl(sb, _url);
if (sb.charAt(sb.length() - 1) != '/') {
sb.append('/');
}