X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2FAbstractPersistent.java;h=cd2837dd389187902af5345f40284aaad1a28cec;hb=96c8961955a306314dfe0cf9ca192252de39fc1c;hp=f5944843ab7a5cd9017da1ed44ee44257d50b306;hpb=42944597bb468685919c4b15146c43b24af9d055;p=utils

diff --git a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
index f5944843..cd2837dd 100644
--- a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
+++ b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
@@ -17,11 +17,6 @@ package org.wamblee.security;
 
 import java.io.Serializable;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Version;
-
 import org.wamblee.persistence.Persistent;
 
 /**
@@ -30,13 +25,10 @@ import org.wamblee.persistence.Persistent;
  * @author Erik Brakkee
  */
 public abstract class AbstractPersistent implements Persistent {
-    
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+   
+    private Serializable primaryKey;
 
-    @Version
-    private int version;
+    private Number version;
 
     protected AbstractPersistent() {
         primaryKey = null;
@@ -60,7 +52,7 @@ public abstract class AbstractPersistent implements Persistent {
      * @see org.wamblee.persistence.Persistent#getPrimaryKey()
      */
     @Override
-    public Long getPrimaryKey() {
+    public Serializable getPrimaryKey() {
         return primaryKey;
     }
 
@@ -71,7 +63,7 @@ public abstract class AbstractPersistent implements Persistent {
      * org.wamblee.persistence.Persistent#setPrimaryKey(java.io.Serializable)
      */
     @Override
-    public void setPrimaryKey(Long aKey) {
+    public void setPrimaryKey(Serializable aKey) {
         primaryKey = aKey;
     }
 
@@ -80,7 +72,7 @@ public abstract class AbstractPersistent implements Persistent {
      * 
      * @see org.wamblee.persistence.Persistent#getPersistedVersion()
      */
-    public int getPersistedVersion() {
+    public Number getPersistedVersion() {
         return version;
     }
 
@@ -89,7 +81,7 @@ public abstract class AbstractPersistent implements Persistent {
      * 
      * @see org.wamblee.persistence.Persistent#setPersistedVersion(int)
      */
-    public void setPersistedVersion(int aVersion) {
+    public void setPersistedVersion(Number aVersion) {
         version = aVersion;
     }
 }