Author: solomax
Date: Wed Sep 16 12:11:00 2015
New Revision: 1703388
URL: http://svn.apache.org/r1703388
Log:
[OPENMEETINGS-1118] Dao were renamed
Added:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
- copied, changed from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
- copied, changed from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
- copied, changed from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
Modified:
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/UserService.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/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.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/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.room.RoomModeratorsDao;
+import org.apache.openmeetings.db.dao.room.RoomModeratorDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -62,7 +62,7 @@ public class ConferenceService {
@Autowired
private RoomDao roomDao;
@Autowired
- private RoomModeratorsDao roomModeratorsDao;
+ private RoomModeratorDao roomModeratorDao;
@Autowired
private ISessionManager sessionManager = null;
@@ -296,11 +296,10 @@ public class ConferenceService {
for (int i = 0; i <
appointments.size(); i++) {
Appointment ment =
appointments.get(i);
- Long rooms_id =
ment.getRoom().getId();
- Room rooom =
roomDao.get(rooms_id);
+ Long roomId =
ment.getRoom().getId();
+ Room rooom =
roomDao.get(roomId);
- rooom.setCurrentusers(this
-
.getRoomClientsListByRoomId(rooom.getId()));
+
rooom.setCurrentusers(getRoomClientsListByRoomId(rooom.getId()));
result.add(rooom);
}
}
@@ -364,7 +363,7 @@ public class ConferenceService {
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- return roomModeratorsDao.getByRoomId(roomId);
+ return roomModeratorDao.getByRoomId(roomId);
}
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -31,7 +31,7 @@ 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.UserContactsDao;
+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;
@@ -63,7 +63,7 @@ public class UserService implements IUse
@Autowired
private UserDao userDao;
@Autowired
- private UserContactsDao userContactsDao;
+ private UserContactDao userContactDao;
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
@@ -182,7 +182,7 @@ public class UserService implements IUse
Long userId = sessiondataDao.checkSession(SID);
// users only
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactsDao.getContactRequestsByUserAndStatus(userId, true);
+ List<UserContact> uList =
userContactDao.getContactRequestsByUserAndStatus(userId, true);
return uList;
}
@@ -197,7 +197,7 @@ public class UserService implements IUse
Long userId = sessiondataDao.checkSession(SID);
// users only
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- List<UserContact> uList =
userContactsDao.getContactsByUserAndStatus(userId, false);
+ List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(userId, false);
return uList;
}
@@ -212,13 +212,13 @@ public class UserService implements IUse
Long userId = sessiondataDao.checkSession(SID);
// users only
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactsDao.get(userContactId);
+ UserContact userContacts =
userContactDao.get(userContactId);
if (userContacts == null) {
return -49;
}
- return
userContactsDao.deleteUserContact(userContactId);
+ return
userContactDao.deleteUserContact(userContactId);
}
} catch (Exception err) {
log.error("[removeContactUser]", err);
@@ -231,7 +231,7 @@ public class UserService implements IUse
Long authUserId = sessiondataDao.checkSession(SID);
// users only
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) {
- List<UserContact> uList =
userContactsDao.getContactsByUserAndStatus(authUserId, false);
+ List<UserContact> uList =
userContactDao.getContactsByUserAndStatus(authUserId, false);
for (UserContact userContact : uList) {
if
(userContact.getContact().getId().equals(userId)) {
@@ -253,11 +253,11 @@ public class UserService implements IUse
// users only
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
- UserContact userContacts =
userContactsDao.get(contactId);
+ UserContact userContacts =
userContactDao.get(contactId);
userContacts.setShareCalendar(shareCalendar);
- userContactsDao.updateContact(userContacts);
+ userContactDao.updateContact(userContacts);
}
} catch (Exception err) {
log.error("[shareCalendarUserContact]", err);
Copied:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
(from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java&r1=1703129&r2=1703388&rev=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java
Wed Sep 16 12:11:00 2015
@@ -29,7 +29,7 @@ import org.apache.openmeetings.db.entity
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class RoomModeratorsDao {
+public class RoomModeratorDao {
@PersistenceContext
private EntityManager em;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
(from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java&r1=1703129&r2=1703388&rev=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
Wed Sep 16 12:11:00 2015
@@ -41,8 +41,8 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class PrivateMessagesDao implements IDataProviderDao<PrivateMessage> {
- private static final Logger log =
Red5LoggerFactory.getLogger(PrivateMessagesDao.class, webAppRootKey);
+public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> {
+ private static final Logger log =
Red5LoggerFactory.getLogger(PrivateMessageDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
(from r1703129,
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?p2=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java&p1=openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java&r1=1703129&r2=1703388&rev=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
Wed Sep 16 12:11:00 2015
@@ -35,9 +35,9 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class UserContactsDao {
+public class UserContactDao {
- private static final Logger log =
Red5LoggerFactory.getLogger(UserContactsDao.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(UserContactDao.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -295,7 +295,7 @@ public class Room implements IDataProvid
private String pin;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinColumn(name = "rooms_id", insertable = true, updatable = true)
+ @JoinColumn(name = "room_id", insertable = true, updatable = true)
@ElementDependent
@org.simpleframework.xml.Transient
private List<RoomGroup> roomGroups = new ArrayList<RoomGroup>();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Wed Sep 16 12:11:00 2015
@@ -53,8 +53,8 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.basic.Configuration;
@@ -115,11 +115,11 @@ public class BackupExport {
@Autowired
private LdapConfigDao ldapConfigDao;
@Autowired
- private PrivateMessagesDao privateMessagesDao;
+ private PrivateMessageDao privateMessageDao;
@Autowired
private PrivateMessageFolderDao privateMessageFolderDao;
@Autowired
- private UserContactsDao userContactsDao;
+ private UserContactDao userContactDao;
@Autowired
private PollDao pollManager;
@Autowired
@@ -247,7 +247,7 @@ public class BackupExport {
* ##################### Private Messages
*/
{
- List<PrivateMessage> list = privateMessagesDao.get(0,
Integer.MAX_VALUE);
+ List<PrivateMessage> list = privateMessageDao.get(0,
Integer.MAX_VALUE);
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
@@ -281,7 +281,7 @@ public class BackupExport {
registry.bind(User.class, UserConverter.class);
writeList(serializer, backup_dir, "userContacts.xml",
- "usercontacts",
userContactsDao.getUserContacts());
+ "usercontacts",
userContactDao.getUserContacts());
progressHolder.setProgress(60);
}
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -69,9 +69,9 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.StateDao;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.basic.Configuration;
@@ -136,7 +136,7 @@ public class BackupImport {
@Autowired
private PrivateMessageFolderDao privateMessageFolderDao;
@Autowired
- private PrivateMessagesDao privateMessagesDao;
+ private PrivateMessageDao privateMessageDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
@@ -144,7 +144,7 @@ public class BackupImport {
@Autowired
private FileExplorerItemDao fileExplorerItemDao;
@Autowired
- private UserContactsDao userContactsDao;
+ private UserContactDao userContactDao;
@Autowired
private PollDao pollManager;
@Autowired
@@ -515,14 +515,14 @@ public class BackupImport {
List<UserContact> list = readList(serializer, f,
"userContacts.xml", "usercontacts", UserContact.class, true);
for (UserContact uc : list) {
Long ucId = uc.getUserContactId();
- UserContact storedUC =
userContactsDao.get(ucId);
+ UserContact storedUC = userContactDao.get(ucId);
if (storedUC == null && uc.getContact() != null
&& uc.getContact().getId() != null) {
uc.setUserContactId(0);
if (uc.getOwner() != null &&
uc.getOwner().getId() == null) {
uc.setOwner(null);
}
- Long newId =
userContactsDao.addUserContactObj(uc);
+ Long newId =
userContactDao.addUserContactObj(uc);
userContactsMap.put(ucId, newId);
}
}
@@ -572,7 +572,7 @@ public class BackupImport {
{
p.setFolderId(SENT_FOLDER_ID);
}
- privateMessagesDao.update(p, null);
+ privateMessageDao.update(p, null);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
Wed Sep 16 12:11:00 2015
@@ -360,24 +360,6 @@ public class InvitationManager implement
return invitation;
}
- /**
- * Sending invitation within plain mail
- *
- * @param user_level
- * @param username
- * @param message
- * @param email
- * @param subject
- * @param rooms_id
- * @param conferencedomain
- * @param isPasswordProtected
- * @param invitationpass
- * @param valid
- * @param validFrom
- * @param validTo
- * @param createdBy
- * @return
- */
public Invitation getInvitation(User inveetee, Room room, boolean
isPasswordProtected, String invitationpass, Valid valid,
User createdBy, Long languageId, Date gmtTimeStart,
Date gmtTimeEnd, Appointment appointment)
{
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
Wed Sep 16 12:11:00 2015
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
@@ -59,7 +59,7 @@ public class WelcomeWidgetView extends W
public void onClick(AjaxRequestTarget target) {
((MainPage)getPage()).updateContents(PROFILE_MESSAGES, target);
}
- }.add(new Label("unread", Model.of("" +
getBean(PrivateMessagesDao.class).count(getUserId(), INBOX_FOLDER_ID, null)))));
+ }.add(new Label("unread", Model.of("" +
getBean(PrivateMessageDao.class).count(getUserId(), INBOX_FOLDER_ID, null)))));
add(new AjaxLink<Void>("editProfile") {
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -35,7 +35,7 @@ import org.apache.openmeetings.core.mail
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
@@ -188,7 +188,7 @@ public class MessageDialog extends Abstr
} else {
p.setRoom(null);
}
- PrivateMessagesDao msgDao = getBean(PrivateMessagesDao.class);
+ PrivateMessageDao msgDao = getBean(PrivateMessageDao.class);
for (User to : modelTo.getObject()) {
UserDao userDao = getBean(UserDao.class);
if (to.getId() == null) {
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=1703388&r1=1703387&r2=1703388&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
Wed Sep 16 12:11:00 2015
@@ -33,8 +33,8 @@ import java.util.List;
import java.util.Set;
import org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.PrivateMessageFolder;
import org.apache.openmeetings.db.entity.user.User;
@@ -173,7 +173,7 @@ public class MessagesContactsPanel exten
}
private void selectMessage(long id, AjaxRequestTarget target) {
- PrivateMessage msg = getBean(PrivateMessagesDao.class).get(id);
+ PrivateMessage msg = getBean(PrivateMessageDao.class).get(id);
selectedMessage.addOrReplace(new Label("from", msg == null ? ""
: getEmail(msg.getFrom())));
selectedMessage.addOrReplace(new Label("to", msg == null ? "" :
getEmail(msg.getTo())));
selectedMessage.addOrReplace(new Label("subj", msg == null ? ""
: msg.getSubject()));
@@ -213,7 +213,7 @@ public class MessagesContactsPanel exten
private void emptySelection(AjaxRequestTarget target) {
selectedMessages.clear();
selectMessage(-1, target);
-
unread.setDefaultModelObject(getBean(PrivateMessagesDao.class).count(getUserId(),
selectedFolderModel.getObject(), null));
+
unread.setDefaultModelObject(getBean(PrivateMessageDao.class).count(getUserId(),
selectedFolderModel.getObject(), null));
if (target != null) {
target.add(unread);
}
@@ -234,8 +234,8 @@ public class MessagesContactsPanel exten
}
private void updateContacts(AjaxRequestTarget target) {
-
pendingContacts.setDefaultModelObject(getBean(UserContactsDao.class).getContactRequestsByUserAndStatus(getUserId(),
true).size());
-
allContacts.setDefaultModelObject(getBean(UserContactsDao.class).getContactsByUserAndStatus(getUserId(),
false).size());
+
pendingContacts.setDefaultModelObject(getBean(UserContactDao.class).getContactRequestsByUserAndStatus(getUserId(),
true).size());
+
allContacts.setDefaultModelObject(getBean(UserContactDao.class).getContactsByUserAndStatus(getUserId(),
false).size());
if (target != null) {
target.add(contacts);
}
@@ -348,12 +348,12 @@ public class MessagesContactsPanel exten
}
}).setOutputMarkupId(true));
- SearchableDataProvider<PrivateMessage> sdp = new
SearchableDataProvider<PrivateMessage>(PrivateMessagesDao.class) {
+ SearchableDataProvider<PrivateMessage> sdp = new
SearchableDataProvider<PrivateMessage>(PrivateMessageDao.class) {
private static final long serialVersionUID = 1L;
@Override
- protected PrivateMessagesDao getDao() {
- return (PrivateMessagesDao)super.getDao();
+ protected PrivateMessageDao getDao() {
+ return (PrivateMessageDao)super.getDao();
}
@Override
@@ -439,7 +439,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget target) {
-
getBean(PrivateMessagesDao.class).moveMailsToFolder(selectedMessages,
INBOX_FOLDER_ID);
+
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages,
INBOX_FOLDER_ID);
selectFolder(selectedFolder,
selectedFolderModel.getObject(), target);
}
}));
@@ -449,9 +449,9 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget
target) {
if (TRASH_FOLDER_ID ==
selectedFolderModel.getObject()) {
-
getBean(PrivateMessagesDao.class).delete(selectedMessages);
+
getBean(PrivateMessageDao.class).delete(selectedMessages);
} else {
-
getBean(PrivateMessagesDao.class).moveMailsToFolder(selectedMessages,
TRASH_FOLDER_ID);
+
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages,
TRASH_FOLDER_ID);
}
emptySelection(target);
target.add(container);
@@ -462,7 +462,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget
target) {
-
getBean(PrivateMessagesDao.class).updateReadStatus(selectedMessages, true);
+
getBean(PrivateMessageDao.class).updateReadStatus(selectedMessages, true);
emptySelection(target);
target.add(container, unread);
}
@@ -472,7 +472,7 @@ public class MessagesContactsPanel exten
@Override
protected void onEvent(AjaxRequestTarget
target) {
-
getBean(PrivateMessagesDao.class).updateReadStatus(selectedMessages, false);
+
getBean(PrivateMessageDao.class).updateReadStatus(selectedMessages, false);
emptySelection(target);
target.add(container);
}
@@ -511,7 +511,7 @@ public class MessagesContactsPanel exten
protected void onUpdate(AjaxRequestTarget target) {
long folderId =
moveDropDown.getModelObject().getId();
if (folderId != MOVE_CHOOSE) {
-
getBean(PrivateMessagesDao.class).moveMailsToFolder(selectedMessages, folderId);
+
getBean(PrivateMessageDao.class).moveMailsToFolder(selectedMessages, folderId);
}
selectFolder(selectedFolder,
selectedFolderModel.getObject(), target);
}
@@ -529,11 +529,11 @@ public class MessagesContactsPanel exten
}
public Iterator<? extends UserContact> iterator(long
first, long count) {
- return
getBean(UserContactsDao.class).get(getUserId(), (int)first,
(int)count).iterator();
+ return
getBean(UserContactDao.class).get(getUserId(), (int)first,
(int)count).iterator();
}
public long size() {
- return
getBean(UserContactsDao.class).count(getUserId());
+ return
getBean(UserContactDao.class).count(getUserId());
}
public IModel<UserContact> model(UserContact object) {
@@ -571,7 +571,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactsDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).deleteUserContact(contactId);
updateContacts(target);
}
}).setVisible(uc.getPending()));
@@ -596,7 +596,7 @@ public class MessagesContactsPanel exten
@Override
protected void
onEvent(AjaxRequestTarget target) {
-
getBean(UserContactsDao.class).deleteUserContact(contactId);
+
getBean(UserContactDao.class).deleteUserContact(contactId);
updateContacts(target);
}
}).setVisible(!uc.getPending()));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
Wed Sep 16 12:11:00 2015
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -66,7 +66,7 @@ public class UserInfoDialog extends Abst
@Override
protected List<DialogButton> getButtons() {
- return userId != getUserId() && 0 ==
getBean(UserContactsDao.class).checkUserContacts(userId, getUserId())
+ return userId != getUserId() && 0 ==
getBean(UserContactDao.class).checkUserContacts(userId, getUserId())
? Arrays.asList(message, cancel) :
Arrays.asList(contacts, message, cancel);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Wed Sep 16 12:11:00 2015
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
@@ -52,7 +52,7 @@ public class UserProfilePanel extends Us
add(new TextArea<String>("userOffers").setEnabled(false));
add(new TextArea<String>("userSearchs").setEnabled(false));
if (getUserId() == model.getObject().getId() ||
model.getObject().isShowContactData()
- ||
(model.getObject().isShowContactDataToContacts() &&
getBean(UserContactsDao.class).checkUserContacts(model.getObject().getId(),
getUserId()) > 0))
+ ||
(model.getObject().isShowContactDataToContacts() &&
getBean(UserContactDao.class).checkUserContacts(model.getObject().getId(),
getUserId()) > 0))
{
addressDenied.setVisible(false);
address.add(new Label("address.phone"));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Wed Sep 16 12:11:00 2015
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.User;
@@ -128,7 +128,7 @@ public class UserSearchPanel extends Use
@Override
protected void populateItem(Item<User> item) {
- final UserContactsDao contactsDao =
getBean(UserContactsDao.class);
+ final UserContactDao contactsDao =
getBean(UserContactDao.class);
User u = item.getModelObject();
final long userId = u.getId();
item.add(new
WebMarkupContainer("status").add(AttributeModifier.append("class",
isUserOnline(userId) ? "online" : "offline")));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
Wed Sep 16 12:11:00 2015
@@ -24,8 +24,8 @@ import static org.apache.openmeetings.we
import java.util.Date;
import org.apache.openmeetings.core.mail.MailHandler;
-import org.apache.openmeetings.db.dao.user.PrivateMessagesDao;
-import org.apache.openmeetings.db.dao.user.UserContactsDao;
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
@@ -37,7 +37,7 @@ import org.apache.openmeetings.web.app.A
public class ContactsHelper {
public static long addUserToContactList(long userIdToAdd) {
- Long countContacts =
getBean(UserContactsDao.class).checkUserContacts(userIdToAdd, getUserId());
+ Long countContacts =
getBean(UserContactDao.class).checkUserContacts(userIdToAdd, getUserId());
if (countContacts != null && countContacts > 0) {
return -45L;
@@ -45,7 +45,7 @@ public class ContactsHelper {
String hash = ManageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
- Long userContactId =
getBean(UserContactsDao.class).addUserContact(userIdToAdd, getUserId(), true,
hash);
+ Long userContactId =
getBean(UserContactDao.class).addUserContact(userIdToAdd, getUserId(), true,
hash);
User user = getBean(UserDao.class).get(getUserId());
User userToAdd = getBean(UserDao.class).get(userIdToAdd);
@@ -53,7 +53,7 @@ public class ContactsHelper {
String subj = user.getFirstname() + " " + user.getLastname() +
" " + Application.getString(1193);
String message = RequestContactTemplate.getEmail(userToAdd,
user);
- getBean(PrivateMessagesDao.class).addPrivateMessage(
+ getBean(PrivateMessageDao.class).addPrivateMessage(
subj, message, 0L, user, userToAdd, userToAdd, false,
null, true, userContactId);
if (userToAdd.getAddress() != null) {
@@ -64,7 +64,7 @@ public class ContactsHelper {
}
public static Long acceptUserContact(long userContactId) {
- UserContactsDao dao = getBean(UserContactsDao.class);
+ UserContactDao dao = getBean(UserContactDao.class);
UserContact contact = dao.get(userContactId);
if (contact == null) {
@@ -87,7 +87,7 @@ public class ContactsHelper {
String subj = contact.getContact().getFirstname() + " "
+ contact.getContact().getLastname() + " " + Application.getString(1198);
- getBean(PrivateMessagesDao.class).addPrivateMessage(
+ getBean(PrivateMessageDao.class).addPrivateMessage(
subj, message,
0L, contact.getContact(), user, user,
false, null, false, 0L);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1703388&r1=1703387&r2=1703388&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Wed Sep 16 12:11:00 2015
@@ -219,7 +219,7 @@
<bean id="appointmentLogic"
class="org.apache.openmeetings.service.calendar.AppointmentLogic" />
<bean id="sessionManagement"
class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
<bean id="userManagement"
class="org.apache.openmeetings.service.user.UserManager" />
- <bean id="roomModeratorsDao"
class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
+ <bean id="roomModeratorDao"
class="org.apache.openmeetings.db.dao.room.RoomModeratorDao" />
<bean id="roomGroupDao"
class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/>
<bean id="conferenceLogDao"
class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" />
<bean id="emailManagement"
class="org.apache.openmeetings.service.mail.EmailManager" />
@@ -232,9 +232,9 @@
<bean id="invitationManagement"
class="org.apache.openmeetings.service.room.InvitationManager" />
<bean id="meetingMemberDao"
class="org.apache.openmeetings.db.dao.calendar.MeetingMemberDao" />
<bean id="privateMessageFolderDao"
class="org.apache.openmeetings.db.dao.user.PrivateMessageFolderDao" />
- <bean id="privateMessagesDao"
class="org.apache.openmeetings.db.dao.user.PrivateMessagesDao" />
+ <bean id="privateMessageDao"
class="org.apache.openmeetings.db.dao.user.PrivateMessageDao" />
<bean id="soapLoginDao"
class="org.apache.openmeetings.db.dao.server.SOAPLoginDao" />
- <bean id="userContactsDao"
class="org.apache.openmeetings.db.dao.user.UserContactsDao" />
+ <bean id="userContactDao"
class="org.apache.openmeetings.db.dao.user.UserContactDao" />
<bean id="userDao" class="org.apache.openmeetings.db.dao.user.UserDao"
/>
<bean id="serverDao"
class="org.apache.openmeetings.db.dao.server.ServerDao" />
<bean id="chatDao" class="org.apache.openmeetings.db.dao.basic.ChatDao"
/>
