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 2014/06/23 10:47:11 UTC
svn commit: r1604715 [2/7] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/basic/
openmeetings-core/src/main/java/org/ap...
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java Mon Jun 23 08:47:06 2014
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.test.rtmp;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class SimulateLoad extends Thread {
-
- private static final Logger log = LoggerFactory
- .getLogger(SimulateLoad.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoad.class, webAppRootKey);
private LoadTestRtmpClient loadTestRtmpClient;
private boolean testRunning = true;
@@ -53,7 +53,6 @@ public class SimulateLoad extends Thread
System.err.println("started ");
} catch (Exception er) {
- er.printStackTrace();
log.error("Error", er);
}
}
@@ -77,12 +76,12 @@ public class SimulateLoad extends Thread
try {
Thread.sleep(200);
} catch (InterruptedException e) {
- e.printStackTrace();
+ log.error("Error", e);
}
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Error", e);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java Mon Jun 23 08:47:06 2014
@@ -18,13 +18,17 @@
*/
package org.apache.openmeetings.test.rtmp;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class SimulateLoadTest {
-
+ private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoadTest.class, webAppRootKey);
private int numberOfClients = 25;
private List<SimulateLoad> simulateLoadList = new ArrayList<SimulateLoad>();
@@ -57,14 +61,14 @@ public class SimulateLoadTest {
Thread.sleep(100);
}
- System.err.println("Clients initialized");
+ log.error("Clients initialized");
for (SimulateLoad simulateLoad : simulateLoadList) {
simulateLoad.start();
Thread.sleep(50);
}
- System.err.println("Clients started");
+ log.error("Clients started");
boolean running = true;
while (running) {
@@ -79,7 +83,7 @@ public class SimulateLoadTest {
try {
Thread.sleep(200);
} catch (InterruptedException e) {
- e.printStackTrace();
+ log.error("Error", e);
}
}
@@ -87,7 +91,7 @@ public class SimulateLoadTest {
for (SimulateLoad simulateLoad : simulateLoadList) {
overallTime += simulateLoad.getAverageTime();
- System.err.println("Number of calls: "
+ log.error("Number of calls: "
+ simulateLoad.getNumberOfCalls() + "overallTime: "
+ overallTime + " averageTime"
+ simulateLoad.getAverageTime());
@@ -96,10 +100,10 @@ public class SimulateLoadTest {
double deltaAllClients = overallTime
/ Integer.valueOf(simulateLoadList.size()).doubleValue();
- System.err.println("Average time per call: " + deltaAllClients);
+ log.error("Average time per call: " + deltaAllClients);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.test.user;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -35,6 +36,8 @@ import javax.mail.util.ByteArrayDataSour
import org.apache.openmeetings.util.mail.SmtpAuthenticator;
import org.junit.Test;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.sun.mail.util.MailSSLSocketFactory;
@@ -44,6 +47,7 @@ import com.sun.mail.util.MailSSLSocketFa
*
*/
public class TestMailSending {
+ private static final Logger log = Red5LoggerFactory.getLogger(TestMailSending.class, webAppRootKey);
//Example GMail email server data
private String smtpServer = "smtp.gmail.com";
@@ -67,7 +71,7 @@ public class TestMailSending {
Transport.send(getMimeMessage());
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
assertTrue(true);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java Mon Jun 23 08:47:06 2014
@@ -18,11 +18,17 @@
*/
package org.apache.openmeetings.test.xsd;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
import com.thaiopensource.relaxng.translate.Driver;
public class GenerateConfigXsd {
+ private static final Logger log = Red5LoggerFactory.getLogger(GenerateConfigXsd.class, webAppRootKey);
public static void main(String... args) {
new GenerateConfigXsd();
@@ -39,7 +45,7 @@ public class GenerateConfigXsd {
Driver.main(args);
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java Mon Jun 23 08:47:06 2014
@@ -18,15 +18,20 @@
*/
package org.apache.openmeetings.test.xsd;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.List;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
import com.thaiopensource.relaxng.translate.Driver;
public class GenerateWebsiteXsd {
-
+ private static final Logger log = Red5LoggerFactory.getLogger(GenerateWebsiteXsd.class, webAppRootKey);
private static String WEBSITE_ROOT_DIR = "xdocs";
public static void main(String... args) {
@@ -69,7 +74,7 @@ public class GenerateWebsiteXsd {
Driver.main(allfilesPlusXSD.toArray(new String[0]));
} catch (Exception err) {
- err.printStackTrace();
+ log.error("Error", err);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java Mon Jun 23 08:47:06 2014
@@ -42,6 +42,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.util.DaoHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -65,6 +66,7 @@ public class ConfigurationDao implements
@PersistenceContext
private EntityManager em;
+ @Autowired
private UserDao userDao;
/**
@@ -226,7 +228,7 @@ public class ConfigurationDao implements
public Configuration update(Configuration entity, Long userId, boolean deleted) {
String key = entity.getConf_key();
String value = entity.getConf_value();
- if (entity.getConfiguration_id() == null || entity.getConfiguration_id() <= 0) {
+ if (entity.getId() == null || entity.getId() <= 0) {
entity.setStarttime(new Date());
entity.setDeleted(deleted);
em.persist(entity);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java Mon Jun 23 08:47:06 2014
@@ -41,15 +41,15 @@ public class ErrorDao {
@PersistenceContext
private EntityManager em;
- public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
+ public Long addErrorType(Long id, Long labelId) {
try {
ErrorType eType = new ErrorType();
- eType.setErrortype_id(errortype_id);
+ eType.setId(id);
eType.setStarttime(new Date());
eType.setDeleted(false);
- eType.setFieldvalues_id(fieldvalues_id);
+ eType.setFieldvalues_id(labelId);
eType = em.merge(eType);
- Long newerrortype_id = eType.getErrortype_id();
+ Long newerrortype_id = eType.getId();
return newerrortype_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
@@ -60,7 +60,6 @@ public class ErrorDao {
public List<ErrorType> getErrorTypes() {
try {
TypedQuery<ErrorType> query = em.createNamedQuery("getErrorTypes", ErrorType.class);
- query.setParameter("deleted", true);
List<ErrorType> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
@@ -69,43 +68,41 @@ public class ErrorDao {
return null;
}
- public ErrorType getErrorType(Long errortype_id) {
+ public ErrorType getErrorType(Long typeId) {
try {
TypedQuery<ErrorType> query = em.createNamedQuery("getErrorType", ErrorType.class);
- query.setParameter("deleted", true);
- query.setParameter("errortype_id", errortype_id);
+ query.setParameter("id", typeId);
return query.getSingleResult();
} catch (Exception ex2) {
- log.error("[getErrorType(" + errortype_id + ")]", ex2);
+ log.error("[getErrorType(" + typeId + ")]", ex2);
}
return null;
}
- public Long addErrorValues(Long errorvalues_id, Long errortype_id,
- Long fieldvalues_id) {
+ public Long addErrorValues(Long id, Long typeId, Long labelId) {
try {
ErrorValue eValue = new ErrorValue();
- eValue.setErrorvalues_id(errorvalues_id);
- eValue.setErrortype_id(errortype_id);
+ eValue.setId(id);
+ eValue.setErrortype_id(typeId);
eValue.setDeleted(false);
eValue.setStarttime(new Date());
- eValue.setFieldvalues_id(fieldvalues_id);
+ eValue.setFieldvalues_id(labelId);
eValue = em.merge(eValue);
- return eValue.getErrorvalues_id();
+ return eValue.getId();
} catch (Exception ex2) {
log.error("[addErrorValues]: ", ex2);
}
return null;
}
- public Long getErrorValueById(Long errortype_id, Long fieldvalues_id) {
+ public Long getErrorValueById(Long typeId, Long labelId) {
try {
ErrorValue eValue = new ErrorValue();
- eValue.setErrortype_id(errortype_id);
+ eValue.setErrortype_id(typeId);
eValue.setStarttime(new Date());
- eValue.setFieldvalues_id(fieldvalues_id);
+ eValue.setFieldvalues_id(labelId);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
+ Long newerrorvalues_id = eValue.getId();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[getErrorValueById]: ", ex2);
@@ -113,14 +110,14 @@ public class ErrorDao {
return null;
}
- public Long updateErrorValues(Long errortype_id, Long fieldvalues_id) {
+ public Long updateErrorValues(Long errortype_id, Long labelId) {
try {
ErrorValue eValue = new ErrorValue();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
- eValue.setFieldvalues_id(fieldvalues_id);
+ eValue.setFieldvalues_id(labelId);
eValue = em.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
+ Long newerrorvalues_id = eValue.getId();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: ", ex2);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java Mon Jun 23 08:47:06 2014
@@ -49,7 +49,7 @@ public class NavigationDao {
public Naviglobal getGlobalMenuEntry(long globalId) {
try {
TypedQuery<Naviglobal> query = em.createNamedQuery("getNavigationById", Naviglobal.class);
- query.setParameter("global_id", globalId);
+ query.setParameter("id", globalId);
return query.getSingleResult();
} catch (Exception ex2) {
log.error("getGlobalMenuEntry", ex2);
@@ -72,73 +72,58 @@ public class NavigationDao {
}
public List<Naviglobal> getMainMenu(boolean admin, long USER_ID) {
- try {
- TypedQuery<Naviglobal> query = em.createNamedQuery("getNavigation", Naviglobal.class);
- query.setParameter("level_id", admin ? 3L : 1L);
- List<Naviglobal> navi = query.getResultList();
- return navi;
- } catch (Exception ex2) {
- log.error("getMainMenu", ex2);
- }
- return null;
+ TypedQuery<Naviglobal> query = em.createNamedQuery("getNavigation", Naviglobal.class);
+ query.setParameter("level_id", admin ? 3L : 1L);
+ List<Naviglobal> navi = query.getResultList();
+ return navi;
}
public void addGlobalStructure(String action, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
String name, boolean deleted, Long tooltip_fieldvalues_id) {
- try {
- Naviglobal ng = new Naviglobal();
- ng.setAction(action);
- ng.setComment("");
- ng.setIcon("");
- ng.setNaviorder(naviorder);
- ng.setFieldvalues_id(fieldvalues_id);
- ng.setIsleaf(isleaf);
- ng.setIsopen(isopen);
- ng.setDeleted(deleted);
- ng.setLevel_id(level_id);
- ng.setName(name);
- ng.setStarttime(new Date());
- ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
- // CriteriaBuilder crit = em.getCriteriaBuilder();
-
- em.merge(ng);
+ Naviglobal ng = new Naviglobal();
+ ng.setAction(action);
+ ng.setComment("");
+ ng.setIcon("");
+ ng.setNaviorder(naviorder);
+ ng.setFieldvalues_id(fieldvalues_id);
+ ng.setIsleaf(isleaf);
+ ng.setIsopen(isopen);
+ ng.setDeleted(deleted);
+ ng.setLevel_id(level_id);
+ ng.setName(name);
+ ng.setStarttime(new Date());
+ ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
+ // CriteriaBuilder crit = em.getCriteriaBuilder();
- } catch (Exception ex2) {
- log.error("addGlobalStructure", ex2);
- }
+ em.persist(ng);
}
public void addMainStructure(String action, String params, int naviorder, long fieldvalues_id, boolean isleaf, boolean isopen,
long level_id, String name, long global_id, boolean deleted, Long tooltip_fieldvalues_id) {
- try {
- Naviglobal ng = getGlobalMenuEntry(global_id);
- List<Navimain> mainEntries = ng.getMainnavi();
- mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries;
-
- Navimain nm = new Navimain();
- nm.setAction(action);
- nm.setParams(params);
- nm.setComment("");
- nm.setIcon("");
- nm.setFieldvalues_id(fieldvalues_id);
- nm.setIsleaf(isleaf);
- nm.setNaviorder(naviorder);
- nm.setIsopen(isopen);
- nm.setLevel_id(level_id);
- nm.setName(name);
- nm.setDeleted(deleted);
- nm.setGlobal_id(global_id);
- nm.setStarttime(new Date());
- nm.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
+ Naviglobal ng = getGlobalMenuEntry(global_id);
+ List<Navimain> mainEntries = ng.getMainnavi();
+ mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries;
+
+ Navimain nm = new Navimain();
+ nm.setAction(action);
+ nm.setParams(params);
+ nm.setComment("");
+ nm.setIcon("");
+ nm.setFieldvalues_id(fieldvalues_id);
+ nm.setIsleaf(isleaf);
+ nm.setNaviorder(naviorder);
+ nm.setIsopen(isopen);
+ nm.setLevel_id(level_id);
+ nm.setName(name);
+ nm.setDeleted(deleted);
+ nm.setGlobal_id(global_id);
+ nm.setStarttime(new Date());
+ nm.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
- mainEntries.add(nm);
- ng.setMainnavi(mainEntries);
+ mainEntries.add(nm);
+ ng.setMainnavi(mainEntries);
- em.merge(ng);
-
- } catch (Exception ex2) {
- log.error("addMainStructure", ex2);
- }
+ em.persist(ng);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentCategoryDao.java Mon Jun 23 08:47:06 2014
@@ -44,17 +44,14 @@ public class AppointmentCategoryDao {
@Autowired
private UserDao usersDao;
- public AppointmentCategory get(Long categoryId) {
+ public AppointmentCategory get(Long id) {
try {
- log.debug("getAppointmentCategoryById: " + categoryId);
+ log.debug("getAppointmentCategoryById: " + id);
- String hql = "select app from AppointmentCategory app "
- + "WHERE app.deleted <> :deleted "
- + "AND app.categoryId = :categoryId";
+ String hql = "select app from AppointmentCategory app WHERE app.deleted = false AND app.id = :id";
TypedQuery<AppointmentCategory> query = em.createQuery(hql, AppointmentCategory.class);
- query.setParameter("deleted", true);
- query.setParameter("categoryId", categoryId);
+ query.setParameter("id", id);
AppointmentCategory appointCategory = null;
try {
@@ -64,7 +61,7 @@ public class AppointmentCategoryDao {
return appointCategory;
} catch (Exception ex2) {
- log.error("[getAppointmentCategoryById]: " + ex2);
+ log.error("[get]: " + ex2);
}
return null;
}
@@ -72,13 +69,12 @@ public class AppointmentCategoryDao {
public Long updateAppointmentCategory(Long categoryId, String name) {
try {
- AppointmentCategory ac = this
- .get(categoryId);
+ AppointmentCategory ac = get(categoryId);
ac.setName(name);
ac.setUpdatetime(new Date());
- if (ac.getCategoryId() == null) {
+ if (ac.getId() == null) {
em.persist(ac);
} else {
if (!em.contains(ac)) {
@@ -105,7 +101,7 @@ public class AppointmentCategoryDao {
ac.setComment(comment);
ac = em.merge(ac);
- Long category_id = ac.getCategoryId();
+ Long category_id = ac.getId();
return category_id;
} catch (Exception ex2) {
@@ -117,8 +113,7 @@ public class AppointmentCategoryDao {
public Long deleteAppointmentCategory(Long categoryId) {
try {
- AppointmentCategory ac = this
- .get(categoryId);
+ AppointmentCategory ac = get(categoryId);
log.debug("ac: " + ac);
@@ -128,7 +123,7 @@ public class AppointmentCategoryDao {
}
ac.setUpdatetime(new Date());
ac.setDeleted(true);
- if (ac.getCategoryId() == null) {
+ if (ac.getId() == null) {
em.persist(ac);
} else {
if (!em.contains(ac)) {
@@ -145,14 +140,11 @@ public class AppointmentCategoryDao {
public List<AppointmentCategory> getAppointmentCategoryList() {
try {
- String hql = "select a from AppointmentCategory a "
- + "WHERE a.deleted <> :deleted ";
+ String hql = "select a from AppointmentCategory a WHERE a.deleted = false ";
TypedQuery<AppointmentCategory> query = em.createQuery(hql, AppointmentCategory.class);
- query.setParameter("deleted", true);
- List<AppointmentCategory> listAppointmentCategory = query
- .getResultList();
+ List<AppointmentCategory> listAppointmentCategory = query.getResultList();
return listAppointmentCategory;
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Mon Jun 23 08:47:06 2014
@@ -146,7 +146,7 @@ public class AppointmentDao {
public Appointment update(Appointment a, Long userId) {
Room r = a.getRoom();
- if (r.getRooms_id() == null) {
+ if (r.getId() == null) {
r.setName(a.getTitle());
r.setNumberOfPartizipants(cfgDao.getConfValue("calendar.conference.rooms.default.size", Long.class, "50"));
}
@@ -210,8 +210,7 @@ public class AppointmentDao {
public List<Appointment> getAppointmentsByRoomId(Long roomId) {
try {
- String hql = "select a from Appointment a "
- + "WHERE a.room.rooms_id = :roomId ";
+ String hql = "select a from Appointment a WHERE a.room.id = :roomId ";
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
@@ -374,14 +373,13 @@ public class AppointmentDao {
try {
String hql = "select a from Appointment a "
- + "WHERE a.deleted <> :deleted "
- + "AND a.owner.user_id = :user_id "
- + "AND a.room.rooms_id = :rooms_id ";
+ + "WHERE a.deleted = false "
+ + "AND a.owner.id = :user_id "
+ + "AND a.room.id = :rooms_id ";
TypedQuery<Appointment> query = em.createQuery(hql,
Appointment.class);
- query.setParameter("deleted", true);
query.setParameter("user_id", user_id);
query.setParameter("rooms_id", rooms_id);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentReminderTypDao.java Mon Jun 23 08:47:06 2014
@@ -51,12 +51,9 @@ public class AppointmentReminderTypDao {
try {
log.debug("AppointmentReminderTypById: " + typId);
- String hql = "select app from AppointmentReminderTyps app "
- + "WHERE app.deleted <> :deleted "
- + "AND app.typId = :typId";
+ String hql = "select app from AppointmentReminderTyps app WHERE app.deleted = false AND app.id = :typId";
TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
- query.setParameter("deleted", true);
query.setParameter("typId", typId);
AppointmentReminderTyps appointmentReminderTyps = null;
@@ -79,7 +76,7 @@ public class AppointmentReminderTypDao {
ac.setName(name);
ac.setUpdatetime(new Date());
- if (ac.getTypId() == null) {
+ if (ac.getId() == null) {
em.persist(ac);
} else {
if (!em.contains(ac)) {
@@ -106,7 +103,7 @@ public class AppointmentReminderTypDao {
ac.setFieldvalues_id(fieldvalues_id);
ac = em.merge(ac);
- Long category_id = ac.getTypId();
+ Long category_id = ac.getId();
return category_id;
} catch (Exception ex2) {
@@ -118,8 +115,7 @@ public class AppointmentReminderTypDao {
public Long deleteAppointmentReminderTyp(Long typId) {
try {
- AppointmentReminderTyps ac = this
- .get(typId);
+ AppointmentReminderTyps ac = get(typId);
log.debug("ac: " + ac);
@@ -130,7 +126,7 @@ public class AppointmentReminderTypDao {
ac.setUpdatetime(new Date());
ac.setDeleted(true);
- if (ac.getTypId() == null) {
+ if (ac.getId() == null) {
em.persist(ac);
} else {
if (!em.contains(ac)) {
@@ -150,17 +146,13 @@ public class AppointmentReminderTypDao {
try {
- String hql = "select a from AppointmentReminderTyps a "
- + "WHERE a.deleted <> :deleted ";
+ String hql = "select a from AppointmentReminderTyps a WHERE a.deleted = false ";
TypedQuery<AppointmentReminderTyps> query = em.createQuery(hql, AppointmentReminderTyps.class);
- query.setParameter("deleted", true);
- List<AppointmentReminderTyps> listAppointmentReminderTyp = query
- .getResultList();
+ List<AppointmentReminderTyps> listAppointmentReminderTyp = query.getResultList();
for (AppointmentReminderTyps ti : listAppointmentReminderTyp) {
- ti.setLabel(fieldLanguagesValuesDao.get(
- ti.getFieldvalues_id(), language_id));
+ ti.setLabel(fieldLanguagesValuesDao.get(ti.getFieldvalues_id(), language_id));
}
return listAppointmentReminderTyp;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java Mon Jun 23 08:47:06 2014
@@ -27,7 +27,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@@ -39,9 +39,7 @@ import org.springframework.transaction.a
@Transactional
public class FileExplorerItemDao {
- private static final Logger log = Red5LoggerFactory.getLogger(
- FileExplorerItemDao.class,
- OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileExplorerItemDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -73,7 +71,7 @@ public class FileExplorerItemDao {
fileItem.setExternalType(externalType);
fileItem = em.merge(fileItem);
- Long fileItemId = fileItem.getFileExplorerItemId();
+ Long fileItemId = fileItem.getId();
log.debug(".add(): file " + fileName + " added as " + fileItemId);
return fileItemId;
@@ -87,7 +85,7 @@ public class FileExplorerItemDao {
try {
fileItem = em.merge(fileItem);
- Long fileItemId = fileItem.getFileExplorerItemId();
+ Long fileItemId = fileItem.getId();
return fileItemId;
} catch (Exception ex2) {
@@ -100,13 +98,11 @@ public class FileExplorerItemDao {
Long room_id, Long ownerId) {
log.debug(".getFileExplorerItemsByRoomAndOwner() started");
try {
- String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.deleted <> :deleted "
+ String hql = "SELECT c FROM FileExplorerItem c WHERE c.deleted = false "
+ "AND c.room_id = :room_id " + "AND c.ownerId = :ownerId "
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", true);
query.setParameter("room_id",room_id);
query.setParameter("ownerId",ownerId);
@@ -125,14 +121,13 @@ public class FileExplorerItemDao {
try {
String hql = "SELECT c FROM FileExplorerItem c " +
- "WHERE c.deleted <> :deleted " +
+ "WHERE c.deleted = false " +
"AND c.room_id = :room_id " +
"AND c.ownerId IS NULL " +
"AND c.parentFileExplorerItemId = :parentFileExplorerItemId " +
"ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", true);
query.setParameter("room_id",room_id);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
@@ -151,13 +146,12 @@ public class FileExplorerItemDao {
try {
String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.deleted <> :deleted "
+ + "WHERE c.deleted = false "
+ "AND c.ownerId = :ownerId "
+ "AND c.parentFileExplorerItemId = :parentFileExplorerItemId "
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", true);
query.setParameter("ownerId",ownerId);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
@@ -176,12 +170,11 @@ public class FileExplorerItemDao {
try {
String hql = "SELECT c FROM FileExplorerItem c "
- + "WHERE c.deleted <> :deleted "
+ + "WHERE c.deleted = false "
+ "AND c.parentFileExplorerItemId = :parentFileExplorerItemId "
+ "ORDER BY c.isFolder DESC, c.fileName ";
TypedQuery<FileExplorerItem> query = em.createQuery(hql, FileExplorerItem.class);
- query.setParameter("deleted", true);
query.setParameter("parentFileExplorerItemId", parentFileExplorerItemId);
FileExplorerItem[] fileExplorerList = query.getResultList().toArray(new FileExplorerItem[0]);
@@ -196,7 +189,7 @@ public class FileExplorerItemDao {
public FileExplorerItem getFileExplorerItemsByHash(String hash) {
try {
- TypedQuery<FileExplorerItem> query = em.createNamedQuery("getByHash", FileExplorerItem.class);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFileByHash", FileExplorerItem.class);
query.setParameter("fileHash", hash);
FileExplorerItem fileExplorerList = null;
@@ -215,8 +208,8 @@ public class FileExplorerItemDao {
public FileExplorerItem getFileExplorerItemsById(Long fileExplorerItemId) {
try {
- TypedQuery<FileExplorerItem> query = em.createNamedQuery("getById", FileExplorerItem.class);
- query.setParameter("fileExplorerItemId", fileExplorerItemId);
+ TypedQuery<FileExplorerItem> query = em.createNamedQuery("getFileById", FileExplorerItem.class);
+ query.setParameter("id", fileExplorerItemId);
FileExplorerItem fileExplorerList = null;
try {
@@ -280,13 +273,12 @@ public class FileExplorerItemDao {
try {
- FileExplorerItem fId = this
- .getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fId = getFileExplorerItemsById(fileExplorerItemId);
fId.setDeleted(true);
fId.setUpdated(new Date());
- if (fId.getFileExplorerItemId() == 0) {
+ if (fId.getId() == null) {
em.persist(fId);
} else {
if (!em.contains(fId)) {
@@ -303,8 +295,7 @@ public class FileExplorerItemDao {
try {
- FileExplorerItem fId = this
- .getFileExplorerItemsByExternalIdAndType(externalFilesid, externalType);
+ FileExplorerItem fId = getFileExplorerItemsByExternalIdAndType(externalFilesid, externalType);
if (fId == null) {
throw new Exception("externalFilesid: "+externalFilesid+" and externalType: "+externalType+" Not found");
@@ -313,7 +304,7 @@ public class FileExplorerItemDao {
fId.setDeleted(true);
fId.setUpdated(new Date());
- if (fId.getFileExplorerItemId() == 0) {
+ if (fId.getId() == null) {
em.persist(fId);
} else {
if (!em.contains(fId)) {
@@ -340,7 +331,7 @@ public class FileExplorerItemDao {
fId.setFileName(fileName);
fId.setUpdated(new Date());
- if (fId.getFileExplorerItemId() == 0) {
+ if (fId.getId() == null) {
em.persist(fId);
} else {
if (!em.contains(fId)) {
@@ -357,7 +348,7 @@ public class FileExplorerItemDao {
try {
// fId.setUpdated(new Date());
- if (fId.getFileExplorerItemId() == 0) {
+ if (fId.getId() == null) {
em.persist(fId);
} else {
if (!em.contains(fId)) {
@@ -380,8 +371,7 @@ public class FileExplorerItemDao {
log.debug(".moveFile() started");
try {
- FileExplorerItem fId = this
- .getFileExplorerItemsById(fileExplorerItemId);
+ FileExplorerItem fId = getFileExplorerItemsById(fileExplorerItemId);
fId.setParentFileExplorerItemId(parentFileExplorerItemId);
@@ -400,7 +390,7 @@ public class FileExplorerItemDao {
fId.setUpdated(new Date());
- if (fId.getFileExplorerItemId() == 0) {
+ if (fId.getId() == null) {
em.persist(fId);
} else {
if (!em.contains(fId)) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguageDao.java Mon Jun 23 08:47:06 2014
@@ -41,7 +41,7 @@ import org.springframework.transaction.a
*/
@Transactional
public class FieldLanguageDao implements Serializable {
- private static final long serialVersionUID = -2714490167956230305L;
+ private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(FieldLanguageDao.class, webAppRootKey);
@@ -49,14 +49,14 @@ public class FieldLanguageDao implements
private EntityManager em;
public long getNextAvailableId() {
- TypedQuery<Long> q = em.createQuery("SELECT MAX(fl.language_id) from FieldLanguage fl", Long.class);
- return q.getSingleResult() + 1;
+ TypedQuery<Long> q = em.createQuery("SELECT MAX(fl.id) from FieldLanguage fl", Long.class);
+ return q.getSingleResult() + 1L;
}
public FieldLanguage addLanguage(int langId, String langName, Boolean langRtl, String code) {
try {
FieldLanguage fl = new FieldLanguage();
- fl.setLanguage_id((long)langId);
+ fl.setId((long)langId);
fl.setStarttime(new Date());
fl.setDeleted(false);
fl.setName(langName);
@@ -66,7 +66,7 @@ public class FieldLanguageDao implements
fl = em.merge(fl);
//Eagerly FETCH values list
- TypedQuery<FieldLanguage> q = em.createQuery("select fl from FieldLanguage fl LEFT JOIN FETCH fl.languageValues WHERE fl.language_id = :langId", FieldLanguage.class);
+ TypedQuery<FieldLanguage> q = em.createQuery("select fl from FieldLanguage fl LEFT JOIN FETCH fl.languageValues WHERE fl.id = :langId", FieldLanguage.class);
q.setParameter("langId", langId);
List<FieldLanguage> results = q.getResultList();
@@ -93,21 +93,20 @@ public class FieldLanguageDao implements
}
public void update(FieldLanguage fl) {
- if (fl.getLanguage_id() == null) {
+ if (fl.getId() == null) {
em.persist(fl);
} else {
em.merge(fl);
}
}
- public FieldLanguage getFieldLanguageById(Long language_id) {
+ public FieldLanguage getFieldLanguageById(Long id) {
try {
String hql = "select c from FieldLanguage as c "
- + "WHERE c.deleted <> :deleted "
- + "AND c.language_id = :language_id";
+ + "WHERE c.deleted = false "
+ + "AND c.id = :id";
TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
- query.setParameter("deleted", true);
- query.setParameter("language_id", language_id);
+ query.setParameter("id", id);
FieldLanguage fl = null;
try {
fl = query.getSingleResult();
@@ -122,10 +121,8 @@ public class FieldLanguageDao implements
public List<FieldLanguage> getLanguages() {
try {
- String hql = "select c from FieldLanguage as c "
- + "WHERE c.deleted <> :deleted ";
+ String hql = "select c from FieldLanguage as c WHERE c.deleted = false ";
TypedQuery<FieldLanguage> query = em.createQuery(hql, FieldLanguage.class);
- query.setParameter("deleted", true);
List<FieldLanguage> ll = query.getResultList();
return ll;
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldLanguagesValuesDao.java Mon Jun 23 08:47:06 2014
@@ -144,7 +144,7 @@ public class FieldLanguagesValuesDao imp
*/
public Fieldlanguagesvalues update(Fieldlanguagesvalues entity, Long userId) {
entity.setUpdatetime(new Date());
- if (entity.getFieldlanguagesvalues_id() == null) {
+ if (entity.getId() == null) {
em.persist(entity);
} else {
entity = em.merge(entity);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/FieldValueDao.java Mon Jun 23 08:47:06 2014
@@ -92,7 +92,7 @@ public class FieldValueDao implements ID
List<Fieldvalues> result = q.getResultList();
for (Fieldvalues fv : result) {
//FIXME ineffective !!!!!!!!!!!!!!!!!!!!
- Fieldlanguagesvalues flv = flvDaoImpl.get(fv.getFieldvalues_id(), language_id);
+ Fieldlanguagesvalues flv = flvDaoImpl.get(fv.getId(), language_id);
if (flv == null) {
flv = new Fieldlanguagesvalues();
flv.setLanguage_id(language_id);
@@ -121,8 +121,8 @@ public class FieldValueDao implements ID
public Fieldvalues update(Fieldvalues entity, Long userId) {
entity.setDeleted(false);
- if (entity.getFieldvalues_id() == null) {
- entity.setFieldvalues_id(count() + 1);
+ if (entity.getId() == null) {
+ entity.setId(count() + 1);
entity.setStarttime(new Date());
em.persist(entity);
} else {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java Mon Jun 23 08:47:06 2014
@@ -67,7 +67,7 @@ public class ConferenceLogDao {
confLog.setEmail(email);
confLog = em.merge(confLog);
- Long confLogId = confLog.getConferenceLogId();
+ Long confLogId = confLog.getId();
return confLogId;
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogTypeDao.java Mon Jun 23 08:47:06 2014
@@ -44,7 +44,7 @@ public class ConferenceLogTypeDao {
confLogType.setEventType(eventType);
confLogType.setInserted(new Date());
confLogType = em.merge(confLogType);
- return confLogType.getConferenceLogTypeId();
+ return confLogType.getId();
} catch (Exception ex2) {
log.error("[addConferenceLogType]: ", ex2);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java Mon Jun 23 08:47:06 2014
@@ -126,7 +126,7 @@ public class FlvRecordingDao {
log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType);
- String hql = "SELECT c FROM FlvRecording c, Room r WHERE c.room_id = r.rooms_id "
+ String hql = "SELECT c FROM FlvRecording c, Room r WHERE c.room_id = r.id "
+ "AND r.externalRoomType LIKE :externalRoomType AND c.insertedBy LIKE :insertedBy "
+ "AND c.deleted = false";
@@ -164,7 +164,7 @@ public class FlvRecordingDao {
log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType);
- String hql = "SELECT c FROM FlvRecording c, Room r " + "WHERE c.room_id = r.rooms_id "
+ String hql = "SELECT c FROM FlvRecording c, Room r " + "WHERE c.room_id = r.id "
+ "AND r.externalRoomType LIKE :externalRoomType " + "AND c.deleted <> :deleted ";
TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class);
@@ -264,7 +264,7 @@ public class FlvRecordingDao {
}
public boolean delete(FlvRecording f) {
- if (f == null || f.getFlvRecordingId() == 0) {
+ if (f == null || f.getId() == null) {
return false;
}
f.setDeleted(true);
@@ -274,7 +274,7 @@ public class FlvRecordingDao {
public FlvRecording update(FlvRecording f) {
try {
- if (f.getFlvRecordingId() == 0) {
+ if (f.getId() == null) {
f.setInserted(new Date());
em.persist(f);
} else {
@@ -313,7 +313,7 @@ public class FlvRecordingDao {
//get all organizations the user can view
for (Organisation_Users ou : userDao.get(userId).getOrganisation_users()) {
- List<FlvRecording>publicFlvRecordings = getFlvRecordingRootByPublic(ou.getOrganisation().getOrganisation_id());
+ List<FlvRecording>publicFlvRecordings = getFlvRecordingRootByPublic(ou.getOrganisation().getId());
//get sizes
for (FlvRecording publicFlvRecording : publicFlvRecordings) {
publicFileSize += getRecordingSize(publicFlvRecording);
@@ -346,7 +346,7 @@ public class FlvRecordingDao {
if (isRecordingExists(r.getFileHash() + OGG_EXTENSION)) {
size += getOggRecording(r.getFileHash()).length();
}
- for (FlvRecording flvRecording : getFlvRecordingByParent(r.getFlvRecordingId())) {
+ for (FlvRecording flvRecording : getFlvRecordingByParent(r.getId())) {
size += getRecordingSize(flvRecording);
}
return size;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java Mon Jun 23 08:47:06 2014
@@ -54,7 +54,7 @@ public class FlvRecordingLogDao {
List<FlvRecordingLog> flvRecordingLogs = getByRecordingId(flvRecordingId);
for (FlvRecordingLog flvRecordingLog : flvRecordingLogs) {
- flvRecordingLog = em.find(FlvRecordingLog.class, flvRecordingLog.getFlvRecordingLogId());
+ flvRecordingLog = em.find(FlvRecordingLog.class, flvRecordingLog.getId());
em.remove(flvRecordingLog);
}
@@ -73,7 +73,7 @@ public class FlvRecordingLogDao {
flvRecordingLog.setMsgType(msgType);
flvRecordingLog = em.merge(flvRecordingLog);
- Long flvRecordingLogId = flvRecordingLog.getFlvRecordingLogId();
+ Long flvRecordingLogId = flvRecordingLog.getId();
return flvRecordingLogId;
} catch (Exception ex2) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java Mon Jun 23 08:47:06 2014
@@ -144,7 +144,7 @@ public class FlvRecordingMetaDataDao {
flvRecordingMetaData.setInteriewPodId(interiewPodId);
flvRecordingMetaData = em.merge(flvRecordingMetaData);
- Long flvRecordingMetaDataId = flvRecordingMetaData.getFlvRecordingMetaDataId();
+ Long flvRecordingMetaDataId = flvRecordingMetaData.getId();
return flvRecordingMetaDataId;
@@ -158,7 +158,7 @@ public class FlvRecordingMetaDataDao {
try {
flvRecordingMetaData = em.merge(flvRecordingMetaData);
- Long flvRecordingMetaDataId = flvRecordingMetaData.getFlvRecordingMetaDataId();
+ Long flvRecordingMetaDataId = flvRecordingMetaData.getId();
return flvRecordingMetaDataId;
@@ -201,7 +201,7 @@ public class FlvRecordingMetaDataDao {
public Long update(FlvRecordingMetaData flvRecordingMetaData) {
try {
- if (flvRecordingMetaData.getFlvRecordingMetaDataId() == 0) {
+ if (flvRecordingMetaData.getId() == 0) {
em.persist(flvRecordingMetaData);
} else {
if (!em.contains(flvRecordingMetaData)) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java Mon Jun 23 08:47:06 2014
@@ -66,7 +66,7 @@ public class FlvRecordingMetaDeltaDao {
try {
flvRecordingMetaDelta = em.merge(flvRecordingMetaDelta);
- Long flvRecordingMetaDeltaId = flvRecordingMetaDelta.getFlvRecordingMetaDeltaId();
+ Long flvRecordingMetaDeltaId = flvRecordingMetaDelta.getId();
log.debug("flvRecordingMetaDeltaId "+flvRecordingMetaDeltaId);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Mon Jun 23 08:47:06 2014
@@ -61,7 +61,7 @@ public class PollDao {
em.persist(pt);
- return pt.getPollTypesId();
+ return pt.getId();
}
public List<PollType> getPollTypes() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Mon Jun 23 08:47:06 2014
@@ -160,14 +160,14 @@ public class RoomDao implements IDataPro
}
public Room update(Room entity, Long userId) {
- if (entity.getRooms_id() == null) {
+ if (entity.getId() == null) {
entity.setStarttime(new Date());
em.persist(entity);
} else {
entity.setUpdatetime(new Date());
}
if (entity.isSipEnabled() && isSipEnabled()) {
- String sipNumber = getSipNumber(entity.getRooms_id());
+ String sipNumber = getSipNumber(entity.getId());
if (!sipNumber.equals(entity.getConfno())) {
entity.setConfno(sipNumber);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java Mon Jun 23 08:47:06 2014
@@ -37,7 +37,7 @@ public class RoomOrganisationDao {
}
public RoomOrganisation update(RoomOrganisation entity, Long userId) {
- if (entity.getRooms_organisation_id() == null) {
+ if (entity.getId() == null) {
entity.setStarttime(new Date());
em.persist(entity);
} else {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Mon Jun 23 08:47:06 2014
@@ -78,9 +78,9 @@ public class LdapConfigDao implements ID
log.debug("addLdapConfig :2: " + insertedby);
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getLdapConfigId();
+ Long ldapConfigId = ldapConfig.getId();
- if (ldapConfigId > 0) {
+ if (ldapConfigId != null) {
return ldapConfigId;
} else {
throw new Exception("Could not store SOAPLogin");
@@ -99,9 +99,9 @@ public class LdapConfigDao implements ID
ldapConfig.setInserted(new Date());
ldapConfig = em.merge(ldapConfig);
- Long ldapConfigId = ldapConfig.getLdapConfigId();
+ Long ldapConfigId = ldapConfig.getId();
- if (ldapConfigId > 0) {
+ if (ldapConfigId != null) {
return ldapConfigId;
} else {
throw new Exception("Could not store SOAPLogin");
@@ -118,7 +118,7 @@ public class LdapConfigDao implements ID
Long updatedby, Boolean isActive) {
try {
- LdapConfig ldapConfig = this.get(ldapConfigId);
+ LdapConfig ldapConfig = get(ldapConfigId);
if (ldapConfig == null) {
return -1L;
@@ -139,7 +139,7 @@ public class LdapConfigDao implements ID
log.debug("updateLdapConfig :2: " + updatedby);
ldapConfig = em.merge(ldapConfig);
- ldapConfigId = ldapConfig.getLdapConfigId();
+ ldapConfigId = ldapConfig.getId();
return ldapConfigId;
@@ -152,14 +152,11 @@ public class LdapConfigDao implements ID
public LdapConfig get(long ldapConfigId) {
try {
- String hql = "select c from LdapConfig c "
- + "WHERE c.ldapConfigId = :ldapConfigId "
- + "AND c.deleted = :deleted";
+ String hql = "select c from LdapConfig c WHERE c.id = :id AND c.deleted = false";
TypedQuery<LdapConfig> query = em
.createQuery(hql, LdapConfig.class);
- query.setParameter("ldapConfigId", ldapConfigId);
- query.setParameter("deleted", false);
+ query.setParameter("id", ldapConfigId);
LdapConfig ldapConfig = null;
try {
@@ -190,7 +187,7 @@ public class LdapConfigDao implements ID
LdapConfig ldapConfig = new LdapConfig();
ldapConfig.setName("local DB [internal]");
- ldapConfig.setLdapConfigId(-1);
+ ldapConfig.setId(-1L);
List<LdapConfig> result = new ArrayList<LdapConfig>();
result.add(ldapConfig);
@@ -214,10 +211,7 @@ public class LdapConfigDao implements ID
public long count() {
try {
- TypedQuery<Long> query = em
- .createQuery(
- "select count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
- Long.class);
+ TypedQuery<Long> query = em.createQuery("select count(c.id) from LdapConfig c where c.deleted = false", Long.class);
List<Long> ll = query.getResultList();
log.debug("selectMaxFromLdapConfig" + ll.get(0));
return ll.get(0);
@@ -234,7 +228,7 @@ public class LdapConfigDao implements ID
public LdapConfig update(LdapConfig entity, Long userId) {
try {
- if (entity.getLdapConfigId() <= 0) {
+ if (entity.getId() == null) {
entity.setInserted(new Date());
if (userId != null) {
entity.setInsertedby(usersDao.get(userId));
@@ -256,7 +250,7 @@ public class LdapConfigDao implements ID
}
public void delete(LdapConfig entity, Long userId) {
- if (entity.getLdapConfigId() >= 0) {
+ if (entity.getId() != null) {
entity.setUpdated(new Date());
if (userId != null) {
entity.setUpdatedby(usersDao.get(userId));
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java Mon Jun 23 08:47:06 2014
@@ -75,7 +75,7 @@ public class OrganisationDao implements
}
public Organisation update(Organisation entity, Long userId) {
- if (entity.getOrganisation_id() == null) {
+ if (entity.getId() == null) {
if (userId != null) {
entity.setInsertedby(userId);
}
@@ -93,7 +93,7 @@ public class OrganisationDao implements
public void delete(Organisation entity, Long userId) {
em.createNamedQuery("deleteUsersFromOrganisation")
- .setParameter("id", entity.getOrganisation_id())
+ .setParameter("id", entity.getId())
.executeUpdate();
entity.setDeleted(true);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java Mon Jun 23 08:47:06 2014
@@ -55,7 +55,7 @@ public class OrganisationUserDao impleme
}
public List<Organisation_Users> get(long orgId, String search, int start, int count, String sort) {
- TypedQuery<Organisation_Users> q = em.createQuery(DaoHelper.getSearchQuery("Organisation_Users", "ou", null, search, false, false, "ou.organisation.organisation_id = :orgId", sort, searchFields), Organisation_Users.class);
+ TypedQuery<Organisation_Users> q = em.createQuery(DaoHelper.getSearchQuery("Organisation_Users", "ou", null, search, false, false, "ou.organisation.id = :orgId", sort, searchFields), Organisation_Users.class);
q.setParameter("orgId", orgId);
q.setFirstResult(start);
q.setMaxResults(count);
@@ -114,7 +114,7 @@ public class OrganisationUserDao impleme
}
public Organisation_Users update(Organisation_Users entity, Long userId) {
- if (entity.getOrganisation_users_id() == null) {
+ if (entity.getId() == null) {
entity.setStarttime(new Date());
em.persist(entity);
} else {
@@ -125,8 +125,8 @@ public class OrganisationUserDao impleme
}
public void delete(Organisation_Users entity, Long userId) {
- if (entity.getOrganisation_users_id() != null) {
- User u = usersDao.get(entity.getUser().getUser_id());
+ if (entity.getId() != null) {
+ User u = usersDao.get(entity.getUser().getId());
int idx = u.getOrganisation_users().indexOf(entity);
//entity has been detached need to re-fetch
Organisation_Users ou = u.getOrganisation_users().remove(idx);
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java Mon Jun 23 08:47:06 2014
@@ -48,7 +48,7 @@ public class PrivateMessageFolderDao imp
privateMessageFolder.setInserted(new Date());
privateMessageFolder = em.merge(privateMessageFolder);
- Long privateMessageFolderId = privateMessageFolder.getPrivateMessageFolderId();
+ Long privateMessageFolderId = privateMessageFolder.getId();
return privateMessageFolderId;
} catch (Exception e) {
@@ -57,78 +57,64 @@ public class PrivateMessageFolderDao imp
return null;
}
- public Long addPrivateMessageFolderObj(PrivateMessageFolder privateMessageFolder) {
- try {
- privateMessageFolder.setInserted(new Date());
-
- privateMessageFolder = em.merge(privateMessageFolder);
- Long privateMessageFolderId = privateMessageFolder.getPrivateMessageFolderId();
-
- return privateMessageFolderId;
- } catch (Exception e) {
- log.error("[addPrivateMessageFolder]",e);
- }
- return null;
+ public Long addPrivateMessageFolderObj(PrivateMessageFolder folder) {
+ folder.setInserted(new Date());
+
+ folder = em.merge(folder);
+ Long privateMessageFolderId = folder.getId();
+
+ return privateMessageFolderId;
}
- public PrivateMessageFolder get(long privateMessageFolderId) {
- try {
- String hql = "select c from PrivateMessageFolder c " +
- "where c.privateMessageFolderId = :privateMessageFolderId ";
+ public PrivateMessageFolder get(long id) {
+ String hql = "select c from PrivateMessageFolder c where c.id = :id ";
- TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
- query.setParameter("privateMessageFolderId", privateMessageFolderId);
-
- PrivateMessageFolder privateMessageFolder = null;
- try {
- privateMessageFolder = query.getSingleResult();
- } catch (NoResultException ex) {
- }
-
- return privateMessageFolder;
- } catch (Exception e) {
- log.error("[getPrivateMessageFolderById]",e);
- }
- return null;
+ TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
+ query.setParameter("id", id);
+
+ PrivateMessageFolder folder = null;
+ try {
+ folder = query.getSingleResult();
+ } catch (NoResultException ex) {
+ }
+
+ return folder;
}
public List<PrivateMessageFolder> get(int start, int count) {
- return em.createQuery("SELECT c FROM PrivateMessageFolder c ORDER BY c.privateMessageFolderId", PrivateMessageFolder.class)
+ return em.createQuery("SELECT c FROM PrivateMessageFolder c ORDER BY c.id", PrivateMessageFolder.class)
.setFirstResult(start).setMaxResults(count)
.getResultList();
}
- public PrivateMessageFolder update(PrivateMessageFolder privateMessageFolder, Long userId) {
- if (privateMessageFolder.getPrivateMessageFolderId() == 0) {
- em.persist(privateMessageFolder);
+ public PrivateMessageFolder update(PrivateMessageFolder folder, Long userId) {
+ if (folder.getId() == 0) {
+ em.persist(folder);
} else {
- if (!em.contains(privateMessageFolder)) {
- privateMessageFolder = em.merge(privateMessageFolder);
+ if (!em.contains(folder)) {
+ folder = em.merge(folder);
}
}
- return privateMessageFolder;
+ return folder;
}
public List<PrivateMessageFolder> getPrivateMessageFolderByUserId(Long userId) {
try {
- String hql = "select c from PrivateMessageFolder c " +
- "where c.userId = :userId ";
+ String hql = "select c from PrivateMessageFolder c where c.userId = :userId ";
TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
query.setParameter("userId", userId);
- List<PrivateMessageFolder> privateMessageFolders = query.getResultList();
-
- return privateMessageFolders;
+ return query.getResultList();
} catch (Exception e) {
log.error("[getPrivateMessageFolderByUserId]",e);
}
return null;
}
- public void delete(PrivateMessageFolder privateMessageFolder, Long userId) {
- privateMessageFolder = em.find(PrivateMessageFolder.class, privateMessageFolder.getPrivateMessageFolderId());
- em.remove(privateMessageFolder);
+ public void delete(PrivateMessageFolder folder, Long userId) {
+ folder = em.find(PrivateMessageFolder.class, folder.getId());
+ em.remove(folder);
}
public List<PrivateMessageFolder> get(String search, int start, int count, String order) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java Mon Jun 23 08:47:06 2014
@@ -93,7 +93,7 @@ public class PrivateMessagesDao implemen
}
public PrivateMessage update(PrivateMessage entity, Long userId) {
- if (entity.getId() < 1) {
+ if (entity.getId() == null) {
entity.setInserted(new Date());
em.persist(entity);
} else {
@@ -105,7 +105,7 @@ public class PrivateMessagesDao implemen
private String getQuery(boolean isCount, String search, String orderBy, boolean asc) {
StringBuilder hql = new StringBuilder("SELECT ");
hql.append(isCount ? "COUNT(" : "").append("m").append(isCount ? ")" : "")
- .append(" FROM PrivateMessage m WHERE m.owner.user_id = :ownerId ")
+ .append(" FROM PrivateMessage m WHERE m.owner.id = :ownerId ")
.append(" AND m.folderId = :folderId ");
if (!StringUtils.isEmpty(search)) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Mon Jun 23 08:47:06 2014
@@ -137,7 +137,7 @@ public class UserDao implements IDataPro
if (filterContacts) {
params.put("ownerId", ownerId);
params.put("contact", Type.contact);
- return "((u.type <> :contact AND ou.organisation.organisation_id IN (SELECT ou.organisation.organisation_id FROM Organisation_Users ou WHERE ou.user.user_id = :ownerId)) "
+ return "((u.type <> :contact AND ou.organisation.id IN (SELECT ou.organisation.id FROM Organisation_Users ou WHERE ou.user.id = :ownerId)) "
+ "OR (u.type = :contact AND u.ownerId = :ownerId))";
}
return null;
@@ -206,7 +206,7 @@ public class UserDao implements IDataPro
ou.setUser(u);
}
}
- if (u.getUser_id() == null) {
+ if (u.getId() == null) {
u.setStarttime(new Date());
em.persist(u);
} else {
@@ -224,7 +224,7 @@ public class UserDao implements IDataPro
User u = update(user, updatedBy);
if (password != null && !password.isEmpty()) {
//OpenJPA is not allowing to set fields not being fetched before
- User u1 = get(u.getUser_id(), true);
+ User u1 = get(u.getId(), true);
u1.updatePassword(cfgDao, password);
update(u1, updatedBy);
}
@@ -232,7 +232,7 @@ public class UserDao implements IDataPro
}
public void delete(User u, Long userId) {
- deleteUserID(u.getUser_id());
+ deleteUserID(u.getId());
}
public User get(long user_id) {
@@ -280,14 +280,14 @@ public class UserDao implements IDataPro
adr.setDeleted(true);
}
- if (us.getUser_id() == null) {
+ if (us.getId() == null) {
em.persist(us);
} else {
if (!em.contains(us)) {
em.merge(us);
}
}
- return us.getUser_id();
+ return us.getId();
}
} catch (Exception ex2) {
log.error("[deleteUserID]", ex2);
@@ -451,19 +451,19 @@ public class UserDao implements IDataPro
User to = null;
try {
to = em.createNamedQuery("getContactByEmailAndUser", User.class)
- .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getUser_id()).getSingleResult();
+ .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getId()).getSingleResult();
} catch (Exception e) {
//no-op
}
if (to == null) {
to = new User();
to.setType(Type.contact);
- String login = owner.getUser_id() + "_" + email; //UserId prefix is used to ensure unique login
+ String login = owner.getId() + "_" + email; //UserId prefix is used to ensure unique login
to.setLogin(login.length() < getMinLoginLength(cfgDao) ? UUID.randomUUID().toString() : login);
to.setFirstname(firstName);
to.setLastname(lastName);
to.setLanguage_id(null == langId ? owner.getLanguage_id() : langId);
- to.setOwnerId(owner.getUser_id());
+ to.setOwnerId(owner.getId());
to.setAdresses(new Address());
to.getAdresses().setEmail(email);
to.setTimeZoneId(null == tzId ? owner.getTimeZoneId() : tzId);
@@ -589,7 +589,7 @@ public class UserDao implements IDataPro
}
User u = users.get(0);
- if (!verifyPassword(u.getUser_id(), userpass)) {
+ if (!verifyPassword(u.getId(), userpass)) {
throw new OmException(-11L);
}
// Check if activated
@@ -602,7 +602,7 @@ public class UserDao implements IDataPro
}
u.setLastlogin(new Date());
- return update(u, u.getUser_id());
+ return update(u, u.getId());
}
public Address getAddress(String street, String zip, String town, long states_id, String additionalname, String fax, String phone, String email) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingContainerData.java Mon Jun 23 08:47:06 2014
@@ -21,11 +21,7 @@ package org.apache.openmeetings.db.dto.f
import java.io.Serializable;
public class RecordingContainerData implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -7211000652612571746L;
+ private static final long serialVersionUID = 1L;
private long userHomeSize;
private long publicFileSize;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/RecordingObject.java Mon Jun 23 08:47:06 2014
@@ -25,7 +25,7 @@ import org.apache.openmeetings.db.entity
public class RecordingObject {
- private long flvRecordingId;
+ private Long id;
private String fileName;
private String alternateDownload;
@@ -68,7 +68,7 @@ public class RecordingObject {
public RecordingObject() {}
public RecordingObject(FlvRecording customObject) {
- this.flvRecordingId = customObject.getFlvRecordingId();
+ this.id = customObject.getId();
this.fileName = customObject.getFileName();
this.alternateDownload = customObject.getAlternateDownload();
@@ -109,12 +109,12 @@ public class RecordingObject {
this.progressPostProcessing = customObject.getProgressPostProcessing();
}
- public long getFlvRecordingId() {
- return flvRecordingId;
+ public long getId() {
+ return id;
}
- public void setFlvRecordingId(long flvRecordingId) {
- this.flvRecordingId = flvRecordingId;
+ public void setId(Long id) {
+ this.id = id;
}
public String getFileName() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java Mon Jun 23 08:47:06 2014
@@ -34,7 +34,7 @@ public class RoomDTO {
}
public RoomDTO(Room r) {
- id = r.getRooms_id();
+ id = r.getId();
name = r.getName();
comment = r.getComment();
roomtype = r.getRoomtype();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java Mon Jun 23 08:47:06 2014
@@ -37,7 +37,7 @@ public class UserDTO {
private Type type = Type.user;
public UserDTO(User u) {
- id = u.getUser_id();
+ id = u.getId();
firstname = u.getFirstname();
lastname = u.getLastname();
rights = u.getRights();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/IDataProviderEntity.java Mon Jun 23 08:47:06 2014
@@ -18,6 +18,10 @@
*/
package org.apache.openmeetings.db.entity;
-public interface IDataProviderEntity {
+import java.io.Serializable;
+public interface IDataProviderEntity extends Serializable {
+ Long getId();
+
+ void setId(Long id);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -43,12 +42,13 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name = "getChatMessageById", query = "SELECT c FROM ChatMessage c WHERE c.id = :id")
- , @NamedQuery(name = "getChatMessagesByUser", query = "SELECT DISTINCT c FROM ChatMessage c WHERE c.fromUser.user_id = :userId OR c.toUser.user_id = :userId ORDER BY c.sent ASC")
+ , @NamedQuery(name = "getChatMessagesByUser", query = "SELECT DISTINCT c FROM ChatMessage c WHERE c.fromUser.id = :userId OR c.toUser.id = :userId ORDER BY c.sent ASC")
, @NamedQuery(name = "getGlobalChatMessages", query = "SELECT DISTINCT c FROM ChatMessage c WHERE c.toUser IS NULL ORDER BY c.sent ASC")
-})@Table(name = "chat")
+})
+@Table(name = "chat")
@Root(name = "ChatMessage")
-public class ChatMessage implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = 4248081997318897605L;
+public class ChatMessage implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -83,11 +83,11 @@ public class ChatMessage implements Seri
@Element(name = "sent", data = true, required = false)
private Date sent;
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -55,14 +54,15 @@ import org.simpleframework.xml.Root;
})
@Table(name = "configuration")
@Root(name = "config")
-public class Configuration implements Serializable, IDataProviderEntity {
- private static final long serialVersionUID = -6129473946508963339L;
+public class Configuration implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Element(name = "id", data = true)
- private Long configuration_id;
-
+ private Long id;
+
@Column(name = "conf_key", unique = true)
@Element(name = "key", data = true, required = false)
private String conf_key;
@@ -118,12 +118,12 @@ public class Configuration implements Se
this.conf_value = conf_value;
}
- public Long getConfiguration_id() {
- return configuration_id;
+ public Long getId() {
+ return id;
}
- public void setConfiguration_id(Long configuration_id) {
- this.configuration_id = configuration_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorType.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -28,20 +27,20 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@NamedQueries({
- @NamedQuery(name = "getErrorTypes", query = "select c from ErrorType as c "
- + "WHERE c.deleted <> :deleted"),
- @NamedQuery(name = "getErrorType", query = "select c from ErrorType as c "
- + "WHERE c.deleted <> :deleted AND c.errortype_id = :errortype_id")
+ @NamedQuery(name = "getErrorTypes", query = "select c from ErrorType as c WHERE c.deleted = false"),
+ @NamedQuery(name = "getErrorType", query = "select c from ErrorType as c WHERE c.deleted = false AND c.id = :id")
})
@Table(name = "errortypes")
-public class ErrorType implements Serializable {
- private static final long serialVersionUID = 1519570470483604258L;
+public class ErrorType implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@Column(name = "id")
- private Long errortype_id;
+ private Long id;
@Column(name = "fieldvalues_id")
private Long fieldvalues_id;
@@ -55,12 +54,12 @@ public class ErrorType implements Serial
@Column(name = "deleted")
private boolean deleted;
- public Long getErrortype_id() {
- return errortype_id;
+ public Long getId() {
+ return id;
}
- public void setErrortype_id(Long errortype_id) {
- this.errortype_id = errortype_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java Mon Jun 23 08:47:06 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.db.entity.basic;
-import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
@@ -28,18 +27,20 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
@Entity
@NamedQueries({
- @NamedQuery(name = "getErrorValueById", query = "SELECT e FROM ErrorValue e WHERE e.errorvalues_id = :id AND e.deleted = false")
+ @NamedQuery(name = "getErrorValueById", query = "SELECT e FROM ErrorValue e WHERE e.id = :id AND e.deleted = false")
})
@Table(name = "errorvalue")
-public class ErrorValue implements Serializable {
- private static final long serialVersionUID = -1892810463706968018L;
+public class ErrorValue implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
@Id
@Column(name = "id")
- private Long errorvalues_id;
-
+ private Long id;
+
@Column(name = "errortype_id")
private Long errortype_id;
@@ -55,12 +56,12 @@ public class ErrorValue implements Seria
@Column(name = "deleted")
private boolean deleted;
- public Long getErrorvalues_id() {
- return errorvalues_id;
+ public Long getId() {
+ return id;
}
- public void setErrorvalues_id(Long errorvalues_id) {
- this.errorvalues_id = errorvalues_id;
+ public void setId(Long id) {
+ this.id = id;
}
public Date getStarttime() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1604715&r1=1604714&r2=1604715&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Mon Jun 23 08:47:06 2014
@@ -37,12 +37,13 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
@NamedQuery(name = "getMailMessageById", query = "SELECT m FROM MailMessage m WHERE m.id = :id")
- , @NamedQuery(name = "getMailMessages"
- , query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
+ , @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m WHERE m.status = :status")
})
@Table(name = "email_queue")
public class MailMessage implements IDataProviderEntity {
+ private static final long serialVersionUID = 1L;
+
public enum Status {
NONE
, SENDING