Extension.value -> LOB,

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / common / User.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/User.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/User.java
index 582729a33c2583b797444588105e20f30b3dc477..b00b8abd6d4e4c05fb41a9732c758f439d56083e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/User.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/User.java
@@ -17,6 +17,7 @@ import javax.persistence.Entity;
 import javax.persistence.FetchType;\r
 import javax.persistence.ManyToMany;\r
 import javax.persistence.OneToOne;\r
+import javax.persistence.Table;\r
 import javax.persistence.Transient;\r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
@@ -28,6 +29,9 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlTransient;\r
 import javax.xml.bind.annotation.XmlType;\r
 \r
+import org.apache.log4j.Logger;\r
+import org.hibernate.annotations.Cascade;\r
+import org.hibernate.annotations.CascadeType;\r
 import org.hibernate.annotations.NaturalId;\r
 import org.hibernate.envers.Audited;\r
 import org.hibernate.envers.NotAudited;\r
@@ -52,13 +56,19 @@ import eu.etaxonomy.cdm.model.agent.Person;
 @XmlRootElement(name = "User")\r
 @Entity\r
 @Audited\r
+@Table(name = "UserAccount")\r
 public class User extends CdmBase implements UserDetails {\r
-\r
-       /**\r
-        * \r
-        */\r
        private static final long serialVersionUID = 6582191171369439163L;\r
-\r
+       @SuppressWarnings(value="unused")\r
+       private static final Logger logger = Logger.getLogger(User.class);\r
+       \r
+       public static User NewInstance(String username, String pwd){\r
+               User user = new User();\r
+               user.setUsername(username);\r
+               user.setPassword(pwd);\r
+               return user;\r
+       }\r
+       \r
        @XmlElement(name = "Username")\r
        @NaturalId\r
        protected String username;\r
@@ -105,6 +115,7 @@ public class User extends CdmBase implements UserDetails {
        @XmlIDREF\r
        @XmlSchemaType(name = "IDREF")\r
        @OneToOne(fetch = FetchType.LAZY)\r
+       @Cascade({CascadeType.SAVE_UPDATE})\r
        protected Person person;\r
        \r
        @XmlTransient\r
@@ -121,6 +132,7 @@ public class User extends CdmBase implements UserDetails {
                authorities = allAuthorities.toArray(new GrantedAuthority[allAuthorities.size()]);\r
        }\r
        \r
+       @Transient\r
        public GrantedAuthority[] getAuthorities() {\r
                if(authorities == null) initAuthorities();\r
                return authorities;\r