From 2e518806086029611b930c3079084e0566ce20af Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Thu, 26 May 2005 01:47:29 +0000
Subject: [PATCH] Remove annotations after discussion with Matthew Porter.

---
 domain/project.xml                                 | 14 --------------
 .../domain/impl/AbstractPersistableEntity.java     |  7 -------
 .../domain/impl/PersistableEntityInteger.java      |  4 ----
 .../domain/impl/PersistableEntityLong.java         |  4 ----
 4 files changed, 29 deletions(-)

diff --git a/domain/project.xml b/domain/project.xml
index b24c48c77c..d5bb33c682 100644
--- a/domain/project.xml
+++ b/domain/project.xml
@@ -19,20 +19,6 @@
       <type>jar</type>
       <url>http://www.hibernate.org</url>
     </dependency>
-    <dependency>
-      <groupId>hibernate</groupId>
-      <artifactId>ejb</artifactId>
-      <version>3.0-edr2</version>
-      <type>jar</type>
-      <url>http://www.hibernate.org</url>
-    </dependency>
-    <dependency>
-      <groupId>hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>3.0-beta1</version>
-      <type>jar</type>
-      <url>http://www.hibernate.org</url>
-    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java b/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
index b1eff3932d..5e5d4d656b 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/AbstractPersistableEntity.java
@@ -15,10 +15,6 @@
 
 package net.sf.acegisecurity.domain.impl;
 
-import javax.persistence.Column;
-import javax.persistence.Transient;
-import javax.persistence.Version;
-
 import net.sf.acegisecurity.domain.PersistableEntity;
 
 /**
@@ -50,7 +46,6 @@ public abstract class AbstractPersistableEntity extends BusinessObject
      * @return <code>true</code> if the instance has not been persisted,
      *         <code>false</code> otherwise
      */
-	@Transient
     public boolean isNew() {
         return (getInternalId() == null);
     }
@@ -66,8 +61,6 @@ public abstract class AbstractPersistableEntity extends BusinessObject
      *
      * @return the version
      */
-    @Version
-    @Column(name="version", nullable=false)
     public int getVersion() {
         return version;
     }
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
index 5253ae49e4..b4d9d7b750 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityInteger.java
@@ -17,8 +17,6 @@ package net.sf.acegisecurity.domain.impl;
 
 import java.io.Serializable;
 
-import javax.persistence.Transient;
-
 /**
  * A persistable entity that uses a <code>Integer</code> based identity.
  *
@@ -52,7 +50,6 @@ public abstract class PersistableEntityInteger extends AbstractPersistableEntity
      * <p>Marked as abstract to remind users to implement. They'll need to implement
      * so their annotations reflect the correct sequence name.
      */
-	@Transient
     public abstract Integer getId();
 
     /**
@@ -71,7 +68,6 @@ public abstract class PersistableEntityInteger extends AbstractPersistableEntity
      *
      * @return the instance's identity
      */
-	@Transient
     public Serializable getInternalId() {
         return this.getId();
     }
diff --git a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
index 68eed0584f..e7ad19ff95 100644
--- a/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
+++ b/domain/src/main/java/org/acegisecurity/domain/impl/PersistableEntityLong.java
@@ -17,8 +17,6 @@ package net.sf.acegisecurity.domain.impl;
 
 import java.io.Serializable;
 
-import javax.persistence.Transient;
-
 /**
  * A persistable entity that uses a <code>Long</code> based identity.
  *
@@ -52,7 +50,6 @@ public abstract class PersistableEntityLong extends AbstractPersistableEntity {
      * <p>Marked as abstract to remind users to implement. They'll need to implement
      * so their annotations reflect the correct sequence name.
      */
-	@Transient
     public abstract Long getId();
 
     /**
@@ -71,7 +68,6 @@ public abstract class PersistableEntityLong extends AbstractPersistableEntity {
      *
      * @return the instance's identity
      */
-	@Transient
     public Serializable getInternalId() {
         return this.getId();
     }