You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/10/04 19:02:19 UTC
svn commit: r1529218 [3/7] - in /openmeetings/trunk/singlewebapp: ./
.settings/ docs/ src/axis/ src/axis/java/ src/axis/java/org/
src/axis/java/org/apache/ src/axis/java/org/apache/openmeetings/
src/axis/java/org/apache/openmeetings/axis/ src/axis/java...
Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java Fri Oct 4 17:02:13 2013
@@ -22,10 +22,7 @@ import java.util.Date;
import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.beans.basic.ErrorResult;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.OrganisationManager;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -33,12 +30,15 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
+import org.apache.openmeetings.db.dto.basic.ErrorResult;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.MainService;
+import org.apache.openmeetings.util.AuthLevelUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -78,8 +78,6 @@ public class UserWebService {
private AdminUserDao usersDao;
@Autowired
private MainService mainService;
- @Autowired
- private AuthLevelUtil authLevelUtil;
/**
* load this session id before doing anything else Returns an Object of Type
@@ -216,7 +214,7 @@ public class UserWebService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
String jName_timeZone = configurationDao.getConfValue("default.timezone", String.class, "");
@@ -298,7 +296,7 @@ public class UserWebService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
Long user_id = userManagement.registerUser(username, userpass,
lastname, firstname, email, new Date(), street,
@@ -390,7 +388,7 @@ public class UserWebService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
+ if (AuthLevelUtil.checkAdminLevel(user_level)) {
User testUser = userManagement.getUserByExternalIdAndType(
externalUserId, externalUserType);
@@ -449,7 +447,7 @@ public class UserWebService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
+ if (AuthLevelUtil.checkAdminLevel(user_level)) {
// Setting user deleted
usersDao.deleteUserID(userId);
@@ -486,7 +484,7 @@ public class UserWebService {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)) {
+ if (AuthLevelUtil.checkAdminLevel(user_level)) {
User userExternal = userManagement.getUserByExternalIdAndType(
externalUserId, externalUserType);
@@ -539,7 +537,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl, email);
@@ -606,7 +604,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -679,7 +677,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -780,7 +778,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -882,7 +880,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -979,7 +977,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -1079,7 +1077,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, lastname, profilePictureUrl,
@@ -1164,7 +1162,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
username, firstname, "", "", "", externalUserId,
@@ -1227,7 +1225,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
return organisationManager.addUserToOrganisation(user_id,
organisation_id, users_id);
@@ -1264,7 +1262,7 @@ public class UserWebService {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
return organisationManager
.getUsersSearchResultByOrganisationId(organisation_id,
start, max, orderby, asc);
@@ -1319,7 +1317,7 @@ public class UserWebService {
public Long addOrganisation(String SID, String name) throws AxisFault {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- if (authLevelUtil.checkWebServiceLevel(user_level)) {
+ if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
return organisationManager.addOrganisation(name, users_id);
}
log.error("Could not create organization");
Modified: openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java (original)
+++ openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java Fri Oct 4 17:02:13 2013
@@ -19,8 +19,8 @@
package org.apache.openmeetings.axis.services;
import org.apache.axis2.AxisFault;
-import org.apache.openmeetings.data.beans.basic.ErrorResult;
-import org.apache.openmeetings.data.beans.basic.UserSearchResult;
+import org.apache.openmeetings.db.dto.basic.ErrorResult;
+import org.apache.openmeetings.db.dto.basic.UserSearchResult;
import org.apache.openmeetings.db.entity.server.Sessiondata;
public class UserWebServiceFacade extends BaseWebService {
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java Fri Oct 4 17:02:13 2013
@@ -18,12 +18,15 @@
*/
package org.apache.openmeetings.db.dao.basic;
-import static org.apache.openmeetings.db.entity.basic.Configuration.CRYPT_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.configKeyCryptClassName;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.OpenmeetingsVariables.whiteboardDrawStatus;
import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.Date;
-import java.util.LinkedHashMap;
import java.util.List;
import javax.annotation.Resource;
@@ -31,13 +34,10 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
-import org.apache.openmeetings.utils.DaoHelper;
-import org.apache.openmeetings.utils.mappings.CastMapToObject;
+import org.apache.openmeetings.util.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -55,8 +55,8 @@ import org.springframework.transaction.a
*/
@Transactional
public class ConfigurationDao implements IDataProviderDao<Configuration> {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ConfigurationDao.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, webAppRootKey);
+ public static final long DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB
public static final String DEFAULT_APP_NAME = "OpenMeetings";
public final static String[] searchFields = {"conf_key", "conf_value"};
@@ -179,37 +179,6 @@ public class ConfigurationDao implements
/**
* @deprecated please use {@link ConfigurationDao#update(Configuration, Long)}
*/
- public Long saveOrUpdateConfiguration(LinkedHashMap<String, ?> values,
- Long userId) {
- try {
- Configuration conf = (Configuration) CastMapToObject.getInstance()
- .castByGivenObject(values, Configuration.class);
- if (conf.getConfiguration_id().equals(null)
- || conf.getConfiguration_id() == 0
- || conf.getConfiguration_id() == 0L) {
- conf.setConfiguration_id(null);
- conf.setStarttime(new Date());
- conf.setDeleted(false);
- return this.addConfig(conf);
- } else {
- Configuration conf2 = this.get(conf.getConfiguration_id());
- conf2.setComment(conf.getComment());
- conf2.setConf_key(conf.getConf_key());
- conf2.setConf_value(conf.getConf_value());
- conf2.setUser(adminUserDao.get(userId));
- conf2.setDeleted(false);
- conf2.setUpdatetime(new Date());
- return this.updateConfig(conf2);
- }
- } catch (Exception ex2) {
- log.error("[updateConfByUID]: ", ex2);
- }
- return new Long(-1);
- }
-
- /**
- * @deprecated please use {@link ConfigurationDao#update(Configuration, Long)}
- */
public Long addConfig(Configuration conf) {
try {
conf = em.merge(conf);
@@ -237,12 +206,10 @@ public class ConfigurationDao implements
conf = em.merge(conf);
}
}
- if (CRYPT_KEY.equals(conf.getConf_key())) {
- ScopeApplicationAdapter.configKeyCryptClassName = conf
- .getConf_value();
+ if (CONFIG_CRYPT_KEY.equals(conf.getConf_key())) {
+ configKeyCryptClassName = conf.getConf_value();
} else if ("show.whiteboard.draw.status".equals(conf.getConf_key())) {
- ScopeApplicationAdapter.whiteboardDrawStatus = "1".equals(conf
- .getConf_value());
+ whiteboardDrawStatus = "1".equals(conf.getConf_value());
}
return conf.getConfiguration_id();
} catch (Exception ex2) {
@@ -251,34 +218,6 @@ public class ConfigurationDao implements
return new Long(-1);
}
- /**
- * @deprecated please use {@link ConfigurationDao#delete(Configuration, Long)}
- */
- public Long deleteConfByConfiguration(LinkedHashMap<String, ?> values,
- Long users_id) {
- try {
- Configuration conf = (Configuration) CastMapToObject.getInstance()
- .castByGivenObject(values, Configuration.class);
- conf.setUser(adminUserDao.get(users_id));
- conf.setUpdatetime(new Date());
- conf.setDeleted(true);
-
- Configuration conf2 = this.get(conf.getConfiguration_id());
- conf2.setComment(conf.getComment());
- conf2.setConf_key(conf.getConf_key());
- conf2.setConf_value(conf.getConf_value());
- conf2.setUser(adminUserDao.get(users_id));
- conf2.setDeleted(true);
- conf2.setUpdatetime(new Date());
-
- this.updateConfig(conf2);
- return new Long(1);
- } catch (Exception ex2) {
- log.error("[deleteConfByUID]: ", ex2);
- }
- return new Long(-1);
- }
-
public String getAppName() {
if (appName == null) {
appName = getConfValue("application.name", String.class,
@@ -335,10 +274,10 @@ public class ConfigurationDao implements
entity.setUpdatetime(new Date());
entity = em.merge(entity);
}
- if (CRYPT_KEY.equals(key)) {
- ScopeApplicationAdapter.configKeyCryptClassName = value;
+ if (CONFIG_CRYPT_KEY.equals(key)) {
+ configKeyCryptClassName = value;
} else if ("show.whiteboard.draw.status".equals(key)) {
- ScopeApplicationAdapter.whiteboardDrawStatus = "1".equals(value);
+ whiteboardDrawStatus = "1".equals(value);
} else if ("application.name".equals(key)) {
appName = value;
}
@@ -350,4 +289,38 @@ public class ConfigurationDao implements
entity.setUpdatetime(new Date());
this.update(entity, userId, true);
}
+
+ /**
+ * returns the max upload size configured by max_upload_size config key
+ *
+ * @param configurationDao
+ * @return
+ */
+ public final long getMaxUploadSize() {
+ try {
+ return getConfValue(CONFIG_MAX_UPLOAD_SIZE_KEY, Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
+ } catch (Exception e) {
+ log.error("Invalid value saved for max_upload_size conf key: ", e);
+ }
+ return DEFAULT_MAX_UPLOAD_SIZE;
+ }
+
+ public String getCryptKey() {
+ if (configKeyCryptClassName == null) {
+ String cryptClass = getConfValue(CONFIG_CRYPT_KEY, String.class, null);
+ if (cryptClass != null) {
+ configKeyCryptClassName = cryptClass;
+ }
+ }
+
+ return configKeyCryptClassName;
+ }
+
+ public boolean getWhiteboardDrawStatus() {
+ if (whiteboardDrawStatus == null) {
+ String drawStatus = getConfValue("show.whiteboard.draw.status", String.class, "0");
+ whiteboardDrawStatus = "1".equals(drawStatus);
+ }
+ return whiteboardDrawStatus;
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Fri Oct 4 17:02:13 2013
@@ -33,17 +33,15 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.conference.InvitationManager;
-import org.apache.openmeetings.data.conference.InvitationManager.MessageType;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType;
import org.apache.openmeetings.db.dao.room.InvitationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.utils.TimezoneUtil;
+import org.apache.openmeetings.db.util.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +53,6 @@ public class AppointmentDao {
@PersistenceContext
private EntityManager em;
@Autowired
- private UserManager userManager;
- @Autowired
private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
private AppointmentReminderTypDao appointmentReminderTypDao;
@@ -69,7 +65,7 @@ public class AppointmentDao {
@Autowired
private ConfigurationDao cfgDao;
@Autowired
- private InvitationManager invitationManager;
+ private IInvitationManager invitationManager;
@Autowired
private TimezoneUtil timezoneUtil;
@Autowired
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/calendar/IInvitationManager.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,16 @@
+package org.apache.openmeetings.db.dao.calendar;
+
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
+
+public interface IInvitationManager {
+ enum MessageType {
+ Create
+ , Update
+ , Cancel
+ }
+
+ void processInvitation(Appointment a, MeetingMember member, MessageType type, String baseUrl);
+
+ void processInvitation(Appointment a, MeetingMember mm, MessageType type, String baseUrl, boolean sendMail);
+}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java Fri Oct 4 17:02:13 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.label;
-import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import java.util.Date;
import java.util.List;
@@ -54,7 +54,7 @@ public class FieldLanguagesValuesDao imp
* @see org.apache.openmeetings.data.OmDAO#get(int, int)
*/
public List<Fieldlanguagesvalues> get(int first, int count) {
- return get(configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1"), first, count);
+ return get(configurationDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1"), first, count);
}
public List<Fieldlanguagesvalues> get(String search, int start, int count, String sort) {
@@ -116,6 +116,10 @@ public class FieldLanguagesValuesDao imp
return flv;
}
+ public String getString(long fieldValuesId, long langId) {
+ Fieldlanguagesvalues v = get(fieldValuesId, langId);
+ return v == null ? null : v.getValue();
+ }
/*
* (non-Javadoc)
*
@@ -160,4 +164,24 @@ public class FieldLanguagesValuesDao imp
entity.setUpdatetime(new Date());
entity = em.merge(entity);
}
+
+ public List<Fieldlanguagesvalues> getMixedFieldValuesList(Long language_id) {
+ // all Fieldlanguagesvalues in current Language
+ TypedQuery<Fieldlanguagesvalues> q = em.createNamedQuery("allFieldLanguageValues", Fieldlanguagesvalues.class);
+ q.setParameter("language_id", language_id);
+ return q.getResultList();
+ }
+
+ public List<Fieldlanguagesvalues> getUntranslatedFieldValuesList(Long language_id) {
+ // all FieldValuesIds in current Language
+ TypedQuery<Long> q0 = em.createNamedQuery("allFieldValuesIds", Long.class);
+ q0.setParameter("language_id", language_id);
+ List<Long> translatedIds = q0.getResultList();
+
+ // all not translated values from english
+ TypedQuery<Fieldlanguagesvalues> q1 = em.createNamedQuery("allNotTranslatedValues", Fieldlanguagesvalues.class);
+ q1.setParameter("id_list", translatedIds);
+
+ return q1.getResultList();
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java Fri Oct 4 17:02:13 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.label;
-import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import java.util.ArrayList;
import java.util.Date;
@@ -32,7 +32,7 @@ import org.apache.openmeetings.db.dao.ID
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.label.Fieldvalues;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +48,7 @@ public class FieldValueDao implements ID
private FieldLanguagesValuesDao flvDaoImpl;
private Long getDefaultLanguage() {
- return configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
+ return configurationDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1");
}
public Fieldvalues get(long id) {
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java Fri Oct 4 17:02:13 2013
@@ -27,7 +27,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingLog;
-import org.apache.openmeetings.documents.beans.ConverterProcessResult;
+import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/IRoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/IRoomManager.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/IRoomManager.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/IRoomManager.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,8 @@
+package org.apache.openmeetings.db.dao.room;
+
+import org.apache.openmeetings.db.entity.room.Room;
+
+//FIXME HACK to bypass cross project compilation
+public interface IRoomManager {
+ Room getRoomByOwnerAndTypeId(Long ownerId, Long roomtypesId, String roomName);
+}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/PollDao.java Fri Oct 4 17:02:13 2013
@@ -29,8 +29,8 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dao.label.FieldValueDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.room.PollType;
import org.apache.openmeetings.db.entity.room.RoomPoll;
@@ -47,16 +47,16 @@ public class PollDao {
@PersistenceContext
private EntityManager em;
@Autowired
- private FieldManager fieldManager;
+ private FieldValueDao fieldValDao;
@Autowired
- private UserManager userManager;
+ private UserDao userDao;
@Autowired
private RoomDao roomDao;
public Long addPollType(Long labelId, Boolean isNumeric) {
log.debug("Adding poll type: " + labelId + ", " + isNumeric);
PollType pt = new PollType();
- pt.setLabel(fieldManager.getFieldvaluesById(labelId));
+ pt.setLabel(fieldValDao.get(labelId));
pt.setIsNumericAnswer(isNumeric);
em.persist(pt);
@@ -78,7 +78,7 @@ public class PollDao {
public RoomPoll createPoll(Client rc, String pollName, String pollQuestion, Long pollTypeId) {
RoomPoll roomP = new RoomPoll();
- roomP.setCreatedBy(userManager.getUserById(rc.getUser_id()));
+ roomP.setCreatedBy(userDao.get(rc.getUser_id()));
roomP.setCreated(new Date());
roomP.setPollName(pollName);
roomP.setPollQuestion(pollQuestion);
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomDao.java Fri Oct 4 17:02:13 2013
@@ -33,8 +33,8 @@ import org.apache.openmeetings.db.dao.ID
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.utils.DaoHelper;
-import org.apache.openmeetings.utils.TimezoneUtil;
+import org.apache.openmeetings.db.util.TimezoneUtil;
+import org.apache.openmeetings.util.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +63,10 @@ public class RoomDao implements IDataPro
return l.isEmpty() ? null : l.get(0);
}
+ public List<Room> get() {
+ return em.createNamedQuery("getBackupRooms", Room.class).getResultList();
+ }
+
public List<Room> get(int start, int count) {
TypedQuery<Room> q = em.createNamedQuery("getNondeletedRooms", Room.class);
q.setFirstResult(start);
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java Fri Oct 4 17:02:13 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.room;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
@@ -29,7 +31,7 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.user.UserManager;
+import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.RoomModerator;
import org.apache.openmeetings.db.entity.user.User;
import org.red5.logging.Red5LoggerFactory;
@@ -39,11 +41,9 @@ import org.springframework.transaction.a
@Transactional
public class RoomModeratorsDao {
-
- private static final Logger log = Red5LoggerFactory
- .getLogger(RoomModeratorsDao.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomModeratorsDao.class, webAppRootKey);
@Autowired
- private UserManager userManagement;
+ private UserDao userDao;
@PersistenceContext
private EntityManager em;
@@ -204,7 +204,7 @@ public class RoomModeratorsDao {
.toString());
this.addRoomModeratorByUserId(
- userManagement.getUserById(userId), isSuperModerator,
+ userDao.get(userId), isSuperModerator,
roomId);
}
@@ -238,7 +238,7 @@ public class RoomModeratorsDao {
if (roomModeratorsId == null || roomModeratorsId == 0) {
Long newRoomModeratorId = this.addRoomModeratorByUserId(
- userManagement.getUserById(userId),
+ userDao.get(userId),
isSuperModerator, roomId);
roomModeratorObj
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.room;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class RoomOrganisationDao {
+ @PersistenceContext
+ private EntityManager em;
+
+ public List<RoomOrganisation> get() {
+ return em.createNamedQuery("getAllRoomsOrganisations", RoomOrganisation.class).getResultList();
+ }
+
+ public RoomOrganisation update(RoomOrganisation entity, Long userId) {
+ if (entity.getRooms_organisation_id() == null) {
+ entity.setStarttime(new Date());
+ em.persist(entity);
+ } else {
+ entity.setUpdatetime(new Date());
+ entity = em.merge(entity);
+ }
+ return entity;
+ }
+
+}
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/room/RoomTypeDao.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.room;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
+import org.apache.openmeetings.db.entity.room.RoomType;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class RoomTypeDao {
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomTypeDao.class, webAppRootKey);
+ @PersistenceContext
+ private EntityManager em;
+
+ @Autowired
+ private FieldLanguagesValuesDao fieldLangValueDao;
+
+ /**
+ * get all availible RoomTypes
+ *
+ * @return List of RoomTypes
+ */
+ public List<RoomType> getAll(long langId) {
+ TypedQuery<RoomType> query = em.createNamedQuery("getAllRoomTypes", RoomType.class);
+ query.setParameter("deleted", true);
+ List<RoomType> ll = query.getResultList();
+ for (RoomType ti : ll) {
+ ti.setLabel(fieldLangValueDao.get(ti.getFieldvalues_id(), langId));
+ }
+ return ll;
+ }
+
+ public RoomType get(long id) {
+ TypedQuery<RoomType> query = em.createNamedQuery("getRoomTypesById", RoomType.class);
+ query.setParameter("roomtypes_id", id);
+ query.setParameter("deleted", true);
+ List<?> ll = query.getResultList();
+ if (ll.size() > 0) {
+ return (RoomType) ll.get(0);
+ }
+ return null;
+ }
+
+ /**
+ * add a new Record to the table roomtypes
+ *
+ * @param name
+ * @return ID of new created roomtype or null
+ */
+ public Long addRoomType(String name, long fieldvalues_id, boolean deleted) {
+ try {
+ RoomType rtype = new RoomType();
+ rtype.setName(name);
+ rtype.setStarttime(new Date());
+ rtype.setDeleted(deleted);
+ rtype.setFieldvalues_id(fieldvalues_id);
+ rtype = em.merge(rtype);
+ long returnId = rtype.getRoomtypes_id();
+ return returnId;
+ } catch (Exception ex2) {
+ log.error("[addRoomType] ", ex2);
+ }
+ return null;
+ }
+}
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ISessionManager.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ISessionManager.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ISessionManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ISessionManager.java Fri Oct 4 17:02:13 2013
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.db.dao.server;
import java.util.Collection;
import java.util.List;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
+import org.apache.openmeetings.db.dto.basic.SearchResult;
+import org.apache.openmeetings.db.dto.server.ClientSessionInfo;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
/**
* Methods to add/get/remove {@link Client}s to the session
@@ -130,7 +130,7 @@ public interface ISessionManager {
* Update the session object
*
* updateRoomCount is only <i>one</i> time true, in
- * {@link ScopeApplicationAdapter#setRoomValues(Long, Boolean, Boolean, Long, String)}
+ * ScopeApplicationAdapter#setRoomValues(Long, Boolean, Boolean, Long, String)
* .
*
* @param streamId
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Fri Oct 4 17:02:13 2013
@@ -32,7 +32,7 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/OAuth2Dao.java Fri Oct 4 17:02:13 2013
@@ -27,7 +27,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.server.OAuthServer;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.springframework.transaction.annotation.Transactional;
@Transactional
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java Fri Oct 4 17:02:13 2013
@@ -27,10 +27,9 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.entity.server.SOAPLogin;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -41,8 +40,6 @@ public class SOAPLoginDao {
@PersistenceContext
private EntityManager em;
- @Autowired
- private ManageCryptStyle manageCryptStyle;
public String addSOAPLogin(String sessionHash, Long room_id,
boolean becomemoderator, boolean showAudioVideoTest,
@@ -53,7 +50,7 @@ public class SOAPLoginDao {
String thistime = "TIME_" + (new Date().getTime());
- String hash = manageCryptStyle.getInstanceOfCrypt()
+ String hash = ManageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(thistime);
SOAPLogin soapLogin = new SOAPLogin();
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/ServerDao.java Fri Oct 4 17:02:13 2013
@@ -30,7 +30,7 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java Fri Oct 4 17:02:13 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.server;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
@@ -31,11 +33,9 @@ import javax.persistence.criteria.Criter
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.session.ISessionManager;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,15 +50,11 @@ import org.springframework.transaction.a
*/
@Transactional
public class SessiondataDao {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- SessiondataDao.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SessiondataDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
- private ManageCryptStyle manageCryptStyle;
- @Autowired
private ISessionManager sessionManager;
/**
@@ -73,7 +69,7 @@ public class SessiondataDao {
long thistime = new Date().getTime();
Sessiondata sessiondata = new Sessiondata();
- sessiondata.setSession_id(manageCryptStyle.getInstanceOfCrypt()
+ sessiondata.setSession_id(ManageCryptStyle.getInstanceOfCrypt()
.createPassPhrase(String.valueOf(thistime).toString()));
sessiondata.setRefresh_time(new Date());
sessiondata.setStarttermin_time(new Date());
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AbstractUserDao.java Fri Oct 4 17:02:13 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.db.dao.user;
+import static org.apache.openmeetings.OpenmeetingsVariables.CONFIG_DEFAUT_LANG_KEY;
import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.db.entity.basic.Configuration.DEFAUT_LANG_KEY;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
@@ -38,10 +38,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
-import org.apache.openmeetings.utils.DaoHelper;
-import org.apache.openmeetings.utils.TimezoneUtil;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
-import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.db.util.TimezoneUtil;
+import org.apache.openmeetings.util.DaoHelper;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +62,6 @@ public class AbstractUserDao {
private EntityManager em;
@Autowired
- private ManageCryptStyle cryptManager;
- @Autowired
private ConfigurationDao configurationDao;
@Autowired
private StateDao stateDaoImpl;
@@ -85,7 +82,7 @@ public class AbstractUserDao {
user.setSalutations_id(1L); // TODO: Fix default selection to be
// configurable
user.setLevel_id(1L);
- user.setLanguage_id(configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1"));
+ user.setLanguage_id(configurationDao.getConfValue(CONFIG_DEFAUT_LANG_KEY, Long.class, "1"));
user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID());
user.setForceTimeZoneCheck(false);
user.setSendSMS(false);
@@ -111,18 +108,18 @@ public class AbstractUserDao {
return isAdmin ? null : "u.type <> :contact OR (u.type = :contact AND u.ownerId = :ownerId)";
}
- private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin){
+ private void setAdditionalParams(TypedQuery<?> q, boolean isAdmin, long currentUserId){
if (!isAdmin) {
- q.setParameter("ownerId", WebSession.getUserId());
+ q.setParameter("ownerId", currentUserId);
q.setParameter("contact", Type.contact);
}
}
- public List<User> get(String search, int start, int count, String sort, boolean isAdmin) {
+ public List<User> get(String search, int start, int count, String sort, boolean isAdmin, long currentUserId) {
TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhere(isAdmin), sort, searchFields), User.class);
q.setFirstResult(start);
q.setMaxResults(count);
- setAdditionalParams(q, isAdmin);
+ setAdditionalParams(q, isAdmin, currentUserId);
return q.getResultList();
}
@@ -132,16 +129,16 @@ public class AbstractUserDao {
return q.getSingleResult();
}
- public long count(String search, boolean isAdmin) {
+ public long count(String search, boolean isAdmin, long currentUserId) {
TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, true, getAdditionalWhere(isAdmin), null, searchFields), Long.class);
- setAdditionalParams(q, isAdmin);
+ setAdditionalParams(q, isAdmin, currentUserId);
return q.getSingleResult();
}
- public List<User> get(String search, boolean isAdmin) {
+ public List<User> get(String search, boolean isAdmin, long currentUserId) {
TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", search, true, false, getAdditionalWhere(isAdmin), null, searchFields), User.class);
if (!isAdmin) {
- q.setParameter("ownerId", WebSession.getUserId());
+ q.setParameter("ownerId", currentUserId);
q.setParameter("contact", Type.contact);
}
return q.getResultList();
@@ -167,7 +164,7 @@ public class AbstractUserDao {
if (password != null && !password.isEmpty()) {
//OpenJPA is not allowing to set fields not being fetched before
User u1 = get(u.getUser_id(), true);
- u1.updatePassword(cryptManager, configurationDao, password);
+ u1.updatePassword(configurationDao, password);
update(u1, updatedBy);
}
return u;
@@ -375,11 +372,9 @@ public class AbstractUserDao {
* @return
*/
public boolean verifyPassword(Long userId, String password) {
- TypedQuery<Long> query = em.createNamedQuery("checkPassword",
- Long.class);
+ TypedQuery<Long> query = em.createNamedQuery("checkPassword", Long.class);
query.setParameter("userId", userId);
- query.setParameter("password", cryptManager.getInstanceOfCrypt()
- .createPassPhrase(password));
+ query.setParameter("password", ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(password));
return query.getResultList().get(0) == 1;
}
@@ -412,4 +407,78 @@ public class AbstractUserDao {
}
return to;
}
+
+ /**
+ * @param hash
+ * @return
+ */
+ public User getUserByActivationHash(String hash) {
+ TypedQuery<User> query = em.createQuery("SELECT u FROM User as u WHERE u.activatehash = :activatehash"
+ + " AND u.deleted = false", User.class);
+ query.setParameter("activatehash", hash);
+ User u = null;
+ try {
+ u = query.getSingleResult();
+ } catch (NoResultException e) {
+ // u=null}
+ }
+ return u;
+ }
+
+ private StringBuilder getUserProfileQuery(boolean count, String text, String offers, String search) {
+ StringBuilder sb = new StringBuilder("SELECT ");
+ sb.append(count ? "COUNT(" : "").append("u").append(count ? ") " : " ")
+ .append("FROM User u WHERE u.deleted = false ");
+ if (offers != null && offers.length() != 0) {
+ sb.append("AND (LOWER(u.userOffers) LIKE :userOffers) ");
+ }
+ if (search != null && search.length() != 0) {
+ sb.append("AND (LOWER(u.userSearchs) LIKE :userSearchs) ");
+ }
+ if (text != null && text.length() != 0) {
+ sb.append("AND (LOWER(u.login) LIKE :search ")
+ .append("OR LOWER(u.firstname) LIKE :search ")
+ .append("OR LOWER(u.lastname) LIKE :search ")
+ .append("OR LOWER(u.adresses.email) LIKE :search ")
+ .append("OR LOWER(u.adresses.town) LIKE :search " + ") ");
+ }
+ return sb;
+ }
+
+ public List<User> searchUserProfile(String text, String offers, String search, String orderBy, int start, int max, boolean asc) {
+ StringBuilder sb = getUserProfileQuery(false, text, offers, search);
+ sb.append(" ORDER BY ").append(orderBy).append(asc ? " ASC" : " DESC");
+
+ log.debug("hql :: " + sb.toString());
+ TypedQuery<User> query = em.createQuery(sb.toString(), User.class);
+
+ if (text != null && text.length() != 0) {
+ query.setParameter("search", StringUtils.lowerCase("%" + text + "%"));
+ }
+ if (offers != null && offers.length() != 0) {
+ query.setParameter("userOffers", StringUtils.lowerCase("%" + offers + "%"));
+ }
+ if (search != null && search.length() != 0) {
+ query.setParameter("userSearchs", StringUtils.lowerCase("%" + search + "%"));
+ }
+ return query.setFirstResult(start).setMaxResults(max).getResultList();
+ }
+
+ public Long searchCountUserProfile(String text, String offers, String search) {
+ StringBuilder sb = getUserProfileQuery(true, text, offers, search);
+
+ log.debug("hql :: " + sb.toString());
+ TypedQuery<Long> query = em.createQuery(sb.toString(), Long.class);
+
+ if (text != null && text.length() != 0) {
+ query.setParameter("search", StringUtils.lowerCase("%" + text + "%"));
+ }
+ if (offers != null && offers.length() != 0) {
+ query.setParameter("userOffers", StringUtils.lowerCase("%" + offers + "%"));
+ }
+ if (search != null && search.length() != 0) {
+ query.setParameter("userSearchs", StringUtils.lowerCase("%" + search + "%"));
+ }
+ return query.getSingleResult();
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/AdminUserDao.java Fri Oct 4 17:02:13 2013
@@ -42,11 +42,11 @@ public class AdminUserDao implements IDa
}
public List<User> get(String search, int start, int count, String order) {
- return dao.get(search, start, count, order, true);
+ return dao.get(search, start, count, order, true, -1);
}
public List<User> get(String search) {
- return dao.get(search, true);
+ return dao.get(search, true, -1);
}
public long count() {
@@ -54,7 +54,7 @@ public class AdminUserDao implements IDa
}
public long count(String search) {
- return dao.count(search, true);
+ return dao.count(search, true, -1);
}
public User update(User entity, Long userId) {
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/ILdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/ILdapLoginManagement.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/ILdapLoginManagement.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/ILdapLoginManagement.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.user;
+
+import org.apache.openmeetings.db.entity.room.Client;
+import org.red5.server.api.IClient;
+
+//FIXME HACK to bypass cross project compilation
+public interface ILdapLoginManagement {
+ Object doLdapLogin(String user, String passwd,
+ Client currentClient, IClient client, String SID, String domain);
+}
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserManager.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserManager.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.user;
+
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.apache.openmeetings.db.entity.room.Client;
+import org.red5.server.api.IClient;
+
+//FIXME HACK to bypass cross project compilation
+public interface IUserManager {
+ Long registerUserInit(long user_level, long level_id, int availible,
+ int status, String login, String password, String lastname,
+ String firstname, String email, Date age, String street,
+ String additionalname, String fax, String zip, long states_id,
+ String town, long language_id, boolean sendWelcomeMessage,
+ List<Long> organisations, String phone, boolean sendSMS, String baseURL,
+ Boolean sendConfirmation,
+ TimeZone timezone, Boolean forceTimeZoneCheck,
+ String userOffers, String userSearchs, Boolean showContactData,
+ Boolean showContactDataToContacts, String activatedHash) throws Exception;
+
+ Long registerUserNoEmail(String login, String Userpass,
+ String lastname, String firstname, String email, Date age,
+ String street, String additionalname, String fax, String zip,
+ long states_id, String town, long language_id, String phone, boolean sendSMS,
+ boolean generateSipUserData, String jNameTimeZone);
+
+ Object loginUser(String SID, String userOrEmail, String userpass,
+ Client currentClient, IClient client, Boolean storePermanent);
+}
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserService.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserService.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/IUserService.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.user;
+
+//FIXME HACK to bypass cross project compilation
+public interface IUserService {
+ Boolean kickUserByStreamId(String SID, String streamid, long serverId);
+}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java Fri Oct 4 17:02:13 2013
@@ -28,7 +28,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.user.Organisation;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.springframework.transaction.annotation.Transactional;
@Transactional
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java Fri Oct 4 17:02:13 2013
@@ -27,7 +27,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.utils.DaoHelper;
+import org.apache.openmeetings.util.DaoHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/SalutationDao.java Fri Oct 4 17:02:13 2013
@@ -18,14 +18,15 @@
*/
package org.apache.openmeetings.db.dao.user;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.FieldManager;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.user.Salutation;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -40,12 +41,10 @@ import org.springframework.transaction.a
*/
@Transactional
public class SalutationDao {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- SalutationDao.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SalutationDao.class, webAppRootKey);
@Autowired
- private FieldManager fieldManager;
+ private FieldLanguagesValuesDao fieldLangValDao;
@PersistenceContext
private EntityManager em;
@@ -84,7 +83,7 @@ public class SalutationDao {
List<Salutation> ll = em.createNamedQuery("getSalutationById", Salutation.class)
.setParameter("id", id).getResultList();
for (Salutation ti : ll) {
- ti.setLabel(fieldManager.getFieldByIdAndLanguage(ti.getFieldvalues_id(), language_id));
+ ti.setLabel(fieldLangValDao.get(ti.getFieldvalues_id(), language_id));
}
return ll.get(0);
}
@@ -98,7 +97,7 @@ public class SalutationDao {
public List<Salutation> getUserSalutations(long language_id) {
List<Salutation> ll = em.createNamedQuery("getSalutations", Salutation.class).getResultList();
for (Salutation ti : ll) {
- ti.setLabel(fieldManager.getFieldByIdAndLanguage(ti.getFieldvalues_id(), language_id));
+ ti.setLabel(fieldLangValDao.get(ti.getFieldvalues_id(), language_id));
}
return ll;
}
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java Fri Oct 4 17:02:13 2013
@@ -28,7 +28,6 @@ import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -42,15 +41,15 @@ public class UserContactsDao {
@PersistenceContext
private EntityManager em;
@Autowired
- private UserManager userManager;
+ private UserDao userDao;
public Long addUserContact(Long user_id, Long ownerId, Boolean pending, String hash) {
try {
UserContact userContact = new UserContact();
userContact.setInserted(new Date());
- userContact.setOwner(userManager.getUserById(ownerId));
- userContact.setContact(userManager.getUserById(user_id));
+ userContact.setOwner(userDao.get(ownerId));
+ userContact.setContact(userDao.get(user_id));
userContact.setPending(pending);
userContact.setHash(hash);
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java Fri Oct 4 17:02:13 2013
@@ -21,11 +21,10 @@ package org.apache.openmeetings.db.dao.u
import java.security.NoSuchAlgorithmException;
import java.util.List;
-import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.user.User;
import org.springframework.beans.factory.annotation.Autowired;
-public class UserDao implements IDataProviderDao<User> {
+public class UserDao {
@Autowired
private AbstractUserDao dao;
@@ -37,20 +36,20 @@ public class UserDao implements IDataPro
return dao.get(start, count);
}
- public List<User> get(String search) {
- return dao.get(search, false);
+ public List<User> get(String search, long currentUserId) {
+ return dao.get(search, false, currentUserId);
}
- public List<User> get(String search, int start, int count, String order) {
- return dao.get(search, start, count, order, false);
+ public List<User> get(String search, int start, int count, String order, long currentUserId) {
+ return dao.get(search, start, count, order, false, currentUserId);
}
public long count() {
return dao.count();
}
- public long count(String search) {
- return dao.count(search, false);
+ public long count(String search, long currentUserId) {
+ return dao.count(search, false, currentUserId);
}
public User update(User entity, Long userId) {
@@ -72,4 +71,16 @@ public class UserDao implements IDataPro
public User getContact(String email, String firstName, String lastName, long ownerId) {
return dao.getContact(email, firstName, lastName, ownerId);
}
+
+ public User getUserByActivationHash(String hash) {
+ return dao.getUserByActivationHash(hash);
+ }
+
+ public List<User> searchUserProfile(String text, String offers, String search, String orderBy, int start, int max, boolean asc) {
+ return dao.searchUserProfile(text, offers, search, orderBy, start, max, asc);
+ }
+
+ public Long searchCountUserProfile(String text, String offers, String search) {
+ return dao.searchCountUserProfile(text, offers, search);
+ }
}
Added: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserLevelDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserLevelDao.java?rev=1529218&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserLevelDao.java (added)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/user/UserLevelDao.java Fri Oct 4 17:02:13 2013
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.db.dao.user;
+
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
+
+import java.util.Date;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.apache.openmeetings.db.entity.user.Userlevel;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class UserLevelDao {
+ private static final Logger log = Red5LoggerFactory.getLogger(UserLevelDao.class, webAppRootKey);
+
+ @PersistenceContext
+ private EntityManager em;
+
+ public void addUserLevel(String description, int myStatus) {
+ try {
+ Userlevel uslevel = new Userlevel();
+ uslevel.setStarttime(new Date());
+ uslevel.setDescription(description);
+ uslevel.setStatuscode(new Integer(myStatus));
+ uslevel.setDeleted(false);
+ em.merge(uslevel);
+ } catch (Exception ex2) {
+ log.error("[addUserLevel]", ex2);
+ }
+ }
+
+}
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/ErrorResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/ErrorResult.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/ErrorResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.basic;
+package org.apache.openmeetings.db.dto.basic;
public class ErrorResult {
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/RoomSearchResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/RoomSearchResult.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/RoomSearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/RoomSearchResult.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.basic;
+package org.apache.openmeetings.db.dto.basic;
import java.util.ArrayList;
import java.util.List;
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/SearchResult.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/SearchResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/SearchResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/SearchResult.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/SearchResult.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/SearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/SearchResult.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.basic;
+package org.apache.openmeetings.db.dto.basic;
import java.util.Collection;
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/UserSearchResult.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/UserSearchResult.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/beans/basic/UserSearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/basic/UserSearchResult.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.basic;
+package org.apache.openmeetings.db.dto.basic;
import java.util.ArrayList;
import java.util.List;
Copied: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java (from r1529067, openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java?p2=openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java&p1=openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java&r1=1529067&r2=1529218&rev=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/session/ClientSessionInfo.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dto/server/ClientSessionInfo.java Fri Oct 4 17:02:13 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.session;
+package org.apache.openmeetings.db.dto.server;
import org.apache.openmeetings.db.entity.room.Client;
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/Configuration.java Fri Oct 4 17:02:13 2013
@@ -57,17 +57,6 @@ import org.simpleframework.xml.Root;
@Root(name = "config")
public class Configuration implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -6129473946508963339L;
- public static final String CRYPT_KEY = "crypt_ClassName";
- public static final String DEFAUT_LANG_KEY = "default_lang_id";
- public static final String MAX_UPLOAD_SIZE_KEY = "max_upload_size";
- public static final String DASHBOARD_SHOW_MYROOMS_KEY = "dashboard.show.myrooms";
- public static final String DASHBOARD_SHOW_RSS_KEY = "dashboard.show.rssfeed";
- public static final String RSS_FEED1_KEY = "rss_feed1";
- public static final String RSS_FEED2_KEY = "rss_feed2";
- public static final String FRONTEND_REGISTER_KEY = "allow_frontend_register";
- public static final String PASS_MIN_LENGTH_KEY = "user.pass.minimum.length";
- public static final String LOGIN_MIN_LENGTH_KEY = "user.login.minimum.length";
-
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java Fri Oct 4 17:02:13 2013
@@ -32,8 +32,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -128,8 +126,6 @@ public class FlvRecordingMetaData implem
/**
* this is only true when the asynchronous stream writer's have completed to
* write packets to the file.
- * @see StreamVideoWriter#closeStream()
- * @see StreamAudioWriter#closeStream()
*/
@Column(name = "stream_reader_thread_complete")
private Boolean streamReaderThreadComplete;
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/Client.java Fri Oct 4 17:02:13 2013
@@ -35,7 +35,7 @@ import javax.persistence.Table;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.util.CalendarPatterns;
/**
* Can be configured to be stored in memory or in database
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/room/RoomOrganisation.java Fri Oct 4 17:02:13 2013
@@ -40,6 +40,7 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
+ @NamedQuery(name = "getAllRoomsOrganisations", query = "select c from RoomOrganisation as c"),
@NamedQuery(name = "getRoomsOrganisationByOrganisationIdAndRoomType", query = "select c from RoomOrganisation as c "
+ "where c.room.roomtypes_id = :roomtypes_id "
+ "AND c.organisation.organisation_id = :organisation_id "
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1529218&r1=1529067&r2=1529218&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java Fri Oct 4 17:02:13 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.entity.user;
-import static org.apache.openmeetings.utils.UserHelper.invalidPassword;
+import static org.apache.openmeetings.db.util.UserHelper.invalidPassword;
import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
@@ -55,8 +55,8 @@ import org.apache.openjpa.persistence.jd
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.utils.crypt.MD5;
-import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.util.crypt.MD5;
+import org.apache.openmeetings.util.crypt.ManageCryptStyle;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
@@ -363,11 +363,11 @@ public class User implements Serializabl
this.login = login;
}
- public void updatePassword(ManageCryptStyle crypt, ConfigurationDao configDao, String pass) throws NoSuchAlgorithmException {
- updatePassword(crypt, configDao, pass, false);
+ public void updatePassword(ConfigurationDao configDao, String pass) throws NoSuchAlgorithmException {
+ updatePassword(configDao, pass, false);
}
- public void updatePassword(ManageCryptStyle crypt, ConfigurationDao configDao, String pass, boolean empty) throws NoSuchAlgorithmException {
+ public void updatePassword(ConfigurationDao configDao, String pass, boolean empty) throws NoSuchAlgorithmException {
if (!empty) {
if (invalidPassword(pass, configDao)) {
throw new RuntimeException("Password of invalid length is provided");
@@ -388,7 +388,7 @@ public class User implements Serializabl
} else {
setSipUser(null);
}
- password = crypt.getInstanceOfCrypt().createPassPhrase(pass);
+ password = ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(pass);
}
public String getPassword() {