Author: solomax
Date: Thu Dec 3 06:40:29 2015
New Revision: 1717714
URL: http://svn.apache.org/viewvc?rev=1717714&view=rev
Log:
[OPENMEETINGS-1276] daos are corrected to work as expected; code clean-up
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
Thu Dec 3 06:40:29 2015
@@ -21,7 +21,6 @@ package org.apache.openmeetings.core.rem
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -31,14 +30,11 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserService;
-import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.db.util.AuthLevelUtil;
-import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.wicket.Application;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
@@ -63,10 +59,6 @@ public class UserService implements IUse
@Autowired
private UserDao userDao;
@Autowired
- private UserContactDao userContactDao;
- @Autowired
- private TimezoneUtil timezoneUtil;
- @Autowired
private ServerDao serverDao;
@Autowired
private ISlaveHTTPConnectionManager slaveHTTPConnectionManager;
@@ -172,114 +164,6 @@ public class UserService implements IUse
return false;
}
- public User updateUserSelfTimeZone(String SID, String jname) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- User us = userDao.get(userId);
-
-
us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID());
- us.setForceTimeZoneCheck(false);
- us.setUpdated(new Date());
-
- userDao.update(us, userId);
-
- return us;
- }
- } catch (Exception err) {
- log.error("[updateUserTimeZone]", err);
- }
- return null;
- }
-
- public List<UserContact> getPendingUserContacts(String SID) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactDao.getContactRequestsByUserAndStatus(userId, true);
-
- return uList;
- }
- } catch (Exception err) {
- log.error("[getPendingUserContact]", err);
- }
- return null;
- }
-
- public List<UserContact> getUserContacts(String SID) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(userId, false);
-
- return uList;
- }
- } catch (Exception err) {
- log.error("[getPendingUserContact]", err);
- }
- return null;
- }
-
- public Integer removeContactUser(String SID, Long userContactId) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactDao.get(userContactId);
-
- if (userContacts == null) {
- return -49;
- }
-
- return
userContactDao.deleteUserContact(userContactId);
- }
- } catch (Exception err) {
- log.error("[removeContactUser]", err);
- }
- return null;
- }
-
- public Boolean checkUserIsInContactList(String SID, Long userId) {
- try {
- Long authUserId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) {
- List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(authUserId, false);
-
- for (UserContact userContact : uList) {
- if
(userContact.getContact().getId().equals(userId)) {
- return true;
- }
- }
-
- return false;
- }
- } catch (Exception err) {
- log.error("[checkUserIsInContactList]", err);
- }
- return null;
- }
-
- public void shareCalendarUserContact(String SID, Long contactId,
Boolean shareCalendar) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
-
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactDao.get(contactId);
-
- userContacts.setShareCalendar(shareCalendar);
-
- userContactDao.update(userContacts);
- }
- } catch (Exception err) {
- log.error("[shareCalendarUserContact]", err);
- }
- }
-
/**
* Kick a user by its publicSID.<br/>
* <br/>
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
Thu Dec 3 06:40:29 2015
@@ -81,7 +81,7 @@ public class ChatDao {
public ChatMessage update(ChatMessage entity) {
entity.setSent(new Date());
- if (entity.getId() == 0) {
+ if (entity.getId() == null) {
em.persist(entity);
}
return entity;
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
Thu Dec 3 06:40:29 2015
@@ -145,18 +145,13 @@ public class RecordingMetaDataDao {
return null;
}
- public Long update(RecordingMetaData metaData) {
- try {
- if (metaData.getId() == 0) {
- em.persist(metaData);
- } else {
- if (!em.contains(metaData)) {
- em.merge(metaData);
- }
- }
- } catch (Exception ex2) {
- log.error("[update]: ", ex2);
+ public RecordingMetaData update(RecordingMetaData metaData) {
+ log.debug("[update]: ");
+ if (metaData.getId() == null) {
+ em.persist(metaData);
+ } else {
+ metaData = em.merge(metaData);
}
- return null;
+ return metaData;
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
Thu Dec 3 06:40:29 2015
@@ -61,21 +61,15 @@ public class RecordingMetaDeltaDao {
return null;
}
- public Long update(RecordingMetaDelta metaDelta) {
- try {
- if (metaDelta.getMetaDataId() == 0) {
- em.persist(metaDelta);
- } else {
- if (!em.contains(metaDelta)) {
- em.merge(metaDelta);
- }
- }
-
- return metaDelta.getMetaDataId();
- } catch (Exception ex2) {
- log.error("[update]: ",ex2);
+ public RecordingMetaDelta update(RecordingMetaDelta metaDelta) {
+ log.debug("[update]: ");
+ if (metaDelta.getMetaDataId() == null) {
+ em.persist(metaDelta);
+ } else {
+ metaDelta = em.merge(metaDelta);
}
- return null;
+
+ return metaDelta;
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
Thu Dec 3 06:40:29 2015
@@ -51,7 +51,7 @@ public class RoomModeratorDao {
}
public RoomModerator update(RoomModerator rm, Long userId) {
- if (rm.getId() == 0) {
+ if (rm.getId() == null) {
rm.setInserted(new Date());
em.persist(rm);
} else {
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
Thu Dec 3 06:40:29 2015
@@ -91,12 +91,10 @@ public class PrivateMessageFolderDao imp
@Override
public PrivateMessageFolder update(PrivateMessageFolder folder, Long
userId) {
- if (folder.getId() == 0) {
+ if (folder.getId() == null) {
em.persist(folder);
} else {
- if (!em.contains(folder)) {
- folder = em.merge(folder);
- }
+ folder = em.merge(folder);
}
return folder;
}
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
Thu Dec 3 06:40:29 2015
@@ -26,7 +26,6 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.user.UserContact;
@@ -40,12 +39,11 @@ public class UserContactDao {
private static final Logger log =
Red5LoggerFactory.getLogger(UserContactDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
- @Autowired
- private UserDao userDao;
+ @Autowired
+ private UserDao userDao;
public Long addUserContact(Long userId, Long ownerId, Boolean pending,
String hash) {
try {
-
UserContact userContact = new UserContact();
userContact.setInserted(new Date());
userContact.setOwner(userDao.get(ownerId));
@@ -54,24 +52,8 @@ public class UserContactDao {
userContact.setHash(hash);
userContact = update(userContact);
- Long userContactId = userContact.getUserContactId();
-
- return userContactId;
- } catch (Exception e) {
- log.error("[addUserContact]",e);
- }
- return null;
- }
-
- public Long addUserContactObj(UserContact userContact) {
- try {
-
- userContact.setInserted(new Date());
- userContact = em.merge(userContact);
- Long userContactId = userContact.getUserContactId();
-
- return userContactId;
+ return userContact.getId();
} catch (Exception e) {
log.error("[addUserContact]",e);
}
@@ -79,18 +61,10 @@ public class UserContactDao {
}
/**
- * @param userContactDeleteId
- * @return rowcount of update
+ * @param id
*/
- public Integer deleteUserContact(Long userContactDeleteId) {
- try {
- Query query = em.createNamedQuery("deleteUserContact");
- query.setParameter("userContactDeleteId",
userContactDeleteId);
- return query.executeUpdate();
- } catch (Exception e) {
- log.error("[deleteUserContact]",e);
- }
- return null;
+ public void delete(Long id) {
+ em.createNamedQuery("deleteUserContact").setParameter("id",
id).executeUpdate();
}
/**
@@ -98,14 +72,7 @@ public class UserContactDao {
* @return rowcount of update
*/
public Integer deleteAllUserContacts(Long ownerId) {
- try {
- Query query =
em.createNamedQuery("deleteAllUserContacts");
- query.setParameter("ownerId",ownerId);
- return query.executeUpdate();
- } catch (Exception e) {
- log.error("[deleteAllUserContacts]",e);
- }
- return null;
+ return
em.createNamedQuery("deleteAllUserContacts").setParameter("ownerId",ownerId).executeUpdate();
}
public UserContact get(Long userId, Long ownerId) {
@@ -193,12 +160,12 @@ public class UserContactDao {
public UserContact get(Long id) {
try {
TypedQuery<UserContact> query =
em.createNamedQuery("getUserContactsById", UserContact.class);
- query.setParameter("userContactId", id);
+ query.setParameter("id", id);
UserContact userContacts = null;
try {
userContacts = query.getSingleResult();
- } catch (NoResultException ex) {
- }
+ } catch (NoResultException ex) {
+ }
return userContacts;
} catch (Exception e) {
log.error("[getUserContacts]",e);
@@ -210,12 +177,12 @@ public class UserContactDao {
return em.createNamedQuery("getUserContacts",
UserContact.class).getResultList();
}
- public Long updateContactStatus(Long userContactId, Boolean pending) {
+ public Long updateContactStatus(Long id, Boolean pending) {
try {
- UserContact userContacts = get(userContactId);
- userContacts.setPending(pending);
- update(userContacts);
- return userContactId;
+ UserContact uc = get(id);
+ uc.setPending(pending);
+ update(uc);
+ return id;
} catch (Exception e) {
log.error("[updateContactStatus]",e);
}
@@ -223,7 +190,7 @@ public class UserContactDao {
}
public UserContact update(UserContact c) {
- if (c.getUserContactId() == 0) {
+ if (c.getId() == 0) {
c.setInserted(new Date());
em.persist(c);
} else {
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
Thu Dec 3 06:40:29 2015
@@ -44,10 +44,8 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getPrivateMessages", query = "SELECT c FROM
PrivateMessage c ORDER BY c.id"),
@NamedQuery(name = "getPrivateMessageById", query = "SELECT c FROM
PrivateMessage c WHERE c.id = :id "),
- @NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead " +
- "WHERE c.id IN (:ids) "),
- @NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage
c SET c.folderId = :folderId " +
- "WHERE c.id IN (:ids) "),
+ @NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead WHERE c.id IN (:ids) "),
+ @NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage
c SET c.folderId = :folderId WHERE c.id IN (:ids) "),
@NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM
PrivateMessage c WHERE c.id IN (:ids) "),
@NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM
PrivateMessage c WHERE c.room.id = :roomId ")
})
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
Thu Dec 3 06:40:29 2015
@@ -39,7 +39,7 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "deleteUserContact", query = "delete from
UserContact u where u.userContactId = :userContactDeleteId"),
+ @NamedQuery(name = "deleteUserContact", query = "delete from
UserContact u where u.id = :id"),
@NamedQuery(name = "deleteAllUserContacts", query = "delete from
UserContact u where u.owner.id = :ownerId"),
@NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM
UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND
c.contact.deleted = false"),
@NamedQuery(name = "getContactsByHash", query = "select c from
UserContact c " +
@@ -67,8 +67,8 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from
UserContact c " +
"where c.contact.id = :userId " +
"AND c.contact.deleted = false"),
- @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM
UserContact c WHERE c.userContactId = :userContactId"),
- @NamedQuery(name = "getUserContacts", query = "SELECT c FROM
UserContact c ORDER BY c.userContactId")
+ @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM
UserContact c WHERE c.id = :id"),
+ @NamedQuery(name = "getUserContacts", query = "SELECT c FROM
UserContact c ORDER BY c.id")
})
@Table(name = "user_contact")
@Root(name="usercontact")
@@ -78,7 +78,7 @@ public class UserContact implements Seri
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
@Element(data = true, name = "userContactId")
- private long userContactId;
+ private long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id")
@@ -109,11 +109,11 @@ public class UserContact implements Seri
@Element(data=true, required=false)
private boolean shareCalendar;
- public long getUserContactId() {
- return userContactId;
+ public Long getId() {
+ return id;
}
- public void setUserContactId(long userContactId) {
- this.userContactId = userContactId;
+ public void setId(Long id) {
+ this.id = id;
}
public User getContact() {
Modified:
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Thu Dec 3 06:40:29 2015
@@ -516,16 +516,16 @@ public class BackupImport {
List<UserContact> list = readList(serializer, f,
"userContacts.xml", "usercontacts", UserContact.class, true);
for (UserContact uc : list) {
- Long ucId = uc.getUserContactId();
+ Long ucId = uc.getId();
UserContact storedUC = userContactDao.get(ucId);
if (storedUC == null && uc.getContact() != null
&& uc.getContact().getId() != null) {
- uc.setUserContactId(0);
+ uc.setId(null);
if (uc.getOwner() != null &&
uc.getOwner().getId() == null) {
uc.setOwner(null);
}
- Long newId =
userContactDao.addUserContactObj(uc);
- userContactsMap.put(ucId, newId);
+ uc = userContactDao.update(uc);
+ userContactsMap.put(ucId, uc.getId());
}
}
}
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Thu Dec 3 06:40:29 2015
@@ -153,12 +153,6 @@ public class MainPage extends BaseInited
private static final long serialVersionUID = 1L;
@Override
- protected void onOpen(IPartialPageRequestHandler
handler) {
- super.onOpen(handler);
- setDefaultModelObject(new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage()));
- }
-
- @Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
BasePanel bp = getCurrentPanel();
if (send.equals(button) && bp != null) {
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
Thu Dec 3 06:40:29 2015
@@ -27,7 +27,7 @@
<div><div wicket:id="step4" class="clickable
start_step4"><wicket:message key="773"/></div></div>
<table>
<tr>
- <td><wicket:message key="804"
escape="false"/></td>
+ <td><div wicket:id="123msg"></div></td>
<td>
<button wicket:id="start"
type="button"><wicket:message key="788"/></button><br/>
<button wicket:id="calendar"
type="button"><wicket:message key="291"/></button>
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
Thu Dec 3 06:40:29 2015
@@ -21,10 +21,12 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
import ro.fortsoft.wicket.dashboard.Widget;
@@ -41,6 +43,7 @@ public class StartWidgetView extends Wid
add(new WebMarkupContainer("step2").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step3").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
+ add(new Label("123msg",
Application.getString(804)).setEscapeModelStrings(false));
add(new Button("start").add(new PublicRoomsEventBehavior()));
add(new Button("calendar").add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Thu Dec 3 06:40:29 2015
@@ -182,13 +182,13 @@ public class MessageDialog extends Abstr
@Override
protected void onSubmit(AjaxRequestTarget target) {
- PrivateMessage p = getModelObject();
- p.setInserted(new Date());
+ PrivateMessage m = getModelObject();
+ m.setInserted(new Date());
UserDao userDao = getBean(UserDao.class);
User owner = userDao.get(getUserId());
- if (p.isBookedRoom()) {
- Room r = p.getRoom();
- r.setName(p.getSubject());
+ if (m.isBookedRoom()) {
+ Room r = m.getRoom();
+ r.setName(m.getSubject());
r.setComment("");
r.setNumberOfPartizipants(100L);
r.setAppointment(true);
@@ -196,8 +196,8 @@ public class MessageDialog extends Abstr
r.setAllowFontStyles(true);
r = getBean(RoomDao.class).update(r, getUserId());
Appointment a = new Appointment();
- a.setTitle(p.getSubject());
- a.setDescription(p.getMessage());
+ a.setTitle(m.getSubject());
+ a.setDescription(m.getMessage());
a.setRoom(r);
a.setStart(CalendarWebHelper.getDate(start.getModelObject()));
a.setEnd(CalendarWebHelper.getDate(end.getModelObject()));
@@ -214,9 +214,9 @@ public class MessageDialog extends Abstr
a.setOwner(owner);
a.setMeetingMembers(attendees);
getBean(AppointmentDao.class).update(a, getUserId(), false);
- p.setRoom(r);
+ m.setRoom(r);
} else {
- p.setRoom(null);
+ m.setRoom(null);
}
PrivateMessageDao msgDao = getBean(PrivateMessageDao.class);
for (User to : modelTo.getObject()) {
@@ -224,12 +224,12 @@ public class MessageDialog extends Abstr
userDao.update(to, getUserId());
}
//to send
- p = new PrivateMessage(p);
+ PrivateMessage p = new PrivateMessage(m);
p.setTo(to);
p.setFolderId(SENT_FOLDER_ID);
msgDao.update(p, getUserId());
//to inbox
- p = new PrivateMessage(p);
+ p = new PrivateMessage(m);
p.setOwner(to);
p.setFolderId(INBOX_FOLDER_ID);
msgDao.update(p, getUserId());
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Thu Dec 3 06:40:29 2015
@@ -546,7 +546,7 @@ public class MessagesContactsPanel exten
@Override
protected void populateItem(Item<UserContact> item) {
UserContact uc = item.getModelObject();
- final long contactId = uc.getUserContactId();
+ final long contactId = uc.getId();
final long userId = uc.getOwner().getId();
if (uc.isPending()) {
item.add(AttributeModifier.append("class", "unread"));
@@ -566,7 +566,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).delete(contactId);
updateContacts(target);
}
}).setVisible(uc.isPending()));
@@ -577,7 +577,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).delete(contactId);
updateContacts(target);
}
}).setVisible(!uc.isPending()));
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
(original)
+++
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Thu Dec 3 06:40:29 2015
@@ -19,7 +19,7 @@
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";>
<context-param>
<param-name>globalScope</param-name>
<param-value>default</param-value>
@@ -71,7 +71,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
-
<param-value>conf,css,default,docs,images,js,persistence,public,screensharing,streams,upload,uploadtemp,services,networktest.,screen.,DownloadHandler</param-value>
+
<param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,networktest.,DownloadHandler</param-value>
</init-param>
</filter>
<filter-mapping>
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=1717714&r1=1717713&r2=1717714&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
Thu Dec 3 06:40:29 2015
@@ -21,7 +21,6 @@ package org.apache.openmeetings.core.rem
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -31,14 +30,11 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserService;
-import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.db.util.AuthLevelUtil;
-import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.wicket.Application;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
@@ -63,10 +59,6 @@ public class UserService implements IUse
@Autowired
private UserDao userDao;
@Autowired
- private UserContactDao userContactDao;
- @Autowired
- private TimezoneUtil timezoneUtil;
- @Autowired
private ServerDao serverDao;
@Autowired
private ISlaveHTTPConnectionManager slaveHTTPConnectionManager;
@@ -156,114 +148,6 @@ public class UserService implements IUse
return false;
}
- public User updateUserSelfTimeZone(String SID, String jname) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- User us = userDao.get(userId);
-
-
us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jname).getID());
- us.setForceTimeZoneCheck(false);
- us.setUpdated(new Date());
-
- userDao.update(us, userId);
-
- return us;
- }
- } catch (Exception err) {
- log.error("[updateUserTimeZone]", err);
- }
- return null;
- }
-
- public List<UserContact> getPendingUserContacts(String SID) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactDao.getContactRequestsByUserAndStatus(userId, true);
-
- return uList;
- }
- } catch (Exception err) {
- log.error("[getPendingUserContact]", err);
- }
- return null;
- }
-
- public List<UserContact> getUserContacts(String SID) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(userId, false);
-
- return uList;
- }
- } catch (Exception err) {
- log.error("[getPendingUserContact]", err);
- }
- return null;
- }
-
- public Integer removeContactUser(String SID, Long userContactId) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactDao.get(userContactId);
-
- if (userContacts == null) {
- return -49;
- }
-
- return
userContactDao.deleteUserContact(userContactId);
- }
- } catch (Exception err) {
- log.error("[removeContactUser]", err);
- }
- return null;
- }
-
- public Boolean checkUserIsInContactList(String SID, Long userId) {
- try {
- Long authUserId = sessiondataDao.checkSession(SID);
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) {
- List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(authUserId, false);
-
- for (UserContact userContact : uList) {
- if
(userContact.getContact().getId().equals(userId)) {
- return true;
- }
- }
-
- return false;
- }
- } catch (Exception err) {
- log.error("[checkUserIsInContactList]", err);
- }
- return null;
- }
-
- public void shareCalendarUserContact(String SID, Long contactId,
Boolean shareCalendar) {
- try {
- Long userId = sessiondataDao.checkSession(SID);
-
- // users only
- if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactDao.get(contactId);
-
- userContacts.setShareCalendar(shareCalendar);
-
- userContactDao.update(userContacts);
- }
- } catch (Exception err) {
- log.error("[shareCalendarUserContact]", err);
- }
- }
-
/**
* Kick a user by its publicSID.<br/>
* <br/>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
Thu Dec 3 06:40:29 2015
@@ -81,7 +81,7 @@ public class ChatDao {
public ChatMessage update(ChatMessage entity) {
entity.setSent(new Date());
- if (entity.getId() == 0) {
+ if (entity.getId() == null) {
em.persist(entity);
}
return entity;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
Thu Dec 3 06:40:29 2015
@@ -145,18 +145,13 @@ public class RecordingMetaDataDao {
return null;
}
- public Long update(RecordingMetaData metaData) {
- try {
- if (metaData.getId() == 0) {
- em.persist(metaData);
- } else {
- if (!em.contains(metaData)) {
- em.merge(metaData);
- }
- }
- } catch (Exception ex2) {
- log.error("[update]: ", ex2);
+ public RecordingMetaData update(RecordingMetaData metaData) {
+ log.debug("[update]: ");
+ if (metaData.getId() == null) {
+ em.persist(metaData);
+ } else {
+ metaData = em.merge(metaData);
}
- return null;
+ return metaData;
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
Thu Dec 3 06:40:29 2015
@@ -61,21 +61,15 @@ public class RecordingMetaDeltaDao {
return null;
}
- public Long update(RecordingMetaDelta metaDelta) {
- try {
- if (metaDelta.getMetaDataId() == 0) {
- em.persist(metaDelta);
- } else {
- if (!em.contains(metaDelta)) {
- em.merge(metaDelta);
- }
- }
-
- return metaDelta.getMetaDataId();
- } catch (Exception ex2) {
- log.error("[update]: ",ex2);
+ public RecordingMetaDelta update(RecordingMetaDelta metaDelta) {
+ log.debug("[update]: ");
+ if (metaDelta.getMetaDataId() == null) {
+ em.persist(metaDelta);
+ } else {
+ metaDelta = em.merge(metaDelta);
}
- return null;
+
+ return metaDelta;
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
Thu Dec 3 06:40:29 2015
@@ -51,7 +51,7 @@ public class RoomModeratorDao {
}
public RoomModerator update(RoomModerator rm, Long userId) {
- if (rm.getId() == 0) {
+ if (rm.getId() == null) {
rm.setInserted(new Date());
em.persist(rm);
} else {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
Thu Dec 3 06:40:29 2015
@@ -91,12 +91,10 @@ public class PrivateMessageFolderDao imp
@Override
public PrivateMessageFolder update(PrivateMessageFolder folder, Long
userId) {
- if (folder.getId() == 0) {
+ if (folder.getId() == null) {
em.persist(folder);
} else {
- if (!em.contains(folder)) {
- folder = em.merge(folder);
- }
+ folder = em.merge(folder);
}
return folder;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
Thu Dec 3 06:40:29 2015
@@ -26,7 +26,6 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.user.UserContact;
@@ -40,12 +39,11 @@ public class UserContactDao {
private static final Logger log =
Red5LoggerFactory.getLogger(UserContactDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
- @Autowired
- private UserDao userDao;
+ @Autowired
+ private UserDao userDao;
public Long addUserContact(Long userId, Long ownerId, Boolean pending,
String hash) {
try {
-
UserContact userContact = new UserContact();
userContact.setInserted(new Date());
userContact.setOwner(userDao.get(ownerId));
@@ -54,24 +52,8 @@ public class UserContactDao {
userContact.setHash(hash);
userContact = update(userContact);
- Long userContactId = userContact.getUserContactId();
-
- return userContactId;
- } catch (Exception e) {
- log.error("[addUserContact]",e);
- }
- return null;
- }
-
- public Long addUserContactObj(UserContact userContact) {
- try {
-
- userContact.setInserted(new Date());
- userContact = em.merge(userContact);
- Long userContactId = userContact.getUserContactId();
-
- return userContactId;
+ return userContact.getId();
} catch (Exception e) {
log.error("[addUserContact]",e);
}
@@ -79,18 +61,10 @@ public class UserContactDao {
}
/**
- * @param userContactDeleteId
- * @return rowcount of update
+ * @param id
*/
- public Integer deleteUserContact(Long userContactDeleteId) {
- try {
- Query query = em.createNamedQuery("deleteUserContact");
- query.setParameter("userContactDeleteId",
userContactDeleteId);
- return query.executeUpdate();
- } catch (Exception e) {
- log.error("[deleteUserContact]",e);
- }
- return null;
+ public void delete(Long id) {
+ em.createNamedQuery("deleteUserContact").setParameter("id",
id).executeUpdate();
}
/**
@@ -98,14 +72,7 @@ public class UserContactDao {
* @return rowcount of update
*/
public Integer deleteAllUserContacts(Long ownerId) {
- try {
- Query query =
em.createNamedQuery("deleteAllUserContacts");
- query.setParameter("ownerId",ownerId);
- return query.executeUpdate();
- } catch (Exception e) {
- log.error("[deleteAllUserContacts]",e);
- }
- return null;
+ return
em.createNamedQuery("deleteAllUserContacts").setParameter("ownerId",ownerId).executeUpdate();
}
public UserContact get(Long userId, Long ownerId) {
@@ -193,12 +160,12 @@ public class UserContactDao {
public UserContact get(Long id) {
try {
TypedQuery<UserContact> query =
em.createNamedQuery("getUserContactsById", UserContact.class);
- query.setParameter("userContactId", id);
+ query.setParameter("id", id);
UserContact userContacts = null;
try {
userContacts = query.getSingleResult();
- } catch (NoResultException ex) {
- }
+ } catch (NoResultException ex) {
+ }
return userContacts;
} catch (Exception e) {
log.error("[getUserContacts]",e);
@@ -210,12 +177,12 @@ public class UserContactDao {
return em.createNamedQuery("getUserContacts",
UserContact.class).getResultList();
}
- public Long updateContactStatus(Long userContactId, Boolean pending) {
+ public Long updateContactStatus(Long id, Boolean pending) {
try {
- UserContact userContacts = get(userContactId);
- userContacts.setPending(pending);
- update(userContacts);
- return userContactId;
+ UserContact uc = get(id);
+ uc.setPending(pending);
+ update(uc);
+ return id;
} catch (Exception e) {
log.error("[updateContactStatus]",e);
}
@@ -223,7 +190,7 @@ public class UserContactDao {
}
public UserContact update(UserContact c) {
- if (c.getUserContactId() == 0) {
+ if (c.getId() == 0) {
c.setInserted(new Date());
em.persist(c);
} else {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
Thu Dec 3 06:40:29 2015
@@ -44,10 +44,8 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getPrivateMessages", query = "SELECT c FROM
PrivateMessage c ORDER BY c.id"),
@NamedQuery(name = "getPrivateMessageById", query = "SELECT c FROM
PrivateMessage c WHERE c.id = :id "),
- @NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead " +
- "WHERE c.id IN (:ids) "),
- @NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage
c SET c.folderId = :folderId " +
- "WHERE c.id IN (:ids) "),
+ @NamedQuery(name = "updatePrivateMessagesReadStatus", query = "UPDATE
PrivateMessage c SET c.isRead = :isRead WHERE c.id IN (:ids) "),
+ @NamedQuery(name = "moveMailsToFolder", query = "UPDATE PrivateMessage
c SET c.folderId = :folderId WHERE c.id IN (:ids) "),
@NamedQuery(name = "deletePrivateMessages", query = "DELETE FROM
PrivateMessage c WHERE c.id IN (:ids) "),
@NamedQuery(name = "getPrivateMessagesByRoom", query = "SELECT c FROM
PrivateMessage c WHERE c.room.id = :roomId ")
})
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
Thu Dec 3 06:40:29 2015
@@ -39,7 +39,7 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
- @NamedQuery(name = "deleteUserContact", query = "delete from
UserContact u where u.userContactId = :userContactDeleteId"),
+ @NamedQuery(name = "deleteUserContact", query = "delete from
UserContact u where u.id = :id"),
@NamedQuery(name = "deleteAllUserContacts", query = "delete from
UserContact u where u.owner.id = :ownerId"),
@NamedQuery(name = "getContactByUserOwner", query = "SELECT c FROM
UserContact c WHERE c.contact.id = :userId AND c.owner.id = :ownerId AND
c.contact.deleted = false"),
@NamedQuery(name = "getContactsByHash", query = "select c from
UserContact c " +
@@ -67,8 +67,8 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "countContactsByUser", query = "select COUNT(c) from
UserContact c " +
"where c.contact.id = :userId " +
"AND c.contact.deleted = false"),
- @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM
UserContact c WHERE c.userContactId = :userContactId"),
- @NamedQuery(name = "getUserContacts", query = "SELECT c FROM
UserContact c ORDER BY c.userContactId")
+ @NamedQuery(name = "getUserContactsById", query = "SELECT c FROM
UserContact c WHERE c.id = :id"),
+ @NamedQuery(name = "getUserContacts", query = "SELECT c FROM
UserContact c ORDER BY c.id")
})
@Table(name = "user_contact")
@Root(name="usercontact")
@@ -78,7 +78,7 @@ public class UserContact implements Seri
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
@Element(data = true, name = "userContactId")
- private long userContactId;
+ private long id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id")
@@ -109,11 +109,11 @@ public class UserContact implements Seri
@Element(data=true, required=false)
private boolean shareCalendar;
- public long getUserContactId() {
- return userContactId;
+ public Long getId() {
+ return id;
}
- public void setUserContactId(long userContactId) {
- this.userContactId = userContactId;
+ public void setId(Long id) {
+ this.id = id;
}
public User getContact() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Thu Dec 3 06:40:29 2015
@@ -516,16 +516,16 @@ public class BackupImport {
List<UserContact> list = readList(serializer, f,
"userContacts.xml", "usercontacts", UserContact.class, true);
for (UserContact uc : list) {
- Long ucId = uc.getUserContactId();
+ Long ucId = uc.getId();
UserContact storedUC = userContactDao.get(ucId);
if (storedUC == null && uc.getContact() != null
&& uc.getContact().getId() != null) {
- uc.setUserContactId(0);
+ uc.setId(null);
if (uc.getOwner() != null &&
uc.getOwner().getId() == null) {
uc.setOwner(null);
}
- Long newId =
userContactDao.addUserContactObj(uc);
- userContactsMap.put(ucId, newId);
+ uc = userContactDao.update(uc);
+ userContactsMap.put(ucId, uc.getId());
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Thu Dec 3 06:40:29 2015
@@ -154,12 +154,6 @@ public class MainPage extends BaseInited
private static final long serialVersionUID = 1L;
@Override
- protected void onOpen(IPartialPageRequestHandler
handler) {
- super.onOpen(handler);
- setDefaultModelObject(new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage()));
- }
-
- @Override
public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
BasePanel bp = getCurrentPanel();
if (send.equals(button) && bp != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
Thu Dec 3 06:40:29 2015
@@ -27,7 +27,7 @@
<div><div wicket:id="step4" class="clickable
start_step4"><wicket:message key="773"/></div></div>
<table>
<tr>
- <td><wicket:message key="804"
escape="false"/></td>
+ <td><div wicket:id="123msg"></div></td>
<td>
<button wicket:id="start"
type="button"><wicket:message key="788"/></button><br/>
<button wicket:id="calendar"
type="button"><wicket:message key="291"/></button>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
Thu Dec 3 06:40:29 2015
@@ -21,10 +21,12 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
import ro.fortsoft.wicket.dashboard.Widget;
@@ -41,6 +43,7 @@ public class StartWidgetView extends Wid
add(new WebMarkupContainer("step2").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step3").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
+ add(new Label("123msg",
Application.getString(804)).setEscapeModelStrings(false));
add(new Button("start").add(new PublicRoomsEventBehavior()));
add(new Button("calendar").add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
Thu Dec 3 06:40:29 2015
@@ -182,13 +182,13 @@ public class MessageDialog extends Abstr
@Override
protected void onSubmit(AjaxRequestTarget target) {
- PrivateMessage p = getModelObject();
- p.setInserted(new Date());
+ PrivateMessage m = getModelObject();
+ m.setInserted(new Date());
UserDao userDao = getBean(UserDao.class);
User owner = userDao.get(getUserId());
- if (p.isBookedRoom()) {
- Room r = p.getRoom();
- r.setName(p.getSubject());
+ if (m.isBookedRoom()) {
+ Room r = m.getRoom();
+ r.setName(m.getSubject());
r.setComment("");
r.setNumberOfPartizipants(100L);
r.setAppointment(true);
@@ -196,8 +196,8 @@ public class MessageDialog extends Abstr
r.setAllowFontStyles(true);
r = getBean(RoomDao.class).update(r, getUserId());
Appointment a = new Appointment();
- a.setTitle(p.getSubject());
- a.setDescription(p.getMessage());
+ a.setTitle(m.getSubject());
+ a.setDescription(m.getMessage());
a.setRoom(r);
a.setStart(CalendarWebHelper.getDate(start.getModelObject()));
a.setEnd(CalendarWebHelper.getDate(end.getModelObject()));
@@ -214,9 +214,9 @@ public class MessageDialog extends Abstr
a.setOwner(owner);
a.setMeetingMembers(attendees);
getBean(AppointmentDao.class).update(a, getUserId(), false);
- p.setRoom(r);
+ m.setRoom(r);
} else {
- p.setRoom(null);
+ m.setRoom(null);
}
PrivateMessageDao msgDao = getBean(PrivateMessageDao.class);
for (User to : modelTo.getObject()) {
@@ -224,12 +224,12 @@ public class MessageDialog extends Abstr
userDao.update(to, getUserId());
}
//to send
- p = new PrivateMessage(p);
+ PrivateMessage p = new PrivateMessage(m);
p.setTo(to);
p.setFolderId(SENT_FOLDER_ID);
msgDao.update(p, getUserId());
//to inbox
- p = new PrivateMessage(p);
+ p = new PrivateMessage(m);
p.setOwner(to);
p.setFolderId(INBOX_FOLDER_ID);
msgDao.update(p, getUserId());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Thu Dec 3 06:40:29 2015
@@ -546,7 +546,7 @@ public class MessagesContactsPanel exten
@Override
protected void populateItem(Item<UserContact> item) {
UserContact uc = item.getModelObject();
- final long contactId = uc.getUserContactId();
+ final long contactId = uc.getId();
final long userId = uc.getOwner().getId();
if (uc.isPending()) {
item.add(AttributeModifier.append("class", "unread"));
@@ -566,7 +566,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).delete(contactId);
updateContacts(target);
}
}).setVisible(uc.isPending()));
@@ -577,7 +577,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).delete(contactId);
updateContacts(target);
}
}).setVisible(!uc.isPending()));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1717714&r1=1717713&r2=1717714&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Thu Dec 3 06:40:29 2015
@@ -19,7 +19,7 @@
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";>
<context-param>
<param-name>globalScope</param-name>
<param-value>default</param-value>
@@ -71,7 +71,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
-
<param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,networktest.,file.</param-value>
+
<param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,networktest.</param-value>
</init-param>
</filter>
<filter-mapping>
