You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/10/25 20:48:10 UTC
svn commit: r1402268 [2/4] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/backup/ src/org/apache/openmeetings/cli/
src/org/apache/openmeetings/data/ src/org/ap...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java Thu Oct 25 18:48:03 2012
@@ -25,8 +25,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.OmDAO;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
import org.apache.openmeetings.sip.api.impl.asterisk.AsteriskDbSipClient;
import org.apache.openmeetings.sip.api.request.SIPCreateConferenceRequest;
@@ -36,12 +36,12 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class RoomDAO implements OmDAO<Rooms> {
+public class RoomDAO implements IDataProviderDao<Rooms> {
public final static String[] searchFields = {"name"};
@PersistenceContext
private EntityManager em;
@Autowired
- private ConfigurationDaoImpl cfgDao;
+ private ConfigurationDao cfgDao;
@Autowired
private AsteriskDbSipClient asteriskDbSipClient;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Thu Oct 25 18:48:03 2012
@@ -33,11 +33,11 @@ import javax.persistence.criteria.Predic
import javax.persistence.criteria.Root;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.conference.dao.RoomModeratorsDaoImpl;
+import org.apache.openmeetings.data.conference.dao.RoomModeratorsDao;
import org.apache.openmeetings.data.user.Organisationmanagement;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.rooms.RoomTypes;
@@ -76,15 +76,15 @@ public class Roommanagement {
@Autowired
private AsteriskDbSipClient asteriskDbSipClient;
@Autowired
- private RoomModeratorsDaoImpl roomModeratorsDao;
+ private RoomModeratorsDao roomModeratorsDao;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
private AuthLevelmanagement authLevelManagement;
@Autowired
private ClientListManager clientListManager;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
private RoomDAO roomDao;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java (from r1399742, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDaoImpl.java&r1=1399742&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java Thu Oct 25 18:48:03 2012
@@ -38,10 +38,10 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class RoomModeratorsDaoImpl {
+public class RoomModeratorsDao {
private static final Logger log = Red5LoggerFactory
- .getLogger(RoomModeratorsDaoImpl.class);
+ .getLogger(RoomModeratorsDao.class);
@Autowired
private Usermanagement userManagement;
@PersistenceContext
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileProcessor.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileProcessor.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileProcessor.java Thu Oct 25 18:48:03 2012
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter;
import org.apache.openmeetings.documents.GenerateImage;
import org.apache.openmeetings.documents.GeneratePDF;
@@ -48,7 +48,7 @@ public class FileProcessor {
@Autowired
private FlvExplorerConverter flvExplorerConverter;
@Autowired
- private FileExplorerItemDaoImpl fileExplorerItemDao;
+ private FileExplorerItemDao fileExplorerItemDao;
@Autowired
private GenerateImage generateImage;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileUtils.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileUtils.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/FileUtils.java Thu Oct 25 18:48:03 2012
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.Locale;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.utils.OmFileHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -36,7 +36,7 @@ public class FileUtils {
FileProcessor.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private FileExplorerItemDaoImpl fileExplorerItemDao;
+ private FileExplorerItemDao fileExplorerItemDao;
public long getSizeOfDirectoryAndSubs(FileExplorerItem fileExplorerItem) {
try {
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/file/dao/FileExplorerItemDao.java Thu Oct 25 18:48:03 2012
@@ -37,10 +37,10 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class FileExplorerItemDaoImpl {
+public class FileExplorerItemDao {
private static final Logger log = Red5LoggerFactory.getLogger(
- FileExplorerItemDaoImpl.class,
+ FileExplorerItemDao.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingDao.java Thu Oct 25 18:48:03 2012
@@ -37,8 +37,8 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class FlvRecordingDaoImpl {
- private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingDaoImpl.class,
+public class FlvRecordingDao {
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingDao.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingLogDao.java Thu Oct 25 18:48:03 2012
@@ -34,9 +34,9 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class FlvRecordingLogDaoImpl {
+public class FlvRecordingLogDao {
- private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingLogDaoImpl.class);
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingLogDao.class);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDataDao.java Thu Oct 25 18:48:03 2012
@@ -34,14 +34,14 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class FlvRecordingMetaDataDaoImpl {
+public class FlvRecordingMetaDataDao {
- private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDataDaoImpl.class,
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDataDao.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
- private FlvRecordingDaoImpl flvRecordingDao;
+ private FlvRecordingDao flvRecordingDao;
public FlvRecordingMetaData getFlvRecordingMetaDataById(Long flvRecordingMetaDataId) {
try {
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/FlvRecordingMetaDeltaDao.java Thu Oct 25 18:48:03 2012
@@ -35,9 +35,9 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class FlvRecordingMetaDeltaDaoImpl {
+public class FlvRecordingMetaDeltaDao {
- private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDeltaDaoImpl.class,
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDeltaDao.class,
OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/BaseConverter.java Thu Oct 25 18:48:03 2012
@@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
import org.apache.openmeetings.documents.GenerateSWF;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
@@ -41,11 +41,11 @@ public abstract class BaseConverter {
BaseConverter.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDaoImpl configurationmanagement;
+ private ConfigurationDao configurationmanagement;
@Autowired
- private FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDaoImpl;
+ private FlvRecordingMetaDataDao flvRecordingMetaDataDaoImpl;
@Autowired
- private FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDaoImpl;
+ private FlvRecordingMetaDeltaDao flvRecordingMetaDeltaDaoImpl;
protected String getPathToFFMPEG() {
String pathToFFMPEG = configurationmanagement.getConfKey(
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvExplorerConverter.java Thu Oct 25 18:48:03 2012
@@ -26,8 +26,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
import org.apache.openmeetings.persistence.beans.files.FileExplorerItem;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -41,9 +41,9 @@ public class FlvExplorerConverter extend
// Spring loaded Beans
@Autowired
- private FileExplorerItemDaoImpl fileExplorerItemDaoImpl;
+ private FileExplorerItemDao fileExplorerItemDaoImpl;
@Autowired
- private FlvRecordingLogDaoImpl flvRecordingLogDaoImpl;
+ private FlvRecordingLogDao flvRecordingLogDaoImpl;
private class FlvDimension {
public FlvDimension(int width, int height) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvInterviewConverter.java Thu Oct 25 18:48:03 2012
@@ -25,9 +25,9 @@ import java.util.List;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
import org.apache.openmeetings.documents.GenerateThumbs;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
@@ -48,11 +48,11 @@ public class FlvInterviewConverter exten
// Spring loaded Beans
@Autowired
- private FlvRecordingDaoImpl flvRecordingDaoImpl = null;
+ private FlvRecordingDao flvRecordingDaoImpl = null;
@Autowired
- private FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDaoImpl = null;
+ private FlvRecordingMetaDataDao flvRecordingMetaDataDaoImpl = null;
@Autowired
- private FlvRecordingLogDaoImpl flvRecordingLogDaoImpl;
+ private FlvRecordingLogDao flvRecordingLogDaoImpl;
@Autowired
private GenerateThumbs generateThumbs;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/converter/FlvRecorderConverter.java Thu Oct 25 18:48:03 2012
@@ -24,9 +24,9 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingLogDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecording;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
import org.apache.openmeetings.utils.ProcessHelper;
@@ -41,11 +41,11 @@ public class FlvRecorderConverter extend
// Spring loaded Beans
@Autowired
- private FlvRecordingDaoImpl flvRecordingDaoImpl = null;
+ private FlvRecordingDao flvRecordingDaoImpl = null;
@Autowired
- private FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDaoImpl = null;
+ private FlvRecordingMetaDataDao flvRecordingMetaDataDaoImpl = null;
@Autowired
- private FlvRecordingLogDaoImpl flvRecordingLogDaoImpl;
+ private FlvRecordingLogDao flvRecordingLogDaoImpl;
private String FFMPEG_MAP_PARAM = ":";
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamAudioListener.java Thu Oct 25 18:48:03 2012
@@ -21,8 +21,8 @@ package org.apache.openmeetings.data.flv
import java.util.Date;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
import org.red5.logging.Red5LoggerFactory;
@@ -41,8 +41,8 @@ public class StreamAudioListener extends
public StreamAudioListener(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview,
- FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDao,
- FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
+ FlvRecordingMetaDeltaDao flvRecordingMetaDeltaDao,
+ FlvRecordingMetaDataDao flvRecordingMetaDataDao) {
streamAudioWriter = new StreamAudioWriter(streamName, scope,
flvRecordingMetaDataId, isScreenData, isInterview,
flvRecordingMetaDeltaDao, flvRecordingMetaDataDao);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/StreamVideoListener.java Thu Oct 25 18:48:03 2012
@@ -21,7 +21,7 @@ package org.apache.openmeetings.data.flv
import java.util.Date;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
import org.red5.logging.Red5LoggerFactory;
@@ -40,7 +40,7 @@ public class StreamVideoListener extends
public StreamVideoListener(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview,
- FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
+ FlvRecordingMetaDataDao flvRecordingMetaDataDao) {
streamVideoWriter = new StreamVideoWriter(streamName, scope, flvRecordingMetaDataId, isScreenData,
isInterview, flvRecordingMetaDataDao);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java Thu Oct 25 18:48:03 2012
@@ -23,8 +23,8 @@ import java.util.Date;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDeltaDao;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaDelta;
import org.red5.io.ITag;
@@ -52,16 +52,16 @@ public class StreamAudioWriter extends B
private long byteCount = 0;
// Autowire is not possible
- protected final FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDao;
- protected final FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao;
+ protected final FlvRecordingMetaDeltaDao flvRecordingMetaDeltaDao;
+ protected final FlvRecordingMetaDataDao flvRecordingMetaDataDao;
private boolean isInterview = false;
public StreamAudioWriter(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview,
- FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDao,
- FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
+ FlvRecordingMetaDeltaDao flvRecordingMetaDeltaDao,
+ FlvRecordingMetaDataDao flvRecordingMetaDataDao) {
super(streamName, scope, flvRecordingMetaDataId, isScreenData);
this.flvRecordingMetaDeltaDao = flvRecordingMetaDeltaDao;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamVideoWriter.java Thu Oct 25 18:48:03 2012
@@ -23,7 +23,7 @@ import java.util.Date;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDaoImpl;
+import org.apache.openmeetings.data.flvrecord.FlvRecordingMetaDataDao;
import org.apache.openmeetings.persistence.beans.flvrecord.FlvRecordingMetaData;
import org.red5.io.ITag;
import org.red5.io.flv.impl.Tag;
@@ -39,7 +39,7 @@ public class StreamVideoWriter extends B
private long initialDelta = 0;
- private final FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao;
+ private final FlvRecordingMetaDataDao flvRecordingMetaDataDao;
private static final Logger log = Red5LoggerFactory.getLogger(
StreamVideoWriter.class, OpenmeetingsVariables.webAppRootKey);
@@ -47,7 +47,7 @@ public class StreamVideoWriter extends B
public StreamVideoWriter(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview,
- FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
+ FlvRecordingMetaDataDao flvRecordingMetaDataDao) {
super(streamName, scope, flvRecordingMetaDataId, isScreenData);
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogDao.java Thu Oct 25 18:48:03 2012
@@ -32,13 +32,13 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class ConferenceLogDaoImpl {
+public class ConferenceLogDao {
- private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
- private ConferenceLogTypeDaoImpl conferenceLogTypeDao;
+ private ConferenceLogTypeDao conferenceLogTypeDao;
public Long addConferenceLog(String eventType, Long userId, String streamid,
Long room_id, String userip, String scopeName,
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDaoImpl.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java Thu Oct 25 18:48:03 2012
@@ -32,9 +32,9 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class ConferenceLogTypeDaoImpl {
+public class ConferenceLogTypeDao {
- private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogTypeDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogTypeDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/BatikMethods.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/BatikMethods.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/record/BatikMethods.java Thu Oct 25 18:48:03 2012
@@ -35,7 +35,7 @@ import javax.swing.JTextArea;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.utils.geom.ArrowStyle;
import org.apache.openmeetings.utils.geom.GeomPoint;
import org.red5.logging.Red5LoggerFactory;
@@ -48,7 +48,7 @@ public class BatikMethods {
private static final Logger log = Red5LoggerFactory.getLogger(BatikMethods.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
public void paintTextByWidthHeight(SVGGraphics2D g2d, int x1, int y1, int width, int height,
String text, int style, int size, Color fontColor) throws Exception {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Emailmanagement.java Thu Oct 25 18:48:03 2012
@@ -24,7 +24,7 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.Fieldmanagment;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.templates.RegisterUserTemplate;
import org.apache.openmeetings.utils.mail.MailHandler;
@@ -33,6 +33,12 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+/**
+ * FIXME: This class should be <i>not</i> {@link Transactional}
+ *
+ * @author swagner
+ *
+ */
@Transactional
public class Emailmanagement {
@@ -43,7 +49,7 @@ public class Emailmanagement {
private EntityManager em;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Organisationmanagement.java Thu Oct 25 18:48:03 2012
@@ -38,9 +38,9 @@ import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.user.dao.OrganisationDAO;
-import org.apache.openmeetings.data.user.dao.OrganisationUserDAO;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.OrganisationDao;
+import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.Users;
@@ -64,11 +64,11 @@ public class Organisationmanagement {
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
- private OrganisationDAO orgDao;
+ private OrganisationDao orgDao;
@Autowired
- private OrganisationUserDAO orgUserDao;
+ private OrganisationUserDao orgUserDao;
@Autowired
private AuthLevelmanagement authLevelManagement;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java Thu Oct 25 18:48:03 2012
@@ -41,13 +41,13 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
-import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
+import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.data.beans.basic.SearchResult;
-import org.apache.openmeetings.data.user.dao.StateDaoImpl;
-import org.apache.openmeetings.data.user.dao.UserSipDataDaoImpl;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.data.user.dao.UserSipDataDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Server;
@@ -90,13 +90,13 @@ public class Usermanagement {
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
- private StateDaoImpl statemanagement;
+ private StateDao statemanagement;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
private Organisationmanagement organisationmanagement;
@Autowired
@@ -104,11 +104,11 @@ public class Usermanagement {
@Autowired
private OpenXGHttpClient openXGHttpClient;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
private Emailmanagement emailManagement;
@Autowired
- private UserSipDataDaoImpl userSipDataDao;
+ private UserSipDataDao userSipDataDao;
@Autowired
private ScopeApplicationAdapter scopeApplicationAdapter;
@Autowired
@@ -120,7 +120,7 @@ public class Usermanagement {
@Autowired
private ClientListManager clientListManager;
@Autowired
- private ServerDaoImpl serverDao;
+ private ServerDao serverDao;
/**
* query for a list of users
@@ -181,7 +181,7 @@ public class Usermanagement {
} else {
sort += " DESC ";
}
- String hql = DaoHelper.getSearchQuery("Users", "u", search, true, false, sort, UsersDaoImpl.searchFields);
+ String hql = DaoHelper.getSearchQuery("Users", "u", search, true, false, sort, UsersDao.searchFields);
log.debug("Show HQL: " + hql);
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java (from r1400803, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDAO.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDAO.java&r1=1400803&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDAO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java Thu Oct 25 18:48:03 2012
@@ -26,13 +26,13 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.OmDAO;
+import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.utils.DaoHelper;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class OrganisationDAO implements OmDAO<Organisation> {
+public class OrganisationDao implements IDataProviderDao<Organisation> {
public final static String[] searchFields = {"name"};
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java (from r1400803, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java&r1=1400803&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java Thu Oct 25 18:48:03 2012
@@ -24,7 +24,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.openmeetings.data.OmDAO;
+import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.DaoHelper;
@@ -32,11 +32,11 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class OrganisationUserDAO implements OmDAO<Organisation_Users> {
+public class OrganisationUserDao implements IDataProviderDao<Organisation_Users> {
@PersistenceContext
private EntityManager em;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.adresses.email"};
public Organisation_Users get(long id) {
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java (from r1388745, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java&r1=1388745&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessageFolderDao.java Thu Oct 25 18:48:03 2012
@@ -33,9 +33,9 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class PrivateMessageFolderDaoImpl {
+public class PrivateMessageFolderDao {
- private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageFolderDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageFolderDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java (from r1388745, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java&r1=1388745&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java Thu Oct 25 18:48:03 2012
@@ -37,9 +37,9 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class PrivateMessagesDaoImpl {
+public class PrivateMessagesDao {
- private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessagesDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessagesDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java (from r1391980, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java&r1=1391980&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java Thu Oct 25 18:48:03 2012
@@ -43,10 +43,10 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class SalutationDaoImpl {
+public class SalutationDao {
private static final Logger log = Red5LoggerFactory.getLogger(
- SalutationDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ SalutationDao.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Fieldmanagment fieldmanagment;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java (from r1391980, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java&r1=1391980&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/StateDao.java Thu Oct 25 18:48:03 2012
@@ -38,9 +38,9 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class StateDaoImpl {
+public class StateDao {
private static final Logger log = Red5LoggerFactory.getLogger(
- StateDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ StateDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java (from r1388745, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java&r1=1388745&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java Thu Oct 25 18:48:03 2012
@@ -36,9 +36,9 @@ import org.springframework.beans.factory
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class UserContactsDaoImpl {
+public class UserContactsDao {
- private static final Logger log = Red5LoggerFactory.getLogger(UserContactsDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UserContactsDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
@Autowired
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDao.java (from r1388745, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java&r1=1388745&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserSipDataDao.java Thu Oct 25 18:48:03 2012
@@ -32,9 +32,9 @@ import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
-public class UserSipDataDaoImpl {
+public class UserSipDataDao {
- private static final Logger log = Red5LoggerFactory.getLogger(UserSipDataDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UserSipDataDao.class, OpenmeetingsVariables.webAppRootKey);
@PersistenceContext
private EntityManager em;
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java (from r1400803, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java&r1=1400803&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java Thu Oct 25 18:48:03 2012
@@ -31,9 +31,9 @@ import org.apache.commons.lang.StringUti
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.OmDAO;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.IDataProviderDao;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.DaoHelper;
@@ -50,10 +50,10 @@ import org.springframework.transaction.a
*
*/
@Transactional
-public class UsersDaoImpl implements OmDAO<Users> {
+public class UsersDao implements IDataProviderDao<Users> {
private static final Logger log = Red5LoggerFactory.getLogger(
- UsersDaoImpl.class, OpenmeetingsVariables.webAppRootKey);
+ UsersDao.class, OpenmeetingsVariables.webAppRootKey);
public final static String[] searchFields = {"lastname", "firstname", "login", "adresses.email"};
@@ -63,13 +63,13 @@ public class UsersDaoImpl implements OmD
@Autowired
private ManageCryptStyle manageCryptStyle;
@Autowired
- private SalutationDaoImpl salutationDaoImpl;
+ private SalutationDao salutationDaoImpl;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
- private StateDaoImpl stateDaoImpl;
+ private StateDao stateDaoImpl;
/**
* Get a new instance of the {@link Users} entity, with all default values
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateImage.java Thu Oct 25 18:48:03 2012
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.HashMap;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.ProcessHelper;
@@ -38,9 +38,9 @@ public class GenerateImage {
GenerateImage.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
private GenerateThumbs generateThumbs;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GeneratePDF.java Thu Oct 25 18:48:03 2012
@@ -25,7 +25,7 @@ import java.util.HashMap;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -42,7 +42,7 @@ public class GeneratePDF {
@Autowired
private GenerateSWF generateSWF;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
public HashMap<String, HashMap<String, String>> convertPDF(String fileName,
String roomName, boolean fullProcessing, File inFile)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/documents/GenerateSWF.java Thu Oct 25 18:48:03 2012
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.utils.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class GenerateSWF {
.getLogger(GenerateSWF.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
public final static boolean isPosix = System.getProperty("os.name")
.toUpperCase().indexOf("WINDOWS") == -1;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Thu Oct 25 18:48:03 2012
@@ -33,17 +33,17 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Navimanagement;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDaoImpl;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.conference.PollManagement;
import org.apache.openmeetings.data.conference.Roommanagement;
import org.apache.openmeetings.data.user.Organisationmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
-import org.apache.openmeetings.data.user.dao.SalutationDaoImpl;
-import org.apache.openmeetings.data.user.dao.StateDaoImpl;
-import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
+import org.apache.openmeetings.data.user.dao.SalutationDao;
+import org.apache.openmeetings.data.user.dao.StateDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
@@ -63,33 +63,33 @@ public class ImportInitvalues {
ImportInitvalues.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
- private UsersDaoImpl usersDao;
+ private UsersDao usersDao;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
private FieldLanguageDaoImpl fieldLanguageDaoImpl;
@Autowired
- private StateDaoImpl statemanagement;
+ private StateDao statemanagement;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
private Navimanagement navimanagement;
@Autowired
private ErrorManagement errorManagement;
@Autowired
- private SalutationDaoImpl salutationmanagement;
+ private SalutationDao salutationmanagement;
@Autowired
private Organisationmanagement organisationmanagement;
@Autowired
private Roommanagement roommanagement;
@Autowired
- private AppointmentCategoryDaoImpl appointmentCategoryDaoImpl;
+ private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
- private AppointmentReminderTypDaoImpl appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
@Autowired
private PollManagement pollManagement;
@@ -295,7 +295,7 @@ public class ImportInitvalues {
cfg.mailUseTls, null, "Enable TLS 1=true, 0=false");
configurationDaoImpl.addConfByKey("application.name",
- ConfigurationDaoImpl.DEFAULT_APP_NAME, null,
+ ConfigurationDao.DEFAULT_APP_NAME, null,
"Name of the Browser Title window");
// "1" == "EN"
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Thu Oct 25 18:48:03 2012
@@ -28,11 +28,11 @@ import java.util.Vector;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.Sessionmanagement;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
-import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
-import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
+import org.apache.openmeetings.data.basic.dao.OmTimeZoneDao;
import org.apache.openmeetings.data.user.Usermanagement;
-import org.apache.openmeetings.data.user.dao.StateDaoImpl;
+import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
@@ -58,15 +58,15 @@ public class LdapLoginManagement {
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private ConfigurationDaoImpl configurationDaoImpl;
+ private ConfigurationDao configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
- private StateDaoImpl statemanagement;
+ private StateDao statemanagement;
@Autowired
- private LdapConfigDaoImpl ldapConfigDao;
+ private LdapConfigDao ldapConfigDao;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ private OmTimeZoneDao omTimeZoneDaoImpl;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java (from r1388584, incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/OmEntity.java)
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/OmEntity.java&r1=1388584&r2=1402268&rev=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/OmEntity.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/IDataProviderEntity.java Thu Oct 25 18:48:03 2012
@@ -18,6 +18,6 @@
*/
package org.apache.openmeetings.persistence.beans;
-public interface OmEntity {
+public interface IDataProviderEntity {
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java Thu Oct 25 18:48:03 2012
@@ -34,7 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -53,7 +53,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "configuration")
@Root(name = "config")
-public class Configuration implements Serializable, OmEntity {
+public class Configuration implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -6129473946508963339L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java Thu Oct 25 18:48:03 2012
@@ -34,7 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -45,7 +45,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
-public class LdapConfig implements Serializable, OmEntity {
+public class LdapConfig implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = 2839158519803993035L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java Thu Oct 25 18:48:03 2012
@@ -34,7 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -49,7 +49,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getServerWithMinimumUsers", query = "SELECT s.id, COUNT(u) AS cnt FROM Users u JOIN u.server s WHERE s.deleted = false GROUP BY s.id ORDER BY cnt") })
@Table(name = "server")
@Root
-public class Server implements Serializable, OmEntity {
+public class Server implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -6822732074549167727L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation.java Thu Oct 25 18:48:03 2012
@@ -30,7 +30,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -47,7 +47,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "organisation")
@Root(name="organisation")
-public class Organisation implements Serializable, OmEntity {
+public class Organisation implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = 99123580264065654L;
@Id
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java Thu Oct 25 18:48:03 2012
@@ -33,7 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.Users;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -49,7 +49,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "organisation_users")
@Root(name="user_organisation")
-public class Organisation_Users implements Serializable, OmEntity {
+public class Organisation_Users implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = 7206870465903375817L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java Thu Oct 25 18:48:03 2012
@@ -34,10 +34,10 @@ import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
@Entity
@Table(name = "fieldlanguage")
-public class FieldLanguage implements Serializable, OmEntity {
+public class FieldLanguage implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = 3501643212388395425L;
@Id
@Column(name="id")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java Thu Oct 25 18:48:03 2012
@@ -36,7 +36,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
@Entity
@NamedQueries({
@@ -58,7 +58,7 @@ import org.apache.openmeetings.persisten
, query = "SELECT f FROM Fieldlanguagesvalues f WHERE f.fieldvalues_id = :fieldValuesId AND f.language_id = :lang AND f.deleted = false")
})
@Table(name = "fieldlanguagesvalues")
-public class Fieldlanguagesvalues implements Serializable, OmEntity {
+public class Fieldlanguagesvalues implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = 1965055047163639210L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldvalues.java Thu Oct 25 18:48:03 2012
@@ -33,7 +33,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
@Entity
@NamedQueries({
@@ -44,7 +44,7 @@ import org.apache.openmeetings.persisten
, @NamedQuery(name = "getFieldByLanguage", query = "SELECT fv FROM Fieldvalues fv WHERE fv.deleted = false") //FIXME no language yet
})
@Table(name = "fieldvalues")
-public class Fieldvalues implements Serializable, OmEntity {
+public class Fieldvalues implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -3439614511218028085L;
@Id
@Column(name="id")
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Thu Oct 25 18:48:03 2012
@@ -40,7 +40,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.ElementDependent;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
@@ -55,7 +55,7 @@ import org.simpleframework.xml.Root;
})
@Table(name = "rooms")
@Root(name = "room")
-public class Rooms implements Serializable, OmEntity {
+public class Rooms implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -2860312283159251568L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java Thu Oct 25 18:48:03 2012
@@ -45,7 +45,7 @@ import org.apache.openjpa.persistence.Fe
import org.apache.openjpa.persistence.FetchGroup;
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.LoadFetchGroup;
-import org.apache.openmeetings.persistence.beans.OmEntity;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.adresses.Adresses;
import org.apache.openmeetings.persistence.beans.adresses.States;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -83,7 +83,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getUsersByOrganisationId", query = "SELECT u FROM Users u WHERE u.deleted = false AND u.organisation_users.organisation.organisation_id = :organisation_id") })
@Table(name = "users")
@Root(name = "user")
-public class Users implements Serializable, OmEntity {
+public class Users implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -2265479712596674065L;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java Thu Oct 25 18:48:03 2012
@@ -25,9 +25,9 @@ import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
-import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDaoImpl;
-import org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl;
-import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDaoImpl;
+import org.apache.openmeetings.data.calendar.daos.AppointmentCategoryDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.RoomDAO;
import org.apache.openmeetings.data.conference.Roommanagement;
@@ -49,7 +49,7 @@ public class CalendarService {
CalendarService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private AppointmentDaoImpl appointmentDao;
+ private AppointmentDao appointmentDao;
@Autowired
private AppointmentLogic appointmentLogic;
@Autowired
@@ -63,9 +63,9 @@ public class CalendarService {
@Autowired
private AuthLevelmanagement authLevelManagement;
@Autowired
- private AppointmentCategoryDaoImpl appointmentCategoryDaoImpl;
+ private AppointmentCategoryDao appointmentCategoryDaoImpl;
@Autowired
- private AppointmentReminderTypDaoImpl appointmentReminderTypDaoImpl;
+ private AppointmentReminderTypDao appointmentReminderTypDaoImpl;
@Autowired
private TimezoneUtil timezoneUtil;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java?rev=1402268&r1=1402267&r2=1402268&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceLibrary.java Thu Oct 25 18:48:03 2012
@@ -32,7 +32,7 @@ import org.apache.openmeetings.conferenc
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
import org.apache.openmeetings.data.file.FileUtils;
-import org.apache.openmeetings.data.file.dao.FileExplorerItemDaoImpl;
+import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
import org.apache.openmeetings.data.file.dto.LibraryPresentation;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.documents.LibraryChartLoader;
@@ -70,7 +70,7 @@ public class ConferenceLibrary implement
@Autowired
private Usermanagement userManagement;
@Autowired
- private FileExplorerItemDaoImpl fileExplorerItemDao;
+ private FileExplorerItemDao fileExplorerItemDao;
@Autowired
private AuthLevelmanagement authLevelManagement;
@Autowired