Author: sebawagner
Date: Sun Apr 1 16:27:25 2012
New Revision: 1308147
URL: http://svn.apache.org/viewvc?rev=1308147&view=rev
Log:
OPENMEETINGS-110 remove "navisub" table
OPENMEETINGS-121 Share/record screen doesn't work
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navisub.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
Sun Apr 1 16:27:25 2012
@@ -30,7 +30,6 @@
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Sun Apr 1 16:27:25 2012
@@ -30,7 +30,6 @@
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
Sun Apr 1 16:27:25 2012
@@ -30,7 +30,6 @@
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
Sun Apr 1 16:27:25 2012
@@ -30,7 +30,6 @@
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
Sun Apr 1 16:27:25 2012
@@ -30,7 +30,6 @@
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
Sun Apr 1 16:27:25 2012
@@ -29,7 +29,6 @@ import javax.persistence.TypedQuery;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.persistence.beans.basic.Naviglobal;
import org.openmeetings.app.persistence.beans.basic.Navimain;
-import org.openmeetings.app.persistence.beans.basic.Navisub;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,19 +61,6 @@ public class Navimanagement {
navim.getFieldvalues_id(),
language_id));
navim.setTooltip(fieldmanagment.getFieldByIdAndLanguageByNavi(
navim.getTooltip_fieldvalues_id(), language_id));
- if (navim.getSubnavi() != null) {
- for (Iterator<Navisub> it4 =
navim.getSubnavi().iterator(); it4
- .hasNext();) {
- Navisub navis = it4.next();
- navis.setLabel(fieldmanagment
-
.getFieldByIdAndLanguageByNavi(
-
navis.getFieldvalues_id(), language_id));
- navis.setTooltip(fieldmanagment
-
.getFieldByIdAndLanguageByNavi(
-
navis.getTooltip_fieldvalues_id(),
-
language_id));
- }
- }
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Navimain.java
Sun Apr 1 16:27:25 2012
@@ -19,25 +19,18 @@
package org.openmeetings.app.persistence.beans.basic;
import java.io.Serializable;
-import java.util.List;
import java.util.Date;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-
-
-
import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
+import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
+
@Entity
@Table(name = "navimain")
public class Navimain implements Serializable {
@@ -76,10 +69,6 @@ public class Navimain implements Seriali
private String deleted;
@Transient
private Fieldlanguagesvalues label;
- @OneToMany(fetch = FetchType.EAGER)
- @JoinColumn(name="main_id")
- @OrderBy("naviorder")
- private List<Navisub> subnavi;
@Transient
private Fieldlanguagesvalues tooltip;
@Column(name="tooltip_fieldvalues_id")
@@ -171,14 +160,6 @@ public class Navimain implements Seriali
this.deleted = deleted;
}
- public List<Navisub> getSubnavi() {
- return subnavi;
- }
-
- public void setSubnavi(List<Navisub> subnavi) {
- this.subnavi = subnavi;
- }
-
public String getName() {
return name;
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sun Apr 1 16:27:25 2012
@@ -145,11 +145,6 @@ public class ScreenRequestHandler extend
throw new Exception("recorder is empty: ");
}
- String mode = httpServletRequest.getParameter("mode");
- if (mode == null) {
- throw new Exception("mode is empty: ");
- }
-
String httpRootKey =
httpServletRequest.getParameter("httpRootKey");
if (httpRootKey == null) {
throw new Exception("httpRootKey is empty could
not start sharer");
@@ -295,80 +290,77 @@ public class ScreenRequestHandler extend
log.debug("Creating JNLP Template for TCP solution");
- if (mode.equals("sharer")) {
+ try {
+
+ log.debug("RTMP Sharer labels :: " +
label_sharer);
+
+ codebase = "http://"; + rtmphostlocal + ":" +
red5httpport
+ + httpRootKey +
"red5-screenshare";
+
+ ConnectionType conType = ConnectionType
+ .valueOf(httpServletRequest
+
.getParameter("connectionType"));
+
+ // FIXME http:// need to be removed
+ String startUpClass;
+ switch (conType) {
+ case rtmp:
+ startUpClass =
"org.openmeetings.screen.webstart.RTMPScreenShare";
+ break;
+ case rtmps:
+ startUpClass =
"org.openmeetings.screen.webstart.RTMPSScreenShare";
+ break;
+ case rtmpt:
+ startUpClass =
"org.openmeetings.screen.webstart.RTMPTScreenShare";
+ break;
+ default:
+ throw new Exception("Unknown connection
type");
+ }
+
+ String orgIdAsString = httpServletRequest
+
.getParameter("organization_id");
+ if (orgIdAsString == null) {
+ throw new Exception(
+ "orgIdAsString is empty
could not start sharer");
+ }
+
+ ctx.put("organization_id", orgIdAsString);
+
+ ctx.put("startUpClass", startUpClass);
+ ctx.put("codebase", codebase);
+ ctx.put("red5-host", rtmphostlocal);
+ ctx.put("red5-app",
OpenmeetingsVariables.webAppRootKey + "/"
+ + room);
+
+ Configuration configuration =
getCfgManagement().getConfKey(3L,
+
"default.quality.screensharing");
+ String default_quality_screensharing = "1";
+ if (configuration != null) {
+ default_quality_screensharing =
configuration
+ .getConf_value();
+ }
- try {
+ ctx.put("default_quality_screensharing",
+ default_quality_screensharing);
- log.debug("RTMP Sharer labels :: " +
label_sharer);
+ ctx.put("user_id", users_id);
- codebase = "http://"; + rtmphostlocal +
":"
- + red5httpport +
httpRootKey
- + "red5-screenshare";
-
- ConnectionType conType =
ConnectionType.valueOf(httpServletRequest
-
.getParameter("connectionType"));
-
- //FIXME http:// need to be removed
- String startUpClass;
- switch (conType) {
- case rtmp:
- startUpClass =
"org.openmeetings.screen.webstart.RTMPScreenShare";
- break;
- case rtmps:
- startUpClass =
"org.openmeetings.screen.webstart.RTMPSScreenShare";
- break;
- case rtmpt:
- startUpClass =
"org.openmeetings.screen.webstart.RTMPTScreenShare";
- break;
- default:
- throw new Exception("Unknown
connection type");
- }
-
- String orgIdAsString =
httpServletRequest
-
.getParameter("organization_id");
- if (orgIdAsString == null) {
- throw new Exception(
- "orgIdAsString
is empty could not start sharer");
- }
-
- ctx.put("organization_id",
orgIdAsString);
-
- ctx.put("startUpClass", startUpClass);
- ctx.put("codebase", codebase);
- ctx.put("red5-host", rtmphostlocal);
- ctx.put("red5-app",
OpenmeetingsVariables.webAppRootKey + "/"
- + room);
-
- Configuration configuration =
getCfgManagement()
- .getConfKey(3L,
"default.quality.screensharing");
- String default_quality_screensharing =
"1";
- if (configuration != null) {
- default_quality_screensharing =
configuration
-
.getConf_value();
- }
-
- ctx.put("default_quality_screensharing",
-
default_quality_screensharing);
-
- ctx.put("user_id", users_id);
-
- String port =
httpServletRequest.getParameter("port");
- if (port == null) {
- throw new Exception("port is
empty: ");
- }
- ctx.put("port", port);
-
- String allowRecording =
httpServletRequest
-
.getParameter("allowRecording");
- if (allowRecording == null) {
- throw new
Exception("allowRecording is empty: ");
- }
- ctx.put("allowRecording",
allowRecording);
+ String port =
httpServletRequest.getParameter("port");
+ if (port == null) {
+ throw new Exception("port is empty: ");
+ }
+ ctx.put("port", port);
- } catch (Exception e) {
- log.error("invalid configuration value
for key screen_viewer!");
+ String allowRecording = httpServletRequest
+ .getParameter("allowRecording");
+ if (allowRecording == null) {
+ throw new Exception("allowRecording is
empty: ");
}
- }
+ ctx.put("allowRecording", allowRecording);
+
+ } catch (Exception e) {
+ log.error("invalid configuration value for key
screen_viewer!");
+ }
String template = "screenshare.vm";
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java?rev=1308147&r1=1308146&r2=1308147&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Sun Apr 1 16:27:25 2012
@@ -26,7 +26,6 @@ import java.util.List;
import org.junit.Test;
import org.openmeetings.app.persistence.beans.basic.Naviglobal;
import org.openmeetings.app.persistence.beans.basic.Navimain;
-import org.openmeetings.app.persistence.beans.basic.Navisub;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
import org.openmeetings.app.persistence.beans.user.Users;
@@ -62,11 +61,6 @@ public class TestNavi extends AbstractOp
for (Navimain navim : navigl.getMainnavi()) {
System.out.println("-->" + navim.getLabel().getValue());
- for (Navisub navis : navim.getSubnavi()) {
- System.out.println("---->"
- + navis.getLabel().getValue());
- }
-
}
}
}
