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 2016/05/10 06:03:27 UTC
svn commit: r1743102 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
branches/3.1.x/openmeetings-web/s...
Author: solomax
Date: Tue May 10 06:03:26 2016
New Revision: 1743102
URL: http://svn.apache.org/viewvc?rev=1743102&view=rev
Log:
[OPENMEETINGS-1396] swf selection is improved
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue May 10 06:03:26 2016
@@ -39,9 +39,9 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -245,10 +245,7 @@ public class SignInDialog extends Abstra
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType()
- ? "networktestingdebug.swf10.swf" : "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", RoomPanel.SWF_TYPE_NETWORK));
}
});
add(new WebMarkupContainer("oauthContainer").add(
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Tue May 10 06:03:26 2016
@@ -26,6 +26,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.room.RoomBroadcaster.getClient;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
+import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.util.HashMap;
@@ -48,7 +49,6 @@ import org.apache.openmeetings.web.room.
import org.apache.openmeetings.web.room.poll.PollResultsDialog;
import org.apache.openmeetings.web.room.poll.VoteDialog;
import org.apache.wicket.Component;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -72,6 +72,7 @@ public class RoomPanel extends BasePanel
private static final String WICKET_ROOM_ID = "wicketroomid";
public static final String PARAM_PUBLIC_SID = "publicSid";
public static final String PARAM_URL = "url";
+ public static final String SWF_TYPE_NETWORK = "network";
private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
private final InvitationDialog invite;
private final CreatePollDialog createPoll;
@@ -84,9 +85,9 @@ public class RoomPanel extends BasePanel
this(id, new PageParameters());
}
- private String getFlashFile() {
- return RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType()
- ? "maindebug.swf11.swf" : "main.swf11.swf";
+ private String getFlashFile(StringValue type) {
+ String fmt = SWF_TYPE_NETWORK.equals(type.toString()) ? "networktesting%s.swf10.swf" : "main%s.swf11.swf";
+ return String.format(fmt, DEVELOPMENT == getApplication().getConfigurationType() ? "debug" : "");
}
private static PageParameters addServer(PageParameters pp, Server s) {
@@ -151,13 +152,11 @@ public class RoomPanel extends BasePanel
} catch (Exception e) {
//no-op
}
- StringValue swfVal = pp.get("swf");
PageParameters spp = new PageParameters(pp);
if (roomId != null) {
spp.mergeWith(new PageParameters().add(WICKET_ROOM_ID, roomId));
}
- String swf = (swfVal.isEmpty() ? getFlashFile() : swfVal.toString())
- + new PageParametersEncoder().encodePageParameters(spp);
+ String swf = getFlashFile(pp.get("swf")) + new PageParametersEncoder().encodePageParameters(spp);
add(new Label("init", String.format("initSwf('%s');", swf)).setEscapeModelStrings(false));
add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Tue May 10 06:03:26 2016
@@ -30,6 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
@@ -73,9 +74,7 @@ public class WelcomeWidgetView extends W
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", RoomPanel.SWF_TYPE_NETWORK));
}
});
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Tue May 10 06:03:26 2016
@@ -181,7 +181,12 @@ public class ScopeApplicationAdapter ext
rcm.setStreamid(conn.getClient().getId());
StringValue scn = StringValue.valueOf(conn.getScope().getName());
rcm.setScope(scn.toString());
- rcm.setRoomId(scn.toOptionalLong());
+ long roomId = scn.toLong(Long.MIN_VALUE);
+ if (Long.MIN_VALUE != roomId) {
+ rcm.setRoomId(roomId);
+ } else if (!"hibernate".equals(scn.toString())) {
+ return rejectClient();
+ }
rcm.setUserport(conn.getRemotePort());
rcm.setUserip(conn.getRemoteAddress());
rcm.setSwfurl(swfURL);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue May 10 06:03:26 2016
@@ -39,9 +39,9 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -245,10 +245,7 @@ public class SignInDialog extends Abstra
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType()
- ? "networktestingdebug.swf10.swf" : "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", SwfPanel.SWF_TYPE_NETWORK));
}
});
add(new WebMarkupContainer("oauthContainer").add(
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java Tue May 10 06:03:26 2016
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
import static org.apache.openmeetings.web.app.WebSession.getSid;
+import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.util.HashMap;
import java.util.List;
@@ -37,7 +38,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -59,6 +59,7 @@ public class SwfPanel extends BasePanel
private static final String WICKET_ROOM_ID = "wicketroomid";
public static final String PARAM_PUBLIC_SID = "publicSid";
public static final String PARAM_URL = "url";
+ public static final String SWF_TYPE_NETWORK = "network";
private static final Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, webAppRootKey);
private Long roomId = null;
@@ -92,13 +93,11 @@ public class SwfPanel extends BasePanel
} catch (Exception e) {
//no-op
}
- StringValue swfVal = pp.get("swf");
PageParameters spp = new PageParameters(pp);
if (roomId != null) {
spp.mergeWith(new PageParameters().add(WICKET_ROOM_ID, roomId));
}
- String swf = (swfVal.isEmpty() ? getFlashFile() : swfVal.toString())
- + new PageParametersEncoder().encodePageParameters(spp);
+ String swf = getFlashFile(pp.get("swf")) + new PageParametersEncoder().encodePageParameters(spp);
add(new Label("init", String.format("initSwf('%s');", swf)).setEscapeModelStrings(false));
add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
private static final long serialVersionUID = 1L;
@@ -127,9 +126,9 @@ public class SwfPanel extends BasePanel
}
}
- private String getFlashFile() {
- return RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType()
- ? "maindebug.swf11.swf" : "main.swf11.swf";
+ private String getFlashFile(StringValue type) {
+ String fmt = SWF_TYPE_NETWORK.equals(type.toString()) ? "networktesting%s.swf10.swf" : "main%s.swf11.swf";
+ return String.format(fmt, DEVELOPMENT == getApplication().getConfigurationType() ? "debug" : "");
}
private static PageParameters addServer(PageParameters pp, Server s) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Tue May 10 06:03:26 2016
@@ -30,6 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
@@ -73,9 +74,7 @@ public class WelcomeWidgetView extends W
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", SwfPanel.SWF_TYPE_NETWORK));
}
});
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Tue May 10 06:03:26 2016
@@ -181,7 +181,12 @@ public class ScopeApplicationAdapter ext
rcm.setStreamid(conn.getClient().getId());
StringValue scn = StringValue.valueOf(conn.getScope().getName());
rcm.setScope(scn.toString());
- rcm.setRoomId(scn.toOptionalLong());
+ long roomId = scn.toLong(Long.MIN_VALUE);
+ if (Long.MIN_VALUE != roomId) {
+ rcm.setRoomId(roomId);
+ } else if (!"hibernate".equals(scn.toString())) {
+ return rejectClient();
+ }
rcm.setUserport(conn.getRemotePort());
rcm.setUserip(conn.getRemoteAddress());
rcm.setSwfurl(swfURL);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Tue May 10 06:03:26 2016
@@ -39,9 +39,9 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -245,10 +245,7 @@ public class SignInDialog extends Abstra
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", RuntimeConfigurationType.DEVELOPMENT == getApplication().getConfigurationType()
- ? "networktestingdebug.swf10.swf" : "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", SwfPanel.SWF_TYPE_NETWORK));
}
});
add(new WebMarkupContainer("oauthContainer").add(
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java Tue May 10 06:03:26 2016
@@ -19,6 +19,8 @@
package org.apache.openmeetings.web.room;
+import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
+
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -33,6 +35,7 @@ import org.apache.wicket.util.string.Str
public class SwfPanel extends BasePanel {
private static final long serialVersionUID = 1L;
+ public static final String SWF_TYPE_NETWORK = "network";
public SwfPanel(String id) {
this(id, new PageParameters());
@@ -43,10 +46,11 @@ public class SwfPanel extends BasePanel
}
public String getInitFunction(PageParameters pp) {
- StringValue swfVal = pp.get("swf");
String initStr = null;
- if (!swfVal.isEmpty()) {
- String swf = swfVal.toString() + new PageParametersEncoder().encodePageParameters(pp);
+ StringValue type = pp.get("swf");
+ if (SWF_TYPE_NETWORK.equals(type.toString())) {
+ String swf = String.format("networktesting%s.swf10.swf", DEVELOPMENT == getApplication().getConfigurationType() ? "debug" : "")
+ + new PageParametersEncoder().encodePageParameters(pp);
initStr = String.format("initSwf('%s');", swf);
}
return initStr;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1743102&r1=1743101&r2=1743102&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Tue May 10 06:03:26 2016
@@ -30,6 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.SwfPage;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
@@ -73,9 +74,7 @@ public class WelcomeWidgetView extends W
@Override
public void onClick() {
- PageParameters pp = new PageParameters();
- pp.add("swf", "networktesting.swf10.swf");
- setResponsePage(SwfPage.class, pp);
+ setResponsePage(SwfPage.class, new PageParameters().add("swf", SwfPanel.SWF_TYPE_NETWORK));
}
});
}