Author: solomax
Date: Mon Jun 16 14:04:15 2014
New Revision: 1602868
URL: http://svn.apache.org/r1602868
Log:
[OPENMEETINGS-1003] basic version of Video-setup is implemented
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html
- copied, changed from r1602864,
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
- copied, changed from r1602807,
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/images/error.png
- copied unchanged from r1602866,
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/assets/error.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/images/info.png
- copied unchanged from r1602843,
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/assets/info.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/images/level_meter.png
- copied unchanged from r1602843,
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/assets/level_meter.png
Removed:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PollService.java
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/assets/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/audioVideoTest/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/base/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/dragHelper.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/hibAdapter.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/lzrecorder/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/main.as3.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/miniIcons.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/modules/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/screensharing/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/testVideoObject.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/video/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/whiteboard/
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf8/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Mon Jun 16 14:04:15 2014
@@ -143,15 +143,6 @@ public class MainService implements IPen
return null;
}
- /**
- * load this session id before doing anything else
- *
- * @return a unique session identifier
- */
- public Sessiondata getsessiondata() {
- return sessiondataDao.startsession();
- }
-
public Long setCurrentUserOrganization(String SID, Long
organization_id) {
try {
sessiondataDao.updateUserOrg(SID, organization_id);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Mon Jun 16 14:04:15 2014
@@ -128,22 +128,6 @@ public class UserService implements IUse
}
/**
- * refreshes the current SID
- *
- * @param SID
- * @return "ok" string in case of success, "error" string in case of
the error
- */
- public String refreshSession(String SID) {
- try {
- sessiondataDao.checkSession(SID);
- return "ok";
- } catch (Exception err) {
- log.error("[refreshSession]", err);
- }
- return "error";
- }
-
- /**
* get all availible Salutations
*
* @param SID
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml Mon Jun
16 14:04:15 2014
@@ -24,30 +24,20 @@
xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:artifact="antlib:org.apache.maven.artifact.ant"
>
- <property name="laszlo.home" value="${basedir}/openlaszlo" />
<property name="laszlo46.home" value="${basedir}/openlaszlo46" />
<!-- LPS Properties -->
<property name="out.dir.swf" value="${dist.webapps.dir}/public" />
+ <property name="flex.src.dir" value="${webcontent.base.dir}/flex" />
<property name="laszlo.as3.src.dir"
value="${webcontent.base.dir}/swf10" />
- <property name="laszlo.src.dir" value="${webcontent.base.dir}/swf8" />
- <path id="laszlo.lib">
- <!-- swf8 -->
- <fileset dir="${laszlo.home}/WEB-INF/lib"
includes="saxon-6.5.3-lz-p1.jar jakarta-regexp-1.2.jar
- commons-collections.jar jdom.jar log4j-1.2.6.jar
lps-4.9.0.jar batik-all-flex.jar velocity-dep-1.4-flex.jar" />
- <!-- swf10 -->
- <fileset dir="${laszlo.home}/WEB-INF/lib" includes="mxmlc*.jar
flex-messaging-common.jar swfutils.jar asc.jar
- fxgutils.jar" />
- </path>
-
<path id="laszlo46.lib">
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only" depends="compile.laszlo.main.as3,
compile.laszlo.main, compile.laszlo.networktesting"
unless="client-already-built">
+ <target name="client.only" depends="compile.flex,
compile.laszlo.networktesting" unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
- <target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug,compile.laszlo.networktesting.debug"
/>
+ <target name="client.debug.only"
depends="compile.flex.debug,compile.laszlo.networktesting.debug" />
<target name="-compile.flash" description="compile flash application">
<!-- commented for now
@@ -73,9 +63,9 @@
<target name="compile.laszlo.networktesting"
depends="compile.laszlo.networktesting.debug">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo.lib" />
+ <param name="flash.classpath.ref" value="laszlo46.lib"
/>
<param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
- <param name="flash.lps.home" value="${laszlo.home}" />
+ <param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf10" />
<param name="flash.main.file"
value="networktesting.lzx" />
<param name="flash.out.file"
value="networktesting.swf10.swf" />
@@ -83,11 +73,11 @@
</antcall>
</target>
- <target name="compile.laszlo.networktesting.debug"
depends="-retrieve-openlaszlo">
+ <target name="compile.laszlo.networktesting.debug"
depends="-retrieve-openlaszlo46">
<antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo.lib" />
+ <param name="flash.classpath.ref" value="laszlo46.lib"
/>
<param name="flash.src.dir"
value="${laszlo.as3.src.dir}/networkTesting" />
- <param name="flash.lps.home" value="${laszlo.home}" />
+ <param name="flash.lps.home" value="${laszlo46.home}" />
<param name="flash.runtime" value="swf10" />
<param name="flash.main.file"
value="networktesting.lzx" />
<param name="flash.out.file"
value="networktestingdebug.swf10.swf" />
@@ -95,79 +85,25 @@
</antcall>
</target>
- <target name="compile.laszlo.testsetup.as3"
depends="-retrieve-openlaszlo46">
- <antcall target="-compile.flash" inheritAll="true" inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib" />
- <param name="flash.src.dir" value="${laszlo.src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="test/test-setup.lzx" />
- <param name="flash.out.file" value="test-setup.as3.swf11.swf" />
- <param name="flash.debug" value="" />
- </antcall>
- </target>
-
- <target name="compile.laszlo.main.as3"
depends="compile.laszlo.main.debug.as3">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="main.as3.lzx" />
- <param name="flash.out.file" value="main.as3.swf11.swf"
/>
- <param name="flash.debug" value="" />
- </antcall>
+ <target name="-compile.flex" description="compile flash application">
+ <exec dir="${flex.src.dir}"
executable="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/bin/mxmlc">
+ <arg value="main.mxml"/>
+ <arg line="-output ${out.dir.swf}/main.swf"/>
+ <env key="PLAYERGLOBAL_HOME"
value="${laszlo46.home}/WEB-INF/flexsdk/4.6.0/frameworks/libs/player"/>
+ </exec>
</target>
-
- <target name="compile.laszlo.main.debug.as3"
depends="-retrieve-openlaszlo46">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${laszlo.as3.src.dir}" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="main.as3.lzx" />
- <param name="flash.out.file"
value="maindebug.as3.swf11.swf" />
- <param name="flash.debug" value="--debug" />
- </antcall>
- </target>
-
- <target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo.lib" />
- <param name="flash.src.dir" value="${laszlo.src.dir}" />
- <param name="flash.lps.home" value="${laszlo.home}" />
- <param name="flash.runtime" value="swf8" />
- <param name="flash.main.file" value="main.lzx" />
- <param name="flash.out.file" value="main.swf8.swf" />
- <param name="flash.debug" value="" />
- </antcall>
+
+ <target name="compile.flex" depends="compile.flex.debug">
+ <antcall target="-compile.flex" inheritAll="true"
inheritRefs="true"/>
</target>
-
- <target name="compile.laszlo.main.debug" depends="-retrieve-openlaszlo">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo.lib" />
- <param name="flash.src.dir" value="${laszlo.src.dir}" />
- <param name="flash.lps.home" value="${laszlo.home}" />
- <param name="flash.runtime" value="swf8" />
- <param name="flash.main.file" value="main.lzx" />
- <param name="flash.out.file" value="maindebug.swf8.swf"
/>
- <param name="flash.debug" value="--debug" />
- </antcall>
+
+ <target name="compile.flex.debug" depends="-retrieve-openlaszlo46">
+ <!--antcall target="-compile.flex" inheritAll="true"
inheritRefs="true"/-->
</target>
<target name="-availability-check" description="Check which libraries
need to be retrieved">
- <available file="${laszlo.home}/WEB-INF/lib" type="dir"
property="laszlo.installed" />
<available file="${laszlo46.home}/WEB-INF/lib" type="dir"
property="laszlo46.installed" />
</target>
- <target name="-retrieve-openlaszlo" unless="laszlo.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
- <mkdir dir="${openlaszlo}"/>
- <get
src="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/openlaszlo-4.9.tgz";
- dest="${openlaszlo}" usetimestamp="true"/>
- <untar src="${openlaszlo}/openlaszlo-4.9.tgz"
dest="${openlaszlo}" compression="gzip" />
- <delete>
- <fileset dir="${openlaszlo}"
includes="openlaszlo*.tgz"/>
- </delete>
- </target>
<target name="-retrieve-openlaszlo46" unless="laszlo46.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
<mkdir dir="${openlaszlo}"/>
<get
src="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/openlaszlo-4.9.5.tgz";
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Mon Jun 16
14:04:15 2014
@@ -30,7 +30,6 @@
<description>TODO</description>
<properties>
<openlaszlo>${project.build.directory}/openlaszlo</openlaszlo>
- <laszlo.home>${openlaszlo}/openlaszlo</laszlo.home>
<laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml
(original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/flex/main.mxml
Mon Jun 16 14:04:15 2014
@@ -86,6 +86,11 @@
interview = 'true' == tla.parameters['interview'];
var _fps:int = parseInt(tla.parameters['fps']);
FPS = interview ? 24 : (isNaN(_fps) ? 30 : _fps);
+
+ var lbls:Array = JSON.parse(tla.parameters['labels'])
as Array;
+ for (var i:int = 0; i < lbls.length; ++i) {
+ labels[lbls[i].id] = lbls[i].value;
+ }
}
private function selectListItem(combo:ComboBox,
selected:int):void {
@@ -175,12 +180,7 @@
var resI:Object = ress.dataProvider.getItemAt(idx > -1
? idx : 0);
setResolution(resI.width, resI.height);
- var lbls:Array = JSON.parse(tla.parameters['labels'])
as Array;
- for (i = 0; i < lbls.length; ++i) {
- labels[lbls[i].id] = lbls.value;
- }
remember.selected = true ==
getStoredProp("savecamdata");
-
}
public function getLabel(id:int):String {
@@ -302,11 +302,11 @@
<s:Group id="mainSetupGroup" width="{APP_WIDTH}">
<s:layout>
- <s:VerticalLayout/>
+ <s:VerticalLayout paddingLeft="5" paddingRight="5"/>
</s:layout>
<mx:Text width="100%" fontWeight="bold" text="{getLabel(758)}"/>
<s:HGroup>
- <s:VGroup>
+ <s:VGroup width="{LEFT_WIDTH}">
<mx:Text text="{getLabel(447)}"/>
<mx:ComboBox id="modes" width="{LEFT_WIDTH}"
change="modeChanged(event)"/>
<s:VGroup id="av">
@@ -319,7 +319,7 @@
<mx:ComboBox id="mics"
width="{LEFT_WIDTH}"/>
</s:VGroup>
<s:VGroup id="resGroup">
- <s:Group><mx:Text
text="{getLabel(1429)}"/><mx:Image x="260" source="assets/error.png"
toolTip="{getLabel(1430)}"/></s:Group>
+ <s:Group><mx:Text
text="{getLabel(1429)}"/><mx:Image x="260" source="../images/error.png"
toolTip="{getLabel(1430)}"/></s:Group>
<mx:ComboBox id="ress"
width="{LEFT_WIDTH}" change="resChanged(event)"/>
</s:VGroup>
<s:Group width="100%">
@@ -343,7 +343,7 @@
<s:stroke><s:SolidColorStroke color="black" weight="2"/></s:stroke>
</s:Rect>
</s:Graphic>
- <mx:Image id="fill"
source="assets/level_meter.png" x="2" y="1" z="3" width="0"/>
+ <mx:Image id="fill"
source="../images/level_meter.png" x="2" y="1" z="3" width="0"/>
<mx:Text text="{getLabel(767)}"
x="0" z="5"/>
</s:Group>
<s:Group width="100%">
@@ -353,7 +353,7 @@
</s:VGroup>
</s:Group>
</s:HGroup>
- <s:HGroup><mx:Image source="assets/info.png"/><mx:Text
text="{getLabel(765)}"/></s:HGroup>
+ <s:HGroup><mx:Image source="../images/info.png"/><mx:Text
text="{getLabel(765)}" width="{APP_WIDTH - 70}"/></s:HGroup>
<s:Group width="100%">
<s:layout><s:HorizontalLayout
horizontalAlign="right"/></s:layout>
<s:Button id="cancel" label="{getLabel(918)}"/>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Mon Jun 16 14:04:15 2014
@@ -264,6 +264,9 @@ public class WebSession extends Abstract
default:
throw new OmException(-1L);
}
+ if (u == null) {
+ return false;
+ }
setUser(u);
return true;
} catch (OmException oe) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
Mon Jun 16 14:04:15 2014
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.web.room.SwfRoomPanel;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -34,7 +34,7 @@ public class SwfPage extends BaseNotInit
public SwfPage(PageParameters pp) {
add(new Label("titleAppName",
getBean(ConfigurationDao.class).getAppName()));
- add(new SwfRoomPanel("room", pp));
+ add(new SwfPanel("room", pp));
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Mon Jun 16 14:04:15 2014
@@ -30,7 +30,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.web.app.Application;
@@ -74,24 +76,39 @@ public class RoomPanel extends BasePanel
@Override
protected void respond(AjaxRequestTarget target) {
target.appendJavaScript("roomMessage(" +
userList(roomId, c) + ");");
+ target.appendJavaScript("setHeight();");
+ //TODO SID etc
+ Room r = getBean(RoomDao.class).get(roomId);
+ target.appendJavaScript(String.format("initVideo('%s',
%s, %s, %s, %s);", "sid"
+ , r.getRooms_id()
+ , r.getIsAudioOnly()
+ , 4L ==
r.getRoomtype().getRoomtypes_id()
+ , getStringLabels(448, 449, 450, 451,
758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54, 761,
762).toString()
+ ));
+
}
};
public RoomPanel(String id, long _roomId) {
super(id);
this.roomId = _roomId;
- add(new MenuPanel("roomMenu", getMenu()));
- add(aab, AttributeAppender.append("style", "height: 100%;")/*,
new AbstractAjaxTimerBehavior(Duration.seconds(10)) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onTimer(AjaxRequestTarget target) {
- // re-request user list to avoid possible issues
- //target.appendJavaScript("roomMessage(" +
userList(roomId, c) + ");"); //TODO is it nessesary ??
- }
- }*/);
+ Room r = getBean(RoomDao.class).get(roomId);
+ add(new MenuPanel("roomMenu",
getMenu()).setVisible(!r.getHideTopBar()));
+ add(aab, AttributeAppender.append("style", "height: 100%;"));
}
+ private JSONArray getStringLabels(long... ids) {
+ JSONArray arr = new JSONArray();
+ try {
+ for (long id : ids) {
+ arr.put(new JSONObject().put("id", id).put("value",
WebSession.getString(id)));
+ }
+ } catch (JSONException e) {
+ log.error("", e);
+ }
+ return arr;
+ }
+
@Override
protected void onBeforeRender() {
super.onBeforeRender();
Copied:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html
(from r1602864,
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.html)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html&p1=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.html&r1=1602864&r2=1602868&rev=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html
Mon Jun 16 14:04:15 2014
@@ -20,8 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div id="swfloading"
- style="z-index: 666666; position: absolute; top: 50%; left:
50%;">
+ <div id="swfloading" style="z-index: 666666; position: absolute; top:
50%; left: 50%;">
<img src="images/ajax-loader.gif" />
</div>
<noscript>Please enable JavaScript in order to use this
application.</noscript>
Copied:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
(from r1602807,
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?p2=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java&p1=openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.java&r1=1602807&r2=1602868&rev=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfRoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Mon Jun 16 14:04:15 2014
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.room
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -32,29 +31,34 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
-public class SwfRoomPanel extends BasePanel {
- private static final long serialVersionUID = 2308988314987829510L;
+public class SwfPanel extends BasePanel {
+ private static final long serialVersionUID = 1L;
- public SwfRoomPanel(String id) {
+ public SwfPanel(String id) {
this(id, new PageParameters());
}
- private String getFlashFile() {
- return RuntimeConfigurationType.DEVELOPMENT ==
getApplication().getConfigurationType()
- ? "maindebug.as3.swf11.swf" :
"main.as3.swf11.swf";
+ public String getInitFunction() {
+ return getInitFunction(new PageParameters());
}
- public SwfRoomPanel(String id, PageParameters pp) {
- super(id);
-
+ public String getInitFunction(PageParameters pp) {
StringValue swfVal = pp.get("swf");
- String swf = (swfVal.isEmpty() ? getFlashFile() :
swfVal.toString())
- + new
PageParametersEncoder().encodePageParameters(pp);
- add(new Label("init", String.format("initSwf('%s');",
swf)).setEscapeModelStrings(false));
+ String initStr = null;
+ if (!swfVal.isEmpty()) {
+ String swf = swfVal.toString() + new
PageParametersEncoder().encodePageParameters(pp);
+ initStr = String.format("initSwf('%s');", swf);
+ }
+ return initStr;
+ }
+
+ public SwfPanel(String id, PageParameters pp) {
+ super(id);
+ add(new Label("init",
getInitFunction(pp)).setEscapeModelStrings(false));
}
private ResourceReference newResourceReference() {
- return new JavaScriptResourceReference(SwfRoomPanel.class,
"swf-functions.js");
+ return new JavaScriptResourceReference(SwfPanel.class,
"swf-functions.js");
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
Mon Jun 16 14:04:15 2014
@@ -74,6 +74,48 @@ function roomMessage(m) {
}
}
+function initVideo(sid, roomid, audioOnly, interview, labels) {
+ var options = {sid: sid, roomid: roomid, audioOnly: audioOnly,
interview: interview, bgcolor: "#ffffff"
+ , width: 570, height: 900
+ , resolutions: JSON.stringify([{label: "4:3 (~6 KByte/sec)",
width: 40, height: 30}
+ , {label: "4:3 (~12 KByte/sec)", width: 80, height: 60}
+ , {label: "4:3 (~20 KByte/sec)", width: 120, height:
90, default: true}
+ , {label: "QQVGA 4:3 (~36 KByte/sec)", width: 160,
height: 120}
+ , {label: "4:3 (~40 KByte/sec)", width: 240, height:
180}
+ , {label: "HVGA 4:3 (~56 KByte/sec)", width: 320,
height: 240}
+ , {label: "4:3 (~60 KByte/sec)", width: 480, height:
360}
+ , {label: "4:3 (~68 KByte/sec)", width: 640, height:
480}
+ , {label: "XGA 4:3", width: 1024, height: 768}
+ , {label: "16:9", width: 256, height: 150}
+ , {label: "WQVGA 9:5", width: 432, height: 240}
+ , {label: "pseudo 16:9", width: 480, height: 234}
+ , {label: "16:9", width: 512, height: 300}
+ , {label: "nHD 16:9", width: 640, height: 360}
+ , {label: "16:9", width: 1024, height: 600}])
+ , labels: JSON.stringify(labels)
+ };
+ var type = 'application/x-shockwave-flash';
+ var src = 'public/main.swf?cache' + new Date().getTime();
+ var r = $('<div class="video">');
+ var o = $('<object>').attr('type', type).attr('data',
src).attr('width', options.width).attr('height', options.height);
+ o.append($('<param>').attr('name', 'quality').attr('value', 'best'));
+ o.append($('<param>').attr('name', 'wmode').attr('value',
'transparent'));
+ o.append($('<param>').attr('name', 'allowscriptaccess').attr('value',
'sameDomain'));
+ o.append($('<param>').attr('name', 'allowfullscreen').attr('value',
'false'));
+ o.append($('<param>').attr('name', 'flashvars').attr('value',
$.param(options)));
+ $('#roomMenu').parent().append(r.append(o));
+ /*
+ .attr('wmode', 'window').attr('allowfullscreen', true)
+ .attr('width', options.width).attr('height',
options.height)
+ .attr('id', 'lzapp').attr('name', 'lzapp')
+ .attr('flashvars', escape($.param(options)))
+ .attr('swliveconnect', true).attr('align', 'middle')
+ .attr('allowscriptaccess', 'sameDomain').attr('type',
'application/x-shockwave-flash')
+ .attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer')
+ */
+ r.dialog({ width: options.width, height: options.height, dialogClass:
"video" });
+}
+
function setHeight() {
var h = $(document).height() - $('#roomMenu').height();
$(".room.sidebar.left").height(h);
@@ -81,7 +123,6 @@ function setHeight() {
}
$(document).ready(function() {
- setHeight();
$(window).on('resize.openmeetings', function() {
setHeight();
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Mon Jun 16 14:04:15 2014
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-function getAppletStatus() {
- return false;
-}
function initSwf(swfurl) {
var general = {
@@ -43,10 +40,3 @@ function initSwf(swfurl) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
-
-function roomExit() {
- $('#header, #topControls, #chatPanel').show();
- $('div[id="contents"], div[id="contents"] > div').css('height', 'auto');
- window.location.hash = "#rooms/public";
- $('#lzappContainer').remove();
-}
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
Mon Jun 16 14:04:15 2014
@@ -40,7 +40,6 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.users.UsersPanel;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.room.SwfRoomPanel;
import org.apache.openmeetings.web.user.calendar.CalendarPanel;
import org.apache.openmeetings.web.user.dashboard.OmDashboardPanel;
import org.apache.openmeetings.web.user.profile.SettingsPanel;
@@ -264,7 +263,6 @@ public class OmUrlFragment implements Se
pp.add("wicketsid", getSid());
pp.add("wicketroomid", roomId);
pp.add("language",
getLanguage());
- basePanel = new
SwfRoomPanel(CHILD_ID, pp);
basePanel = new
RoomPanel(CHILD_ID, roomId);
}
} catch(NumberFormatException ne) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Mon Jun 16 14:04:15 2014
@@ -81,7 +81,6 @@
<!-- Start of Services -->
<bean id="xmlcrm.service"
class="org.apache.openmeetings.core.remote.MainService" />
<bean id="printservice.service"
class="org.apache.openmeetings.core.remote.PrintService" />
- <bean id="pollservice.service"
class="org.apache.openmeetings.core.remote.PollService" />
<bean id="languageservice.service"
class="org.apache.openmeetings.core.remote.LanguageService" />
<bean id="invitationservice.service"
class="org.apache.openmeetings.core.remote.InvitationService" />
<bean id="whiteboardservice.service"
class="org.apache.openmeetings.core.remote.WhiteBoardService" />
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
Mon Jun 16 14:04:15 2014
@@ -47,3 +47,7 @@
.room.sidebar.left .user.list .user.current {
font-weight: bold;
}
+.ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video
.video.ui-dialog-content {
+ padding: 0;
+ overflow: hidden;
+}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Mon Jun 16 14:04:15 2014
@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.openmeetings.core.remote.InvitationService;
-import org.apache.openmeetings.core.remote.MainService;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
@@ -35,7 +35,7 @@ public class TestInvitation extends Abst
@Autowired
private InvitationService invitationService;
@Autowired
- private MainService mService;
+ private SessiondataDao sessDao;
@Autowired
private UserWebService userWebService;
@Autowired
@@ -43,7 +43,7 @@ public class TestInvitation extends Abst
@Test
public void testSendInvitationLink() {
- Sessiondata sessionData = mService.getsessiondata();
+ Sessiondata sessionData = sessDao.startsession();
Long uid =
userWebService.loginUser(sessionData.getSession_id(), username, userpass);
User us = userDao.get(uid);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
Mon Jun 16 14:04:15 2014
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.userdata;
-import org.apache.openmeetings.core.remote.MainService;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.apache.openmeetings.util.crypt.ManageCryptStyle;
@@ -27,11 +27,11 @@ import org.springframework.beans.factory
public class TestAuth extends AbstractJUnitDefaults {
@Autowired
- private MainService mService;
+ private SessiondataDao sessionDao;
@Test
public void testTestAuth() {
- Sessiondata sessionData = mService.getsessiondata();
+ Sessiondata sessionData = sessionDao.startsession();
System.out.println("sessionData: " +
sessionData.getSession_id());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1602868&r1=1602867&r2=1602868&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Mon Jun 16 14:04:15 2014
@@ -31,16 +31,15 @@ import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.data.basic.FieldManager;
-import org.apache.openmeetings.core.remote.MainService;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserManager;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dao.user.OrganisationDao;
import org.apache.openmeetings.db.dao.user.OrganisationUserDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.dto.user.UserSearchResult;
@@ -94,7 +93,7 @@ public class UserWebService {
@Autowired
private UserDao userDao;
@Autowired
- private MainService mainService;
+ private SessiondataDao sessionDao;
@Autowired
private FieldLanguagesValuesDao labelDao;
@@ -108,7 +107,7 @@ public class UserWebService {
@Path("/session")
public Sessiondata getSession() {
log.debug("SPRING LOADED getSession -- ");
- return mainService.getsessiondata();
+ return sessionDao.startsession();
}
/**
