You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/09/03 06:11:59 UTC
svn commit: r1519549 [1/2] - in /openmeetings/trunk/singlewebapp/src:
main/java/org/apache/openmeetings/axis/services/
main/java/org/apache/openmeetings/backup/
main/java/org/apache/openmeetings/cli/
main/java/org/apache/openmeetings/data/basic/dao/ ma...
Author: vdegtyarev
Date: Tue Sep 3 04:11:58 2013
New Revision: 1519549
URL: http://svn.apache.org/r1519549
Log:
OPENMEETINGS-776 - first check in. Contacts are visible for owner and admin.
Added:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java
- copied, changed from r1519541, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java
Removed:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UsersDao.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java Tue Sep 3 04:11:58 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.data.bean
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.basic.ErrorValue;
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
@@ -75,7 +75,7 @@ public class UserWebService {
@Autowired
private SOAPLoginDao soapLoginDao;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private MainService mainService;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/backup/UserConverter.java Tue Sep 3 04:11:58 2013
@@ -20,20 +20,20 @@ package org.apache.openmeetings.backup;
import java.util.Map;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
public class UserConverter extends OmConverter<User> {
- private UsersDao userDao;
+ private AdminUserDao userDao;
private Map<Long, Long> idMap;
public UserConverter() {
//default constructor is for export
}
- public UserConverter(UsersDao userDao, Map<Long, Long> idMap) {
+ public UserConverter(AdminUserDao userDao, Map<Long, Long> idMap) {
this.userDao = userDao;
this.idMap = idMap;
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/cli/Admin.java Tue Sep 3 04:11:58 2013
@@ -48,7 +48,7 @@ import org.apache.openjpa.lib.log.LogFac
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.documents.InstallationDocumentHandler;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
@@ -347,7 +347,7 @@ public class Admin {
long invalid = 0;
long deleted = 0;
ClassPathXmlApplicationContext ctx = getApplicationContext(ctxName);
- UsersDao udao = ctx.getBean(UsersDao.class);
+ AdminUserDao udao = ctx.getBean(AdminUserDao.class);
for (File profile : profiles.listFiles()) {
long pSize = OmFileHelper.getSize(profile);
long userId = getUserIdByProfile(profile.getName());
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Tue Sep 3 04:11:58 2013
@@ -33,7 +33,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.utils.DaoHelper;
@@ -63,8 +63,8 @@ public class ConfigurationDao implements
@PersistenceContext
private EntityManager em;
- @Resource(name = "usersDao")
- private UsersDao usersDao;
+ @Resource(name = "adminUserDao")
+ private AdminUserDao adminUserDao;
/**
* @deprecated Dao's are not the place to store session variables, also
@@ -193,7 +193,7 @@ public class ConfigurationDao implements
conf2.setComment(conf.getComment());
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
- conf2.setUser(usersDao.get(userId));
+ conf2.setUser(adminUserDao.get(userId));
conf2.setDeleted(false);
conf2.setUpdatetime(new Date());
return this.updateConfig(conf2);
@@ -256,7 +256,7 @@ public class ConfigurationDao implements
try {
Configuration conf = (Configuration) CastMapToObject.getInstance()
.castByGivenObject(values, Configuration.class);
- conf.setUser(usersDao.get(users_id));
+ conf.setUser(adminUserDao.get(users_id));
conf.setUpdatetime(new Date());
conf.setDeleted(true);
@@ -264,7 +264,7 @@ public class ConfigurationDao implements
conf2.setComment(conf.getComment());
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
- conf2.setUser(usersDao.get(users_id));
+ conf2.setUser(adminUserDao.get(users_id));
conf2.setDeleted(true);
conf2.setUpdatetime(new Date());
@@ -326,7 +326,7 @@ public class ConfigurationDao implements
em.persist(entity);
} else {
if (userId != null) {
- entity.setUser(usersDao.get(userId));
+ entity.setUser(adminUserDao.get(userId));
}
entity.setDeleted(deleted);
entity.setUpdatetime(new Date());
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java Tue Sep 3 04:11:58 2013
@@ -30,7 +30,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.utils.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -55,7 +55,7 @@ public class LdapConfigDao implements ID
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
public Long addLdapConfig(String name, Boolean addDomainToUserName,
String configFileName, String domain, Long insertedby,
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/basic/dao/ServerDao.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.utils.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -53,7 +53,7 @@ public class ServerDao implements IDataP
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
/**
* Get a list of all available servers
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -42,7 +42,7 @@ public class AppointmentCategoryDao {
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
public AppointmentCategory getAppointmentCategoryById(Long categoryId) {
try {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Tue Sep 3 04:11:58 2013
@@ -43,7 +43,7 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -73,7 +73,7 @@ public class AppointmentDao {
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private RoomDao roomDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class AppointmentReminderTypDao {
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private FieldLanguagesValuesDao fieldLanguagesValuesDao;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class MeetingMemberDao {
@Autowired
private AppointmentDao appointmentDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
public MeetingMember getMeetingMemberById(Long meetingMemberId) {
try {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java Tue Sep 3 04:11:58 2013
@@ -33,7 +33,7 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.basic.MailMessage;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
@@ -80,7 +80,7 @@ public class InvitationManager {
@Autowired
private RoomDao roomDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private MailHandler mailHandler;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/RoomManager.java Tue Sep 3 04:11:58 2013
@@ -39,7 +39,7 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
import org.apache.openmeetings.data.conference.dao.SipDao;
import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
@@ -70,7 +70,7 @@ public class RoomManager {
@Autowired
private RoomModeratorsDao roomModeratorsDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private AuthLevelUtil authLevelUtil;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/dao/RoomDao.java Tue Sep 3 04:11:58 2013
@@ -31,7 +31,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.TimezoneUtil;
@@ -52,7 +52,7 @@ public class RoomDao implements IDataPro
@Autowired
private SipDao sipDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private TimezoneUtil timezoneUtil;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/OrganisationManager.java Tue Sep 3 04:11:58 2013
@@ -40,7 +40,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -64,7 +64,7 @@ public class OrganisationManager {
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private OrganisationDao orgDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java Tue Sep 3 04:11:58 2013
@@ -45,8 +45,8 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.room.Client;
@@ -96,7 +96,7 @@ public class UserManager {
@Autowired
private ManageCryptStyle cryptManager;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private EmailManager emailManagement;
@Autowired
@@ -169,7 +169,7 @@ public class UserManager {
} else {
sort += " DESC ";
}
- String hql = DaoHelper.getSearchQuery("User", "u", search, true, false, sort, UsersDao.searchFields);
+ String hql = DaoHelper.getSearchQuery("User", "u", search, true, false, sort, AdminUserDao.searchFields);
log.debug("Show HQL: " + hql);
Copied: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java (from r1519541, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UsersDao.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java?p2=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UsersDao.java&r1=1519541&r2=1519549&rev=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AbstractUserDao.java Tue Sep 3 04:11:58 2013
@@ -33,14 +33,15 @@ import javax.persistence.TypedQuery;
import org.apache.commons.lang3.StringUtils;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
-import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.Address;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.persistence.beans.user.User.Type;
import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.web.app.WebSession;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,12 +50,12 @@ import org.springframework.transaction.a
/**
* CRUD operations for {@link User}
*
- * @author swagner, solomax
+ * @author swagner, solomax, vasya
*
*/
@Transactional
-public class UsersDao implements IDataProviderDao<User> {
- private static final Logger log = Red5LoggerFactory.getLogger(UsersDao.class, webAppRootKey);
+public class AbstractUserDao {
+ private static final Logger log = Red5LoggerFactory.getLogger(AbstractUserDao.class, webAppRootKey);
public final static String[] searchFields = {"lastname", "firstname", "login", "adresses.email", "adresses.town"};
@@ -105,11 +106,23 @@ public class UsersDao implements IDataPr
q.setMaxResults(count);
return q.getResultList();
}
+
+ private String getAdditionalWhire(boolean isAdmin){
+ return isAdmin ? null : "u.type <> :contact OR (u.type = :contact AND u.owner_id = :ownerId)";
+ }
+
+ private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin){
+ if (!isAdmin) {
+ q.setParameter("ownerId", WebSession.getUserId());
+ q.setParameter("contact", Type.contact);
+ }
+ }
- public List<User> get(String search, int start, int count, String sort) {
- TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, sort, searchFields), User.class);
+ public List<User> get(String search, int start, int count, String sort, boolean isAdmin) {
+ TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhire(isAdmin), sort, searchFields), User.class);
q.setFirstResult(start);
q.setMaxResults(count);
+ setAdditionalParams(q, isAdmin);
return q.getResultList();
}
@@ -119,13 +132,18 @@ public class UsersDao implements IDataPr
return q.getSingleResult();
}
- public long count(String search) {
- TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, true, null, searchFields), Long.class);
+ public long count(String search, boolean isAdmin) {
+ TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, true, getAdditionalWhire(isAdmin), null, searchFields), Long.class);
+ setAdditionalParams(q, isAdmin);
return q.getSingleResult();
}
- public List<User> get(String search) {
- TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, null, searchFields), User.class);
+ public List<User> get(String search, boolean isAdmin) {
+ TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhire(isAdmin), null, searchFields), User.class);
+ if (!isAdmin) {
+ q.setParameter("ownerId", WebSession.getUserId());
+ q.setParameter("contact", Type.contact);
+ }
return q.getResultList();
}
@@ -272,6 +290,7 @@ public class UsersDao implements IDataPr
long count = em.createNamedQuery("checkUserEmail", Long.class)
.setParameter("email", email)
.setParameter("id", id == null ? 0 : id)
+ .setParameter("type", Type.contact)
.getSingleResult();
log.debug("size: " + count);
@@ -369,4 +388,5 @@ public class UsersDao implements IDataPr
return query.getResultList().get(0) == 1;
}
+
}
Added: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java?rev=1519549&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java (added)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/AdminUserDao.java Tue Sep 3 04:11:58 2013
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.data.user.dao;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class AdminUserDao implements IDataProviderDao<User> {
+
+ @Autowired
+ private AbstractUserDao dao;
+
+ public final static String[] searchFields = AbstractUserDao.searchFields;
+
+
+ public User get(long id) {
+ return dao.get(id);
+ }
+
+ public List<User> get(int start, int count) {
+ return dao.get(start, count);
+ }
+
+ public List<User> get(String search, int start, int count, String order) {
+ return dao.get(search, start, count, order, true);
+ }
+
+ public List<User> get(String search) {
+ return dao.get(search, true);
+ }
+
+ public long count() {
+ return dao.count();
+ }
+
+ public long count(String search) {
+ return dao.count(search, true);
+ }
+
+ public User update(User entity, Long userId) {
+ return dao.update(entity, userId);
+ }
+
+ public void delete(User entity, Long userId) {
+ dao.delete(entity, userId);
+ }
+
+ public Long deleteUserID(long userId) {
+ return dao.deleteUserID(userId);
+ }
+
+ public User getNewUserInstance(User currentUser) {
+ return dao.getNewUserInstance(currentUser);
+ }
+
+ public User update(User user, String password, long updatedBy) throws NoSuchAlgorithmException {
+ return dao.update(user, password, updatedBy);
+ }
+
+ public List<User> getAllUsers() {
+ return dao.getAllUsers();
+ }
+
+ public List<User> getAllUsersDeleted() {
+ return dao.getAllUsersDeleted();
+ }
+
+ public boolean verifyPassword(Long userId, String password) {
+ return dao.verifyPassword(userId, password);
+ }
+
+ public boolean checkUserLogin(String login, Long id) {
+ return dao.checkUserLogin(login, id);
+ }
+
+ public boolean checkUserEMail(String email, Long id) {
+ return dao.checkUserEMail(email, id);
+ }
+
+ public User getUserByName(String login) {
+ return dao.getUserByName(login);
+ }
+
+ public User getUserByEmail(String email) {
+ return dao.getUserByEmail(email);
+ }
+
+ public Object getUserByHash(String hash) {
+ return dao.getUserByHash(hash);
+ }
+
+}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java Tue Sep 3 04:11:58 2013
@@ -36,7 +36,7 @@ public class OrganisationUserDao impleme
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.adresses.email"};
public Organisation_Users get(long id) {
Added: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java?rev=1519549&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java (added)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/dao/UserDao.java Tue Sep 3 04:11:58 2013
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.data.user.dao;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.persistence.beans.user.User;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class UserDao implements IDataProviderDao<User> {
+
+ @Autowired
+ private AbstractUserDao dao;
+
+ public User get(long id) {
+ return dao.get(id);
+ }
+
+ public List<User> get(int start, int count) {
+ return dao.get(start, count);
+ }
+
+ public List<User> get(String search) {
+ return dao.get(search, false);
+ }
+
+ public List<User> get(String search, int start, int count, String order) {
+ return dao.get(search, start, count, order, false);
+ }
+
+ public long count() {
+ return dao.count();
+ }
+
+ public long count(String search) {
+ return dao.count(search, false);
+ }
+
+ public User update(User entity, Long userId) {
+ return dao.update(entity, userId);
+ }
+
+ public User update(User user, String password, long updatedBy) throws NoSuchAlgorithmException {
+ return dao.update(user, password, updatedBy);
+ }
+
+ public void delete(User entity, Long userId) {
+ dao.delete(entity, userId);
+ }
+
+}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/documents/GenerateImage.java Tue Sep 3 04:11:58 2013
@@ -33,7 +33,7 @@ import java.io.IOException;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.data.flvrecord.converter.BaseConverter;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.documents.beans.ConverterProcessResultList;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -48,7 +48,7 @@ public class GenerateImage extends BaseC
private static final Logger log = Red5LoggerFactory.getLogger(GenerateImage.class, webAppRootKey);
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private GenerateThumbs generateThumbs;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Tue Sep 3 04:11:58 2013
@@ -52,9 +52,9 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.oauth.OAuth2Dao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.SalutationDao;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@@ -79,7 +79,7 @@ public class ImportInitvalues {
@Autowired
private UserManager userManager;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private FieldManager fieldManager;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java Tue Sep 3 04:11:58 2013
@@ -34,7 +34,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.room.Client;
@@ -72,7 +72,7 @@ public class LdapLoginManagement {
@Autowired
private ManageCryptStyle cryptManager;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private TimezoneUtil timezoneUtil;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/user/User.java Tue Sep 3 04:11:58 2013
@@ -77,7 +77,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "checkUserLogin", query = "SELECT COUNT(u) FROM User AS u WHERE ((:id > 0 AND u.user_id <> :id) OR (:id = 0)) "
+ "AND u.login = :login AND u.deleted = false"),
@NamedQuery(name = "checkUserEmail", query = "SELECT COUNT(u) FROM User u WHERE ((:id > 0 AND u.user_id <> :id) OR (:id = 0)) "
- + "AND u.adresses.email = :email AND u.deleted = false"),
+ + "AND u.adresses.email = :email AND u.deleted = false AND u.type <> :type"),
@NamedQuery(name = "getUserByName", query = "SELECT u FROM User as u "
+ " where u.login = :login" + " AND u.deleted <> :deleted"),
@NamedQuery(name = "getUserByEmail", query = "SELECT u FROM User as u "
@@ -267,6 +267,10 @@ public class User implements Serializabl
@Element(data = true, required = false)
@Enumerated(EnumType.STRING)
private Type type = Type.user;
+
+ @Column(name = "ownerId")
+ @Element(data = true, required = false)
+ private Long owner_id;
public Long getUser_id() {
return user_id;
@@ -617,4 +621,12 @@ public class User implements Serializabl
public void setType(Type type) {
this.type = type;
}
+
+ public Long getOwner_id(){
+ return owner_id;
+ }
+
+ public void setOwner_id(Long owner_id){
+ this.owner_id = owner_id;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Tue Sep 3 04:11:58 2013
@@ -37,7 +37,7 @@ import org.apache.openmeetings.data.flvr
import org.apache.openmeetings.data.flvrecord.listener.StreamAudioListener;
import org.apache.openmeetings.data.flvrecord.listener.StreamVideoListener;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
import org.apache.openmeetings.persistence.beans.room.Client;
@@ -79,7 +79,7 @@ public class FLVRecorderService implemen
@Autowired
private FlvRecordingMetaDataDao flvRecordingMetaDataDao;
@Autowired
- private UsersDao usersDaoImpl;
+ private UserDao usersDaoImpl;
@Autowired
private RoomDao roomDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/InvitationService.java Tue Sep 3 04:11:58 2013
@@ -27,7 +27,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.TimezoneUtil;
@@ -46,7 +46,7 @@ public class InvitationService implement
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UsersDao userDAO;
+ private UserDao userDAO;
@Autowired
private UserManager userManager;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java Tue Sep 3 04:11:58 2013
@@ -38,8 +38,8 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.logs.ConferenceLogDao;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
@@ -92,7 +92,7 @@ public class MainService implements IPen
@Autowired
private ConferenceLogDao conferenceLogDao;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private LdapConfigDao ldapConfigDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/UserService.java Tue Sep 3 04:11:58 2013
@@ -41,11 +41,11 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
import org.apache.openmeetings.data.user.dao.SalutationDao;
import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -109,7 +109,7 @@ public class UserService {
@Autowired
private PrivateMessageFolderDao privateMessageFolderDao;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private UserContactsDao userContactsDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Tue Sep 3 04:11:58 2013
@@ -42,7 +42,7 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.logs.ConferenceLogDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.data.whiteboard.EmoticonsManager;
import org.apache.openmeetings.data.whiteboard.WhiteboardManager;
import org.apache.openmeetings.data.whiteboard.dto.BrowserStatus;
@@ -105,7 +105,7 @@ public class ScopeApplicationAdapter ext
@Autowired
private ConferenceLogDao conferenceLogDao;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private RoomDao roomDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/servlet/outputhandler/UploadController.java Tue Sep 3 04:11:58 2013
@@ -36,7 +36,7 @@ import org.apache.commons.transaction.ut
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.file.FileProcessor;
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.documents.GenerateImage;
import org.apache.openmeetings.documents.GeneratePDF;
import org.apache.openmeetings.documents.GenerateThumbs;
@@ -61,7 +61,7 @@ public class UploadController extends Ab
UploadController.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupExport.java Tue Sep 3 04:11:58 2013
@@ -59,10 +59,10 @@ import org.apache.openmeetings.data.file
import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
@@ -119,7 +119,7 @@ public class BackupExport {
@Autowired
private FlvRecordingDao flvRecordingDao;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private MeetingMemberDao meetingMemberDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/utils/BackupImport.java Tue Sep 3 04:11:58 2013
@@ -73,12 +73,12 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
import org.apache.openmeetings.data.user.OrganisationManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDao;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UserContactsDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
@@ -143,7 +143,7 @@ public class BackupImport {
@Autowired
private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private FlvRecordingDao flvRecordingDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/AddUsersDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/AddUsersDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/AddUsersDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/AddUsersDialog.java Tue Sep 3 04:11:58 2013
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -87,7 +87,7 @@ public class AddUsersDialog extends Abst
protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) {
usersToAdd.clear();
usersInList.clear();
- usersInList.addAll(Application.getBean(UsersDao.class).get(userSearchText));
+ usersInList.addAll(Application.getBean(AdminUserDao.class).get(userSearchText));
target.add(users);
}
});
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Tue Sep 3 04:11:58 2013
@@ -23,8 +23,8 @@ import static org.apache.openmeetings.we
import java.util.List;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -69,7 +69,7 @@ public class GroupForm extends AdminComm
@Override
public void submitView(AjaxRequestTarget target, List<User> usersToAdd) {
// TODO Auto-generated method stub
- UsersDao userDao = Application.getBean(UsersDao.class);
+ AdminUserDao userDao = Application.getBean(AdminUserDao.class);
Organisation organisation = getModelObject();
for (User u : usersToAdd) {
List<Organisation_Users> orgUsers = u.getOrganisation_users();
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import static org.apache.wicket.validati
import java.util.Arrays;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.WebSession;
@@ -78,7 +78,7 @@ public class UserForm extends AdminBaseF
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
User u = getModelObject();
try {
- u = getBean(UsersDao.class).update(u, generalForm.getPasswordField().getConvertedInput(), getUserId());
+ u = getBean(AdminUserDao.class).update(u, generalForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {
// FIXME update feedback with the error details
}
@@ -94,7 +94,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
- UsersDao usersDaoImpl = getBean(UsersDao.class);
+ AdminUserDao usersDaoImpl = getBean(AdminUserDao.class);
setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
target.add(this);
target.appendJavaScript("omUserPanelInit();");
@@ -104,7 +104,7 @@ public class UserForm extends AdminBaseF
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
User user = getModelObject();
if (user.getUser_id() != null) {
- user = getBean(UsersDao.class).get(user.getUser_id());
+ user = getBean(AdminUserDao.class).get(user.getUser_id());
} else {
user = new User();
}
@@ -115,7 +115,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- UsersDao usersDaoImpl = getBean(UsersDao.class);
+ AdminUserDao usersDaoImpl = getBean(AdminUserDao.class);
usersDaoImpl.delete(this.getModelObject(), getUserId());
this.setModelObject(usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())));
target.add(listContainer);
@@ -193,7 +193,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onValidate() {
- if(!getBean(UsersDao.class).checkUserLogin(login.getConvertedInput(), getModelObject().getUser_id())) {
+ if(!getBean(AdminUserDao.class).checkUserLogin(login.getConvertedInput(), getModelObject().getUser_id())) {
error(WebSession.getString(105));
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Tue Sep 3 04:11:58 2013
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.admi
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
@@ -64,7 +64,7 @@ public class UsersPanel extends AdminPan
super(id);
final SearchableDataView<User> dataView = new SearchableDataView<User>("userList"
- , new SearchableDataProvider<User>(UsersDao.class)) {
+ , new SearchableDataProvider<User>(AdminUserDao.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -107,7 +107,7 @@ public class UsersPanel extends AdminPan
add(container.orderLinks);
add(navigator);
- UsersDao usersDaoImpl = getBean(UsersDao.class);
+ AdminUserDao usersDaoImpl = getBean(AdminUserDao.class);
form = new UserForm("form", listContainer, usersDaoImpl.getNewUserInstance(usersDaoImpl.get(getUserId())), warning);
form.showNewRecord();
add(form, warning);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.java Tue Sep 3 04:11:58 2013
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.web.pages.ActivatePage;
import org.apache.openmeetings.web.pages.MainPage;
@@ -205,7 +205,7 @@ public class Application extends Authent
if (!isInstalled) {
if (ScopeApplicationAdapter.initComplete) {
//TODO can also check crypt class here
- result = get()._getBean(UsersDao.class).count() > 0
+ result = get()._getBean(AdminUserDao.class).count() > 0
&& get()._getBean(FieldLanguagesValuesDao.class).count() > 0;
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/WebSession.java Tue Sep 3 04:11:58 2013
@@ -40,7 +40,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
@@ -162,7 +162,7 @@ public class WebSession extends Abstract
WebSession session = get();
if (session.languageId < 0) {
if (session.isSignedIn()) {
- session.languageId = getBean(UsersDao.class).get(session.userId).getLanguage_id();
+ session.languageId = getBean(UserDao.class).get(session.userId).getLanguage_id();
} else {
session.languageId = getBean(ConfigurationDao.class).getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Tue Sep 3 04:11:58 2013
@@ -29,9 +29,9 @@ import java.util.List;
import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.user.OrganisationManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.SalutationDao;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
@@ -152,7 +152,7 @@ public class GeneralUserForm extends For
@Override
protected void onValidate() {
- if(!getBean(UsersDao.class).checkUserEMail(email.getConvertedInput(), getModelObject().getUser_id())) {
+ if(!getBean(AdminUserDao.class).checkUserEMail(email.getConvertedInput(), getModelObject().getUser_id())) {
error(WebSession.getString(1000));
}
super.onValidate();
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java Tue Sep 3 04:11:58 2013
@@ -25,7 +25,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.net.URI;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.AttributeModifier;
@@ -46,7 +46,7 @@ public class ProfileImagePanel extends B
super(id);
profile = new TransparentWebMarkupContainer("profile");
- String uri = getBean(UsersDao.class).get(userId).getPictureuri();
+ String uri = getBean(UserDao.class).get(userId).getPictureuri();
boolean absolute = false;
try {
absolute = URI.create(uri).isAbsolute();
@@ -68,7 +68,7 @@ public class ProfileImagePanel extends B
@Override
protected byte[] getData(Attributes attributes) {
- String uri = getBean(UsersDao.class).get(userId).getPictureuri();
+ String uri = getBean(UserDao.class).get(userId).getPictureuri();
File img = OmFileHelper.getUserProfilePicture(userId, uri);
try {
return IOUtils.toByteArray(new FileInputStream(img));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java Tue Sep 3 04:11:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.auth.ResetPasswordDialog;
@@ -31,7 +31,7 @@ public class ResetPage extends BaseNotIn
public ResetPage(PageParameters pp){
String resetHash = pp.get(RESET_PARAM).toString();
if (resetHash != null){
- Object user = Application.getBean(UsersDao.class).getUserByHash(resetHash);
+ Object user = Application.getBean(AdminUserDao.class).getUserByHash(resetHash);
if (user instanceof User){
add(new ResetPasswordDialog("resetPassword", (User)user));
}else {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Tue Sep 3 04:11:58 2013
@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.ResetPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -110,7 +110,7 @@ public class ForgetPasswordDialog extend
@Override
protected void onValidate() {
- UsersDao dao = getBean(UsersDao.class);
+ AdminUserDao dao = getBean(AdminUserDao.class);
String n = nameField.getConvertedInput();
if (type == Type.email && null == dao.getUserByEmail(n)) {
error(WebSession.getString(318));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Sep 3 04:11:58 2013
@@ -32,8 +32,8 @@ import java.util.TimeZone;
import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.data.user.dao.StateDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.user.State;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -261,10 +261,10 @@ public class RegisterDialog extends Abst
|| !passwordField.getConvertedInput().equals(confirmPassword.getConvertedInput())) {
error(WebSession.getString(232));
}
- if(!getBean(UsersDao.class).checkUserEMail(emailField.getConvertedInput(), null)) {
+ if(!getBean(AdminUserDao.class).checkUserEMail(emailField.getConvertedInput(), null)) {
error(WebSession.getString(1000));
}
- if(!getBean(UsersDao.class).checkUserLogin(loginField.getConvertedInput(), null)) {
+ if(!getBean(AdminUserDao.class).checkUserLogin(loginField.getConvertedInput(), null)) {
error(WebSession.getString(105));
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Tue Sep 3 04:11:58 2013
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -155,7 +155,7 @@ public class ResetPasswordDialog extends
@Override
protected void onSubmit(AjaxRequestTarget target) {
try {
- getBean(UsersDao.class).update(user, password.getConvertedInput(), user.getUser_id());
+ getBean(AdminUserDao.class).update(user, password.getConvertedInput(), user.getUser_id());
} catch (Exception e) {
error(e.getMessage());
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Tue Sep 3 04:11:58 2013
@@ -48,7 +48,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.oauth.OAuth2Dao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer;
import org.apache.openmeetings.web.app.Application;
@@ -316,7 +316,7 @@ public class SignInPage extends BaseInit
}
private void loginViaOAuth2(Map<String, String> params, long serverId) throws IOException, NoSuchAlgorithmException {
- UsersDao userDao = getBean(UsersDao.class);
+ AdminUserDao userDao = getBean(AdminUserDao.class);
UserManager userManager = getBean(UserManager.class);
ConfigurationDao configurationDao = getBean(ConfigurationDao.class);
String login = params.get("login");
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Tue Sep 3 04:11:58 2013
@@ -27,7 +27,7 @@ import static org.apache.openmeetings.we
import java.util.Date;
import org.apache.openmeetings.data.chat.ChatDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.chat.ChatMessage;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.Component;
@@ -109,7 +109,7 @@ public class ChatPanel extends UserPanel
ChatMessage m = new ChatMessage();
m.setMessage(unescapeXml(chatMessage.getDefaultModelObjectAsString()));
m.setSent(new Date());
- m.setFromUser(getBean(UsersDao.class).get(getUserId()));
+ m.setFromUser(getBean(UserDao.class).get(getUserId()));
dao.update(m);
IWebSocketConnectionRegistry reg = IWebSocketSettings.Holder.get(getApplication()).getConnectionRegistry();
for (IWebSocketConnection c : reg.getConnections(getApplication())) {
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Tue Sep 3 04:11:58 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.dao.RoomDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
@@ -317,7 +317,7 @@ public class AppointmentDialog extends A
List<Room> result = new ArrayList<Room>();
RoomDao dao = getBean(RoomDao.class);
result.addAll(dao.getPublicRooms());
- for (Organisation_Users ou : getBean(UsersDao.class).get(getUserId()).getOrganisation_users()) {
+ for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getOrganisation_id()));
}
if (getModelObject().getRoom() != null && getModelObject().getRoom().getAppointment()) { //FIXME review
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/calendar/MeetingMemberDialog.java Tue Sep 3 04:11:58 2013
@@ -19,12 +19,14 @@
package org.apache.openmeetings.web.user.calendar;
import static org.apache.openmeetings.web.admin.groups.GroupUsersPanel.getUser;
+import static org.apache.openmeetings.web.app.WebSession.getLanguage;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -97,7 +99,7 @@ public class MeetingMemberDialog extends
protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) {
usersToAdd.clear();
usersInList.clear();
- usersInList.addAll(Application.getBean(UsersDao.class).get(searchUser.inputToString()));
+ usersInList.addAll(Application.getBean(UserDao.class).get(searchUser.inputToString()));
target.add(users);
}
});
@@ -196,19 +198,20 @@ public class MeetingMemberDialog extends
final List<MeetingMember> meetingMembers = app.getMeetingMember() == null ? new ArrayList<MeetingMember>() : app.getMeetingMember();
for (User u : attendeesInList) {
boolean found = false;
- for (MeetingMember m : meetingMembers){
- if (u == m.getUserid()){
+ for (MeetingMember m : meetingMembers) {
+ if (u.getAdresses().getEmail().equals(m.getUserid().getAdresses().getEmail())) {
found = true;
break;
}
}
- if (!found){
+ if (!found) {
MeetingMember mm = new MeetingMember();
+ if (u.getType() == Type.contact) {
+ u.setOwner_id(getUserId());
+ u.setLanguage_id(getLanguage());
+ }
mm.setUserid(u);
mm.setDeleted(false);
- if (u.getType() == Type.contact){
- u.setLanguage_id(WebSession.getLanguage());
- }
mm.setStarttime(app.getStarttime());
mm.setUpdatetime(app.getUpdatetime());
mm.setAppointment(app);