Author: sebawagner
Date: Thu Feb 2 10:46:38 2012
New Revision: 1239534
URL: http://svn.apache.org/viewvc?rev=1239534&view=rev
Log:
OPENMEETINGS-40 Merge Audio/Video components to trunk part 2
Modified:
incubator/openmeetings/trunk/singlewebapp/ (props changed)
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
(contents, props changed)
Propchange: incubator/openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 2 10:46:38 2012
@@ -1,2 +1,3 @@
+/incubator/openmeetings/branches/video-components:1220095-1239505
/incubator/openmeetings/import/branches/dev/injection:1219598-1219722
/incubator/openmeetings/import/branches/dev/om_openjpa:1219535-1219562
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1239534&r1=1239533&r2=1239534&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Thu Feb 2 10:46:38 2012
@@ -137,6 +137,11 @@ these properties will be overwritten by
<attribute name="drawAllowStatus" value="null"/>
+<!-- this attribute holds an object of type RoomClient
+the LAST RoomClient Object that has been changed the giveExclusiveAudio status
+-->
+<attribute name="exclusiveAudioAllowStatus" value="null"/>
+
<!--
this value indicates if this user is allowed to draw to the Whiteboard
If this user is currently Moderator => he ALWAYS can draw to whiteboard
@@ -379,6 +384,8 @@ and some more references to temp-objects
<attribute name="isAllowedToRemoteControl" value="false" type="boolean" />
+<attribute name="isAllowedToGiveExclusiveAudio" value="false" type="boolean" />
+
<attribute name="lzCalendarInfoTab" value="null"/>
<attribute name="roomJumpId" value="0" type="number" />
@@ -436,4 +443,9 @@ and some more references to temp-objects
<attribute name="currentMicName" value="" type="string"/>
<attribute name="currentCamName" value="" type="string"/>
+<attribute name="currentBaseConferenceRoom" value="null" />
+
+<!--F12-->
+<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/>
+
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1239534&r1=1239533&r2=1239534&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Thu Feb 2 10:46:38 2012
@@ -819,6 +819,15 @@ if (cItem == null) {
]]>
</method>
+<method name="setExclusiveAudioAllowStatus" args="roomClientObj">
+ <![CDATA[
+ if ($debug) Debug.write("giveExclusiveAudioStatus changes ###### ");
+ if (roomClientObj.publicSID==canvas.publicSID) {
+
canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
+ }
+ ]]>
+</method>
+
<method name="setMuteStatus" args="roomClientObj">
<![CDATA[
if ($debug) Debug.write("setMuteStatus changes ######
",roomClientObj.micMuted);
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1239534&r1=1239533&r2=1239534&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Feb 2 10:46:38 2012
@@ -34,7 +34,6 @@
<!-- Doclet Classes -->
<property name="doclet.src.dir" value="${basedir}/src/docgenerator" />
-
<property name="classes.dir" value="${basedir}/bin" />
<property name="dist.dir" value="dist" />
<property name="red5.root" value="${dist.dir}/red5" />
@@ -50,7 +49,7 @@
<!-- screenshare.out.dir -->
<property name="screenshare.out.dir"
value="${dist.webapps.dir}/red5-screenshare" />
-
+
<!-- libraries -->
<property name="project.lib" value="${basedir}/lib" />
@@ -138,7 +137,7 @@
<!-- build webapp -->
- <target name="dist" description="binary distribution of OpenMeetings"
depends="cleanForBinary, jar, compile.laszlo.main, enhance, signWebStartJars">
+ <target name="dist" description="binary distribution of OpenMeetings"
depends="cleanForBinary, jar, compile.laszlo.main, compile.laszlo.main.as3,
enhance, signWebStartJars">
</target>
@@ -148,7 +147,7 @@
</target>
<!-- compiles the sources only with laszlo debug client -->
- <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="cleanForBinary, jar, compile.laszlo.main.debug,
signWebStartJars">
+ <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="cleanForBinary, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, signWebStartJars">
</target>
@@ -235,7 +234,6 @@
</copy>
<copy file="src/META-INF/${db.provider}_persistence.xml"
tofile="${dist.webapps.dir}/WEB-INF/classes/META-INF/persistence.xml" />
-
<chmod dir="${dist.webapps.dir}/WEB-INF/lib" perm="755"
includes="**/*.sh" />
<!-- add language files from .war version -->
@@ -444,7 +442,6 @@
<path>
<fileset dir="${dist.webapps.dir}/screen">
<include name="**/*.jar" />
-
</fileset>
<fileset dir="${screenshare.out.dir}">
<include name="**/*.jar" />
@@ -453,6 +450,30 @@
</signjar>
</target>
+ <target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug" />
+
+ <target name="compile.laszlo.main.as3"
depends="compile.laszlo.main.debug.as3">
+ <java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true" dir="${laszlo.src.dir}"
classpathref="laszlo.lib">
+ <jvmarg value="-DLPS_HOME=${laszlo.home}" />
+ <jvmarg value="-Dlzdebug=${laszlo.debug}" />
+ <jvmarg value="-Dlzproxied=${laszlo.proxied}" />
+ <jvmarg value="-Xms1024M" />
+ <jvmarg value="-Xmx1024M" />
+ <arg line="--runtime=swf10 --dir ${out.dir.swf}
--onerror warn main.as3.lzx" />
+ </java>
+ </target>
+
+ <target name="compile.laszlo.main.debug.as3">
+ <java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true" dir="${laszlo.src.dir}"
classpathref="laszlo.lib">
+ <jvmarg value="-DLPS_HOME=${laszlo.home}" />
+ <jvmarg value="-Dlzdebug=${laszlo.debug}" />
+ <jvmarg value="-Dlzproxied=${laszlo.proxied}" />
+ <jvmarg value="-Xms1024M" />
+ <jvmarg value="-Xmx1024M" />
+ <arg line="--runtime=swf10 --dir ${out.dir.swf}
--onerror warn maindebug.as3.lzx" />
+ </java>
+ </target>
+
<target name="compile.laszlo.main" depends="compile.laszlo.main.debug">
<java classname="org.openlaszlo.compiler.Main" fork="true"
newenvironment="true" failonerror="true" dir="${laszlo.src.dir}"
classpathref="laszlo.lib">
<jvmarg value="-DLPS_HOME=${laszlo.home}" />
@@ -476,7 +497,6 @@
</target>
<target name="compile" depends="prepare, compile.only" />
-
<!-- Normal build of application
compiler="org.eclipse.jdt.core.JDTCompilerAdapter" -->
<target name="compile.only" depends="compile.screen.share">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java?rev=1239534&r1=1239533&r2=1239534&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
Thu Feb 2 10:46:38 2012
@@ -128,6 +128,7 @@ public class ClientListManager {
return null;
}
+
public synchronized RoomClient getClientByPublicSID(String publicSID) {
try {
for (Iterator<String> iter =
clientList.keySet().iterator(); iter
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1239534&r1=1239533&r2=1239534&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Thu Feb 2 10:46:38 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.openmeetings.servlet.outputhandler;
-
+package org.openmeetings.servlet.outputhandler;
+
import java.util.HashMap;
import java.util.Iterator;
@@ -34,171 +34,171 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-
-public class DefaultIndex extends VelocityViewServlet {
- private static final long serialVersionUID = 3043617619650666432L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- DefaultIndex.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private Configurationmanagement getConfigurationmanagement() {
- try {
- if (!ScopeApplicationAdapter.initComplete) {
- return null;
- }
- ApplicationContext context = WebApplicationContextUtils
-
.getWebApplicationContext(getServletContext());
- return (Configurationmanagement)
context.getBean("cfgManagement");
- } catch (Exception err) {
- log.error("[getConfigurationmanagement]", err);
- }
- return null;
- }
-
- @Override
- public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx) {
-
- try {
-
- if (getConfigurationmanagement() == null) {
- return
getVelocityView().getVelocityEngine().getTemplate(
- "booting.vm");
- }
-
- String template = "sip_template.vm";
-
- // Enable SIP Template or not
- Configuration SIP_ENABLE =
getConfigurationmanagement().getConfKey(
- 3L, "sip.enable");
-
- // SIP_REALM
- ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
-
- if (SIP_ENABLE == null ||
!SIP_ENABLE.getConf_value().equals("yes")) {
-
- template = "usual_template.vm";
-
- } else {
-
- // Set all the Params for the Applet
Configuration
-
- // SIP_REALM
- Configuration SIP_REALM =
getConfigurationmanagement()
- .getConfKey(3L, "sip.realm");
- if (SIP_REALM == null) {
- ctx.put("SIP_REALM", "");
- } else {
- ctx.put("SIP_REALM",
SIP_REALM.getConf_value());
- }
-
- // SIP_PORT
- Configuration SIP_PORT =
getConfigurationmanagement()
- .getConfKey(3L, "sip.port");
- if (SIP_PORT == null) {
- ctx.put("SIP_PORT", "");
- } else {
- ctx.put("SIP_PORT",
SIP_PORT.getConf_value());
- }
-
- // SIP_PROXYNAME
- Configuration SIP_PROXYNAME =
getConfigurationmanagement()
- .getConfKey(3L,
"sip.proxyname");
- if (SIP_PROXYNAME == null) {
- ctx.put("SIP_PROXYNAME", "");
- } else {
- ctx.put("SIP_PROXYNAME",
SIP_PROXYNAME.getConf_value());
- }
-
- // SIP_TUNNEL
- Configuration SIP_TUNNEL =
getConfigurationmanagement()
- .getConfKey(3L, "sip.tunnel");
- if (SIP_TUNNEL == null) {
- ctx.put("SIP_TUNNEL", "");
- } else {
- ctx.put("SIP_TUNNEL",
SIP_TUNNEL.getConf_value());
- }
-
- // SIP_CODEBASE
- Configuration SIP_CODEBASE =
getConfigurationmanagement()
- .getConfKey(3L, "sip.codebase");
- if (SIP_CODEBASE == null) {
- ctx.put("SIP_CODEBASE", "");
- } else {
- ctx.put("SIP_CODEBASE",
SIP_CODEBASE.getConf_value());
- }
-
- // SIP_FORCETUNNEL
- Configuration SIP_FORCETUNNEL =
getConfigurationmanagement()
- .getConfKey(3L,
"sip.forcetunnel");
- if (SIP_FORCETUNNEL == null) {
- ctx.put("SIP_FORCETUNNEL", "");
- } else {
- ctx.put("SIP_FORCETUNNEL",
SIP_FORCETUNNEL.getConf_value());
- }
- }
-
- // Parse the Param for the SWF URL
- String swf = httpServletRequest.getParameter("swf");
- if (swf == null) {
- ctx.put("SWF_URL", "main.swf8.swf");
- } else {
- ctx.put("SWF_URL", swf);
- }
-
- String SWF_PARAMS = "";
- String SWF_FLASHVARS = "";
-
- // Load params from URL and set into wrapper code
- if (httpServletRequest.getParameterMap() != null) {
- for (@SuppressWarnings("unchecked")
- Iterator<String> iter =
httpServletRequest.getParameterMap()
- .keySet().iterator();
iter.hasNext();) {
- String paramKey = iter.next();
- SWF_FLASHVARS += paramKey
- + "="
- +
httpServletRequest.getParameterMap()
-
.get(paramKey) + "&";
- SWF_PARAMS += paramKey
- + "="
- +
httpServletRequest.getParameterMap()
-
.get(paramKey) + "&";
- }
- }
-
- HashMap<String, String> defaultValuesMap = new
HashMap<String, String>();
-
- defaultValuesMap.put("lzt", "swf");
- defaultValuesMap.put("lzproxied", "solo");
- defaultValuesMap.put("lzr", "swf8");
- defaultValuesMap.put("bgcolor", "%23ffffff");
- defaultValuesMap.put("width", "100%25");
- defaultValuesMap.put("height", "100%25");
- //
defaultValuesMap.put("__lzurl","main.lzx%3Flzt%3Dswf%26lzproxied%3Dsolo%26lzr%3Dswf8");
- defaultValuesMap.put("__lzminimumversion", "8");
- defaultValuesMap.put("id", "lzapp");
-
- for (Iterator<String> iter =
defaultValuesMap.keySet().iterator(); iter
- .hasNext();) {
- String paramKey = iter.next();
- SWF_PARAMS += paramKey + "=" +
defaultValuesMap.get(paramKey);
- SWF_FLASHVARS += paramKey + "="
- +
defaultValuesMap.get(paramKey);
- if (iter.hasNext()) {
- SWF_PARAMS += "&";
- SWF_FLASHVARS += "&";
- }
- }
-
- ctx.put("SWF_PARAMS", SWF_PARAMS);
- ctx.put("SWF_FLASHVARS", SWF_FLASHVARS);
-
- return
getVelocityView().getVelocityEngine().getTemplate(template);
-
- } catch (Exception er) {
- System.out.println("Error downloading: " + er);
- er.printStackTrace();
- log.error("[Calendar :: service]", er);
- }
- return null;
- }
-}
+
+public class DefaultIndex extends VelocityViewServlet {
+ private static final long serialVersionUID = 3043617619650666432L;
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ DefaultIndex.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ private Configurationmanagement getConfigurationmanagement() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Configurationmanagement)
context.getBean("cfgManagement");
+ } catch (Exception err) {
+ log.error("[getConfigurationmanagement]", err);
+ }
+ return null;
+ }
+
+ @Override
+ public Template handleRequest(HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse, Context ctx) {
+
+ try {
+
+ if (getConfigurationmanagement() == null) {
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "booting.vm");
+ }
+
+ String template = "sip_template.vm";
+
+ // Enable SIP Template or not
+ Configuration SIP_ENABLE =
getConfigurationmanagement().getConfKey(
+ 3L, "sip.enable");
+
+ // SIP_REALM
+ ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
+
+ if (SIP_ENABLE == null ||
!SIP_ENABLE.getConf_value().equals("yes")) {
+
+ template = "usual_template.vm";
+
+ } else {
+
+ // Set all the Params for the Applet
Configuration
+
+ // SIP_REALM
+ Configuration SIP_REALM =
getConfigurationmanagement()
+ .getConfKey(3L, "sip.realm");
+ if (SIP_REALM == null) {
+ ctx.put("SIP_REALM", "");
+ } else {
+ ctx.put("SIP_REALM",
SIP_REALM.getConf_value());
+ }
+
+ // SIP_PORT
+ Configuration SIP_PORT =
getConfigurationmanagement()
+ .getConfKey(3L, "sip.port");
+ if (SIP_PORT == null) {
+ ctx.put("SIP_PORT", "");
+ } else {
+ ctx.put("SIP_PORT",
SIP_PORT.getConf_value());
+ }
+
+ // SIP_PROXYNAME
+ Configuration SIP_PROXYNAME =
getConfigurationmanagement()
+ .getConfKey(3L,
"sip.proxyname");
+ if (SIP_PROXYNAME == null) {
+ ctx.put("SIP_PROXYNAME", "");
+ } else {
+ ctx.put("SIP_PROXYNAME",
SIP_PROXYNAME.getConf_value());
+ }
+
+ // SIP_TUNNEL
+ Configuration SIP_TUNNEL =
getConfigurationmanagement()
+ .getConfKey(3L, "sip.tunnel");
+ if (SIP_TUNNEL == null) {
+ ctx.put("SIP_TUNNEL", "");
+ } else {
+ ctx.put("SIP_TUNNEL",
SIP_TUNNEL.getConf_value());
+ }
+
+ // SIP_CODEBASE
+ Configuration SIP_CODEBASE =
getConfigurationmanagement()
+ .getConfKey(3L, "sip.codebase");
+ if (SIP_CODEBASE == null) {
+ ctx.put("SIP_CODEBASE", "");
+ } else {
+ ctx.put("SIP_CODEBASE",
SIP_CODEBASE.getConf_value());
+ }
+
+ // SIP_FORCETUNNEL
+ Configuration SIP_FORCETUNNEL =
getConfigurationmanagement()
+ .getConfKey(3L,
"sip.forcetunnel");
+ if (SIP_FORCETUNNEL == null) {
+ ctx.put("SIP_FORCETUNNEL", "");
+ } else {
+ ctx.put("SIP_FORCETUNNEL",
SIP_FORCETUNNEL.getConf_value());
+ }
+ }
+
+ // Parse the Param for the SWF URL
+ String swf = httpServletRequest.getParameter("swf");
+ if (swf == null) {
+ ctx.put("SWF_URL", "main.as3.swf10.swf");
+ } else {
+ ctx.put("SWF_URL", swf);
+ }
+
+ String SWF_PARAMS = "";
+ String SWF_FLASHVARS = "";
+
+ // Load params from URL and set into wrapper code
+ if (httpServletRequest.getParameterMap() != null) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<String> iter =
httpServletRequest.getParameterMap()
+ .keySet().iterator();
iter.hasNext();) {
+ String paramKey = iter.next();
+ SWF_FLASHVARS += paramKey
+ + "="
+ +
httpServletRequest.getParameterMap()
+
.get(paramKey) + "&";
+ SWF_PARAMS += paramKey
+ + "="
+ +
httpServletRequest.getParameterMap()
+
.get(paramKey) + "&";
+ }
+ }
+
+ HashMap<String, String> defaultValuesMap = new
HashMap<String, String>();
+
+ defaultValuesMap.put("lzt", "swf");
+ defaultValuesMap.put("lzproxied", "solo");
+ defaultValuesMap.put("lzr", "swf8");
+ defaultValuesMap.put("bgcolor", "%23ffffff");
+ defaultValuesMap.put("width", "100%25");
+ defaultValuesMap.put("height", "100%25");
+ //
defaultValuesMap.put("__lzurl","main.lzx%3Flzt%3Dswf%26lzproxied%3Dsolo%26lzr%3Dswf8");
+ defaultValuesMap.put("__lzminimumversion", "8");
+ defaultValuesMap.put("id", "lzapp");
+
+ for (Iterator<String> iter =
defaultValuesMap.keySet().iterator(); iter
+ .hasNext();) {
+ String paramKey = iter.next();
+ SWF_PARAMS += paramKey + "=" +
defaultValuesMap.get(paramKey);
+ SWF_FLASHVARS += paramKey + "="
+ +
defaultValuesMap.get(paramKey);
+ if (iter.hasNext()) {
+ SWF_PARAMS += "&";
+ SWF_FLASHVARS += "&";
+ }
+ }
+
+ ctx.put("SWF_PARAMS", SWF_PARAMS);
+ ctx.put("SWF_FLASHVARS", SWF_FLASHVARS);
+
+ return
getVelocityView().getVelocityEngine().getTemplate(template);
+
+ } catch (Exception er) {
+ System.out.println("Error downloading: " + er);
+ er.printStackTrace();
+ log.error("[Calendar :: service]", er);
+ }
+ return null;
+ }
+}
\ No newline at end of file
Propchange:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 2 10:46:38 2012
@@ -1,2 +1,3 @@
+/incubator/openmeetings/branches/video-components/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java:1220095-1239505
/incubator/openmeetings/import/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java:1219598-1219722
/incubator/openmeetings/import/branches/dev/om_openjpa/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java:1219535-1219562
