incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1357753 - in /incubator/isis/trunk/framework/tck: pom.xml tck-dom/pom.xml tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
Date Thu, 05 Jul 2012 17:27:22 GMT
Author: danhaywood
Date: Thu Jul  5 17:27:22 2012
New Revision: 1357753

URL: http://svn.apache.org/viewvc?rev=1357753&view=rev
Log:
ISIS-14: updating tck domain class with JDO annotations

Modified:
    incubator/isis/trunk/framework/tck/pom.xml
    incubator/isis/trunk/framework/tck/tck-dom/pom.xml
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java

Modified: incubator/isis/trunk/framework/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/pom.xml?rev=1357753&r1=1357752&r2=1357753&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/pom.xml Thu Jul  5 17:27:22 2012
@@ -329,6 +329,24 @@
                 <version>0.3.1-incubating-SNAPSHOT</version>
             </dependency>
 
+            <!-- isis: runtimes-dflt: objectstores: jdo/datanucleus -->
+            <dependency>
+                <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+                <artifactId>jdo-applib</artifactId>
+                <version>0.3.1-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+                <artifactId>jdo-metamodel</artifactId>
+                <version>0.3.1-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+                <artifactId>jdo-datanucleus</artifactId>
+                <version>0.3.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+
             <!-- isis: runtimes-dflt: objectstores: jpa/openjpa -->
             <dependency>
                 <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>

Modified: incubator/isis/trunk/framework/tck/tck-dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/pom.xml?rev=1357753&r1=1357752&r2=1357753&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/pom.xml Thu Jul  5 17:27:22 2012
@@ -36,6 +36,11 @@
 
 		<dependency>
             <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+			<artifactId>jdo-applib</artifactId>
+		</dependency>
+
+		<dependency>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
 			<artifactId>jpa-applib</artifactId>
 		</dependency>
 		

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java?rev=1357753&r1=1357752&r2=1357753&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
Thu Jul  5 17:27:22 2012
@@ -19,6 +19,9 @@
 
 package org.apache.isis.tck.dom.scalars;
 
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PrimaryKey;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -27,15 +30,18 @@ import org.apache.isis.applib.AbstractDo
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.ObjectType;
 
-@Entity // for openjpa object store
-@DiscriminatorValue("PRMV") // for openjpa object store
+@PersistenceCapable         // for jdo object store
+@Discriminator("PRMV")      // for jdo object store
+@Entity                     // for jpa object store
+@DiscriminatorValue("PRMV") // for jpa object store
 @ObjectType("PRMV")
 public class PrimitiveValuedEntity extends AbstractDomainObject {
 
     // {{ Id (Integer)
     private Integer id;
 
-    @Id // for openjpa object store
+    @PrimaryKey // for jdo object store
+    @Id         // for jpa object store
     public Integer getId() {
         return id;
     }



Mime
View raw message