Author: sebawagner
Date: Thu Feb 7 06:00:06 2013
New Revision: 1443318
URL: http://svn.apache.org/viewvc?rev=1443318&view=rev
Log:
Change IDataProviderDao to have Long instead of long in update and delete
method to have "null" available in case you don't know who is performing the
update or delete (system update).
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/IDataProviderDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Whiteboard.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/IDataProviderDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/IDataProviderDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/IDataProviderDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/IDataProviderDao.java
Thu Feb 7 06:00:06 2013
@@ -80,7 +80,7 @@ public interface IDataProviderDao<T exte
* @param entity - entity to be updated
* @param userId - user performed update
*/
- T update(T entity, long userId);
+ T update(T entity, Long userId);
/**
* Delete an instance of {@link T}
@@ -88,5 +88,5 @@ public interface IDataProviderDao<T exte
* @param entity - entity to be deleted
* @param userId - user performed delete
*/
- void delete(T entity, long userId);
+ void delete(T entity, Long userId);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguagesValuesDaoImpl.java
Thu Feb 7 06:00:06 2013
@@ -137,7 +137,7 @@ public class FieldLanguagesValuesDaoImpl
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public Fieldlanguagesvalues update(Fieldlanguagesvalues entity, long
userId) {
+ public Fieldlanguagesvalues update(Fieldlanguagesvalues entity, Long
userId) {
entity.setUpdatetime(new Date());
if (entity.getFieldlanguagesvalues_id() == null) {
em.persist(entity);
@@ -154,7 +154,7 @@ public class FieldLanguagesValuesDaoImpl
*
org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public void delete(Fieldlanguagesvalues entity, long userId) {
+ public void delete(Fieldlanguagesvalues entity, Long userId) {
entity.setDeleted(true);
entity.setUpdatetime(new Date());
entity = em.merge(entity);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldValueDaoImpl.java
Thu Feb 7 06:00:06 2013
@@ -138,7 +138,7 @@ public class FieldValueDaoImpl implement
return q.getSingleResult();
}
- public Fieldvalues 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);
@@ -150,7 +150,7 @@ public class FieldValueDaoImpl implement
return entity;
}
- public void delete(Fieldvalues entity, long userId) {
+ public void delete(Fieldvalues entity, Long userId) {
// TODO Auto-generated method stub
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
Thu Feb 7 06:00:06 2013
@@ -365,7 +365,7 @@ public class ConfigurationDao implements
return q.getSingleResult();
}
- public Configuration update(Configuration entity, long userId) {
+ public Configuration update(Configuration entity, Long userId) {
String key = entity.getConf_key();
String value = entity.getConf_value();
if (entity.getConfiguration_id() == null
@@ -392,7 +392,7 @@ public class ConfigurationDao implements
return entity;
}
- public void delete(Configuration entity, long userId) {
+ public void delete(Configuration entity, Long userId) {
if (userId > 0) {
entity.setUser(usersDao.get(userId));
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
Thu Feb 7 06:00:06 2013
@@ -305,7 +305,7 @@ public class LdapConfigDao implements ID
return q.getSingleResult();
}
- public LdapConfig update(LdapConfig entity, long userId) {
+ public LdapConfig update(LdapConfig entity, Long userId) {
try {
if (entity.getLdapConfigId() <= 0) {
entity.setInserted(new Date());
@@ -328,7 +328,7 @@ public class LdapConfigDao implements ID
return entity;
}
- public void delete(LdapConfig entity, long userId) {
+ public void delete(LdapConfig entity, Long userId) {
if (entity.getLdapConfigId() >= 0) {
entity.setUpdated(new Date());
if (userId > 0) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
Thu Feb 7 06:00:06 2013
@@ -159,7 +159,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#update(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public Server update(Server entity, long userId) {
+ public Server update(Server entity, Long userId) {
entity.setDeleted(false);
if (entity.getId() > 0) {
if (userId > 0) {
@@ -188,7 +188,7 @@ public class ServerDao implements IDataP
*
org.apache.openmeetings.data.OmDAO#delete(org.apache.openmeetings.persistence
* .beans.OmEntity, long)
*/
- public void delete(Server entity, long userId) {
+ public void delete(Server entity, Long userId) {
if (entity.getId() > 0) {
entity.setUpdated(new Date());
if (userId > 0) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/dao/RoomDao.java
Thu Feb 7 06:00:06 2013
@@ -91,7 +91,7 @@ public class RoomDao implements IDataPro
return q.getResultList();
}
- public Room update(Room entity, long userId) {
+ public Room update(Room entity, Long userId) {
if (entity.getRooms_id() == null) {
entity.setStarttime(new Date());
em.persist(entity);
@@ -102,7 +102,7 @@ public class RoomDao implements IDataPro
return entity;
}
- public void delete(Room entity, long userId) {
+ public void delete(Room entity, Long userId) {
entity.setDeleted(true);
update(entity, userId);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/Usermanagement.java
Thu Feb 7 06:00:06 2013
@@ -1549,7 +1549,7 @@ public class Usermanagement {
}
public void updateUser(User user) {
- usersDao.update(user, -1L);
+ usersDao.update(user, null);
}
/**
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationDao.java
Thu Feb 7 06:00:06 2013
@@ -74,7 +74,7 @@ public class OrganisationDao implements
return q.getSingleResult();
}
- public Organisation update(Organisation entity, long userId) {
+ public Organisation update(Organisation entity, Long userId) {
if (entity.getOrganisation_id() == null) {
if (userId > 0) {
entity.setInsertedby(userId);
@@ -91,7 +91,7 @@ public class OrganisationDao implements
return entity;
}
- public void delete(Organisation entity, long userId) {
+ public void delete(Organisation entity, Long userId) {
em.createNamedQuery("deleteUsersFromOrganisation")
.setParameter("id", entity.getOrganisation_id())
.executeUpdate();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/OrganisationUserDao.java
Thu Feb 7 06:00:06 2013
@@ -97,12 +97,12 @@ public class OrganisationUserDao impleme
return q.getSingleResult();
}
- public Organisation_Users 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) {
+ public void delete(Organisation_Users entity, Long userId) {
if (entity.getOrganisation_users_id() != null) {
User u = usersDao.get(entity.getUser_id());
int idx = u.getOrganisation_users().indexOf(entity);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
Thu Feb 7 06:00:06 2013
@@ -128,7 +128,7 @@ public class UsersDao implements IDataPr
return q.getResultList();
}
- public User update(User u, long userId) {
+ public User update(User u, Long userId) {
if (u.getUser_id() == null) {
u.setStarttime(new Date());
em.persist(u);
@@ -139,7 +139,7 @@ public class UsersDao implements IDataPr
return u;
}
- public void delete(User u, long userId) {
+ public void delete(User u, Long userId) {
deleteUserID(u.getUser_id());
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Whiteboard.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Whiteboard.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Whiteboard.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Whiteboard.java
Thu Feb 7 06:00:06 2013
@@ -12,6 +12,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
@Entity
@Table(name = "whiteboard")
@@ -42,6 +43,7 @@ public class Whiteboard {
@OneToMany
@ElementJoinColumn(name = "whiteboarditem_id", referencedColumnName =
"id")
+ @ForeignKey(enabled = true)
private Collection<WhiteboardItem> roomItems;
public long getId() {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSession.java
Thu Feb 7 06:00:06 2013
@@ -58,7 +58,7 @@ public class TestDbSession extends Abstr
server = new Server();
server.setName("Test Server");
server.setActive(true);
- serverDao.update(server, 0);
+ serverDao.update(server, null);
}
Client cl1 = new Client();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java?rev=1443318&r1=1443317&r2=1443318&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/session/TestDbSessionGetRoomIds.java
Thu Feb 7 06:00:06 2013
@@ -58,7 +58,7 @@ public class TestDbSessionGetRoomIds ext
server = new Server();
server.setName("Test Server");
server.setActive(true);
- serverDao.update(server, 0);
+ serverDao.update(server, null);
}
Client cl1 = new Client();
