Revision: 4174
Author: seba.wagner
Date: Sun Sep 4 03:51:40 2011
Log: Fix Build Jar only
Fix some problems with activityList reference
http://code.google.com/p/openmeetings/source/detail?r=4174
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
/trunk/singlewebapp/build_openmeetings_jar.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 10:26:21 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sun Sep 4 03:51:40 2011
@@ -1029,7 +1029,9 @@
if (value.isScreenClient) {
return;
}
- canvas.currentActivityList.addMessageRequest(value,
canvas.getLabelName(1367), new Date().getTime());
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList.addMessageRequest(value,
canvas.getLabelName(1367), new Date().getTime());
+ }
if (canvas._overallchatcontent!=null){
var parentObj =
canvas._overallchatcontent.parent.parent.parent._chatparticipants;
parentObj.removeItemById(value.user_id);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Wed Aug 24 01:01:53 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Sun Sep 4 03:51:40 2011
@@ -72,6 +72,10 @@
if (canvas.currentFileExplorer != null) {
canvas.currentFileExplorer = null;
}
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Wed Aug 24 01:01:53 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Sun Sep 4 03:51:40 2011
@@ -71,6 +71,10 @@
if (canvas.currentFileExplorer != null) {
canvas.currentFileExplorer = null;
}
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Sun Jun 19 01:03:45 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Sun Sep 4 03:51:40 2011
@@ -64,6 +64,10 @@
if (canvas.currentFileExplorer != null) {
canvas.currentFileExplorer = null;
}
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Wed Aug 24 01:01:53 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Sun Sep 4 03:51:40 2011
@@ -66,6 +66,10 @@
if (canvas.currentFileExplorer != null) {
canvas.currentFileExplorer = null;
}
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
=======================================
--- /trunk/singlewebapp/build_openmeetings_jar.xml Sun Sep 4 02:15:43 2011
+++ /trunk/singlewebapp/build_openmeetings_jar.xml Sun Sep 4 03:51:40 2011
@@ -10,6 +10,9 @@
<property name="server.src.dir" value="${basedir}/src/server"/>
<property name="client.src.dir" value="${basedir}/src/client"/>
<property name="main.out.dir" value="${basedir}/bin"/>
+
+ <!-- Red5 dir -->
+ <property name="red5.server.dir" value="red5-1.0.0-RC1"/>
<!-- screen.out.dir -->
<property name="screen.out.dir" value="${basedir}/screen_compile" />
@@ -64,8 +67,8 @@
<property name="openjpa.lib" value="${project.lib}/openjpa2"/>
<!--JDBC Drivers-->
<property name="database.lib" value="${project.lib}/database" />
- <property name="red5.lib" value="${basedir}/server/red5" />
- <property name="red5.server.lib" value="${basedir}/server/red5/lib" />
+ <property name="red5.lib" value="${basedir}/${red5.server.dir}/red5" />
+ <property name="red5.server.lib"
value="${basedir}/${red5.server.dir}/red5/lib" />
<property name="spring.lib" value="${project.lib}/spring" />
<property name="upload.lib" value="${project.lib}/upload" />
<property name="xstream.lib" value="${project.lib}/xstream" />
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sun Sep 4 03:51:40 2011
@@ -299,7 +299,7 @@
* @param argObject
* @return user_id or NULL or negativ value (error_id)
*/
- public Long updateUserSelfSmall(String SID, ObjectMap values) {
+ public Long updateUserSelfSmall(String SID, @SuppressWarnings("rawtypes")
ObjectMap values) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
@@ -321,6 +321,7 @@
* @param regObjectObj
* @return
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public Long saveOrUpdateUser(String SID, Object regObjectObj) {
try {
LinkedHashMap argObjectMap = (LinkedHashMap)
regObjectObj;
@@ -348,7 +349,7 @@
Date age = null;
if (argObjectMap.get("userage") instanceof Date) {
age = (Date) argObjectMap.get("userage");
- log.error("saveOrUpdateUser7: " +
age.getTimezoneOffset());
+ //log.debug("saveOrUpdateUser7 TimezoneOffset: " +
age.getTimezoneOffset());
}
log.debug("Mail : " +
argObjectMap.get("email").toString());
@@ -910,6 +911,7 @@
return null;
}
+ @SuppressWarnings("deprecation")
public Long composeMail(String SID, List<String> recipients,
String subject, String message, Boolean bookedRoom,
Date validFromDate, String validFromTime, Date
validToDate,
@@ -1255,7 +1257,7 @@
return null;
}
- public Integer moveMailsToFolder(String SID, List privateMessageIntsIds,
+ public Integer moveMailsToFolder(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds,
Long newFolderId) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1280,7 +1282,7 @@
return null;
}
- public Integer moveMailsToTrash(String SID, List privateMessageIntsIds,
+ public Integer moveMailsToTrash(String SID, @SuppressWarnings("rawtypes")
List privateMessageIntsIds,
Boolean isTrash) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1307,7 +1309,7 @@
return -1;
}
- public Integer deletePrivateMessages(String SID, List
privateMessageIntsIds) {
+ public Integer deletePrivateMessages(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
@@ -1331,7 +1333,7 @@
return -1;
}
- public Integer markReadStatusMails(String SID, List
privateMessageIntsIds,
+ public Integer markReadStatusMails(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds,
Boolean isRead) {
try {
Long users_id = sessionManagement.checkSession(SID);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
