You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/06 15:29:39 UTC

[31/32] ISIS-188: factored out isis-parent pom

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
deleted file mode 100644
index e44ff9c..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype1Entity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("PIS1")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@ObjectType("PIS1")
-public class PolyInterfaceSubtype1Entity extends BaseEntity implements PolyInterface {
-
-
-    
-    // {{ Parent (title #1)
-    private PolyInterfaceParentEntity parent;
-
-    @Title(sequence="1", append="-")
-    @MemberOrder(sequence = "1")
-    @Optional
-    public PolyInterfaceParentEntity getParent() {
-        return parent;
-    }
-
-    public void setParent(final PolyInterfaceParentEntity parent) {
-        this.parent = parent;
-    }
-
-    // }}
-
-    // {{ Name  (title #2)
-    private String name;
-
-    @Title(sequence="2")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-    
-    // {{ Foo (property)
-    private int foo;
-
-    @MemberOrder(sequence = "1")
-    public int getFoo() {
-        return foo;
-    }
-
-    public void setFoo(final int foo) {
-        this.foo = foo;
-    }
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
deleted file mode 100644
index a85d3b4..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype2Entity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("PIS2")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@ObjectType("PIS2")
-public class PolyInterfaceSubtype2Entity extends BaseEntity implements PolyInterface {
-
-    
-    // {{ Parent (title #1)
-    private PolyInterfaceParentEntity parent;
-
-    @Title(sequence="1", append="-")
-    @MemberOrder(sequence = "1")
-    @Optional
-    public PolyInterfaceParentEntity getParent() {
-        return parent;
-    }
-
-    public void setParent(final PolyInterfaceParentEntity parent) {
-        this.parent = parent;
-    }
-
-    // }}
-
-    // {{ Name  (title #2)
-    private String name;
-
-    @Title(sequence="2")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-    
-    // {{ Bar (property)
-    private String bar;
-
-    @MemberOrder(sequence = "1")
-    public String getBar() {
-        return bar;
-    }
-
-    public void setBar(final String bar) {
-        this.bar = bar;
-    }
-    // }}
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
deleted file mode 100644
index 4678937..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/PolyInterfaceSubtype3Entity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Inheritance;
-import javax.jdo.annotations.InheritanceStrategy;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("PIS3")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@ObjectType("PIS3")
-public class PolyInterfaceSubtype3Entity extends BaseEntity implements PolyInterface {
-
-    
-
-    // {{ Parent (title #1)
-    private PolyInterfaceParentEntity parent;
-
-    @Title(sequence="1", append="-")
-    @MemberOrder(sequence = "1")
-    @Optional
-    public PolyInterfaceParentEntity getParent() {
-        return parent;
-    }
-
-    public void setParent(final PolyInterfaceParentEntity parent) {
-        this.parent = parent;
-    }
-
-    // }}
-
-    // {{ Name  (title #2)
-    private String name;
-
-    @Title(sequence="2")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-    
-    // {{ Baz (property)
-    private java.math.BigDecimal boz;
-
-    @MemberOrder(sequence = "1")
-    public java.math.BigDecimal getBoz() {
-        return boz;
-    }
-
-    public void setBoz(final java.math.BigDecimal baz) {
-        this.boz = baz;
-    }
-    // }}
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
deleted file mode 100644
index 6303b9f..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/ReferencingEntity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import java.util.List;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.InheritanceStrategy;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.annotation.NotPersisted;
-import org.apache.isis.applib.annotation.ObjectType;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("RFCG")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("RFCG")
-public class ReferencingEntity extends BaseEntity {
-    
-    
-    // {{ Reference
-    private SimpleEntity reference;
-
-    public SimpleEntity getReference() {
-        return reference;
-    }
-
-    public void setReference(final SimpleEntity reference) {
-        this.reference = reference;
-    }
-
-    // }}
-
-    // {{ AggregatedEntity
-    private AggregatedEntity aggregatedReference;
-
-    public AggregatedEntity getAggregatedReference() {
-        return aggregatedReference;
-    }
-
-    public void setAggregatedReference(final AggregatedEntity aggregatedReference) {
-        this.aggregatedReference = aggregatedReference;
-    }
-
-    public AggregatedEntity addAggregatedReference() {
-        final AggregatedEntity aggregatedEntity = newAggregatedInstance(AggregatedEntity.class);
-        setAggregatedReference(aggregatedEntity);
-        return aggregatedEntity;
-    }
-    // }}
-
-    // {{ AggregatedEntities
-    private List<AggregatedEntity> aggregatedEntities = Lists.newArrayList();
-
-    public List<AggregatedEntity> getAggregatedEntities() {
-        return aggregatedEntities;
-    }
-
-    public void setAggregatedEntities(List<AggregatedEntity> aggregatedEntities) {
-        this.aggregatedEntities = aggregatedEntities;
-    }
-    
-    public AggregatedEntity addAggregatedEntityToCollection() {
-        final AggregatedEntity aggregatedEntity = newAggregatedInstance(AggregatedEntity.class);
-        getAggregatedEntities().add(aggregatedEntity);
-        return aggregatedEntity;
-    }
-    // }}
-
-    // {{ NotPersisted
-    @NotPersisted
-    public SimpleEntity getNotPersisted() {
-        throw new org.apache.isis.applib.ApplicationException("unexpected call");
-    }
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
deleted file mode 100644
index c59ef5c..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/SimpleEntity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import java.util.Date;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.NotPersisted;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("SMPL")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("SMPL")
-public class SimpleEntity extends BaseEntity {
-    
-    // {{ name: String (title)
-    private String name;
-
-    @Title
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-    // {{ Date: java.util.Date
-    private Date date;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(final Date date) {
-        this.date = date;
-    }
-    // }}
-
-    // {{ Size: int
-    private int size;
-
-    @MemberOrder(sequence = "1")
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(final int size) {
-        this.size = size;
-    }
-
-    // }}
-
-    // {{ Nullable: long
-    private Long number;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Long getNullable() {
-        return number;
-    }
-
-    public void setNullable(final Long number) {
-        this.number = number;
-    }
-
-    // }}
-
-    // {{ NotPersisted: int  (nb: throws exception if called)
-    @NotPersisted
-    public int getNotPersisted() {
-        throw new org.apache.isis.applib.ApplicationException("unexpected call");
-    }
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
deleted file mode 100644
index 6e765f4..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkChildEntity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDFC")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDFC")
-public class UnidirFkChildEntity extends AbstractDomainObject {
-    
-
-    // {{ Name  (title)
-    private String name;
-
-    @Title(sequence="1")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
deleted file mode 100644
index 34fc364..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDFP")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDFP")
-public class UnidirFkParentEntity extends BaseEntity {
-
-    
-    // {{ Name (also title)
-    private String name;
-    
-    @Title
-    @MemberOrder(sequence = "1")
-    @Optional
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-    // {{ Children
-    private Set<UnidirFkChildEntity> children = new HashSet<UnidirFkChildEntity>();
-
-    public Set<UnidirFkChildEntity> getChildren() {
-        return children;
-    }
-
-    public void setChildren(final Set<UnidirFkChildEntity> children) {
-        this.children = children;
-    }
-    // }}
-
-
-    // {{ newChild (action)
-    public UnidirFkChildEntity newChild(final String name) {
-        final UnidirFkChildEntity childEntity = newTransientInstance(UnidirFkChildEntity.class);
-        childEntity.setName(name);
-        addChild(childEntity);
-        return childEntity;
-    }
-    // }}
-
-
-    // {{ removeChild (action)
-    public void addChild(UnidirFkChildEntity childEntity) {
-        this.getChildren().add(childEntity);
-        persistIfNotAlready(childEntity);
-    }
-    // }}
-
-    // {{ removeChild (action)
-    public UnidirFkParentEntity removeChild(final UnidirFkChildEntity childEntity) {
-        if (getChildren().contains(childEntity)) {
-            getChildren().remove(childEntity);
-        }
-        return this;
-    }
-
-    public List<UnidirFkChildEntity> choices0RemoveChild() {
-        return Arrays.asList(getChildren().toArray(new UnidirFkChildEntity[0]));
-    }
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java
deleted file mode 100644
index 7314dce..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirFkParentEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("UnidirParentEntities")
-@ObjectType("UnidirParentEntities")
-public class UnidirFkParentEntityRepository extends AbstractEntityRepository<UnidirFkParentEntity> {
-
-    public UnidirFkParentEntityRepository() {
-        super(UnidirFkParentEntity.class, "UnidirParentEntities");
-    }
-
-    @MemberOrder(sequence = "2")
-    public UnidirFkParentEntity newEntity(final String name) {
-        final UnidirFkParentEntity entity = newTransientInstance(UnidirFkParentEntity.class);
-        entity.setName(name);
-        persist(entity);
-        return entity;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
deleted file mode 100644
index cd23022..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinChildEntity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDJC")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDJC")
-public class UnidirJoinChildEntity extends AbstractDomainObject {
-    
-
-    // {{ Name  (title)
-    private String name;
-
-    @Title(sequence="1")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
deleted file mode 100644
index 272f00e..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Join;
-import javax.jdo.annotations.Persistent;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDJP")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDJP")
-public class UnidirJoinParentEntity extends BaseEntity {
-
-    
-    // {{ Name (also title)
-    private String name;
-    
-    @Title
-    @MemberOrder(sequence = "1")
-    @Optional
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-    // {{ Children
-    @Join
-    private Set<UnidirJoinChildEntity> children = new HashSet<UnidirJoinChildEntity>();
-
-    public Set<UnidirJoinChildEntity> getChildren() {
-        return children;
-    }
-
-    public void setChildren(final Set<UnidirJoinChildEntity> children) {
-        this.children = children;
-    }
-    // }}
-
-
-    // {{ newChild (action)
-    public UnidirJoinChildEntity newChild(final String name) {
-        final UnidirJoinChildEntity childEntity = newTransientInstance(UnidirJoinChildEntity.class);
-        childEntity.setName(name);
-        addChild(childEntity);
-        return childEntity;
-    }
-    // }}
-
-
-    // {{ removeChild (action)
-    public void addChild(UnidirJoinChildEntity childEntity) {
-        this.getChildren().add(childEntity);
-        persistIfNotAlready(childEntity);
-    }
-    // }}
-
-    // {{ removeChild (action)
-    public UnidirJoinParentEntity removeChild(final UnidirJoinChildEntity childEntity) {
-        if (getChildren().contains(childEntity)) {
-            getChildren().remove(childEntity);
-        }
-        return this;
-    }
-
-    public List<UnidirFkChildEntity> choices0RemoveChild() {
-        return Arrays.asList(getChildren().toArray(new UnidirFkChildEntity[0]));
-    }
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java
deleted file mode 100644
index c141ae5..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirJoinParentEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("UnidirParentEntities")
-@ObjectType("UnidirParentEntities")
-public class UnidirJoinParentEntityRepository extends AbstractEntityRepository<UnidirJoinParentEntity> {
-
-    public UnidirJoinParentEntityRepository() {
-        super(UnidirJoinParentEntity.class, "UnidirJoinParentEntities");
-    }
-
-    @MemberOrder(sequence = "2")
-    public UnidirJoinParentEntity newEntity(final String name) {
-        final UnidirJoinParentEntity entity = newTransientInstance(UnidirJoinParentEntity.class);
-        entity.setName(name);
-        persist(entity);
-        return entity;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
deleted file mode 100644
index 16dd5cc..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDRD")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDRD")
-public class UnidirReferencedEntity extends AbstractDomainObject {
-    
-
-    // {{ Name  (title)
-    private String name;
-
-    @Title(sequence="1")
-    @MemberOrder(sequence = "1")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java
deleted file mode 100644
index 10f82b1..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencedEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("UnidirReferencedEntities")
-@ObjectType("UnidirReferencedEntities")
-public class UnidirReferencedEntityRepository extends AbstractEntityRepository<UnidirReferencedEntity> {
-
-    public UnidirReferencedEntityRepository() {
-        super(UnidirReferencedEntity.class, "UnidirReferencedEntities");
-    }
-
-    @MemberOrder(sequence = "2")
-    public UnidirReferencedEntity newEntity(final String name) {
-        final UnidirReferencedEntity entity = newTransientInstance(UnidirReferencedEntity.class);
-        entity.setName(name);
-        persist(entity);
-        return entity;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
deleted file mode 100644
index 6ccbc86..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("UDRG")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("UDRG")
-public class UnidirReferencingEntity extends BaseEntity {
-
-    
-    // {{ Name (also title)
-    private String name;
-    
-    @Title
-    @MemberOrder(sequence = "1")
-    @Optional
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    // }}
-
-
-    // {{ Referenced (property)
-    public UnidirReferencedEntity referenced;
-
-    @MemberOrder(sequence = "1")
-    public UnidirReferencedEntity getReferenced() {
-        return referenced;
-    }
-
-    public void setReferenced(final UnidirReferencedEntity referenced) {
-        this.referenced = referenced;
-    }
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java
deleted file mode 100644
index 6fcb7dc..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/refs/UnidirReferencingEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.refs;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("UnidirReferencingEntities")
-@ObjectType("UnidirReferencingEntities")
-public class UnidirReferencingEntityRepository extends AbstractEntityRepository<UnidirReferencingEntity> {
-
-    public UnidirReferencingEntityRepository() {
-        super(UnidirReferencingEntity.class, "UnidirReferencingEntities");
-    }
-
-    @MemberOrder(sequence = "2")
-    public UnidirReferencingEntity newEntity(final String name) {
-        final UnidirReferencingEntity entity = newTransientInstance(UnidirReferencingEntity.class);
-        entity.setName(name);
-        persist(entity);
-        return entity;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
deleted file mode 100644
index d48852c..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntity.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.value.Color;
-import org.apache.isis.applib.value.Date;
-import org.apache.isis.applib.value.DateTime;
-import org.apache.isis.applib.value.Image;
-import org.apache.isis.applib.value.Money;
-import org.apache.isis.applib.value.Password;
-import org.apache.isis.applib.value.Percentage;
-import org.apache.isis.applib.value.Time;
-import org.apache.isis.applib.value.TimeStamp;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("APLV")
-@javax.jdo.annotations.Query(
-        name="jdkv_findByStringProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.scalars.ApplibValuedEntity WHERE stringProperty == :i")
-@ObjectType("APLV")
-public class ApplibValuedEntity extends AbstractDomainObject {
-
-    
-    // {{ StringProperty (also title, pk)
-    private String stringProperty;
-
-    @javax.jdo.annotations.PrimaryKey
-    @Title
-    @Optional
-    @MemberOrder(sequence = "1")
-    public String getStringProperty() {
-        return stringProperty;
-    }
-
-    public void setStringProperty(final String description) {
-        this.stringProperty = description;
-    }
-
-    // }}
-
-    
-    
-    // {{ DateProperty
-    @javax.jdo.annotations.Persistent
-    private Date dateProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Date getDateProperty() {
-        return dateProperty;
-    }
-
-    public void setDateProperty(final Date dateProperty) {
-        this.dateProperty = dateProperty;
-    }
-
-    // }}
-
-    // {{ ColorProperty
-    @javax.jdo.annotations.NotPersistent
-    private Color colorProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Color getColorProperty() {
-        return colorProperty;
-    }
-
-    public void setColorProperty(final Color colorProperty) {
-        this.colorProperty = colorProperty;
-    }
-
-    // }}
-
-    // {{ DateTimeProperty
-    @javax.jdo.annotations.NotPersistent
-    private DateTime dateTimeProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public DateTime getDateTimeProperty() {
-        return dateTimeProperty;
-    }
-
-    public void setDateTimeProperty(final DateTime dateTimeProperty) {
-        this.dateTimeProperty = dateTimeProperty;
-    }
-
-    // }}
-
-    // {{ ImageProperty
-    @javax.jdo.annotations.NotPersistent
-    private Image imageProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Image getImageProperty() {
-        return imageProperty;
-    }
-
-    public void setImageProperty(final Image imageProperty) {
-        this.imageProperty = imageProperty;
-    }
-
-    // }}
-
-    // {{ MoneyProperty
-    @javax.jdo.annotations.NotPersistent
-    private Money moneyProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Money getMoneyProperty() {
-        return moneyProperty;
-    }
-
-    public void setMoneyProperty(final Money moneyProperty) {
-        this.moneyProperty = moneyProperty;
-    }
-
-    // }}
-
-    // {{ PasswordProperty
-    @javax.jdo.annotations.NotPersistent
-    private Password passwordProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Password getPasswordProperty() {
-        return passwordProperty;
-    }
-
-    public void setPasswordProperty(final Password passwordProperty) {
-        this.passwordProperty = passwordProperty;
-    }
-
-    // }}
-
-    // {{ PercentageProperty
-    @javax.jdo.annotations.NotPersistent
-    private Percentage percentageProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Percentage getPercentageProperty() {
-        return percentageProperty;
-    }
-
-    public void setPercentageProperty(final Percentage percentageProperty) {
-        this.percentageProperty = percentageProperty;
-    }
-
-    // }}
-
-    // {{ TimeProperty
-    @javax.jdo.annotations.NotPersistent
-    private Time timeProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Time getTimeProperty() {
-        return timeProperty;
-    }
-
-    public void setTimeProperty(final Time timeProperty) {
-        this.timeProperty = timeProperty;
-    }
-
-    // }}
-
-    // {{ TimeStampProperty
-    @javax.jdo.annotations.NotPersistent
-    private TimeStamp timeStampProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public TimeStamp getTimeStampProperty() {
-        return timeStampProperty;
-    }
-
-    public void setTimestampProperty(final TimeStamp timestampProperty) {
-        this.timeStampProperty = timestampProperty;
-    }
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java
deleted file mode 100644
index 729f65c..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/ApplibValuedEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("ApplibValuedEntities")
-@ObjectType("ApplibValuedEntities")
-public class ApplibValuedEntityRepository extends AbstractEntityRepository<ApplibValuedEntity> {
-
-    public ApplibValuedEntityRepository() {
-        super(ApplibValuedEntity.class, "ApplibValuedEntities");
-    }
-    
-    /**
-     * Required to discover the ApplibValuedEntity type.
-     */
-    @Override
-    @MemberOrder(sequence = "2")
-    public ApplibValuedEntity newEntity() {
-        return super.newEntity();
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
deleted file mode 100644
index e7f3db1..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
-@javax.jdo.annotations.Discriminator("AUAS")
-@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
-@ObjectType("AUAS")
-public class AutoAssignedEntity extends AbstractDomainObject {
-
-    
-    // {{ StringProperty (used in title)
-    private String stringProperty;
-
-    @Title(sequence="2")
-    @Optional
-    @MemberOrder(sequence = "1")
-    public String getStringProperty() {
-        return stringProperty;
-    }
-
-    public void setStringProperty(final String description) {
-        this.stringProperty = description;
-    }
-
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntityRepository.java
deleted file mode 100644
index a969d2a..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/AutoAssignedEntityRepository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("AutoAssignedEntities")
-@ObjectType("AutoAssignedEntities")
-public class AutoAssignedEntityRepository extends AbstractEntityRepository<AutoAssignedEntity> {
-
-    public AutoAssignedEntityRepository() {
-        super(AutoAssignedEntity.class, "AutoAssignedEntities");
-    }
-    
-    /**
-     * Required to discover the AutoAssignedEntity type.
-     */
-    @Override
-    @MemberOrder(sequence = "2")
-    public AutoAssignedEntity newEntity() {
-        return super.newEntity();
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
deleted file mode 100644
index 708dae8..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntity.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("JDKV")
-@javax.jdo.annotations.Query(
-        name="jdkv_findByStringProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.scalars.JdkValuedEntity WHERE stringProperty == :i")
-@ObjectType("JDKV")
-public class JdkValuedEntity extends AbstractDomainObject {
-
-    // {{ StringProperty (also title, pk)
-    private String stringProperty;
-
-    @javax.jdo.annotations.PrimaryKey
-    @Title
-    @Optional
-    @MemberOrder(sequence = "1")
-    public String getStringProperty() {
-        return stringProperty;
-    }
-
-    public void setStringProperty(final String description) {
-        this.stringProperty = description;
-    }
-
-    // }}
-
-    // {{ JavaUtilDateProperty
-    private Date javaUtilDateProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Date getJavaUtilDateProperty() {
-        return javaUtilDateProperty;
-    }
-
-    public void setJavaUtilDateProperty(final Date javaUtilDateProperty) {
-        this.javaUtilDateProperty = javaUtilDateProperty;
-    }
-
-    // }}
-
-    // {{ JavaSqlDateProperty
-    private java.sql.Date javaSqlDateProperty;
-
-    @javax.jdo.annotations.Persistent() // since not persistent by default
-    @Optional
-    @MemberOrder(sequence = "1")
-    public java.sql.Date getJavaSqlDateProperty() {
-        return javaSqlDateProperty;
-    }
-
-    public void setJavaSqlDateProperty(final java.sql.Date javaSqlDateProperty) {
-        this.javaSqlDateProperty = javaSqlDateProperty;
-    }
-
-    // }}
-
-    // {{ JavaSqlTimeProperty (property)
-    @javax.jdo.annotations.Persistent() // since not persistent by default
-    private java.sql.Time javaSqlTimeProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public java.sql.Time getJavaSqlTimeProperty() {
-        return javaSqlTimeProperty;
-    }
-
-    public void setJavaSqlTimeProperty(final java.sql.Time javaSqlTimeProperty) {
-        this.javaSqlTimeProperty = javaSqlTimeProperty;
-    }
-    // }}
-
-
-    
-    // {{ JavaSqlTimestampProperty
-    @javax.jdo.annotations.Persistent() // since not persistent by default
-    private java.sql.Timestamp javaSqlTimestampProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public java.sql.Timestamp getJavaSqlTimestampProperty() {
-        return javaSqlTimestampProperty;
-    }
-
-    public void setJavaSqlTimestampProperty(final java.sql.Timestamp javaSqlTimestampProperty) {
-        this.javaSqlTimestampProperty = javaSqlTimestampProperty;
-    }
-
-    // }}
-
-    // {{ BigIntegerProperty
-    private BigInteger bigIntegerProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public BigInteger getBigIntegerProperty() {
-        return bigIntegerProperty;
-    }
-
-    public void setBigIntegerProperty(final BigInteger bigIntegerProperty) {
-        this.bigIntegerProperty = bigIntegerProperty;
-    }
-
-    // }}
-
-    // {{ BigDecimalProperty
-    private BigDecimal bigDecimalProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public BigDecimal getBigDecimalProperty() {
-        return bigDecimalProperty;
-    }
-
-    public void setBigDecimalProperty(final BigDecimal bigDecimalProperty) {
-        this.bigDecimalProperty = bigDecimalProperty;
-    }
-
-    // }}
-
-
-    // {{ MyEnum (property)
-    private MyEnum myEnum;
-
-    @javax.jdo.annotations.Persistent
-    @Optional
-    @MemberOrder(sequence = "1")
-    public MyEnum getMyEnum() {
-        return myEnum;
-    }
-
-    public void setMyEnum(final MyEnum myEnum) {
-        this.myEnum = myEnum;
-    }
-    // }}
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java
deleted file mode 100644
index 42fcb48..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/JdkValuedEntityRepository.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("JdkValuedEntities")
-@ObjectType("JdkValuedEntities")
-public class JdkValuedEntityRepository extends AbstractEntityRepository<JdkValuedEntity> {
-
-    public JdkValuedEntityRepository() {
-        super(JdkValuedEntity.class, "JdkValuedEntities");
-    }
-
-    /**
-     * Required to discover the JdkValueEntity type.
-     */
-    @Override
-    @MemberOrder(sequence = "2")
-    public JdkValuedEntity newEntity() {
-        return super.newEntity();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/MyEnum.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/MyEnum.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/MyEnum.java
deleted file mode 100644
index bbfcf81..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/MyEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.isis.tck.dom.scalars;
-
-public enum MyEnum {
-    RED,
-    ORANGE,
-    YELLOW,
-    GREEN,
-    BLUE,
-    INDIGO,
-    VIOLET
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
deleted file mode 100644
index 5f6f333..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntity.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("PRMV")
-@javax.jdo.annotations.Query(
-        name="prmv_findByIntProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity WHERE intProperty == :i")
-@ObjectType("PRMV")
-public class PrimitiveValuedEntity extends AbstractDomainObject {
-
-    // {{ Id (Integer)
-    private Integer id;
-
-    @javax.jdo.annotations.PrimaryKey // must be on the getter.
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(final Integer id) {
-        this.id = id;
-    }
-    // }}
-
-    // {{ Title
-    public String title() {
-        return null;
-    }
-
-    // }}
-
-    // {{ BooleanProperty
-    private boolean booleanProperty;
-
-    @MemberOrder(sequence = "3")
-    public boolean getBooleanProperty() {
-        return booleanProperty;
-    }
-
-    public void setBooleanProperty(final boolean booleanProperty) {
-        this.booleanProperty = booleanProperty;
-    }
-
-    // }}
-
-    // {{ ByteProperty
-    private byte byteProperty;
-
-    @MemberOrder(sequence = "1")
-    public byte getByteProperty() {
-        return byteProperty;
-    }
-
-    public void setByteProperty(final byte byteProperty) {
-        this.byteProperty = byteProperty;
-    }
-
-    // }}
-
-    // {{ ShortProperty
-    private short shortProperty;
-
-    @MemberOrder(sequence = "1")
-    public short getShortProperty() {
-        return shortProperty;
-    }
-
-    public void setShortProperty(final short shortProperty) {
-        this.shortProperty = shortProperty;
-    }
-
-    // }}
-
-    // {{ IntProperty
-    private int intProperty;
-
-    @MemberOrder(sequence = "1")
-    public int getIntProperty() {
-        return intProperty;
-    }
-
-    public void setIntProperty(final int intProperty) {
-        this.intProperty = intProperty;
-    }
-
-    // }}
-
-    // {{ LongProperty
-    private long longProperty;
-
-    @MemberOrder(sequence = "1")
-    public long getLongProperty() {
-        return longProperty;
-    }
-
-    public void setLongProperty(final long longProperty) {
-        this.longProperty = longProperty;
-    }
-
-    // }}
-
-    // {{ FloatProperty
-    private float floatProperty;
-
-    @MemberOrder(sequence = "1")
-    public float getFloatProperty() {
-        return floatProperty;
-    }
-
-    public void setFloatProperty(final float floatProperty) {
-        this.floatProperty = floatProperty;
-    }
-
-    // }}
-
-    // {{ DoubleProperty
-    private double doubleProperty;
-
-    @MemberOrder(sequence = "1")
-    public double getDoubleProperty() {
-        return doubleProperty;
-    }
-
-    public void setDoubleProperty(final double doubleProperty) {
-        this.doubleProperty = doubleProperty;
-    }
-    // }}
-
-    
-    // {{ CharProperty
-    @javax.jdo.annotations.Column(jdbcType="char") // for hsqldb
-    //@javax.jdo.annotations.Column(jdbcType="char", sqlType="char") // for mssqlserver
-    private char charProperty;
-
-    @MemberOrder(sequence = "1")
-    public char getCharProperty() {
-        return charProperty;
-    }
-
-    public void setCharProperty(final char charProperty) {
-        this.charProperty = charProperty;
-    }
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java
deleted file mode 100644
index 900c572..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/PrimitiveValuedEntityRepository.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.QueryOnly;
-import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.query.QueryDefault;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("PrimitiveValuedEntities")
-@ObjectType("PrimitiveValuedEntities")
-public class PrimitiveValuedEntityRepository extends AbstractEntityRepository<PrimitiveValuedEntity> {
-
-    public PrimitiveValuedEntityRepository() {
-        super(PrimitiveValuedEntity.class, "PrimitiveValuedEntities");
-    }
-
-    @QueryOnly
-    @MemberOrder(sequence = "1")
-    public PrimitiveValuedEntity findById(int id) {
-        final Query<PrimitiveValuedEntity> query = 
-                new QueryDefault<PrimitiveValuedEntity>(PrimitiveValuedEntity.class, PrimitiveValuedEntity.class.getName() + "#pk", "id", id);
-        return this.firstMatch(query);
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
deleted file mode 100644
index 87fd362..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntity.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Title;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("WRPV")
-@javax.jdo.annotations.Query(
-        name="wrpv_findByStringProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.scalars.WrapperValuedEntity WHERE stringProperty == :i")
-@ObjectType("WRPV")
-public class WrapperValuedEntity extends AbstractDomainObject {
-
-    // {{ StringProperty (also pk, title)
-    private String stringProperty;
-
-    @javax.jdo.annotations.PrimaryKey
-    @Title
-    @Optional
-    @MemberOrder(sequence = "1")
-    public String getStringProperty() {
-        return stringProperty;
-    }
-
-    public void setStringProperty(final String description) {
-        this.stringProperty = description;
-    }
-
-    // }}
-
-    // {{ BooleanProperty
-    private Boolean booleanProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Boolean getBooleanProperty() {
-        return booleanProperty;
-    }
-
-    public void setBooleanProperty(final Boolean booleanProperty) {
-        this.booleanProperty = booleanProperty;
-    }
-
-    // }}
-
-    // {{ ByteProperty
-    private Byte byteProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Byte getByteProperty() {
-        return byteProperty;
-    }
-
-    public void setByteProperty(final Byte byteWProperty) {
-        this.byteProperty = byteWProperty;
-    }
-
-    // }}
-
-    // {{ ShortProperty
-    private Short shortProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Short getShortProperty() {
-        return shortProperty;
-    }
-
-    public void setShortProperty(final Short shortProperty) {
-        this.shortProperty = shortProperty;
-    }
-
-    // }}
-
-    // {{ IntegerProperty
-    private Integer integerProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Integer getIntegerProperty() {
-        return integerProperty;
-    }
-
-    public void setIntegerProperty(final Integer integerProperty) {
-        this.integerProperty = integerProperty;
-    }
-
-    // }}
-
-    // {{ LongProperty
-    private Long longProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Long getLongProperty() {
-        return longProperty;
-    }
-
-    public void setLongProperty(final Long longProperty) {
-        this.longProperty = longProperty;
-    }
-
-    // }}
-
-    // {{ FloatProperty
-    private Float floatProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Float getFloatProperty() {
-        return floatProperty;
-    }
-
-    public void setFloatProperty(final Float floatWProperty) {
-        this.floatProperty = floatWProperty;
-    }
-
-    // }}
-
-    // {{ DoubleProperty
-    private Double doubleProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Double getDoubleProperty() {
-        return doubleProperty;
-    }
-
-    public void setDoubleProperty(final Double doubleWProperty) {
-        this.doubleProperty = doubleWProperty;
-    }
-    // }}
-
-    // {{ CharacterProperty (property)
-    @javax.jdo.annotations.Column(jdbcType="char") // works for hsqldb
-    //@javax.jdo.annotations.Column(jdbcType="char", sqlType="char") // works for mssqlserver
-    private Character characterProperty;
-
-    @Optional
-    @MemberOrder(sequence = "1")
-    public Character getCharacterProperty() {
-        return characterProperty;
-    }
-
-    public void setCharacterProperty(final Character charProperty) {
-        this.characterProperty = charProperty;
-    }
-    // }}
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java
deleted file mode 100644
index 762c3ea..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/scalars/WrapperValuedEntityRepository.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.isis.tck.dom.scalars;
-
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.tck.dom.AbstractEntityRepository;
-
-@Named("WrapperValues")
-@ObjectType("WrapperValues")
-public class WrapperValuedEntityRepository extends AbstractEntityRepository<WrapperValuedEntity> {
-
-    public WrapperValuedEntityRepository() {
-        super(WrapperValuedEntity.class, "WrapperValuedEntities");
-    }
-
-    /**
-     * Required to discover the WrapperValuedEntity type.
-     */
-    @Override
-    @MemberOrder(sequence = "2")
-    public WrapperValuedEntity newEntity() {
-        return super.newEntity();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java
deleted file mode 100644
index f01bd01..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/SqlDomainObjectRepository.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-/**
- * 
- */
-package org.apache.isis.tck.dom.sqlos;
-
-import java.util.List;
-
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.tck.dom.poly.Empty;
-import org.apache.isis.tck.dom.poly.ReferencingPolyTypesEntity;
-import org.apache.isis.tck.dom.poly.SelfReferencingEntity;
-import org.apache.isis.tck.dom.poly.StringBaseEntitySub;
-import org.apache.isis.tck.dom.poly.StringBaseEntitySubThree;
-import org.apache.isis.tck.dom.poly.StringBaseEntitySubTwo;
-import org.apache.isis.tck.dom.poly.Stringable;
-import org.apache.isis.tck.dom.poly.StringableEntityWithOwnProperties;
-import org.apache.isis.tck.dom.poly.StringableEntityWithOwnProperty;
-import org.apache.isis.tck.dom.scalars.PrimitiveValuedEntity;
-import org.apache.isis.tck.dom.sqlos.data.SimpleClass;
-import org.apache.isis.tck.dom.sqlos.data.SimpleClassTwo;
-import org.apache.isis.tck.dom.sqlos.data.SqlDataClass;
-
-/**
- * @author Kevin
- * 
- */
-public class SqlDomainObjectRepository extends AbstractFactoryAndRepository {
-
-    // {{ Persistor actions
-    public void save(final Object sqlDataClass) {
-        persistIfNotAlready(sqlDataClass);
-    }
-
-    public void delete(final Object sqlDataClass) {
-        remove(sqlDataClass);
-    }
-
-    public void update(final Object object) {
-        getContainer().objectChanged(object);
-    }
-
-    public void resolve(final Object domainObject) {
-        getContainer().resolve(domainObject);
-    }
-
-    // }}
-
-    // SqlDataClass
-    public List<SqlDataClass> allDataClasses() {
-        return allInstances(SqlDataClass.class);
-    }
-
-    public SqlDataClass newDataClass() {
-        final SqlDataClass object = newTransientInstance(SqlDataClass.class);
-        return object;
-    }
-
-    
-    // SimpleClass
-    public SimpleClass newSimpleClass() {
-        final SimpleClass object = newTransientInstance(SimpleClass.class);
-        return object;
-    }
-
-    public List<SimpleClass> allSimpleClasses() {
-        return allInstances(SimpleClass.class);
-    }
-
-    public List<SimpleClass> allSimpleClassesThatMatch(final SimpleClass simpleClassMatch) {
-        return allMatches(SimpleClass.class, simpleClassMatch);
-    }
-
-    
-    // SimpleClassTwo
-    public List<SimpleClassTwo> allSimpleClassTwos() {
-        return allInstances(SimpleClassTwo.class);
-    }
-
-    public SimpleClassTwo newSimpleClassTwo() {
-        final SimpleClassTwo object = newTransientInstance(SimpleClassTwo.class);
-        return object;
-    }
-
-    // PrimitiveValuedEntity
-    public List<PrimitiveValuedEntity> allPrimitiveValueEntities() {
-        return allInstances(PrimitiveValuedEntity.class);
-    }
-
-    public PrimitiveValuedEntity newPrimitiveValuedEntity() {
-        return newTransientInstance(PrimitiveValuedEntity.class);
-    }
-
-    public List<PrimitiveValuedEntity> allPrimitiveValuedEntitiesThatMatch(final PrimitiveValuedEntity match) {
-        return allMatches(PrimitiveValuedEntity.class, match);
-    }
-
-    
-    // PolyTestClass
-    public ReferencingPolyTypesEntity newPolyTestClass() {
-        final ReferencingPolyTypesEntity object = newTransientInstance(ReferencingPolyTypesEntity.class);
-        return object;
-    }
-
-    public List<ReferencingPolyTypesEntity> allPolyTestClasses() {
-        return allInstances(ReferencingPolyTypesEntity.class);
-    }
-
-    public StringBaseEntitySub newPolySubClassOne() {
-        final StringBaseEntitySub object = newTransientInstance(StringBaseEntitySub.class);
-        return object;
-    }
-
-    public StringBaseEntitySubThree newPolySubClassThree() {
-        final StringBaseEntitySubThree object = newTransientInstance(StringBaseEntitySubThree.class);
-        return object;
-    }
-
-    public StringBaseEntitySubTwo newPolySubClassTwo() {
-        final StringBaseEntitySubTwo object = newTransientInstance(StringBaseEntitySubTwo.class);
-        return object;
-    }
-
-    public StringableEntityWithOwnProperty newPolyInterfaceImplA() {
-        final StringableEntityWithOwnProperty object = newTransientInstance(StringableEntityWithOwnProperty.class);
-        return object;
-    }
-
-    public StringableEntityWithOwnProperties newPolyInterfaceImplB() {
-        final StringableEntityWithOwnProperties object = newTransientInstance(StringableEntityWithOwnProperties.class);
-        return object;
-    }
-
-    public SelfReferencingEntity newPolySelfRefClass() {
-        final SelfReferencingEntity object = newTransientInstance(SelfReferencingEntity.class);
-        return object;
-    }
-
-    public List<Stringable> allPolyInterfaces() {
-        return allInstances(Stringable.class);
-    }
-
-    public List<Stringable> queryPolyInterfaces(final Stringable query) {
-        return allMatches(Stringable.class, query);
-    }
-
-    public List<Empty> allEmptyInterfacesThatMatch(final Empty match) {
-        return allMatches(Empty.class, match);
-    }
-
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/cb83d4c7/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClass.java
----------------------------------------------------------------------
diff --git a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClass.java b/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClass.java
deleted file mode 100644
index c392e51..0000000
--- a/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/sqlos/data/SimpleClass.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-/**
- * 
- */
-package org.apache.isis.tck.dom.sqlos.data;
-
-import org.apache.isis.applib.AbstractDomainObject;
-
-/**
- * @author Kevin
- * 
- */
-public class SimpleClass extends AbstractDomainObject {
-    public String title() {
-        return string;
-    }
-
-    // {{ String type
-    private String string;
-
-    public String getString() {
-        return string;
-    }
-
-    public void setString(final String string) {
-        this.string = string;
-    }
-
-    // }}
-
-    // {{ SimpleClassTwoA
-    private SimpleClassTwo simplyClassTwoA;
-
-    public SimpleClassTwo getSimpleClassTwoA() {
-        return simplyClassTwoA;
-    }
-
-    public void setSimpleClassTwoA(final SimpleClassTwo simpleClassTwoA) {
-        this.simplyClassTwoA = simpleClassTwoA;
-    }
-    // }}
-
-}