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 2014/10/28 17:16:48 UTC

[45/56] [abbrv] ISIS-937: moved TCK out of core.

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
deleted file mode 100644
index 5ec351c..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
+++ /dev/null
@@ -1,222 +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.core.runtime.fixturedomainservice;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeThat;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-import java.util.TimeZone;
-
-import junit.framework.Assert;
-
-import com.google.common.collect.Sets;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ReferencingEntity;
-import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-
-public class ObjectFixtureFilePersistorTest {
-
-    private static final String DATEFORMAT_PATTERN = "dd-MMM-yyyy HH:mm z";
-    
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat(DATEFORMAT_PATTERN, Locale.US);
-    
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder()
-        .with(configuration()).build();
-    
-    private static IsisConfiguration configuration() {
-        final IsisConfigurationDefault config = new IsisConfigurationDefault();
-        config.add("isis.value.format.datetime", DATEFORMAT_PATTERN);
-        return config;
-    }
-
-    private ObjectFixtureFilePersistor persistor;
-
-    @Before
-    public void setup() throws Exception {
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-
-        Locale.setDefault(Locale.UK);
-
-        persistor = new ObjectFixtureFilePersistor();
-
-        iswf.fixtures.smpl1.setName("Fred Smith");
-        iswf.fixtures.smpl1.setDate(dateFormat.parse("08-Mar-2010 01:00 UTC"));
-
-        iswf.fixtures.smpl2.setName("Joe Bloggs");
-        iswf.fixtures.smpl2.setDate(dateFormat.parse("09-Apr-2011 02:10 UTC"));
-
-        assumeThat(TimeZone.getDefault().getDisplayName(), is("Greenwich Mean Time"));
-    }
-    
-
-    @Test
-    public void loadInstance() throws Exception {
-        
-        final StringReader reader = new StringReader(SimpleEntity.class.getName() + "#1\n  name: Fred Smith\n  date: 08-Mar-2010 01:00 UTC");
-        final Set<Object> objects = persistor.loadData(reader);
-
-        assertEquals(1, objects.size());
-        final Object object = objects.toArray()[0];
-        assertThat(object instanceof SimpleEntity, is(true));
-        final SimpleEntity epv = (SimpleEntity) object;
-        assertEquals("Fred Smith", epv.getName());
-        
-        assertEquals(dateFormat.parse("08-Mar-2010 01:00 GMT"), epv.getDate());
-    }
-
-    @Test
-    public void invalidFieldLine() throws Exception {
-        try {
-            final StringReader reader = new StringReader(SimpleEntity.class.getName() + "#1\n  name Fred Smith");
-            persistor.loadData(reader);
-            Assert.fail();
-        } catch (final FixtureException e) {
-            Assert.assertEquals("failed to load data at line 2", e.getMessage());
-            Assert.assertEquals("no colon (:) in: name Fred Smith", e.getCause().getMessage());
-        }
-    }
-
-    @Test
-    public void oldFieldNameSkipped() throws Exception {
-        final StringReader reader = new StringReader(SimpleEntity.class.getName() + "#1\n  xname: Fred Smith");
-        final Set<Object> objects = persistor.loadData(reader);
-        final Object object = objects.toArray()[0];
-        Assert.assertNull(((SimpleEntity) object).getName());
-
-    }
-
-    @Test
-    public void saveNoObjects() throws Exception {
-        // Person person = new Person();
-        final Set<Object> objects = new HashSet<Object>();
-        final StringWriter out = new StringWriter();
-        persistor.save(objects, out);
-        Assert.assertEquals("", out.toString());
-    }
-
-    @Test
-    public void saveOneObject() throws Exception {
-        final Set<Object> objects = Sets.newLinkedHashSet();
-        objects.add(iswf.fixtures.smpl1);
-
-        final StringWriter out = new StringWriter();
-        persistor.save(objects, out);
-        final String actual = canonicalize(out);
-        
-        final String expected = SimpleEntity.class.getName() + "#2\n  date: 08-Mar-2010 01:00 UTC\n  name: Fred Smith\n";
-        
-        assertThat(actual, IsisMatchers.startsWith(expected));
-    }
-
-    @Test
-    public void saveTwoObjects() throws Exception {
-        final Set<Object> objects = Sets.newLinkedHashSet();
-        objects.add(iswf.fixtures.smpl1);
-        objects.add(iswf.fixtures.smpl3);
-
-        final StringWriter out = new StringWriter();
-        persistor.save(objects, out);
-        final String actual = canonicalize(out);
-
-        final String expected1 = SimpleEntity.class.getName() + "#2\n  date: 08-Mar-2010 01:00 UTC\n  name: Fred Smith\n";
-        final String expected2 = SimpleEntity.class.getName() + "#3\n  date: \n  name: 3\n";
-        assertThat(actual, IsisMatchers.contains(expected1));
-        assertThat(actual, IsisMatchers.contains(expected2));
-    }
-
-
-    private String canonicalize(final String out) {
-        return out.replaceAll("\r\n", "\n");
-    }
-
-    private String canonicalize(final StringWriter out) {
-        return canonicalize(out.toString());
-    }
-
-    @Test
-    public void saveReferencedObject() throws Exception {
-
-        final Set<Object> objects = Sets.newLinkedHashSet();
-        
-        iswf.fixtures.rfcg1.setReference(iswf.fixtures.smpl1);
-        objects.add(iswf.fixtures.rfcg1);
-        objects.add(iswf.fixtures.smpl1);
-
-        final StringWriter out = new StringWriter();
-        persistor.save(objects, out);
-        final String actual = canonicalize(out);
-
-        final String expected1 = ReferencingEntity.class.getName() + "#2\n  aggregatedEntities: \n  aggregatedReference: \n  reference: " + SimpleEntity.class.getName() + "#3";
-        final String expected2 = SimpleEntity.class.getName() + "#3\n  date: 08-Mar-2010 01:00 UTC\n  name: Fred Smith\n";
-        assertThat(actual, IsisMatchers.contains(expected1));
-        assertThat(actual, IsisMatchers.contains(expected2));
-    }
-
-    
-    @Test
-    public void saveObjectAndAssociatedCollection() throws Exception {
-
-        final Set<Object> objects = Sets.newLinkedHashSet();
-        
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl1);
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl2);
-        objects.add(iswf.fixtures.prnt1);
-
-        objects.add(iswf.fixtures.smpl1);
-        objects.add(iswf.fixtures.smpl2);
-
-        final StringWriter out = new StringWriter();
-        persistor.save(objects, out);
-        final String actual = canonicalize(out);
-        
-        final String expected1a = ParentEntity.class.getName() + "#2\n";
-        final String expected1b = "heterogeneousCollection: \n  homogeneousCollection: " + SimpleEntity.class.getName() + "#3 " + SimpleEntity.class.getName() + "#4 " + "\n";
-        final String expected2 = SimpleEntity.class.getName() + "#3\n  date: 08-Mar-2010 01:00 UTC\n  name: Fred Smith\n";
-        final String expected3 = SimpleEntity.class.getName() + "#4\n  date: 09-Apr-2011 02:10 UTC\n  name: Joe Bloggs\n";
-        assertThat(actual.replaceAll("\n", "###"), IsisMatchers.contains(expected1a.replaceAll("\n", "###")));
-        assertThat(actual.replaceAll("\n", "###"), IsisMatchers.contains(expected1b.replaceAll("\n", "###")));
-        assertThat(actual, IsisMatchers.contains(expected2));
-        assertThat(actual, IsisMatchers.contains(expected3));
-    }
-
-}
-

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
deleted file mode 100644
index b0fe6db..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
+++ /dev/null
@@ -1,88 +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.core.runtime.fixturedomainservice;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Date;
-import java.util.Locale;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class ObjectFixtureServiceTest_loadFile {
-
-    private static IsisConfiguration configuration() {
-        IsisConfigurationDefault configuration = new IsisConfigurationDefault();
-        configuration.add(ConfigurationConstants.ROOT + "exploration-objects.file", "test.data");
-        return configuration;
-    }
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().with(configuration()).build();
-    
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
-    private ObjectFixtureService service;
-
-    
-    @Before
-    public void setup() {
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-        Locale.setDefault(Locale.UK);
-
-        service = new ObjectFixtureService();
-    }
-
-
-    @Test
-    public void loadFile() throws Exception {
-
-        // when
-        service.loadFile();
-
-        // then
-        final Set<Object> objects = service.allSavedObjects();
-        Assert.assertEquals(1, objects.size());
-        final Object object = objects.toArray()[0];
-        assertThat(object instanceof SimpleEntity, is(true));
-        Assert.assertEquals("Fred Smith", ((SimpleEntity) object).getName());
-        Assert.assertEquals(new Date(110, 2, 8, 13, 32), ((SimpleEntity) object).getDate());
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
deleted file mode 100644
index 1087b67..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
+++ /dev/null
@@ -1,73 +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.core.runtime.fixturedomainservice;
-
-import java.io.File;
-import java.util.Locale;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class ObjectFixtureServiceTest_loadFile_nothingExists {
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-    
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
-    private ObjectFixtureService service;
-
-    
-    @Before
-    public void setup() {
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-        Locale.setDefault(Locale.UK);
-
-        service = new ObjectFixtureService();
-        deleteFixtureData();
-    }
-
-
-    private static void deleteFixtureData() {
-        new File("fixture-data").delete();
-    }
-
-    @Test
-    public void loadNothingIfNoFileExists() throws Exception {
-        service.loadFile();
-
-        final Set<Object> objects = service.allSavedObjects();
-        Assert.assertEquals(0, objects.size());
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
deleted file mode 100644
index fbb3b69..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
+++ /dev/null
@@ -1,84 +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.core.runtime.fixturedomainservice;
-
-import java.io.File;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class ObjectFixtureServiceTest_save {
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-    
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
-    private ObjectFixtureService service;
-
-    
-    @Before
-    public void setup() {
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
-        Locale.setDefault(Locale.UK);
-
-        service = new ObjectFixtureService();
-        deleteFixtureData();
-    }
-
-
-    private static void deleteFixtureData() {
-        new File("fixture-data").delete();
-    }
-
-
-    @Test
-    public void saveObjectAddedToList() throws Exception {
-        
-        final SimpleEntity epv = iswf.fixtures.smpl1;
-        epv.setName("Fred Smith");
-        epv.setDate(new Date(110, 2, 8, 13, 32));
-        
-        final ParentEntity epc = iswf.fixtures.prnt1;
-        epc.getHomogeneousCollection().add(iswf.fixtures.smpl1);
-        epc.getHomogeneousCollection().add(iswf.fixtures.smpl2);
-        service.save(epc);
-
-        final Set<Object> savedObjects = service.allSavedObjects();
-        Assert.assertEquals(3, savedObjects.size());
-    }
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
deleted file mode 100644
index 6787e43..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
+++ /dev/null
@@ -1,221 +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.core.runtime.memento;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
-import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.tck.dom.refs.BaseEntity;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ReferencingEntity;
-import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-
-public class MementoTest {
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-    
-    private ObjectAdapter originalAdapterForEpv1;
-    private ObjectAdapter originalAdapterForEpr1;
-    private ObjectAdapter originalAdapterForEpc1;
-    
-    private ObjectAdapter recreatedAdapter;
-
-    private Memento mementoForEpv1;
-    private Memento mementoForEpr1;
-    private Memento mementoForEpc1;
-    
-    private byte[] bytesForEpv1;
-    private byte[] bytesForEpr1;
-    private byte[] bytesForEpc1;
-
-    private ByteArrayInputStream bais;
-    
-
-    @Before
-    public void setUpSystem() throws Exception {
-        
-//        final Logger logger = LoggerFactory.getLogger(FieldType.class);
-//        logger.setLevel(Level.DEBUG);
-//        logger.addAppender(new ConsoleAppender());
-//        BasicConfigurator.configure();
-
-        iswf.fixtures.smpl1.setName("Fred");
-        iswf.fixtures.smpl2.setName("Harry");
-        
-        iswf.fixtures.rfcg1_a1.setName("Tom");
-        
-        iswf.fixtures.rfcg1.setReference(iswf.fixtures.smpl1);
-        iswf.fixtures.rfcg1.setAggregatedReference(iswf.fixtures.rfcg1_a1);
-        
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl1);
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl2);
-        
-        iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.smpl1);
-        iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.rfcg1);
-        
-        originalAdapterForEpv1 = iswf.adapterFor(iswf.fixtures.smpl1);
-        originalAdapterForEpr1 = iswf.adapterFor(iswf.fixtures.rfcg1);
-        originalAdapterForEpc1 = iswf.adapterFor(iswf.fixtures.prnt1);
-
-        mementoForEpv1 = new Memento(originalAdapterForEpv1);
-        mementoForEpr1 = new Memento(originalAdapterForEpr1);
-        mementoForEpc1 = new Memento(originalAdapterForEpc1);
-        
-        bytesForEpv1 = toBytes(mementoForEpv1);
-        bytesForEpr1 = toBytes(mementoForEpr1);
-        bytesForEpc1 = toBytes(mementoForEpc1);
-    
-        iswf.tearDownSystem();
-        
-//        logger.debug("*************************************");
-        
-        iswf.setUpSystem();
-        
-        mementoForEpv1 = fromBytes(bytesForEpv1);
-        mementoForEpr1 = fromBytes(bytesForEpr1);
-        mementoForEpc1 = fromBytes(bytesForEpc1);
-
-        IsisContext.getTransactionManager().startTransaction();
-    }
-
-
-    @After
-    public void tearDown() throws Exception {
-        IsisContext.getTransactionManager().endTransaction();
-    }
-    
-    private Memento fromBytes(final byte[] bytes) throws IOException {
-        bais = new ByteArrayInputStream(bytes);
-        DataInputStreamExtended input = new DataInputStreamExtended(bais);
-        final Memento recreate = Memento.recreateFrom(input);
-        return recreate;
-    }
-
-
-    private static byte[] toBytes(final Memento memento) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        DataOutputStreamExtended output = new DataOutputStreamExtended(baos);
-        memento.encodedData(output);
-        return baos.toByteArray();
-    }
-
-
-    @Test
-    public void recreateObject_adaptersAreNotSame() throws Exception {
-
-        recreatedAdapter = mementoForEpv1.recreateObject();
-        
-        assertNotSame(originalAdapterForEpv1, recreatedAdapter);
-    }
-
-    @Test
-    public void recreateObject_getOid_areEquals() throws Exception {
-        recreatedAdapter = mementoForEpv1.recreateObject();
-
-        assertEquals(originalAdapterForEpv1.getOid(), recreatedAdapter.getOid());
-    }
-
-    @Test
-    public void recreateObject_getSpecification_isSame() throws Exception {
-        recreatedAdapter = mementoForEpv1.recreateObject();
-        
-        final ObjectSpecification specification = originalAdapterForEpv1.getSpecification();
-        final ObjectSpecification recreatedSpecification = recreatedAdapter.getSpecification();
-        assertSame(specification, recreatedSpecification);
-    }
-
-    @Test
-    public void recreateObject_valuePreserved() throws Exception {
-        recreatedAdapter = mementoForEpv1.recreateObject();
-        final SimpleEntity recreatedObject = (SimpleEntity)recreatedAdapter.getObject();
-        assertEquals("Fred", recreatedObject.getName());
-    }
-
-    @Test
-    public void recreateObject_referencePreserved() throws Exception {
-        recreatedAdapter = mementoForEpr1.recreateObject();
-        final ReferencingEntity recreatedObject = (ReferencingEntity)recreatedAdapter.getObject();
-        final SimpleEntity reference1 = recreatedObject.getReference();
-        assertNotNull(reference1);
-        
-        assertThat("Fred", equalTo(reference1.getName()));
-    }
-
-    @Test
-    public void recreateObject_homogeneousCollectionPreserved() throws Exception {
-        recreatedAdapter = mementoForEpc1.recreateObject();
-        final ParentEntity recreatedObject = (ParentEntity)recreatedAdapter.getObject();
-        final List<SimpleEntity> homogenousCollection = recreatedObject.getHomogeneousCollection();
-        assertNotNull(homogenousCollection);
-        
-        assertThat(homogenousCollection.size(), is(2));
-        assertThat(homogenousCollection.get(0).getName(), is("Fred"));
-        assertThat(homogenousCollection.get(1).getName(), is("Harry"));
-    }
-
-    @Test
-    public void recreateObject_heterogeneousCollectionPreserved() throws Exception {
-        recreatedAdapter = mementoForEpc1.recreateObject();
-        final ParentEntity recreatedObject = (ParentEntity)recreatedAdapter.getObject();
-        final List<BaseEntity> hetrogenousCollection = recreatedObject.getHeterogeneousCollection();
-        assertNotNull(hetrogenousCollection);
-        
-        assertThat(hetrogenousCollection.size(), is(2));
-        final SimpleEntity firstObj = (SimpleEntity)hetrogenousCollection.get(0);
-        assertThat(firstObj.getName(), is("Fred"));
-        
-        final ReferencingEntity secondObj = (ReferencingEntity)hetrogenousCollection.get(1);
-        final SimpleEntity reference1 = secondObj.getReference();
-        assertThat(reference1.getName(), is("Fred"));
-        
-        assertSame(firstObj, reference1);
-    }
-
-    @Test
-    public void recreateObject_whenNull() throws Exception {
-        final Memento memento = new Memento(null);
-        ObjectAdapter returnedAdapter = memento.recreateObject();
-        assertNull(returnedAdapter);
-    }
-
-    
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_data.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_data.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_data.java
deleted file mode 100644
index 3ecc2d1..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_data.java
+++ /dev/null
@@ -1,93 +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.core.runtime.memento;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntity;
-
-public class MementoTest_data {
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-
-    private ObjectAdapter originalAdapter1, originalAdapter2;
-    private Oid oid1, oid2;
-
-    private Memento memento1, memento2;
-    private Data data1, data2;
-
-    @Before
-    public void setUpSystem() throws Exception {
-        iswf.fixtures.wve1.setStringProperty("Fred");
-        
-        originalAdapter1 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.wve1);
-        oid1 = originalAdapter1.getOid();
-        memento1 = new Memento(originalAdapter1);
-        data1 = memento1.getData();
-        
-        iswf.fixtures.wve2.setStringProperty("Harry");
-        iswf.container.persist(iswf.fixtures.wve2);
-        
-        originalAdapter2 = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.wve2);
-        oid2 = originalAdapter2.getOid();
-        memento2 = new Memento(originalAdapter2);
-        data2 = memento2.getData();
-    }
-
-    
-    @Test
-    public void data_whenNull() throws Exception {
-        final Memento memento = new Memento(null);
-        Data data = memento.getData();
-
-        assertEquals(null, data);
-    }
-
-
-    @Test
-    public void data_getOid_equal() throws Exception {
-        assertEquals(oid1, data1.getOid());
-    }
-
-
-
-    @Test
-    public void data_getClassName() throws Exception {
-        assertEquals(WrapperValuedEntity.class.getName(), data1.getClassName());
-    }
-    
-    
-    @Test
-    public void data_getEntry_forStringField() throws Exception {
-        assertEquals(ObjectData.class, data1.getClass());
-        final ObjectData objectData = (ObjectData) data1;
-        assertEquals("Fred", objectData.getEntry("stringProperty"));
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_encodedData.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_encodedData.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_encodedData.java
deleted file mode 100644
index f86d96d..0000000
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest_encodedData.java
+++ /dev/null
@@ -1,80 +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.core.runtime.memento;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
-import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
-public class MementoTest_encodedData {
-
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
-    @Rule
-    public IsisSystemWithFixtures iswf = IsisSystemWithFixtures.builder().build();
-
-    private ObjectAdapter rootAdapter;
-
-    private Memento memento;
-
-    @Mock
-    private DataOutputStreamExtended mockOutputImpl;
-
-    @Before
-    public void setUpSystem() throws Exception {
-        iswf.fixtures.smpl1.setName("Fred");
-        iswf.fixtures.smpl2.setName("Harry");
-        
-        iswf.fixtures.rfcg1.setReference(iswf.fixtures.smpl1);
-        
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl1);
-        iswf.fixtures.prnt1.getHomogeneousCollection().add(iswf.fixtures.smpl2);
-        
-        iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.smpl1);
-        iswf.fixtures.prnt1.getHeterogeneousCollection().add(iswf.fixtures.rfcg1);
-
-        
-        rootAdapter = IsisContext.getPersistenceSession().getAdapterManager().adapterFor(iswf.fixtures.smpl1);
-
-        memento = new Memento(rootAdapter);
-    }
-
-    
-    @Test
-    public void encodedData() throws Exception {
-        context.checking(new Expectations() {
-            {
-                one(mockOutputImpl).writeEncodable(memento.getData());
-            }
-        });
-        memento.encodedData(mockOutputImpl);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b1629c2..724bc4f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1192,34 +1192,6 @@ ${license.additional-notes}
                 <version>1.8.0-SNAPSHOT</version>
             </dependency>
 
-            <!-- TCK -->
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-tck</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-tck-dom</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-tck-fixture</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-tck-integtests</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.isis.core</groupId>
-                <artifactId>isis-core-tck-viewer-restfulobjects</artifactId>
-                <version>1.8.0-SNAPSHOT</version>
-            </dependency>
-
-
             <!-- JodaTime -->
             <dependency>
                 <groupId>joda-time</groupId>
@@ -1917,8 +1889,6 @@ ${license.additional-notes}
         <module>viewer-restfulobjects-applib</module>
         <module>viewer-restfulobjects-rendering</module>
         <module>viewer-restfulobjects-server</module>
-
-        <module>tck</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
deleted file mode 100644
index 61bef4b..0000000
--- a/core/tck/pom.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.isis.core</groupId>
-        <artifactId>isis</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>isis-core-tck</artifactId>
-
-    <name>Isis Core TCK App</name>
-
-    <packaging>pom</packaging>
-
-    <properties>
-        <!-- must be consistent with the versions defined by the JDO Objectstore -->
-        <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
-        <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
-        <datanucleus-jodatime.version>3.2.1</datanucleus-jodatime.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshots</name>
-            <url>https://repository.apache.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
-                    <configuration>
-                        <source>1.6</source>
-                        <target>1.6</target>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>source</id>
-                            <phase>compile</phase>
-                        </execution>
-                        <execution>
-                            <id>test</id>
-                            <phase>test-compile</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.16</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>**/Test*.java</exclude>
-                        </excludes>
-                        <useFile>true</useFile>
-                        <printSummary>false</printSummary>
-                        <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.16</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>**/Test*.java</exclude>
-                        </excludes>
-                        <showSuccess>false</showSuccess>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>test</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>maven-jetty-plugin</artifactId>
-                    <version>${jetty.version}</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.7</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- DataNucleus -->
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
-                <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-jodatime</artifactId>
-                <version>${datanucleus-jodatime.version}</version>
-            </dependency>
-
-        </dependencies>
-
-    </dependencyManagement>
-
-    <modules>
-        <module>tck-dom</module>
-        <module>tck-fixture</module>
-        <module>tck-integtests</module>
-        <module>tck-viewer-restfulobjects</module>
-    </modules>
-
-</project>

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/.gitignore
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/.gitignore b/core/tck/tck-dom/.gitignore
deleted file mode 100644
index 0a37d92..0000000
--- a/core/tck/tck-dom/.gitignore
+++ /dev/null
@@ -1,19 +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. 
-#
-.project

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/log4j.properties
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/log4j.properties b/core/tck/tck-dom/log4j.properties
deleted file mode 100644
index 155ae59..0000000
--- a/core/tck/tck-dom/log4j.properties
+++ /dev/null
@@ -1,40 +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.
-
-
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
deleted file mode 100644
index e4a0333..0000000
--- a/core/tck/tck-dom/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-    	<groupId>org.apache.isis.core</groupId>
-    	<artifactId>isis-core-tck</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>isis-core-tck-dom</artifactId>
-	<name>Isis Core TCK DOM</name>
-
-    <profiles>
-        <profile>
-            <id>isis-jdo-objectstore</id>
-            <activation>
-                <property>
-                    <name>component</name>
-                    <value>isis-jdo-objectstore</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.datanucleus</groupId>
-                        <artifactId>datanucleus-maven-plugin</artifactId>
-                        <version>${datanucleus-maven-plugin.version}</version>
-                        <configuration>
-                            <fork>false</fork>
-                            <verbose>true</verbose>
-                            <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>enhance</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    
-                </plugins>
-                <pluginManagement>
-                    <plugins>
-                        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                        <plugin>
-                            <groupId>org.eclipse.m2e</groupId>
-                            <artifactId>lifecycle-mapping</artifactId>
-                            <version>1.0.0</version>
-                            <configuration>
-                                <lifecycleMappingMetadata>
-                                    <pluginExecutions>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>
-                                                    org.datanucleus
-                                                </groupId>
-                                                <artifactId>
-                                                    datanucleus-maven-plugin
-                                                </artifactId>
-                                                <versionRange>
-                                                    [3.2.0-release,)
-                                                </versionRange>
-                                                <goals>
-                                                    <goal>enhance</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <ignore />
-                                            </action>
-                                        </pluginExecution>
-                                    </pluginExecutions>
-                                </lifecycleMappingMetadata>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-core-applib</artifactId>
-		</dependency>
-
-        <!-- DataNucleus -->
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
-            <type>pom</type>
-        </dependency>
-        <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jodatime</artifactId>
-        </dependency>
-
-    </dependencies>
-    
-</project>

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/appended-resources/supplemental-models.xml b/core/tck/tck-dom/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index bbf2a84..0000000
--- a/core/tck/tck-dom/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<supplementalDataModels 
-  xmlns="http://maven.apache.org/supplemental-model/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 
-            http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-
-</supplementalDataModels>

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/AbstractEntityRepository.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/AbstractEntityRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/AbstractEntityRepository.java
deleted file mode 100644
index d6b6a24..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/AbstractEntityRepository.java
+++ /dev/null
@@ -1,74 +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.core.tck.dom;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.QueryOnly;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.query.QueryDefault;
-
-public abstract class AbstractEntityRepository<T> extends AbstractFactoryAndRepository {
-
-    private final Class<T> entityClass;
-    private final String serviceId;
-    
-    public AbstractEntityRepository(Class<T> entityClass, String serviceId) {
-        this.entityClass = entityClass;
-        this.serviceId = serviceId;
-    }
-
-    @Override
-    public final String getId() {
-        return serviceId;
-    }
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public List<T> list() {
-        return allInstances(entityClass);
-    }
-
-    @MemberOrder(sequence = "2")
-    public T newEntity() {
-        final T entity = newTransientInstance(entityClass);
-        persist(entity);
-        return entity;
-    }
-    
-    @Programmatic
-    public T findByNamedQueryFirstOnly(String queryName, Map<String, Object> argumentByParameterName) {
-        final Query<T> query = new QueryDefault<T>(entityClass, queryName, argumentByParameterName); 
-        return this.firstMatch(query);
-    }
-
-    @Programmatic
-    public List<T> findByNamedQueryAll(String queryName, Map<String, Object> argumentByParameterName) {
-        final Query<T> query = new QueryDefault<T>(entityClass, queryName, argumentByParameterName); 
-        return this.allMatches(query);
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntity.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntity.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntity.java
deleted file mode 100644
index 2f4ed64..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntity.java
+++ /dev/null
@@ -1,76 +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.core.tck.dom.actions;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("RTNE")
-@ObjectType("RTNE")
-public class ActionsEntity 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;
-    }
-    // }}
-
-
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity visibleAndInvokableAction() {
-        return this;
-    }
-
-    @Disabled
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity visibleButUninvokableAction() {
-        return this;
-    }
-
-    @Hidden
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity invisibleAction() {
-        return this;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntityRepository.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntityRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntityRepository.java
deleted file mode 100644
index f53bca0..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/actions/ActionsEntityRepository.java
+++ /dev/null
@@ -1,126 +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.core.tck.dom.actions;
-
-import java.util.List;
-
-import org.apache.isis.applib.annotation.*;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.core.tck.dom.AbstractEntityRepository;
-
-@Named("ActionsEntities")
-@ObjectType("ActionsEntities")
-@DomainService
-public class ActionsEntityRepository extends AbstractEntityRepository<ActionsEntity> {
-
-    public ActionsEntityRepository() {
-        super(ActionsEntity.class, "ActionsEntities");
-    }
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity findById(@Named("id") int id) {
-        return findByIdIfAny(id);
-    }
-
-    @ActionSemantics(Of.IDEMPOTENT)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity findByIdIdempotent(@Named("id") int id) {
-        return findByIdIfAny(id);
-    }
-
-    @ActionSemantics(Of.NON_IDEMPOTENT)
-    @MemberOrder(sequence = "1")
-    public ActionsEntity findByIdNotIdempotent(@Named("id") int id) {
-        return findByIdIfAny(id);
-    }
-
-    private ActionsEntity findByIdIfAny(int id) {
-        List<ActionsEntity> subList = subList(id, id+1);
-        return subList.isEmpty()?null:subList.get(0);
-    }
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public List<ActionsEntity> subList(
-            @MustSatisfy(IntegerCannotBeNegative.class)
-            @Named("from") int from, 
-            @MustSatisfy(IntegerCannotBeNegative.class)
-            @Named("to") int to) {
-        List<ActionsEntity> list = list();
-        int toChecked = Math.min(to, list.size());
-        int fromChecked = Math.min(from, toChecked);
-        return list.subList(fromChecked, toChecked);
-    }
-    public String validateSubList(final int from, final int to) {
-        if(from > to) {
-            return "'from' cannot be larger than 'to'";
-        }
-        return null;
-    }
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public boolean contains(@Named("searchFor") ActionsEntity entity, @Named("from") int from, @Named("to") int to) {
-        List<ActionsEntity> list = subList(from, to);
-        return list.contains(entity);
-    }
-
-    public static class IntegerCannotBeNegative implements Specification {
-        @Override
-        public String satisfies(Object obj) {
-            if(!(obj instanceof Integer)) {
-                return null;
-            } 
-            Integer integer = (Integer) obj;
-            return integer.intValue() < 0? "Cannot be less than zero": null;
-        }
-    }
-
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public List<ActionsEntity> subListWithOptionalRange(
-            @Optional
-            @MustSatisfy(IntegerCannotBeNegative.class)
-            @Named("from") Integer from, 
-            @Optional
-            @MustSatisfy(IntegerCannotBeNegative.class)
-            @Named("to") Integer to) {
-        return subList(valueElseDefault(from, 0), valueElseDefault(to, Integer.MAX_VALUE));
-    }
-
-    public String validateSubListWithOptionalRange(final Integer from, final Integer to) {
-        return validateSubList(valueElseDefault(from, 0), valueElseDefault(to, Integer.MAX_VALUE));
-    }
-
-    private static int valueElseDefault(Integer value, int i) {
-        return value != null? value: i;
-    }
-    
-    @ActionSemantics(Of.IDEMPOTENT)
-    @MemberOrder(sequence = "90")
-    public String concatenate(@Named("str1") String str1, @Named("str2") String str2) {
-        return str1 + str2;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntity.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntity.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntity.java
deleted file mode 100644
index 3894d1a..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntity.java
+++ /dev/null
@@ -1,165 +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.core.tck.dom.busrules;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("BSRL")
-@javax.jdo.annotations.Query(
-        name="prmv_findByIntProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.busrules.BusRulesEntity WHERE intProperty == :i")
-@ObjectType("BSRL")
-public class BusRulesEntity 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;
-    }
-    // }}
-
-
-    // {{ visibleAndEditableProperty
-    private int visibleAndEditableProperty;
-
-    @MemberOrder(sequence = "1")
-    public int getVisibleAndEditableProperty() {
-        return visibleAndEditableProperty;
-    }
-
-    public void setVisibleAndEditableProperty(final int intProperty) {
-        this.visibleAndEditableProperty = intProperty;
-    }
-    // }}
-
-
-    // {{ visibleButNotEditableProperty
-    private int visibleButNotEditableProperty;
-
-    @Disabled
-    @MemberOrder(sequence = "2")
-    public int getVisibleButNotEditableProperty() {
-        return visibleButNotEditableProperty;
-    }
-
-    public void setVisibleButNotEditableProperty(final int intProperty) {
-        this.visibleButNotEditableProperty = intProperty;
-    }
-    // }}
-
-    // {{ invisibleProperty
-    private int invisibleProperty;
-
-    @Hidden
-    @MemberOrder(sequence = "3")
-    public int getInvisibleProperty() {
-        return invisibleProperty;
-    }
-
-    public void setInvisibleProperty(final int intProperty) {
-        this.invisibleProperty = intProperty;
-    }
-    // }}
-
-    
-    // {{ VisibleAndEditableCollection (Collection)
-    private List<BusRulesEntityChild> editableCollection = new ArrayList<BusRulesEntityChild>();
-
-    @MemberOrder(sequence = "11")
-    public List<BusRulesEntityChild> getVisibleAndEditableCollection() {
-        return editableCollection;
-    }
-
-    public void setVisibleAndEditableCollection(final List<BusRulesEntityChild> children) {
-        this.editableCollection = children;
-    }
-    // }}
-
-    
-    // {{ VisibleButNotEditableCollection (Collection)
-    private List<BusRulesEntityChild> notEditableCollection = new ArrayList<BusRulesEntityChild>();
-
-    @MemberOrder(sequence = "11")
-    public List<BusRulesEntityChild> getVisibleButNotEditableCollection() {
-        return notEditableCollection;
-    }
-
-    public void setVisibleButNotEditableCollection(final List<BusRulesEntityChild> children) {
-        this.notEditableCollection = children;
-    }
-    // }}
-
-    // {{ InvisibleCollection (Collection)
-    private List<BusRulesEntityChild> invisibleCollection = new ArrayList<BusRulesEntityChild>();
-
-    @Hidden
-    @MemberOrder(sequence = "11")
-    public List<BusRulesEntityChild> getInvisibleCollection() {
-        return invisibleCollection;
-    }
-
-    public void setInvisibleCollection(final List<BusRulesEntityChild> children) {
-        this.invisibleCollection = children;
-    }
-    // }}
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity visibleAndInvokableAction() {
-        return this;
-    }
-
-    @Disabled
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity visibleButUninvokableAction() {
-        return this;
-    }
-
-    @Hidden
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity invisibleAction() {
-        return this;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityChild.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityChild.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityChild.java
deleted file mode 100644
index 5011c23..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityChild.java
+++ /dev/null
@@ -1,55 +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.core.tck.dom.busrules;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.ObjectType;
-
-@javax.jdo.annotations.PersistenceCapable
-@javax.jdo.annotations.Discriminator("BSRC")
-@javax.jdo.annotations.Query(
-        name="prmv_findByIntProperty", language="JDOQL",  
-        value="SELECT FROM org.apache.isis.tck.dom.busrules.BusRulesEntityChild WHERE intProperty == :i")
-@ObjectType("BSRC")
-public class BusRulesEntityChild 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;
-    }
-    // }}
-
-
-    
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityRepository.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityRepository.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityRepository.java
deleted file mode 100644
index e13664c..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/busrules/BusRulesEntityRepository.java
+++ /dev/null
@@ -1,68 +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.core.tck.dom.busrules;
-
-import org.apache.isis.applib.annotation.*;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.query.Query;
-import org.apache.isis.applib.query.QueryDefault;
-import org.apache.isis.core.tck.dom.AbstractEntityRepository;
-
-@Named("BusinessRulesEntities")
-@ObjectType("BusinessRulesEntities")
-@DomainService
-public class BusRulesEntityRepository extends AbstractEntityRepository<BusRulesEntity> {
-
-    public BusRulesEntityRepository() {
-        super(BusRulesEntity.class, "BusinessRulesEntities");
-    }
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity findById(int id) {
-        final Query<BusRulesEntity> query = 
-                new QueryDefault<BusRulesEntity>(BusRulesEntity.class, BusRulesEntity.class.getName() + "#pk", "id", id);
-        return this.firstMatch(query);
-    }
-
-
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity visibleAndInvocableAction(@Named("id") int id) {
-        return this.findById(id);
-    }
-
-    @Disabled
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity visibleButNotInvocableAction(@Named("id") int id) {
-        return this.findById(id);
-    }
-
-    @Hidden
-    @ActionSemantics(Of.SAFE)
-    @MemberOrder(sequence = "1")
-    public BusRulesEntity invisibleAction(int id) {
-        return this.findById(id);
-    }
-
-    
-    
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Approver.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Approver.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Approver.java
deleted file mode 100644
index ac84e44..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Approver.java
+++ /dev/null
@@ -1,24 +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.core.tck.dom.claimapp.claims;
-
-public interface Approver {
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Claim.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Claim.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Claim.java
deleted file mode 100644
index 09af5eb..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/Claim.java
+++ /dev/null
@@ -1,239 +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.core.tck.dom.claimapp.claims;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.value.Color;
-import org.apache.isis.applib.value.Date;
-
-public class Claim extends AbstractDomainObject {
-
-    // {{ Title
-    public String title() {
-        return getStatus() + " - " + getDate();
-    }
-
-    // }}
-
-    // {{ Lifecycle
-    public void created() {
-        status = "New";
-        date = new Date();
-    }
-
-    // }}
-
-    // {{ Description
-    private String description;
-
-    @MemberOrder(sequence = "1")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-    public String defaultDescription() {
-        return "enter a description here";
-    }
-
-    // }}
-
-    // {{ Date
-    private Date date;
-
-    @MemberOrder(sequence = "2")
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(final Date date) {
-        this.date = date;
-    }
-
-    // }}
-
-    // {{ Status
-    private String status;
-
-    @Disabled
-    @MemberOrder(sequence = "3")
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(final String status) {
-        this.status = status;
-    }
-
-    // }}
-
-    // {{ Claimant
-    private Claimant claimant;
-
-    @Disabled
-    @MemberOrder(sequence = "4")
-    public Claimant getClaimant() {
-        return claimant;
-    }
-
-    public void setClaimant(final Claimant claimant) {
-        this.claimant = claimant;
-    }
-
-    // }}
-
-    // {{ BigDecimal
-    private BigDecimal bigDecimal;
-
-    @MemberOrder(sequence = "9")
-    public BigDecimal getBigDecimal() {
-        return bigDecimal;
-    }
-
-    public void setBigDecimal(final BigDecimal bigDecimal) {
-        this.bigDecimal = bigDecimal;
-    }
-
-    public void modifyBigDecimal(final BigDecimal bigDecimal) {
-        // check for no-op
-        if (bigDecimal == null || bigDecimal.equals(getBigDecimal())) {
-            return;
-        }
-        // associate new
-        setBigDecimal(bigDecimal);
-        // additional business logic
-        onModifyBigDecimal(bigDecimal);
-    }
-
-    public void clearBigDecimal() {
-        // check for no-op
-        if (getBigDecimal() == null) {
-            return;
-        }
-        // dissociate existing
-        setBigDecimal(null);
-        // additional business logic
-        onClearBigDecimal();
-    }
-
-    protected void onModifyBigDecimal(final BigDecimal bigDecimal) {
-    }
-
-    protected void onClearBigDecimal() {
-    }
-
-    // }}
-
-    // {{ Color
-    private Color color;
-
-    @MemberOrder(sequence = "8")
-    public Color getColor() {
-        return color;
-    }
-
-    public void setColor(final Color color) {
-        this.color = color;
-    }
-
-    public void modifyColor(final Color color) {
-        // check for no-op
-        if (color == null || color.equals(getColor())) {
-            return;
-        }
-        // associate new
-        setColor(color);
-        // additional business logic
-        onModifyColor(color);
-    }
-
-    public void clearColor() {
-        // check for no-op
-        if (getColor() == null) {
-            return;
-        }
-        // dissociate existing
-        setColor(null);
-        // additional business logic
-        onClearColor();
-    }
-
-    protected void onModifyColor(final Color color) {
-    }
-
-    protected void onClearColor() {
-    }
-
-    // }}
-
-    // {{ Approver
-    private Approver approver;
-
-    @Disabled
-    @MemberOrder(sequence = "5")
-    public Approver getApprover() {
-        return approver;
-    }
-
-    public void setApprover(final Approver approver) {
-        this.approver = approver;
-    }
-
-    // }}
-
-    // {{ Items
-    private final List<ClaimItem> items = new ArrayList<ClaimItem>();
-
-    @MemberOrder(sequence = "6")
-    public List<ClaimItem> getItems() {
-        return items;
-    }
-
-    public void addToItems(final ClaimItem item) {
-        items.add(item);
-    }
-
-    // }}
-
-    // {{ action: Submit
-    public void submit(final Approver approver) {
-        setStatus("Submitted");
-        setApprover(approver);
-    }
-
-    public String disableSubmit() {
-        return getStatus().equals("New") ? null : "Claim has already been submitted";
-    }
-
-    public Object[] defaultSubmit() {
-        return new Object[] { getClaimant().getApprover() };
-    }
-    // }}
-
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/21e2882a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/ClaimItem.java
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/ClaimItem.java b/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/ClaimItem.java
deleted file mode 100644
index 0c80cb8..0000000
--- a/core/tck/tck-dom/src/main/java/org/apache/isis/core/tck/dom/claimapp/claims/ClaimItem.java
+++ /dev/null
@@ -1,77 +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.core.tck.dom.claimapp.claims;
-
-import org.apache.isis.applib.AbstractDomainObject;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.value.Date;
-import org.apache.isis.applib.value.Money;
-
-public class ClaimItem extends AbstractDomainObject {
-
-    // {{ Title
-    public String title() {
-        return getDescription();
-    }
-
-    // }}
-
-    // {{ DateIncurred
-    private Date dateIncurred;
-
-    @MemberOrder(sequence = "1")
-    public Date getDateIncurred() {
-        return dateIncurred;
-    }
-
-    public void setDateIncurred(final Date dateIncurred) {
-        this.dateIncurred = dateIncurred;
-    }
-
-    // }}
-
-    // {{ Description
-    private String description;
-
-    @MemberOrder(sequence = "2")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-    // }}
-
-    // {{ Amount
-    private Money amount;
-
-    @MemberOrder(sequence = "3")
-    public Money getAmount() {
-        return amount;
-    }
-
-    public void setAmount(final Money price) {
-        this.amount = price;
-    }
-    // }}
-
-}