Author: solomax
Date: Thu Nov 19 07:59:36 2015
New Revision: 1715122
URL: http://svn.apache.org/viewvc?rev=1715122&view=rev
Log:
[OPENMEETINGS-1279] more work on swf code
Modified:
openmeetings/branches/3.1.x/LICENSE
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
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/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Modified: openmeetings/branches/3.1.x/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/LICENSE?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/LICENSE (original)
+++ openmeetings/branches/3.1.x/LICENSE Thu Nov 19 07:59:36 2015
@@ -646,7 +646,6 @@ Copyright (c) 2004-2008 QOS.ch
The XmlPull API is in public domain in hope that it will be embraced by Java
developers
-
======================================================================================================================
plugins/websocket-1.1.jar
@@ -1500,6 +1499,7 @@ POSSIBILITY OF SUCH DAMAGE.
asm-5.0.4.jar
URL: http://asm.objectweb.org/asm/
+
======================================================================================================================
SERP License
@@ -1793,6 +1793,8 @@ Copyright (c) 2002 JSON.org
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+
======================================================================================================================
For javax.annotation-api-1.2.jar:
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Thu Nov 19 07:59:36 2015
@@ -99,8 +99,8 @@ public class ConferenceService {
log.debug("getRoomsByGroup");
- Long user_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasModLevel(userDao.get(user_id), groupId)) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasModLevel(userDao.get(userId), groupId)) {
return roomManager.getRoomGroupByGroupId(groupId,
start, max, orderby, asc);
}
return null;
@@ -355,4 +355,12 @@ public class ConferenceService {
}
return null;
}
+
+ public Room getRoomById(String SID, Long roomId) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
+ return roomDao.get(roomId);
+ }
+ return null;
+ }
}
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Thu Nov 19 07:59:36 2015
@@ -330,7 +330,7 @@ public class MainService implements IPen
currentClient.setEmail(email);
// Log the User
- conferenceLogDao.addConferenceLog(
+ conferenceLogDao.add(
ConferenceLog.Type.nicknameEnter,
currentClient.getUserId(), streamId,
null, currentClient.getUserip(),
currentClient.getScope());
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Thu Nov 19 07:59:36 2015
@@ -200,7 +200,7 @@ public class ScopeApplicationAdapter ext
}
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.clientConnect,
+ conferenceLogDao.add(ConferenceLog.Type.clientConnect,
rcm.getUserId(), streamId, null,
rcm.getUserip(),
rcm.getScope());
return true;
@@ -507,7 +507,7 @@ public class ScopeApplicationAdapter ext
Long roomId = currentClient.getRoomId();
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomLeave,
+ conferenceLogDao.add(ConferenceLog.Type.roomLeave,
currentClient.getUserId(),
currentClient.getStreamid(),
roomId, currentClient.getUserip(), "");
@@ -1166,7 +1166,7 @@ public class ScopeApplicationAdapter ext
}
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomEnter,
+ conferenceLogDao.add(ConferenceLog.Type.roomEnter,
currentClient.getUserId(), streamid,
roomId,
currentClient.getUserip(), "");
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
Thu Nov 19 07:59:36 2015
@@ -127,7 +127,7 @@ public class DownloadHandler extends Bas
- // make a complete name out of
domain(organisation) + roomname
+ // make a complete name out of domain(group) +
roomname
String roomName = room_id;
// trim whitespaces cause it is a directory name
roomName =
StringUtils.deleteWhitespace(roomName);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
Thu Nov 19 07:59:36 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.log;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import javax.persistence.EntityManager;
@@ -25,39 +27,29 @@ import javax.persistence.PersistenceCont
import org.apache.openmeetings.db.entity.log.ConferenceLog;
import org.apache.openmeetings.db.entity.log.ConferenceLog.Type;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class ConferenceLogDao {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(ConferenceLogDao.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ConferenceLogDao.class, webAppRootKey);
+
@PersistenceContext
private EntityManager em;
- public Long addConferenceLog(Type type, Long userId, String streamid,
Long roomId, String userip, String scopeName) {
- try {
-
- ConferenceLog confLog = new ConferenceLog();
- confLog.setType(type);
- confLog.setInserted(new Date());
- confLog.setUserId(userId);
- confLog.setStreamid(streamid);
- confLog.setScopeName(scopeName);
- confLog.setRoomId(roomId);
- confLog.setUserip(userip);
-
- confLog = em.merge(confLog);
- Long confLogId = confLog.getId();
-
- return confLogId;
- } catch (Exception ex2) {
- log.error("[addConferenceLog]: ",ex2);
- }
- return null;
+ public ConferenceLog add(Type type, Long userId, String streamid, Long
roomId, String userip, String scopeName) {
+ ConferenceLog confLog = new ConferenceLog();
+ confLog.setType(type);
+ confLog.setInserted(new Date());
+ confLog.setUserId(userId);
+ confLog.setStreamid(streamid);
+ confLog.setScopeName(scopeName);
+ confLog.setRoomId(roomId);
+ confLog.setUserip(userip);
+
+ em.persist(confLog);
+ log.debug("[addConferenceLog]: " + confLog);
+ return confLog;
}
-
-
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Thu Nov 19 07:59:36 2015
@@ -70,7 +70,7 @@ public class RoomDTO implements Serializ
appointment = r.isAppointment();
confno = r.getConfno();
isPublic = r.getIspublic();
- demo = r.getIsDemoRoom();
+ demo = r.isDemoRoom();
closed = r.isClosed();
demoTime = r.getDemoTime();
externalId = r.getExternalId();
@@ -100,7 +100,7 @@ public class RoomDTO implements Serializ
r.setAppointment(appointment);
r.setConfno(confno);
r.setIspublic(isPublic);
- r.setIsDemoRoom(demo);
+ r.setDemoRoom(demo);
r.setDemoTime(demoTime);
r.setExternalId(externalId);
r.setExternalType(externalType);
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
Thu Nov 19 07:59:36 2015
@@ -171,17 +171,17 @@ public class Room implements IDataProvid
private boolean appointment;
// Vars to simulate external Room
- @Column(name = "externalId")
+ @Column(name = "external_id")
@Element(data = true, required = false)
private Long externalId;
- @Column(name = "externalType")
+ @Column(name = "external_type")
@Element(data = true, required = false)
private String externalType;
- @Column(name = "isdemoroom")
- @Element(data = true, required = false)
- private boolean isDemoRoom;
+ @Column(name = "demo_room")
+ @Element(name = "isDemoRoom", data = true, required = false)
+ private boolean demoRoom;
@Column(name = "demo_time")
@Element(data = true, required = false)
@@ -391,12 +391,12 @@ public class Room implements IDataProvid
this.appointment = appointment;
}
- public boolean getIsDemoRoom() {
- return isDemoRoom;
+ public boolean isDemoRoom() {
+ return demoRoom;
}
- public void setIsDemoRoom(boolean isDemoRoom) {
- this.isDemoRoom = isDemoRoom;
+ public void setDemoRoom(boolean demoRoom) {
+ this.demoRoom = demoRoom;
}
public Integer getDemoTime() {
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/contentviews/baseContentView.lzx
Thu Nov 19 07:59:36 2015
@@ -34,9 +34,13 @@
<method name="construct" args="p,args"><![CDATA[
super.construct(p, args);
if ($debug) Debug.write("baseContentView:: construct");
- canvas.currentContentView = this;
]]></method>
+ <handler name="oninit"><![CDATA[
+ if ($debug) Debug.write("baseContentView:: oninit");
+ canvas.currentContentView = this;
+ ]]></handler>
+
<!--
This Event is for sending additional Init Events, for example after
the reconnect
the File-List has to be refreshed for the File-Browser Plugin
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Thu Nov 19 07:59:36 2015
@@ -500,26 +500,22 @@
]]>
</method>
- <method name="setRoomValues" args="roomTypeId,roomId,roomObj">
-
- if ($debug) Debug.warn("setRoomValues ",roomTypeId,roomId,roomObj);
- if (roomTypeId=='conference'){
- canvas.isConference = true;
- } else {
- canvas.isConference = false;
- }
+ <method name="setRoomValues" args="roomTypeId,roomId,roomObj">
+ if ($debug) Debug.warn("setRoomValues
",roomTypeId,roomId,roomObj);
+ canvas.isConference = roomTypeId == 'conference';
//this is needed cause in the rpc-method *getCurrentModeratorList* we
check if its room.type == 'restricted'
//if so we will not show any *There is no Moderator* Warning Dialog
canvas.currentRoomObject = roomObj;
hib.currentroomid = roomId;
- if (roomObj!=null){
- if (roomTypeId=='conference'){
+ if (roomObj != null) {
+ if (roomTypeId == 'conference') {
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:roomObj});
- } else if (roomTypeId=='restricted'){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
- } else if (roomTypeId=='interview'){
+ } else if (roomTypeId == 'restricted') {
+ new
lz.restrictedConferenceRoom(canvas.main_content._content.inner,
{roomobj:roomObj});
+ //new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.restrictedRoomModule,roomObj:roomObj});
+ } else if (roomTypeId == 'interview') {
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj});
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Thu Nov 19 07:59:36 2015
@@ -63,8 +63,12 @@
<method name="construct" args="p,args"><![CDATA[
super.construct(p, args);
- this.roomobj = args.roomobj;
if ($debug) Debug.write("baseConferenceRoom:: construct", p, args);
+ ]]></method>
+
+ <handler name="oninit">
+ <![CDATA[
+ if ($debug) Debug.write("baseConferenceRoom:: oninit");
_mainScrollBar.setAttribute("visibility","hidden");
if ($debug) Debug.write("roomobj: ",this.roomobj);
@@ -115,15 +119,13 @@
if ($debug) Debug.write("no appointed meeting");
}
- if (this.roomobj.isDemoRoom && this.roomobj.demoTime != null) {
+ if (this.roomobj.demoRoom && this.roomobj.demoTime != null) {
if ($debug) Debug.warn("THIS IS A DEMO ROOM THAT SHOULD
CLOSE AFTER SEC: ",this.roomobj.demoTime);
- this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
+ this.meetingTimer = new
lz.meetingTimer(canvas,{refObj:this, roomobj:this.roomobj});
}
+ if ($debug) Debug.write("canvas._videocontainer ",
canvas._videocontainer);
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
- ]]></method>
- <handler name="oninit">
- <![CDATA[
]]>
</handler>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Thu Nov 19 07:59:36 2015
@@ -21,6 +21,11 @@
<library>
<class name="restrictedConferenceRoom" extends="baseConferenceRoom">
+ <method name="construct" args="p,args"><![CDATA[
+ super.construct(p, args);
+ if ($debug) Debug.write("restrictedConferenceRoom:: construct", p,
args);
+ ]]></method>
+
<handler name="oninit">
if ($debug) Debug.write("restrictedConferenceRoom::oninit ");
</handler>
Modified:
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Thu Nov 19 07:59:36 2015
@@ -430,7 +430,7 @@ public class ImportInitvalues {
r.setAppointment(false);
- r.setIsDemoRoom(false);
+ r.setDemoRoom(false);
r.setDemoTime(null);
r.setModerated(false);
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Thu Nov 19 07:59:36 2015
@@ -668,7 +668,7 @@
<entry key="652">M</entry>
<entry key="653">Do you want to change this user to be a moderator of that
organisation?</entry>
<entry key="654">Please choose an organisation before you try to add a user
to it</entry>
- <entry key="655">Organisation - moderator</entry>
+ <entry key="655">Group - moderator</entry>
<entry key="656">Do you really want to delete this user from the
organisation?</entry>
<entry key="657">This user is a moderator</entry>
<entry key="658">This user is not a moderator</entry>
@@ -1769,9 +1769,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
Thu Nov 19 07:59:36 2015
@@ -1762,9 +1762,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
Thu Nov 19 07:59:36 2015
@@ -1762,9 +1762,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
Thu Nov 19 07:59:36 2015
@@ -1762,9 +1762,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
Thu Nov 19 07:59:36 2015
@@ -1762,9 +1762,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Thu Nov 19 07:59:36 2015
@@ -83,7 +83,7 @@ public class RoomPanel extends BasePanel
private String getFlashFile() {
return RuntimeConfigurationType.DEVELOPMENT ==
getApplication().getConfigurationType()
- ? "maindebug.as3.swf11.swf" :
"main.as3.swf11.swf";
+ ? "maindebug.swf11.swf" : "main.swf11.swf";
}
private static PageParameters addServer(PageParameters pp, Server s) {
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Thu Nov 19 07:59:36 2015
@@ -16,9 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-function getAppletStatus() {
- return false;
-}
function initSwf(swfurl) {
var general = {
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Thu Nov 19 07:59:36 2015
@@ -643,7 +643,7 @@ Copyright (c) 2004-2008 QOS.ch
For xmlpull-1.1.3.1.jar
For xpp3_min-1.1.4c.jar
-
+
The XmlPull API is in public domain in hope that it will be embraced by Java
developers
======================================================================================================================
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
Thu Nov 19 07:59:36 2015
@@ -99,8 +99,8 @@ public class ConferenceService {
log.debug("getRoomsByGroup");
- Long user_id = sessiondataDao.checkSession(SID);
- if (AuthLevelUtil.hasModLevel(userDao.get(user_id), groupId)) {
+ Long userId = sessiondataDao.checkSession(SID);
+ if (AuthLevelUtil.hasModLevel(userDao.get(userId), groupId)) {
return roomManager.getRoomGroupByGroupId(groupId,
start, max, orderby, asc);
}
return null;
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=1715122&r1=1715121&r2=1715122&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
Thu Nov 19 07:59:36 2015
@@ -233,7 +233,7 @@ public class MainService implements IPen
currentClient.setEmail(email);
// Log the User
- conferenceLogDao.addConferenceLog(
+ conferenceLogDao.add(
ConferenceLog.Type.nicknameEnter,
currentClient.getUserId(), streamId,
null, currentClient.getUserip(),
currentClient.getScope());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Thu Nov 19 07:59:36 2015
@@ -191,7 +191,7 @@ public class ScopeApplicationAdapter ext
}
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.clientConnect,
+ conferenceLogDao.add(ConferenceLog.Type.clientConnect,
rcm.getUserId(), streamId, null,
rcm.getUserip(),
rcm.getScope());
return true;
@@ -498,7 +498,7 @@ public class ScopeApplicationAdapter ext
Long roomId = currentClient.getRoomId();
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomLeave,
+ conferenceLogDao.add(ConferenceLog.Type.roomLeave,
currentClient.getUserId(),
currentClient.getStreamid(),
roomId, currentClient.getUserip(), "");
@@ -1156,7 +1156,7 @@ public class ScopeApplicationAdapter ext
}
// Log the User
-
conferenceLogDao.addConferenceLog(ConferenceLog.Type.roomEnter,
+ conferenceLogDao.add(ConferenceLog.Type.roomEnter,
currentClient.getUserId(), streamid,
roomId,
currentClient.getUserip(), "");
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
Thu Nov 19 07:59:36 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.log;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import javax.persistence.EntityManager;
@@ -25,39 +27,29 @@ import javax.persistence.PersistenceCont
import org.apache.openmeetings.db.entity.log.ConferenceLog;
import org.apache.openmeetings.db.entity.log.ConferenceLog.Type;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class ConferenceLogDao {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(ConferenceLogDao.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ConferenceLogDao.class, webAppRootKey);
+
@PersistenceContext
private EntityManager em;
- public Long addConferenceLog(Type type, Long userId, String streamid,
Long roomId, String userip, String scopeName) {
- try {
-
- ConferenceLog confLog = new ConferenceLog();
- confLog.setType(type);
- confLog.setInserted(new Date());
- confLog.setUserId(userId);
- confLog.setStreamid(streamid);
- confLog.setScopeName(scopeName);
- confLog.setRoomId(roomId);
- confLog.setUserip(userip);
-
- confLog = em.merge(confLog);
- Long confLogId = confLog.getId();
-
- return confLogId;
- } catch (Exception ex2) {
- log.error("[addConferenceLog]: ",ex2);
- }
- return null;
+ public ConferenceLog add(Type type, Long userId, String streamid, Long
roomId, String userip, String scopeName) {
+ ConferenceLog confLog = new ConferenceLog();
+ confLog.setType(type);
+ confLog.setInserted(new Date());
+ confLog.setUserId(userId);
+ confLog.setStreamid(streamid);
+ confLog.setScopeName(scopeName);
+ confLog.setRoomId(roomId);
+ confLog.setUserip(userip);
+
+ em.persist(confLog);
+ log.debug("[addConferenceLog]: " + confLog);
+ return confLog;
}
-
-
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
Thu Nov 19 07:59:36 2015
@@ -70,7 +70,7 @@ public class RoomDTO implements Serializ
appointment = r.isAppointment();
confno = r.getConfno();
isPublic = r.getIspublic();
- demo = r.getIsDemoRoom();
+ demo = r.isDemoRoom();
closed = r.isClosed();
demoTime = r.getDemoTime();
externalId = r.getExternalId();
@@ -100,7 +100,7 @@ public class RoomDTO implements Serializ
r.setAppointment(appointment);
r.setConfno(confno);
r.setIspublic(isPublic);
- r.setIsDemoRoom(demo);
+ r.setDemoRoom(demo);
r.setDemoTime(demoTime);
r.setExternalId(externalId);
r.setExternalType(externalType);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
Thu Nov 19 07:59:36 2015
@@ -171,17 +171,17 @@ public class Room implements IDataProvid
private boolean appointment;
// Vars to simulate external Room
- @Column(name = "externalId")
+ @Column(name = "external_id")
@Element(data = true, required = false)
private Long externalId;
- @Column(name = "externalType")
+ @Column(name = "external_type")
@Element(data = true, required = false)
private String externalType;
- @Column(name = "isdemoroom")
- @Element(data = true, required = false)
- private boolean isDemoRoom;
+ @Column(name = "demo_room")
+ @Element(name = "isDemoRoom", data = true, required = false)
+ private boolean demoRoom;
@Column(name = "demo_time")
@Element(data = true, required = false)
@@ -391,12 +391,12 @@ public class Room implements IDataProvid
this.appointment = appointment;
}
- public boolean getIsDemoRoom() {
- return isDemoRoom;
+ public boolean isDemoRoom() {
+ return demoRoom;
}
- public void setIsDemoRoom(boolean isDemoRoom) {
- this.isDemoRoom = isDemoRoom;
+ public void setDemoRoom(boolean demoRoom) {
+ this.demoRoom = demoRoom;
}
public Integer getDemoTime() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1715122&r1=1715121&r2=1715122&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Thu Nov 19 07:59:36 2015
@@ -436,7 +436,7 @@ public class ImportInitvalues {
r.setAppointment(false);
- r.setIsDemoRoom(false);
+ r.setDemoRoom(false);
r.setDemoTime(null);
r.setModerated(false);
