Author: solomax
Date: Sat Feb 25 16:00:45 2017
New Revision: 1784392
URL: http://svn.apache.org/viewvc?rev=1784392&view=rev
Log:
no jira: build is fixed
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1784392&r1=1784391&r2=1784392&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Sat Feb 25 16:00:45 2017
@@ -110,7 +110,7 @@ public class RoomPanel extends BasePanel
target.appendJavaScript("setRoomSizes();");
//TODO SID etc
try {
- URL url = new
URL(getMainPanel().getExtendedProperties().getCodebase());
+ URL url = new
URL(WebSession.get().getExtendedProperties().getCodebase());
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) +
1);
target.appendJavaScript(String.format("initVideo(%s);", new JSONObject()
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=1784392&r1=1784391&r2=1784392&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
Sat Feb 25 16:00:45 2017
@@ -22,7 +22,6 @@ import static org.apache.wicket.RuntimeC
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;