You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/09/30 12:25:07 UTC
svn commit: r1391980 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ src/org/apache/openmeetings/backup/
src/org/apache/openmeetings/cli/ src/org/apache/openmeetings/data/basic/dao/
src/org/apache/openmeetings/data/calendar/daos/ s...
Author: sebawagner
Date: Sun Sep 30 10:25:05 2012
New Revision: 1391980
URL: http://svn.apache.org/viewvc?rev=1391980&view=rev
Log:
OPENMEETINGS-428: Basic user operations,
Processing of Password in User administration does not work yet, so that newly created users can't login
+ rename/factor Saluationmanagement to SaluationDaoImpl
+ rename/factor Statemanagement to StateDaoImpl
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java
- copied, changed from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java
- copied, changed from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Sep 30 10:25:05 2012
@@ -181,12 +181,12 @@
<bean id="organisationmanagement" class="org.apache.openmeetings.data.user.Organisationmanagement" />
<bean id="organisationDAO" class="org.apache.openmeetings.data.user.dao.OrganisationDAO" />
<bean id="organisationUserDAO" class="org.apache.openmeetings.data.user.dao.OrganisationUserDAO" />
- <bean id="salutationmanagement" class="org.apache.openmeetings.data.user.Salutationmanagement" />
+ <bean id="salutationmanagement" class="org.apache.openmeetings.data.user.dao.SalutationDaoImpl" />
<bean id="errorManagement" class="org.apache.openmeetings.data.basic.ErrorManagement" />
<bean id="navimanagement" class="org.apache.openmeetings.data.basic.Navimanagement" />
<bean id="pollManagement" class="org.apache.openmeetings.data.conference.PollManagement" />
<bean id="omTimeZoneDaoImpl" class="org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl" />
- <bean id="statemanagement" class="org.apache.openmeetings.data.user.Statemanagement" />
+ <bean id="statemanagement" class="org.apache.openmeetings.data.user.dao.StateDaoImpl" />
<bean id="fieldLanguageDaoImpl" class="org.apache.openmeetings.data.basic.FieldLanguageDaoImpl" />
<bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.data.basic.FieldLanguagesValuesDaoImpl" />
<bean id="fieldmanagment" class="org.apache.openmeetings.data.basic.Fieldmanagment" />
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/backup/StateConverter.java Sun Sep 30 10:25:05 2012
@@ -18,19 +18,19 @@
*/
package org.apache.openmeetings.backup;
-import org.apache.openmeetings.data.user.Statemanagement;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.simpleframework.xml.stream.InputNode;
import org.simpleframework.xml.stream.OutputNode;
public class StateConverter extends OmConverter<States> {
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
public StateConverter() {
//default constructor is for export
}
- public StateConverter(Statemanagement statemanagement) {
+ public StateConverter(StateDaoImpl statemanagement) {
this.statemanagement = statemanagement;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java Sun Sep 30 10:25:05 2012
@@ -451,7 +451,7 @@ public class Admin {
for (File profile : profiles.listFiles()) {
long pSize = OmFileHelper.getSize(profile);
long userId = getUserIdByProfile(profile.getName());
- Users u = udao.getUser(userId);
+ Users u = udao.get(userId);
if (profile.isFile() || userId < 0 || u == null) {
if (cleanup) {
FileHelper.removeRec(profile);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -300,7 +300,7 @@ public class ConfigurationDaoImpl implem
try {
Configuration conf = (Configuration) CastMapToObject.getInstance()
.castByGivenObject(values, Configuration.class);
- conf.setUser(usersDao.getUser(users_id));
+ conf.setUser(usersDao.get(users_id));
conf.setUpdatetime(new Date());
conf.setDeleted(true);
@@ -308,7 +308,7 @@ public class ConfigurationDaoImpl implem
conf2.setComment(conf.getComment());
conf2.setConf_key(conf.getConf_key());
conf2.setConf_value(conf.getConf_value());
- conf2.setUser(usersDao.getUser(users_id));
+ conf2.setUser(usersDao.get(users_id));
conf2.setDeleted(true);
conf2.setUpdatetime(new Date());
@@ -366,7 +366,7 @@ public class ConfigurationDaoImpl implem
entity.setDeleted(false);
this.updateConfig(entity);
} else {
- entity.setUser(usersDao.getUser(userId));
+ entity.setUser(usersDao.get(userId));
entity.setDeleted(false);
entity.setUpdatetime(new Date());
this.updateConfig(entity);
@@ -374,7 +374,7 @@ public class ConfigurationDaoImpl implem
}
public void delete(Configuration entity, long userId) {
- entity.setUser(usersDao.getUser(userId));
+ entity.setUser(usersDao.get(userId));
entity.setDeleted(true);
entity.setUpdatetime(new Date());
this.updateConfig(entity);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -73,8 +73,8 @@ public class LdapConfigDaoImpl implement
ldapConfig.setName(name);
ldapConfig.setInserted(new Date());
if (insertedby != null) {
- log.debug("addLdapConfig :1: " + usersDao.getUser(insertedby));
- ldapConfig.setInsertedby(usersDao.getUser(insertedby));
+ log.debug("addLdapConfig :1: " + usersDao.get(insertedby));
+ ldapConfig.setInsertedby(usersDao.get(insertedby));
}
log.debug("addLdapConfig :2: " + insertedby);
@@ -134,8 +134,8 @@ public class LdapConfigDaoImpl implement
ldapConfig.setName(name);
ldapConfig.setUpdated(new Date());
if (updatedby != null) {
- log.debug("updateLdapConfig :1: " + usersDao.getUser(updatedby));
- ldapConfig.setUpdatedby(usersDao.getUser(updatedby));
+ log.debug("updateLdapConfig :1: " + usersDao.get(updatedby));
+ ldapConfig.setUpdatedby(usersDao.get(updatedby));
}
log.debug("updateLdapConfig :2: " + updatedby);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -27,8 +27,10 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
+import org.apache.openmeetings.persistence.beans.user.Users;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -40,6 +42,34 @@ public class OmTimeZoneDaoImpl {
@PersistenceContext
private EntityManager em;
+ @Autowired
+ private ConfigurationDaoImpl configurationDaoImpl;
+
+ /**
+ * Get a default {@link OmTimeZone}, if user is set, it will return the
+ * {@link OmTimeZone} of the user, if not it will try to load it from the
+ * server's config
+ *
+ * @param user
+ * can be null
+ * @return
+ */
+ public OmTimeZone getDefaultOmTimeZone(Users user) {
+
+ if (user != null && user.getOmTimeZone() != null) {
+ return user.getOmTimeZone();
+ }
+
+ String jNameTimeZone = configurationDaoImpl.getConfValue(
+ "default.timezone", String.class, "Europe/Berlin");
+
+ OmTimeZone omTimeZone = this.getOmTimeZone(jNameTimeZone);
+ if (omTimeZone == null) {
+ throw new RuntimeException("Could not find default.timezone, misconfiguration of database");
+ }
+ return omTimeZone;
+ }
+
public Long addOmTimeZone(String name, String label, String iCal,
Integer orderId) {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -104,7 +104,7 @@ public class AppointmentCategoryDaoImpl
ac.setName(name);
ac.setStarttime(new Date());
ac.setDeleted(false);
- ac.setUser(usersDao.getUser(user_id));
+ ac.setUser(usersDao.get(user_id));
ac.setComment(comment);
ac = em.merge(ac);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -224,7 +224,7 @@ public class AppointmentDaoImpl {
ap.setLanguage_id(language_id);
ap.setIsPasswordProtected(isPasswordProtected);
ap.setPassword(password);
- ap.setUserId(usersDao.getUser(userId));
+ ap.setUserId(usersDao.get(userId));
ap.setAppointmentCategory(appointmentCategoryDaoImpl
.getAppointmentCategoryById(categoryId));
ap.setRoom(room);
@@ -845,7 +845,7 @@ public class AppointmentDaoImpl {
+ "app.appointmentStarttime between :starttime " + "AND "
+ " :endtime";
- TimeZone timeZone = timezoneUtil.getTimezoneByUser(usersDao.getUser(userId));
+ TimeZone timeZone = timezoneUtil.getTimezoneByUser(usersDao.get(userId));
Calendar startCal = Calendar.getInstance(timeZone);
startCal.set(Calendar.MINUTE, 0);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -103,7 +103,7 @@ public class AppointmentReminderTypDaoIm
ac.setName(name);
ac.setStarttime(new Date());
ac.setDeleted(false);
- ac.setUser(usersDao.getUser(user_id));
+ ac.setUser(usersDao.get(user_id));
ac = em.merge(ac);
Long category_id = ac.getTypId();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -156,7 +156,7 @@ public class MeetingMemberDaoImpl {
gm.setAppointment(appointmentDao.getAppointmentById(appointmentId));
gm.setDeleted(false);
gm.setUpdatetime(new Date());
- gm.setUserid(usersDao.getUser(userid));
+ gm.setUserid(usersDao.get(userid));
gm.setEmail(email);
gm.setPhone(phone);
@@ -188,7 +188,7 @@ public class MeetingMemberDaoImpl {
gm.setMemberStatus(memberStatus);
gm.setAppointmentStatus(appointmentStatus);
gm.setAppointment(appointmentDao.getAppointmentById(appointmentId));
- gm.setUserid(usersDao.getUser(userid));
+ gm.setUserid(usersDao.get(userid));
gm.setEmail(email);
gm.setPhone(phone);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Invitationmanagement.java Sun Sep 30 10:25:05 2012
@@ -168,7 +168,7 @@ public class Invitationmanagement {
invitation.setDeleted(false);
- Users us = usersDao.getUser(createdBy);
+ Users us = usersDao.get(createdBy);
String hashRaw = "HASH" + (System.currentTimeMillis());
invitation.setHash(MD5.do_checksum(hashRaw));
@@ -554,7 +554,7 @@ public class Invitationmanagement {
invitation.setDeleted(false);
- Users us = usersDao.getUser(createdBy);
+ Users us = usersDao.get(createdBy);
String hashRaw = "InvitationHash"
+ (System.currentTimeMillis());
log.debug("addInvitationIcalLink : rawHash = " + hashRaw);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Sun Sep 30 10:25:05 2012
@@ -1248,7 +1248,7 @@ public class Roommanagement {
private boolean checkUserOrgRoom(long user_id, long rooms_id) {
try {
- Users us = usersDao.getUser(user_id);
+ Users us = usersDao.get(user_id);
List<Organisation_Users> s = us.getOrganisation_users();
for (Iterator<Organisation_Users> it = s.iterator(); it.hasNext();) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java Sun Sep 30 10:25:05 2012
@@ -441,7 +441,7 @@ public class Organisationmanagement {
public Long addOrganisationUserObj(Long user_id, Organisation_Users orgUser) {
try {
- Users u = usersDao.getUser(user_id);
+ Users u = usersDao.get(user_id);
orgUser.setStarttime(new Date());
orgUser = em.merge(orgUser);
@@ -485,7 +485,7 @@ public class Organisationmanagement {
+ organisation_id);
//user should be updated to have recent organisation_users list
Long id = null;
- Users u = usersDao.getUser(user_id);
+ Users u = usersDao.get(user_id);
List<Organisation_Users> l = u.getOrganisation_users();
for (Organisation_Users ou : l) {
if (ou.getOrganisation().getOrganisation_id().equals(organisation_id)) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java Sun Sep 30 10:25:05 2012
@@ -45,6 +45,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.data.user.dao.UserSipDataDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
@@ -92,7 +93,7 @@ public class Usermanagement {
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@Autowired
@@ -136,7 +137,7 @@ public class Usermanagement {
if (authLevelManagement.checkAdminLevel(user_level)) {
SearchResult<Users> sresult = new SearchResult<Users>();
sresult.setObjectName(Users.class.getName());
- sresult.setRecords(usersDao.selectMaxFromUsers());
+ sresult.setRecords(usersDao.count());
// get all users
CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -239,7 +240,7 @@ public class Usermanagement {
// FIXME: We have to check here for the User only cause the
// Org-Moderator otherwise cannot access it
if (authLevelManagement.checkUserLevel(user_level)) {
- return usersDao.getUser(user_id);
+ return usersDao.get(user_id);
}
return null;
}
@@ -475,7 +476,7 @@ public class Usermanagement {
if (authLevelManagement.checkUserLevel(user_level) && user_id != 0) {
try {
- Users us = usersDao.getUser(user_id);
+ Users us = usersDao.get(user_id);
// Check for duplicates
boolean checkName = true;
@@ -510,7 +511,7 @@ public class Usermanagement {
organisationmanagement.updateUserOrganisationsByUser(
us, organisations);
}
- us = usersDao.getUser(user_id);
+ us = usersDao.get(user_id);
us.setLastname(lastname);
us.setFirstname(firstname);
@@ -1363,7 +1364,7 @@ public class Usermanagement {
if (user_id != null && user_id > 0) {
returnLong = user_id;
- Users savedUser = usersDao.getUser(user_id);
+ Users savedUser = usersDao.get(user_id);
savedUser.setAge((Date) values.get("age"));
savedUser.setFirstname(values.get("firstname").toString());
savedUser.setLastname(values.get("lastname").toString());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java Sun Sep 30 10:25:05 2012
@@ -72,7 +72,7 @@ public class OrganisationUserDAO impleme
public void delete(Organisation_Users entity, long userId) {
if (entity.getOrganisation_users_id() != null) {
- Users u = usersDao.getUser(entity.getUser_id());
+ Users u = usersDao.get(entity.getUser_id());
int idx = u.getOrganisation_users().indexOf(entity);
//entity has been detached need to re-fetch
Organisation_Users ou = u.getOrganisation_users().remove(idx);
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java&r1=1388584&r2=1391980&rev=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Salutationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user;
+package org.apache.openmeetings.data.user.dao;
import java.util.Date;
import java.util.List;
@@ -37,15 +37,16 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
/**
+ * CRUD operations for {@link Salutation}
*
* @author swagner
*
*/
@Transactional
-public class Salutationmanagement {
+public class SalutationDaoImpl {
private static final Logger log = Red5LoggerFactory.getLogger(
- Salutationmanagement.class, OpenmeetingsVariables.webAppRootKey);
+ SalutationDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Fieldmanagment fieldmanagment;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java&r1=1388584&r2=1391980&rev=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Statemanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.user;
+package org.apache.openmeetings.data.user.dao;
import java.util.Date;
import java.util.List;
@@ -32,14 +32,15 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
/**
+ * CRUD operations for {@link States}
*
* @author swagner
*
*/
@Transactional
-public class Statemanagement {
+public class StateDaoImpl {
private static final Logger log = Red5LoggerFactory.getLogger(
- Statemanagement.class, OpenmeetingsVariables.webAppRootKey);
+ StateDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java Sun Sep 30 10:25:05 2012
@@ -33,6 +33,8 @@ import javax.persistence.criteria.Root;
import org.apache.commons.lang.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.OmDAO;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
@@ -41,27 +43,73 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+/**
+ * CRUD operations for {@link Users}
+ *
+ * @author swagner, solomax
+ *
+ */
@Transactional
public class UsersDaoImpl implements OmDAO<Users> {
- private static final Logger log = Red5LoggerFactory.getLogger(UsersDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ UsersDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+
@PersistenceContext
private EntityManager em;
+
@Autowired
private ManageCryptStyle manageCryptStyle;
+ @Autowired
+ private SalutationDaoImpl salutationDaoImpl;
+ @Autowired
+ private ConfigurationDaoImpl configurationDaoImpl;
+ @Autowired
+ private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ @Autowired
+ private StateDaoImpl stateDaoImpl;
- public Users get(long id) {
- return getUser(id);
+ /**
+ * Get a new instance of the {@link Users} entity, with all default values
+ * set
+ *
+ * @return
+ */
+ public Users getNewInstance(Users currentUser) {
+ Users user = new Users();
+ user.setSalutations_id(1L); // TODO: Fix default selection to be
+ // configurable
+ user.setLevel_id(2L);
+ user.setLanguage_id(configurationDaoImpl.getConfValue(
+ "default_lang_id", Long.class, "1"));
+ user.setOmTimeZone(omTimeZoneDaoImpl.getDefaultOmTimeZone(currentUser));
+ user.setForceTimeZoneCheck(false);
+ user.setSendSMS(false);
+ user.setAge(new Date());
+ Adresses adresses = new Adresses();
+ adresses.setStates(stateDaoImpl.getStateById(1L));
+ user.setAdresses(adresses);
+ user.setStatus(1);
+ user.setShowContactData(false);
+ user.setShowContactDataToContacts(false);
+
+ return user;
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.openmeetings.data.OmDAO#get(int, int)
+ */
public List<Users> get(int first, int count) {
return getNondeletedUsers(first, count);
}
-
- //FIXME need to be generalized with other copy/pasted methods
+
+ // FIXME need to be generalized with other copy/pasted methods
public List<Users> get(String search) {
String[] searchItems = search.split(" ");
- StringBuilder hql = new StringBuilder("SELECT u FROM Users u WHERE u.deleted = false ");
+ StringBuilder hql = new StringBuilder(
+ "SELECT u FROM Users u WHERE u.deleted = false ");
hql.append("AND ( ");
for (int i = 0; i < searchItems.length; ++i) {
@@ -72,45 +120,55 @@ public class UsersDaoImpl implements OmD
hql.append(" OR ");
}
StringBuilder placeholder = new StringBuilder();
- placeholder.append("%").append(StringUtils.lowerCase(searchItems[i])).append("%");
+ placeholder.append("%")
+ .append(StringUtils.lowerCase(searchItems[i])).append("%");
- hql.append("(lower(u.lastname) LIKE '")
- .append(placeholder)
- .append("' OR lower(u.firstname) LIKE '")
- .append(placeholder)
- .append("' OR lower(u.login) LIKE '")
- .append(placeholder)
- .append("' OR lower(u.adresses.email) LIKE '")
- .append(placeholder)
- .append("' ) ");
+ hql.append("(lower(u.lastname) LIKE '").append(placeholder)
+ .append("' OR lower(u.firstname) LIKE '")
+ .append(placeholder).append("' OR lower(u.login) LIKE '")
+ .append(placeholder)
+ .append("' OR lower(u.adresses.email) LIKE '")
+ .append(placeholder).append("' ) ");
}
hql.append(" ) ");
TypedQuery<Users> q = em.createQuery(hql.toString(), Users.class);
return q.getResultList();
}
-
- public long count() {
- return selectMaxFromUsers();
- }
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
+ * .beans.OmEntity, long)
+ */
public void update(Users u, long userId) {
- updateUser(u);
+ updateUser(u);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
+ * .beans.OmEntity, long)
+ */
public void delete(Users u, long userId) {
- deleteUserID(u.getUser_id());
+ deleteUserID(u.getUser_id());
}
-
- /**
+
+ /*
+ * (non-Javadoc)
*
- * @param user_id
- * @return
+ * @see org.apache.openmeetings.data.OmDAO#get(long)
*/
- public Users getUser(Long user_id) {
- if (user_id != null && user_id > 0) {
+ public Users get(long user_id) {
+ if (user_id > 0) {
try {
- TypedQuery<Users> query = em.createQuery("select c from Users as c where c.user_id = :user_id", Users.class);
+ TypedQuery<Users> query = em.createQuery(
+ "select c from Users as c where c.user_id = :user_id",
+ Users.class);
query.setParameter("user_id", user_id);
Users users = null;
@@ -129,27 +187,24 @@ public class UsersDaoImpl implements OmD
}
public void updateUser(Users user) {
- if (user.getUser_id() > 0) {
- try {
- if (user.getUser_id() == null) {
- em.persist(user);
- } else {
- if (!em.contains(user)) {
- em.merge(user);
- }
+ try {
+ if (user.getUser_id() == null) {
+ em.persist(user);
+ } else {
+ user.setUpdatetime(new Date());
+ if (!em.contains(user)) {
+ em.merge(user);
}
- } catch (Exception ex2) {
- log.error("[updateUser] ", ex2);
}
- } else {
- log.info("[updateUser] " + "Error: No USER_ID given");
+ } catch (Exception ex2) {
+ log.error("[updateUser] ", ex2);
}
}
- public Long deleteUserID(long USER_ID) {
+ public Long deleteUserID(long userId) {
try {
- if (USER_ID != 0) {
- Users us = getUser(USER_ID);
+ if (userId != 0) {
+ Users us = get(userId);
us.setDeleted(true);
us.setUpdatetime(new Date());
Adresses adr = us.getAdresses();
@@ -172,26 +227,23 @@ public class UsersDaoImpl implements OmD
return null;
}
- /**
- * returns the maximum
+ /*
+ * (non-Javadoc)
*
- * @return
+ * @see org.apache.openmeetings.data.OmDAO#count()
*/
- public Long selectMaxFromUsers() {
- try {
- // get all users
- TypedQuery<Long> query = em.createQuery("select count(c.user_id) from Users c where c.deleted = false", Long.class);
- List<Long> ll = query.getResultList();
- log.info("selectMaxFromUsers" + ll.get(0));
- return ll.get(0);
- } catch (Exception ex2) {
- log.error("[selectMaxFromUsers] ", ex2);
- }
- return null;
+ public long count() {
+ // get all users
+ TypedQuery<Long> query = em.createQuery(
+ "select count(c.user_id) from Users c where c.deleted = false",
+ Long.class);
+ List<Long> ll = query.getResultList();
+ return ll.get(0);
}
public List<Users> getNondeletedUsers(int first, int count) {
- TypedQuery<Users> q = em.createNamedQuery("getNondeletedUsers", Users.class);
+ TypedQuery<Users> q = em.createNamedQuery("getNondeletedUsers",
+ Users.class);
q.setFirstResult(first);
q.setMaxResults(count);
return q.getResultList();
@@ -217,7 +269,8 @@ public class UsersDaoImpl implements OmD
public List<Users> getAllUsersDeleted() {
try {
- TypedQuery<Users> q = em.createNamedQuery("getAllUsers", Users.class);
+ TypedQuery<Users> q = em.createNamedQuery("getAllUsers",
+ Users.class);
return q.getResultList();
} catch (Exception ex2) {
log.error("[getAllUsersDeleted] ", ex2);
@@ -279,7 +332,10 @@ public class UsersDaoImpl implements OmD
*/
public boolean checkUserLogin(String DataValue) {
try {
- TypedQuery<Users> query = em.createQuery("select c from Users as c where c.login = :DataValue AND c.deleted <> :deleted", Users.class);
+ TypedQuery<Users> query = em
+ .createQuery(
+ "select c from Users as c where c.login = :DataValue AND c.deleted <> :deleted",
+ Users.class);
query.setParameter("DataValue", DataValue);
query.setParameter("deleted", true);
int count = query.getResultList().size();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java Sun Sep 30 10:25:05 2012
@@ -111,7 +111,7 @@ public class GenerateImage {
fToDelete.delete();
String pictureuri = destinationFile.getName();
- Users us = usersDao.getUser(users_id);
+ Users us = usersDao.get(users_id);
us.setUpdatetime(new java.util.Date());
us.setPictureuri(pictureuri);
usersDao.updateUser(us);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Sun Sep 30 10:25:05 2012
@@ -40,9 +40,9 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.conference.PollManagement;
import org.apache.openmeetings.data.conference.Roommanagement;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.Salutationmanagement;
-import org.apache.openmeetings.data.user.Statemanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.SalutationDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
@@ -73,7 +73,7 @@ public class ImportInitvalues {
@Autowired
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@Autowired
@@ -81,7 +81,7 @@ public class ImportInitvalues {
@Autowired
private ErrorManagement errorManagement;
@Autowired
- private Salutationmanagement salutationmanagement;
+ private SalutationDaoImpl salutationmanagement;
@Autowired
private Organisationmanagement organisationmanagement;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Sun Sep 30 10:25:05 2012
@@ -31,8 +31,8 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
-import org.apache.openmeetings.data.user.Statemanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
@@ -62,7 +62,7 @@ public class LdapLoginManagement {
@Autowired
private Usermanagement userManagement;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private LdapConfigDaoImpl ldapConfigDao;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java Sun Sep 30 10:25:05 2012
@@ -58,7 +58,9 @@ import org.simpleframework.xml.Root;
@Table(name = "users")
@Root(name = "user")
public class Users implements Serializable, OmEntity {
+
private static final long serialVersionUID = -2265479712596674065L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -528,4 +530,5 @@ public class Users implements Serializab
public String getPhoneForSMS() {
return getSendSMS() ? getAdresses().getPhone() : "";
}
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/FLVRecorderService.java Sun Sep 30 10:25:05 2012
@@ -713,7 +713,7 @@ public class FLVRecorderService implemen
if (flvRecording.getInsertedBy() != null) {
flvRecording.setCreator(this.usersDaoImpl
- .getUser(flvRecording.getInsertedBy()));
+ .get(flvRecording.getInsertedBy()));
}
if (flvRecording.getRoom_id() != null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Sun Sep 30 10:25:05 2012
@@ -39,8 +39,8 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.Invitationmanagement;
import org.apache.openmeetings.data.conference.Roommanagement;
import org.apache.openmeetings.data.logs.ConferenceLogDaoImpl;
-import org.apache.openmeetings.data.user.Statemanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.adresses.States;
@@ -89,7 +89,7 @@ public class MainService implements IPen
@Autowired
private Usermanagement userManagement;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@Autowired
@@ -151,7 +151,7 @@ public class MainService implements IPen
Long users_id = sessionManagement.checkSession(SID);
long user_level = userManagement.getUserLevelByID(users_id);
if (user_level > 2) {
- users = usersDao.getUser(new Long(USER_ID));
+ users = usersDao.get(new Long(USER_ID));
} else {
users.setFirstname("No rights to do this");
}
@@ -903,7 +903,7 @@ public class MainService implements IPen
Long user_level = userManagement.getUserLevelByID(users_id);
return invitationManagement.sendInvitionLink(user_level,
username, message, domain, room, roomtype, baseurl, email,
- usersDao.getUser(users_id).getAdresses().getEmail(), subject, room_id, null, null);
+ usersDao.get(users_id).getAdresses().getEmail(), subject, room_id, null, null);
}
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Sun Sep 30 10:25:05 2012
@@ -40,10 +40,10 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.conference.Invitationmanagement;
import org.apache.openmeetings.data.conference.Roommanagement;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.Salutationmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDaoImpl;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDaoImpl;
+import org.apache.openmeetings.data.user.dao.SalutationDaoImpl;
import org.apache.openmeetings.data.user.dao.UserContactsDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
@@ -97,7 +97,7 @@ public class UserService {
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@Autowired
- private Salutationmanagement salutationmanagement;
+ private SalutationDaoImpl salutationmanagement;
@Autowired
private Organisationmanagement organisationmanagement;
@Autowired
@@ -138,7 +138,7 @@ public class UserService {
*/
public Users getUserSelf(String SID) {
Long users_id = sessionManagement.checkSession(SID);
- return usersDao.getUser(users_id);
+ return usersDao.get(users_id);
}
public Long resetUserPwd(String SID, String email, String login,
@@ -968,7 +968,7 @@ public class UserService {
// users only
if (authLevelManagement.checkUserLevel(user_level)) {
- TimeZone timezone = timezoneUtil.getTimezoneByUser(usersDao.getUser(users_id));
+ TimeZone timezone = timezoneUtil.getTimezoneByUser(usersDao.get(users_id));
Date appointmentstart = createCalendarDate(timezone, validFromDate, validFromTime);
Date appointmentend = createCalendarDate(timezone, validToDate, validToTime);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Sun Sep 30 10:25:05 2012
@@ -1448,7 +1448,7 @@ public class ScopeApplicationAdapter ext
// Inject externalUserId if nothing is set yet
if (currentClient.getExternalUserId() == null) {
- Users us = usersDao.getUser(currentClient.getUser_id());
+ Users us = usersDao.get(currentClient.getUser_id());
if (us != null) {
currentClient.setExternalUserId(us.getExternalUserId());
currentClient.setExternalUserType(us.getExternalUserType());
@@ -1746,7 +1746,7 @@ public class ScopeApplicationAdapter ext
// only fill this value from User-Record
// cause invited users have non
// you cannot set the firstname,lastname from the UserRecord
- Users us = usersDao.getUser(userId);
+ Users us = usersDao.get(userId);
if (us != null && us.getPictureuri() != null) {
// set Picture-URI
currentClient.setPicture_uri(us.getPictureuri());
@@ -1796,7 +1796,7 @@ public class ScopeApplicationAdapter ext
// only fill this value from User-Record
// cause invited users have non
// you cannot set the firstname,lastname from the UserRecord
- Users us = usersDao.getUser(userId);
+ Users us = usersDao.get(userId);
if (us != null && us.getPictureuri() != null) {
// set Picture-URI
currentClient.setPicture_uri(us.getPictureuri());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Sun Sep 30 10:25:05 2012
@@ -72,9 +72,9 @@ import org.apache.openmeetings.data.file
import org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl;
import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.Statemanagement;
import org.apache.openmeetings.data.user.dao.PrivateMessageFolderDaoImpl;
import org.apache.openmeetings.data.user.dao.PrivateMessagesDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.data.user.dao.UserContactsDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
@@ -138,7 +138,7 @@ public class BackupImportController exte
@Autowired
private AppointmentDaoImpl appointmentDao;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@Autowired
@@ -636,7 +636,7 @@ public class BackupImportController exte
performImport(is);
LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
- hs.put("user", usersDao.getUser(info.userId));
+ hs.put("user", usersDao.get(info.userId));
hs.put("message", "library");
hs.put("action", "import");
hs.put("error", "");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ImportController.java Sun Sep 30 10:25:05 2012
@@ -85,7 +85,7 @@ public class ImportController extends Ab
log.debug("Return And Close");
LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
- hs.put("user", usersDao.getUser(info.userId));
+ hs.put("user", usersDao.get(info.userId));
hs.put("message", "library");
hs.put("action", "import");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Sun Sep 30 10:25:05 2012
@@ -172,7 +172,7 @@ public class UploadController extends Ab
private LinkedHashMap<String, Object> prepareMessage(UploadInfo info) {
LinkedHashMap<String, Object> hs = new LinkedHashMap<String, Object>();
- hs.put("user", usersDao.getUser(info.userId));
+ hs.put("user", usersDao.get(info.userId));
return hs;
}
@@ -295,7 +295,7 @@ public class UploadController extends Ab
.generateThumb("_big_", completeName, 240));
String pictureuri = completeName.getName();
- Users us = usersDao.getUser(userId);
+ Users us = usersDao.get(userId);
us.setUpdatetime(new java.util.Date());
us.setPictureuri(pictureuri);
usersDao.updateUser(us);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java Sun Sep 30 10:25:05 2012
@@ -101,7 +101,7 @@ public abstract class AbstractOpenmeetin
ap.setIsYearly(false);
ap.setIsPasswordProtected(false);
- ap.setUserId(usersDao.getUser(1L));
+ ap.setUserId(usersDao.get(1L));
ap.setIsConnectedEvent(false);
Long id = appointmentDao.addAppointmentObj(ap);
assertNotNull("Cann't add appointment", id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java Sun Sep 30 10:25:05 2012
@@ -32,7 +32,7 @@ public class TestDatabaseStructureGetUse
@Test
public void testAddingGroup() {
try {
- usersDao.getUser(new Long(1));
+ usersDao.get(new Long(1));
} catch (Exception err) {
log.error("[testAddingGroup]", err);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/domain/TestAddGroup.java Sun Sep 30 10:25:05 2012
@@ -49,7 +49,7 @@ public class TestAddGroup extends Abstra
log.error("new organisation_user: " + organisation_usersid);
- Users us = usersDao.getUser(new Long(1));
+ Users us = usersDao.get(new Long(1));
log.error(us.getLastname());
log.error(us.getAdresses().getTown());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Sun Sep 30 10:25:05 2012
@@ -110,7 +110,7 @@ public class WebSession extends Abstract
public static long getLanguage() {
WebSession session = get();
if (session.isSignedIn()) {
- return Application.getBean(UsersDaoImpl.class).getUser(session.userId).getLanguage_id();
+ return Application.getBean(UsersDaoImpl.class).get(session.userId).getLanguage_id();
} else {
return Application.getBean(ConfigurationDaoImpl.class).getConfValue("default_lang_id", Long.class, "1");
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java Sun Sep 30 10:25:05 2012
@@ -89,28 +89,75 @@ public class AdminBaseForm<T> extends Fo
basePanel.hideNewRecord();
}
+ /**
+ * invoked when user press save button
+ *
+ * @param target
+ * @param form
+ */
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked when save has error
+ *
+ * @param target
+ * @param form
+ */
protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked when new button is pressed
+ *
+ * @param target
+ * @param form
+ */
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked if new has error
+ *
+ * @param target
+ * @param form
+ */
protected void onNewError(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked when refresh button is pressed
+ *
+ * @param target
+ * @param form
+ */
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked when refresh has error
+ *
+ * @param target
+ * @param form
+ */
protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
}
-
+ /**
+ * invoked when delete button is pressed
+ *
+ * @param target
+ * @param form
+ */
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
}
+ /**
+ * invoked when delete has error
+ *
+ * @param target
+ * @param form
+ */
protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java Sun Sep 30 10:25:05 2012
@@ -26,8 +26,9 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.Salutationmanagement;
-import org.apache.openmeetings.data.user.Statemanagement;
+import org.apache.openmeetings.data.user.dao.SalutationDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Server;
@@ -39,14 +40,18 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.extensions.markup.html.form.DateTextField;
import org.apache.wicket.extensions.yui.calendar.DatePicker;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.ListMultipleChoice;
+import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
@@ -58,14 +63,31 @@ import org.apache.wicket.util.time.Durat
import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.wicket.validation.validator.StringValidator;
+/**
+ * CRUD operations in form for {@link Users}
+ *
+ * @author swagner
+ *
+ */
public class UserForm extends AdminBaseForm<Users> {
+ private static final long serialVersionUID = 1L;
+
+ private WebMarkupContainer listContainer;
+
+ private Users user;
+
private final List<Salutations> saluationList = Application.getBean(
- Salutationmanagement.class).getUserSalutations(
+ SalutationDaoImpl.class).getUserSalutations(
WebSession.getLanguage());
private final List<FieldLanguage> languageList = Application.getBean(
FieldLanguageDaoImpl.class).getLanguages();
+ /**
+ * Get id list of {@link Salutations}
+ *
+ * @return
+ */
private List<Long> getSalutationsIds() {
ArrayList<Long> saluationIdList = new ArrayList<Long>(
saluationList.size());
@@ -75,6 +97,12 @@ public class UserForm extends AdminBaseF
return saluationIdList;
}
+ /**
+ * Get a name for a given id of {@link Salutations}
+ *
+ * @param id
+ * @return
+ */
private String getSaluationLabelById(Long id) {
for (Salutations saluation : saluationList) {
if (id.equals(saluation.getSalutations_id())) {
@@ -84,6 +112,11 @@ public class UserForm extends AdminBaseF
throw new RuntimeException("Could not find Salutations for id " + id);
}
+ /**
+ * Id list of {@link FieldLanguage}
+ *
+ * @return
+ */
private List<Long> getFieldLanguageIds() {
ArrayList<Long> languageIdList = new ArrayList<Long>(
languageList.size());
@@ -93,6 +126,12 @@ public class UserForm extends AdminBaseF
return languageIdList;
}
+ /**
+ * Get name of {@link FieldLanguage} by its id
+ *
+ * @param id
+ * @return
+ */
private String getFieldLanguageLabelById(Long id) {
for (FieldLanguage language : languageList) {
if (id.equals(language.getLanguage_id())) {
@@ -102,15 +141,78 @@ public class UserForm extends AdminBaseF
throw new RuntimeException("Could not find FieldLanguage for id " + id);
}
- public UserForm(String id, final Users user) {
+ public UserForm(String id, WebMarkupContainer listContainer,
+ final Users user) {
super(id, new CompoundPropertyModel<Users>(user));
setOutputMarkupId(true);
-
+ this.listContainer = listContainer;
+ this.user = user;
+
+ // Add form fields
+ addFormFields();
+
+ // attach an ajax validation behavior to all form component's keydown
+ // event and throttle it down to once per second
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown",
+ Duration.ONE_SECOND);
+
+ }
+
+ @Override
+ protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ Application.getBean(UsersDaoImpl.class).update(getModelObject(),
+ WebSession.getUserId());
+ Users user = Application.getBean(UsersDaoImpl.class).get(
+ getModelObject().getUser_id());
+ this.setModelObject(user);
+ target.add(this);
+ target.add(listContainer);
+ }
+
+ @Override
+ protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
+ UsersDaoImpl usersDaoImpl = Application.getBean(UsersDaoImpl.class);
+ this.setModelObject(usersDaoImpl.getNewInstance(usersDaoImpl
+ .get(WebSession.getUserId())));
+ target.add(this);
+ }
+
+ @Override
+ protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
+ Users user = this.getModelObject();
+ if (user.getUser_id() <= 0) {
+ user = Application.getBean(UsersDaoImpl.class).get(
+ user.getUser_id());
+ } else {
+ user = new Users();
+ }
+ this.setModelObject(user);
+ target.add(this);
+ }
+
+ @Override
+ protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
+ UsersDaoImpl usersDaoImpl = Application.getBean(UsersDaoImpl.class);
+ usersDaoImpl.delete(this.getModelObject(),
+ WebSession.getUserId());
+ this.setModelObject(usersDaoImpl.getNewInstance(usersDaoImpl
+ .get(WebSession.getUserId())));
+ target.add(listContainer);
+ target.add(this);
+ }
+
+ /**
+ * Add the fields to the form
+ */
+ private void addFormFields() {
+
RequiredTextField<String> login = new RequiredTextField<String>("login");
login.add(new StringValidator(4, null));
- login.setLabel(new Model<String>("testname"));
+ // login.setLabel(new Model<String>("testname"));
add(login);
-
+
+ add(new PasswordTextField("password", Model.of("")));
+
add(new DropDownChoice<Long>("salutations_id", getSalutationsIds(),
new IChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
@@ -147,8 +249,9 @@ public class UserForm extends AdminBaseF
}));
add(new CheckBox("forceTimeZoneCheck"));
- RequiredTextField<String> email = new RequiredTextField<String>("adresses.email");
- email.setLabel(new Model<String>("testemail"));
+ RequiredTextField<String> email = new RequiredTextField<String>(
+ "adresses.email");
+ // email.setLabel(new Model<String>("testemail"));
email.add(EmailAddressValidator.getInstance());
add(email);
add(new TextField<String>("adresses.phone"));
@@ -171,7 +274,7 @@ public class UserForm extends AdminBaseF
add(new TextField<String>("adresses.zip"));
add(new TextField<String>("adresses.town"));
add(new DropDownChoice<States>("adresses.states", Application.getBean(
- Statemanagement.class).getStates(), new ChoiceRenderer<States>(
+ StateDaoImpl.class).getStates(), new ChoiceRenderer<States>(
"name", "state_id")));
final String field159 = WebSession.getString(159);
@@ -297,20 +400,9 @@ public class UserForm extends AdminBaseF
}
}));
-
+
add(new TextArea<String>("userOffers"));
add(new TextArea<String>("userSearchs"));
-
- // attach an ajax validation behavior to all form component's keydown
- // event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown",
- Duration.ONE_SECOND);
-
}
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html Sun Sep 30 10:25:05 2012
@@ -53,7 +53,7 @@
<div wicket:id="buttons"></div>
<wicket:ommessage key="132" />: <input type="text" wicket:id="login"/>
<br/>
- <wicket:ommessage key="133" />: <input type="password" />
+ <wicket:ommessage key="133" />: <input type="password" wicket:id="password"/>
<br/>
<wicket:ommessage key="135" />: <select wicket:id="salutations_id" style="width: 70px;"/> <input type="text" wicket:id="firstname"/>
<br/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java Sun Sep 30 10:25:05 2012
@@ -32,14 +32,16 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.markup.repeater.data.DataView;
public class UsersPanel extends AdminPanel {
+
private static final long serialVersionUID = -4463107742579790120L;
-
+
+ private UserForm form;
+
public UsersPanel(String id) {
super(id);
- final UserForm form = new UserForm("form", new Users());
- add(form);
-
- DataView<Users> dataView = new DataView<Users>("userList", new OmDataProvider<Users>(UsersDaoImpl.class)) {
+
+ DataView<Users> dataView = new DataView<Users>("userList",
+ new OmDataProvider<Users>(UsersDaoImpl.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
@@ -47,11 +49,10 @@ public class UsersPanel extends AdminPan
final Users u = item.getModelObject();
item.add(new Label("userId", "" + u.getUser_id()));
item.add(new Label("login", u.getLogin()));
- final String fName = u.getFirstname();
- item.add(new Label("firstName", fName));
- final String lName = u.getLastname();
- item.add(new Label("lastName", lName));
- item.add(AttributeModifier.append("class", "clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ item.add(new Label("firstName", u.getFirstname()));
+ item.add(new Label("lastName", u.getLastname()));
+ item.add(AttributeModifier.append("class", "clickable "
+ + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
@@ -62,7 +63,8 @@ public class UsersPanel extends AdminPan
});
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
+ final WebMarkupContainer listContainer = new WebMarkupContainer(
+ "listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
@@ -72,5 +74,8 @@ public class UsersPanel extends AdminPan
target.add(listContainer);
}
});
+
+ form = new UserForm("form", listContainer, new Users());
+ add(form);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java?rev=1391980&r1=1391979&r2=1391980&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java Sun Sep 30 10:25:05 2012
@@ -23,8 +23,8 @@ import java.io.InputStream;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.Emailmanagement;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.Statemanagement;
import org.apache.openmeetings.data.user.Usermanagement;
+import org.apache.openmeetings.data.user.dao.StateDaoImpl;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.servlet.outputhandler.BackupImportController;
@@ -45,7 +45,7 @@ public class UserImport {
@Autowired
private UsersDaoImpl usersDao;
@Autowired
- private Statemanagement statemanagement;
+ private StateDaoImpl statemanagement;
@Autowired
private BackupImportController backupController;