isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1362800 - in /incubator/isis/trunk: examples/quickstart/wicket/ide/eclipse/launch/ framework/runtimes/dflt/objectstores/ framework/tck/tck-dom/ framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ framework/tck/tck-dom/src/mai...
Date Wed, 18 Jul 2012 07:56:56 GMT
Author: danhaywood
Date: Wed Jul 18 07:56:55 2012
New Revision: 1362800

URL: http://svn.apache.org/viewvc?rev=1362800&view=rev
Log:
ISIS-14: removing javax.persistence annotations and ref to the JPA objectstore (in order to
focus solely on the JDO objectstore).

Modified:
    incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
    incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/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/refs/AggregatedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListChildEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetChildEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassChildEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype1Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype2Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype3Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategyParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype1Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype2Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
    incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java

Modified: incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
(original)
+++ incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
Wed Jul 18 07:56:55 2012
@@ -16,4 +16,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-D isis.persistor.datanucleus.install-fixtures=true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-wicket"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
(original)
+++ incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
Wed Jul 18 07:56:55 2012
@@ -16,4 +16,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-wicket"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml Wed Jul 18 07:56:55
2012
@@ -46,7 +46,6 @@
 		<module>xml</module>
 		<module>sql</module>
 		<module>nosql</module>
