From 1739e251a90176e3fccc64ff51ca1e4dbe498eaa Mon Sep 17 00:00:00 2001
From: ghilaima <ghilainm@gmail.com>
Date: Tue, 1 Dec 2015 07:37:18 +0100
Subject: [PATCH] JUDDI-946 - Incorrect annotation on JPA entity classes

---
 juddi-core/src/main/java/org/apache/juddi/model/TempKey.java  |  6 +++---
 .../src/main/java/org/apache/juddi/model/TransferToken.java   | 11 ++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java b/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java
index 33f1927..98d7902 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/TempKey.java
@@ -15,8 +15,8 @@ package org.apache.juddi.model;
  * limitations under the License.
  */
 
+import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 /**
@@ -32,8 +32,8 @@ public class TempKey implements java.io.Serializable {
 	
 	public TempKey(){
 	}
-	
-	@Id
+
+	@EmbeddedId
 	public TempKeyPK getPk() {
 		return pk;
 	}
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java b/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java
index f98acab..f1e41c8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/TransferToken.java
@@ -17,19 +17,11 @@
 
 package org.apache.juddi.model;
 
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  */
@@ -61,6 +53,7 @@ public class TransferToken implements java.io.Serializable{
 		this.transferToken = transferToken;
 	}
 
+	@Temporal(TemporalType.TIMESTAMP)
     @Column(name="expiration_date", nullable = false, updatable = false)
 	public Date getExpirationDate() {
 		return expirationDate;
-- 
1.9.5.msysgit.1