Author: solomax
Date: Thu Oct 18 14:00:42 2012
New Revision: 1399666
URL: http://svn.apache.org/viewvc?rev=1399666&view=rev
Log:
OPENMEETINGS-449 backup is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/OmDAO.java
Thu Oct 18 14:00:42 2012
@@ -79,7 +79,7 @@ public interface OmDAO<T extends OmEntit
* @param entity - entity to be updated
* @param userId - user performed update
*/
- void update(T entity, long userId);
+ T update(T entity, long userId);
/**
* Delete an instance of {@link T}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -137,13 +137,14 @@ public class FieldLanguagesValuesDaoImpl
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public void update(Fieldlanguagesvalues entity, long userId) {
+ public Fieldlanguagesvalues update(Fieldlanguagesvalues entity, long
userId) {
entity.setUpdatetime(new Date());
if (entity.getFieldlanguagesvalues_id() == null) {
em.persist(entity);
} else {
entity = em.merge(entity);
}
+ return entity;
}
/*
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -124,7 +124,7 @@ public class FieldValueDaoImpl implement
return q.getSingleResult();
}
- public void update(Fieldvalues entity, long userId) {
+ public Fieldvalues update(Fieldvalues entity, long userId) {
entity.setDeleted(false);
if (entity.getFieldvalues_id() == null) {
entity.setFieldvalues_id(count() + 1);
@@ -133,6 +133,7 @@ public class FieldValueDaoImpl implement
} else {
entity = em.merge(entity);
}
+ return entity;
}
public void delete(Fieldvalues entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -367,7 +367,7 @@ public class ConfigurationDaoImpl implem
return q.getSingleResult();
}
- public void update(Configuration entity, long userId) {
+ public Configuration update(Configuration entity, long userId) {
if (entity.getConfiguration_id() == null
|| entity.getConfiguration_id() <= 0) {
entity.setStarttime(new Date());
@@ -379,6 +379,8 @@ public class ConfigurationDaoImpl implem
entity.setUpdatetime(new Date());
this.updateConfig(entity);
}
+ //TODO ensure entity returned is updated
+ return entity;
}
public void delete(Configuration entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -305,7 +305,7 @@ public class LdapConfigDaoImpl implement
return q.getSingleResult();
}
- public void update(LdapConfig entity, long userId) {
+ public LdapConfig update(LdapConfig entity, long userId) {
try {
if (entity.getLdapConfigId() <= 0) {
entity.setInserted(new Date());
@@ -321,6 +321,7 @@ public class LdapConfigDaoImpl implement
} catch (PersistenceException ex) {
log.error("[update LdapConfig]", ex);
}
+ return entity;
}
public void delete(LdapConfig entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -210,7 +210,7 @@ public class ServerDaoImpl implements Om
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public void update(Server entity, long userId) {
+ public Server update(Server entity, long userId) {
try {
if (entity.getId() <= 0) {
entity.setInserted(new Date());
@@ -226,6 +226,7 @@ public class ServerDaoImpl implements Om
} catch (PersistenceException ex) {
log.error("[update LdapConfig]", ex);
}
+ return entity;
}
/*
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=1399666&r1=1399665&r2=1399666&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 18 14:00:42 2012
@@ -76,7 +76,7 @@ public class RoomDAO implements OmDAO<Ro
return q.getSingleResult();
}
- public void update(Rooms entity, long userId) {
+ public Rooms update(Rooms entity, long userId) {
if (entity.getRooms_id() == null) {
/* Red5SIP integration
*******************************************************************************/
String sipEnabled =
cfgDao.getConfValue("red5sip.enable", String.class, "no");
@@ -93,11 +93,12 @@ public class RoomDAO implements OmDAO<Ro
}
/*****************************************************************************************************/
entity.setStarttime(new Date());
- entity = em.merge(entity);
+ em.persist(entity);
} else {
entity.setUpdatetime(new Date());
- em.persist(entity);
+ entity = em.merge(entity);
}
+ return entity;
}
public void delete(Rooms entity, long userId) {
Modified:
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?rev=1399666&r1=1399665&r2=1399666&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 18 14:00:42 2012
@@ -74,7 +74,7 @@ public class OrganisationDAO implements
return q.getSingleResult();
}
- public void update(Organisation entity, long userId) {
+ public Organisation update(Organisation entity, long userId) {
if (entity.getOrganisation_id() == null) {
entity.setInsertedby(userId);
entity.setStarttime(new Date());
@@ -84,6 +84,7 @@ public class OrganisationDAO implements
entity.setUpdatetime(new Date());
em.merge(entity);
}
+ return entity;
}
public void delete(Organisation entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDAO.java?rev=1399666&r1=1399665&r2=1399666&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 18 14:00:42 2012
@@ -97,9 +97,9 @@ public class OrganisationUserDAO impleme
return q.getSingleResult();
}
- public void update(Organisation_Users entity, long userId) {
+ public Organisation_Users update(Organisation_Users entity, long
userId) {
//if (entity.getOrganisation_users_id())// TODO Auto-generated
method stub
-
+ return entity;
}
public void delete(Organisation_Users entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
Thu Oct 18 14:00:42 2012
@@ -148,7 +148,7 @@ public class UsersDaoImpl implements OmD
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public void update(Users u, long userId) {
+ public Users update(Users u, long userId) {
if (u.getUser_id() == null) {
u.setStarttime(new Date());
em.persist(u);
@@ -156,6 +156,7 @@ public class UsersDaoImpl implements OmD
u.setUpdatetime(new Date());
u = em.merge(u);
}
+ return u;
}
/*
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1399666&r1=1399665&r2=1399666&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Thu Oct 18 14:00:42 2012
@@ -328,7 +328,7 @@ public class BackupImportController exte
// otherwise
r.setRooms_id(null);
- roomDao.update(r, 1L);
+ r = roomDao.update(r, 1L);
roomsMap.put(roomId, r.getRooms_id());
for (RoomModerators rm : r.getModerators()) {