-		<module>jpa</module>
 		<module>jdo</module>
 	</modules>
 	

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=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/pom.xml (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/pom.xml Wed Jul 18 07:56:55 2012
@@ -112,6 +112,11 @@
 			<artifactId>jdo-applib</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>wicket-applib</artifactId>
+		</dependency>
+
 		<!-- DataNucleus (horrid, but needed to run the enhancer)-->
        <dependency>
             <groupId>javax.jdo</groupId>
@@ -130,16 +135,5 @@
             <artifactId>datanucleus-api-jdo</artifactId>
         </dependency>
 		
-
-		<dependency>
-            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-			<artifactId>jpa-applib</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>wicket-applib</artifactId>
-		</dependency>
-				
 	</dependencies>
 </project>

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/AggregatedEntity.java
Wed Jul 18 07:56:55 2012
@@ -26,9 +26,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable
 @javax.jdo.annotations.EmbeddedOnly
 @javax.jdo.annotations.Discriminator("RFCG")
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("RFCG")
-@javax.persistence.Embeddable
 @Aggregated
 @ObjectType("AGGR")
 public class AggregatedEntity extends BaseEntity {

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListChildEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListChildEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListChildEntity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("BDLC")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("BDLC")
 @ObjectType("BDLC")
 public class BidirWithListChildEntity extends AbstractDomainObject {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithListParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -33,8 +33,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("BDLP")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("BDLP")
 @ObjectType("BDLP")
 public class BidirWithListParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetChildEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetChildEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetChildEntity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("BDSC")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("BDSC")
 @ObjectType("BDSC")
 public class BidirWithSetChildEntity extends AbstractDomainObject {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/BidirWithSetParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -35,8 +35,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("BDSP")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("BDSP")
 @ObjectType("BDSP")
 public class BidirWithSetParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassChildEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassChildEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassChildEntity.java
Wed Jul 18 07:56:55 2012
@@ -35,8 +35,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PCCH")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PCCH")
 @ObjectType("PCCH")
 public abstract class PolyClassChildEntity extends AbstractDomainObject {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -36,8 +36,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("PCPR")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PCPR")
 @ObjectType("PCPR")
 public class PolyClassParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype1Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype1Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype1Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype1Entity.java
Wed Jul 18 07:56:55 2012
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PCS1")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PCS1")
 @ObjectType("PCS1")
 public class PolyClassSubtype1Entity extends PolyClassChildEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype2Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype2Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype2Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype2Entity.java
Wed Jul 18 07:56:55 2012
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PCS2")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PCS2")
 @ObjectType("PCS2")
 public class PolyClassSubtype2Entity extends PolyClassChildEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype3Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype3Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype3Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyClassSubtype3Entity.java
Wed Jul 18 07:56:55 2012
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PCS3")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PCS3")
 @ObjectType("PCS3")
 public class PolyClassSubtype3Entity extends PolyClassChildEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategyParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategyParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategyParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategyParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -38,8 +38,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("PIIP")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIIP")
 @ObjectType("PIIP")
 public class PolyInterfaceIdentityStrategyParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype1Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype1Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype1Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype1Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PII1")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PII1")
 @ObjectType("PII1")
 public class PolyInterfaceIdentityStrategySubtype1Entity extends BaseEntity implements PolyInterfaceIdentityStrategy
{
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype2Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype2Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype2Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype2Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PII2")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PII2")
 @ObjectType("PII2")
 public class PolyInterfaceIdentityStrategySubtype2Entity extends BaseEntity implements PolyInterfaceIdentityStrategy
{
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceIdentityStrategySubtype3Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PIS3")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIS3")
 @ObjectType("PIS3")
 public class PolyInterfaceIdentityStrategySubtype3Entity extends BaseEntity implements PolyInterfaceIdentityStrategy
{
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -37,8 +37,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("PIPR")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIPR")
 @ObjectType("PIPR")
 public class PolyInterfaceParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PIS1")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIS1")
 @ObjectType("PIS1")
 public class PolyInterfaceSubtype1Entity extends BaseEntity implements PolyInterface {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PIS2")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIS2")
 @ObjectType("PIS2")
 public class PolyInterfaceSubtype2Entity extends BaseEntity implements PolyInterface {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Discriminator("PIS3")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("PIS3")
 @ObjectType("PIS3")
 public class PolyInterfaceSubtype3Entity extends BaseEntity implements PolyInterface {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("RFCG")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("RFCG")
 @ObjectType("RFCG")
 public class ReferencingEntity extends BaseEntity {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
Wed Jul 18 07:56:55 2012
@@ -32,8 +32,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("SMPL")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("SMPL")
 @ObjectType("SMPL")
 public class SimpleEntity extends BaseEntity {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
Wed Jul 18 07:56:55 2012
@@ -29,8 +29,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDFC")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDFC")
 @ObjectType("UDFC")
 public class UnidirFkChildEntity extends AbstractDomainObject {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -34,8 +34,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDFP")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDFP")
 @ObjectType("UDFP")
 public class UnidirFkParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
Wed Jul 18 07:56:55 2012
@@ -29,8 +29,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDJC")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDJC")
 @ObjectType("UDJC")
 public class UnidirJoinChildEntity extends AbstractDomainObject {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
Wed Jul 18 07:56:55 2012
@@ -36,8 +36,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDJP")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDJP")
 @ObjectType("UDJP")
 public class UnidirJoinParentEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
Wed Jul 18 07:56:55 2012
@@ -29,8 +29,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDRD")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDRD")
 @ObjectType("UDRD")
 public class UnidirReferencedEntity extends AbstractDomainObject {
     

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
Wed Jul 18 07:56:55 2012
@@ -29,8 +29,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("UDRG")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("UDRG")
 @ObjectType("UDRG")
 public class UnidirReferencingEntity extends BaseEntity {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
Wed Jul 18 07:56:55 2012
@@ -39,8 +39,6 @@ import org.apache.isis.applib.value.Time
 @javax.jdo.annotations.Query(
         name="jdkv_findByStringProperty", language="JDOQL",  
         value="SELECT FROM org.apache.isis.tck.dom.scalars.ApplibValuedEntity WHERE stringProperty
== :i")
-@javax.persistence.Entity                    
-@javax.persistence.DiscriminatorValue("APLV")
 @ObjectType("APLV")
 public class ApplibValuedEntity extends AbstractDomainObject {
 
@@ -49,7 +47,6 @@ public class ApplibValuedEntity extends 
     private String stringProperty;
 
     @javax.jdo.annotations.PrimaryKey
-    @javax.persistence.Id
     @Title
     @Optional
     @MemberOrder(sequence = "1")

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
Wed Jul 18 07:56:55 2012
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
 @javax.jdo.annotations.Discriminator("AUAS")
 @javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@javax.persistence.Entity
-@javax.persistence.DiscriminatorValue("AUAS")
 @ObjectType("AUAS")
 public class AutoAssignedEntity extends AbstractDomainObject {
 

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
Wed Jul 18 07:56:55 2012
@@ -34,8 +34,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Query(
         name="jdkv_findByStringProperty", language="JDOQL",  
         value="SELECT FROM org.apache.isis.tck.dom.scalars.JdkValuedEntity WHERE stringProperty
== :i")
-@javax.persistence.Entity                    
-@javax.persistence.DiscriminatorValue("JDKV")
 @ObjectType("JDKV")
 public class JdkValuedEntity extends AbstractDomainObject {
 
@@ -43,7 +41,6 @@ public class JdkValuedEntity extends Abs
     private String stringProperty;
 
     @javax.jdo.annotations.PrimaryKey
-    @javax.persistence.Id
     @Title
     @Optional
     @MemberOrder(sequence = "1")

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=1362800&r1=1362799&r2=1362800&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
Wed Jul 18 07:56:55 2012
@@ -28,8 +28,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Query(
         name="prmv_findByIntProperty", language="JDOQL",  
         value="SELECT FROM org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity WHERE intProperty
== :i")
-@javax.persistence.Entity                    
-@javax.persistence.DiscriminatorValue("PRMV")
 @ObjectType("PRMV")
 public class PrimitiveValuedEntity extends AbstractDomainObject {
 
@@ -37,7 +35,6 @@ public class PrimitiveValuedEntity exten
     private Integer id;
 
     @javax.jdo.annotations.PrimaryKey // must be on the getter.
-    @javax.persistence.Id
     public Integer getId() {
         return id;
     }

Modified: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java?rev=1362800&r1=1362799&r2=1362800&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
(original)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
Wed Jul 18 07:56:55 2012
@@ -30,8 +30,6 @@ import org.apache.isis.applib.annotation
 @javax.jdo.annotations.Query(
         name="wrpv_findByStringProperty", language="JDOQL",  
         value="SELECT FROM org.apache.isis.tck.dom.scalars.WrapperValuedEntity WHERE stringProperty
== :i")
-@javax.persistence.Entity                    
-@javax.persistence.DiscriminatorValue("WRPV")
 @ObjectType("WRPV")
 public class WrapperValuedEntity extends AbstractDomainObject {
 
@@ -39,7 +37,6 @@ public class WrapperValuedEntity extends
     private String stringProperty;
 
     @javax.jdo.annotations.PrimaryKey
-    @javax.persistence.Id
     @Title
     @Optional
     @MemberOrder(sequence = "1")



Mime
View raw message