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 [2/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...
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Tue Sep 3 04:11:58 2013
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.pages.MainPage;
@@ -45,7 +45,7 @@ public class WelcomeWidgetView extends W
public WelcomeWidgetView(String id, Model<Widget> model) {
super(id, model);
- User u = getBean(UsersDao.class).get(getUserId());
+ User u = getBean(UserDao.class).get(getUserId());
add(new UploadableProfileImagePanel("img", getUserId()));
//FIXME this need to be aligned according to Locale
add(new Label("firstname", Model.of(u.getFirstname())));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java Tue Sep 3 04:11:58 2013
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
-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.persistence.beans.user.PrivateMessage;
import org.apache.openmeetings.utils.mail.MailHandler;
@@ -71,7 +71,7 @@ public class MessageDialog extends Abstr
}
public void open(AjaxRequestTarget target, long userId) {
- getModelObject().setTo(getBean(UsersDao.class).get(userId));
+ getModelObject().setTo(getBean(UserDao.class).get(userId));
open(target);
}
@@ -79,7 +79,7 @@ public class MessageDialog extends Abstr
modelStart.setObject(new Date());
modelEnd.setObject(new Date()); //TODO should we add 1 hour or generalize with Calendar???
PrivateMessage p = new PrivateMessage();
- p.setFrom(getBean(UsersDao.class).get(getUserId()));
+ p.setFrom(getBean(UserDao.class).get(getUserId()));
p.setOwner(p.getFrom());
p.setIsTrash(false);
p.setIsRead(false);
@@ -168,7 +168,7 @@ public class MessageDialog extends Abstr
p.setRoom(null);
}
if (p.getTo().getUser_id() == null) {
- getBean(UsersDao.class).update(p.getTo(), getUserId());
+ getBean(UserDao.class).update(p.getTo(), getUserId());
}
//to send
getBean(PrivateMessagesDao.class).update(p, getUserId());
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java Tue Sep 3 04:11:58 2013
@@ -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.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
@@ -40,7 +40,7 @@ public class ProfilePanel extends UserPa
super(id);
setOutputMarkupId(true);
- Form<User> form = new Form<User>("form", new CompoundPropertyModel<User>(getBean(UsersDao.class).get(getUserId()))) {
+ Form<User> form = new Form<User>("form", new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId()))) {
private static final long serialVersionUID = -4968428244553170528L;
private final UserForm userForm;
@@ -52,7 +52,7 @@ public class ProfilePanel extends UserPa
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
User u = getModelObject();
try {
- u = getBean(UsersDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
+ u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
} catch (Exception e) {
// FIXME update feedback with the error details
}
@@ -69,7 +69,7 @@ public class ProfilePanel extends UserPa
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(UserDao.class).get(user.getUser_id());
} else {
user = new User();
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Tue Sep 3 04:11:58 2013
@@ -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.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ProfileImagePanel;
@@ -53,7 +53,7 @@ public class UserProfilePanel extends Us
public UserProfilePanel(String id, long userId) {
super(id);
- User u = getBean(UsersDao.class).get(userId);
+ User u = getBean(UserDao.class).get(userId);
add(new ProfileImagePanel("img", userId));
add(new Label("firstname", u.getFirstname()));
add(new Label("lastname", u.getLastname()));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Tue Sep 3 04:11:58 2013
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-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.flvrecord.FlvRecording;
import org.apache.openmeetings.web.app.WebSession;
@@ -352,7 +352,7 @@ public class RecordingsPanel extends Use
public Iterator<? extends FlvRecording> getChildren(FlvRecording node) {
if (node.getFlvRecordingId() < 0) {
List<FlvRecording> roots = new ArrayList<FlvRecording>();
- for (Organisation_Users ou : getBean(UsersDao.class).get(getUserId()).getOrganisation_users()) {
+ for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
roots.addAll(getBean(FlvRecordingDao.class).getFlvRecordingRootByPublic(ou.getOrganisation().getOrganisation_id()));
}
return roots.iterator();
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java Tue Sep 3 04:11:58 2013
@@ -23,7 +23,7 @@ import java.io.FileInputStream;
import java.util.List;
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.room.Client;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.session.SessionManager;
@@ -112,7 +112,7 @@ public class RoomsPanel extends UserPane
@Override
protected byte[] getData(Attributes attributes) {
- String uri = Application.getBean(UsersDao.class).get(userId).getPictureuri();
+ String uri = Application.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/user/rooms/RoomsTabbedPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java Tue Sep 3 04:11:58 2013
@@ -22,7 +22,7 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
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.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -42,7 +42,7 @@ public class RoomsTabbedPanel extends Us
public RoomsTabbedPanel(String id) {
super(id);
- User u = getBean(UsersDao.class).get(getUserId());
+ User u = getBean(UserDao.class).get(getUserId());
add(new ListView<Organisation_Users>("orgTabs", u.getOrganisation_users()) {
private static final long serialVersionUID = -145637079945252731L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Tue Sep 3 04:11:58 2013
@@ -26,7 +26,7 @@ import java.util.Date;
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.data.user.dao.UserDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.UserContact;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -48,8 +48,8 @@ public class ContactsHelper {
Long userContactId = getBean(UserContactsDao.class).addUserContact(userIdToAdd, getUserId(), true, hash);
- User user = getBean(UsersDao.class).get(getUserId());
- User userToAdd = getBean(UsersDao.class).get(userIdToAdd);
+ User user = getBean(UserDao.class).get(getUserId());
+ User userToAdd = getBean(UserDao.class).get(userIdToAdd);
String subj = user.getFirstname() + " " + user.getLastname() + " " + WebSession.getString(1193);
String message = RequestContactTemplate.getEmail(userToAdd, user);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/RecordingResourceReference.java Tue Sep 3 04:11:58 2013
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.io.input.BoundedInputStream;
import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
-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.flvrecord.FlvRecording;
import org.apache.openmeetings.web.app.WebSession;
@@ -174,7 +174,7 @@ public abstract class RecordingResourceR
return r;
}
//FIXME UGLY need to be optimized
- for (Organisation_Users ou : getBean(UsersDao.class).get(getUserId()).getOrganisation_users()) {
+ for (Organisation_Users ou : getBean(UserDao.class).get(getUserId()).getOrganisation_users()) {
if (ou.getOrganisation().getOrganisation_id().equals(r.getOrganization_id())) {
return r;
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java Tue Sep 3 04:11:58 2013
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.we
import java.util.List;
import java.util.Locale;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
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;
@@ -125,7 +125,7 @@ public class UserAutoCompleteTextField e
@Override
protected List<User> getChoices(String input) {
inputValue = input;
- return getBean(UsersDao.class).get(input, 0, 10, null);
+ return getBean(UserDao.class).get(input, 0, 10, null);
}
private static class UserTextRenderer implements ITextRenderer<User> {
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/openmeetings-applicationContext.xml Tue Sep 3 04:11:58 2013
@@ -273,7 +273,9 @@
<bean id="privateMessagesDao" class="org.apache.openmeetings.data.user.dao.PrivateMessagesDao" />
<bean id="soapLoginDao" class="org.apache.openmeetings.data.basic.dao.SOAPLoginDao" />
<bean id="userContactsDao" class="org.apache.openmeetings.data.user.dao.UserContactsDao" />
- <bean id="usersDao" class="org.apache.openmeetings.data.user.dao.UsersDao" />
+ <bean id="dao" class="org.apache.openmeetings.data.user.dao.AbstractUserDao" />
+ <bean id="usersDao" class="org.apache.openmeetings.data.user.dao.UserDao" />
+ <bean id="adminUserDao" class="org.apache.openmeetings.data.user.dao.AdminUserDao" />
<bean id="serverDao" class="org.apache.openmeetings.data.basic.dao.ServerDao" />
<bean id="chatDao" class="org.apache.openmeetings.data.chat.ChatDao" />
<bean id="clientDao" class="org.apache.openmeetings.data.conference.dao.ClientDao" />
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Tue Sep 3 04:11:58 2013
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.test;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -27,11 +28,13 @@ import java.util.Date;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
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.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+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.OmFileHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.junit.Before;
@@ -61,7 +64,7 @@ public abstract class AbstractOpenmeetin
@Autowired
private UserManager userManager;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Autowired
private ImportInitvalues importInitvalues;
@Autowired
@@ -143,4 +146,21 @@ public abstract class AbstractOpenmeetin
cfg.ical_timeZone = timeZone;
importInitvalues.loadAll(cfg, false);
}
+
+ public User createUserContact(int rnd, Long ownerId) throws Exception {
+ User user = new User();
+ // add user as contact
+ user.setFirstname("firstname" + rnd);
+ user.setLastname("lastname" + rnd);
+ user.setLogin(getUserId() + "_" + "email" + rnd);
+ user.setLanguage_id(1L);
+ user.setType(Type.contact);
+ user.setOwner_id(ownerId);
+ user.setAdresses(new Address());
+ user.getAdresses().setEmail("email" + rnd);
+ user = usersDao.update(user, ownerId);
+ assertNotNull("Cann't add user", user);
+ return user;
+ }
+
}
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Tue Sep 3 04:11:58 2013
@@ -29,8 +29,8 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.RoomManager;
import org.apache.openmeetings.data.conference.dao.RoomDao;
+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.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.BackupImport;
import org.junit.Test;
@@ -47,7 +47,7 @@ public class TestOldBackups extends Abst
@Autowired
private OrganisationDao organisationDao;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
@Autowired
private RoomDao roomDao;
@Autowired
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java Tue Sep 3 04:11:58 2013
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.calendar;
import org.apache.log4j.Logger;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.UserDao;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ import org.springframework.beans.factory
public class TestDatabaseStructureGetUserStart extends AbstractOpenmeetingsSpringTest {
private static final Logger log = Logger.getLogger(TestDatabaseStructureGetUserStart.class);
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
@Test
public void testAddingGroup() {
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java Tue Sep 3 04:11:58 2013
@@ -20,7 +20,7 @@ package org.apache.openmeetings.test.dom
import org.apache.log4j.Logger;
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.user.User;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.junit.Test;
@@ -31,7 +31,7 @@ public class TestAddGroup extends Abstra
@Autowired
private OrganisationManager organisationManager;
@Autowired
- private UsersDao usersDao;
+ private UserDao usersDao;
private static final Logger log = Logger.getLogger(TestAddGroup.class);
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java?rev=1519549&r1=1519548&r2=1519549&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java Tue Sep 3 04:11:58 2013
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
import java.util.List;
import org.apache.openmeetings.data.user.OrganisationManager;
-import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.data.user.dao.AdminUserDao;
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;
@@ -37,7 +37,7 @@ public class TestUserOrganisation extend
@Autowired
private OrganisationManager orgManagement;
@Autowired
- private UsersDao usersDao;
+ private AdminUserDao usersDao;
private User getValidUser() {
for (User u : usersDao.getAllUsers()) {