Author: sebawagner
Date: Mon Oct 15 18:21:06 2012
New Revision: 1398434
URL: http://svn.apache.org/viewvc?rev=1398434&view=rev
Log:
OPENMEETINGS-445 - rename Fetchgroup to something more meaningfull
("backupexport")
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/Users.java
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=1398434&r1=1398433&r2=1398434&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
Mon Oct 15 18:21:06 2012
@@ -280,7 +280,7 @@ public class UsersDaoImpl implements OmD
Users.class);
@SuppressWarnings("unchecked")
OpenJPAQuery<Users> kq = OpenJPAPersistence.cast(q);
- kq.getFetchPlan().addFetchGroup("passwordexport");
+ kq.getFetchPlan().addFetchGroup("backupexport");
return kq.getResultList();
} catch (Exception ex2) {
log.error("[getAllUsersDeleted] ", ex2);
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=1398434&r1=1398433&r2=1398434&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
Mon Oct 15 18:21:06 2012
@@ -65,7 +65,7 @@ import org.simpleframework.xml.Root;
*/
@Entity
@FetchGroups({
- @FetchGroup(name = "passwordexport",
+ @FetchGroup(name = "backupexport",
attributes = { @FetchAttribute(name = "password")
})
})
@@ -125,7 +125,7 @@ public class Users implements Serializab
@Basic(fetch = FetchType.LAZY)
@Column(name = "password")
- @LoadFetchGroup("passwordexport")
+ @LoadFetchGroup("backupexport")
@Element(name = "pass", data = true)
private String password;