polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [6/6] polygene-java git commit: Fixing the "too soon" start up problem with the systems running in Docker.
Date Sun, 19 Mar 2017 09:03:45 GMT
Fixing the "too soon" start up problem with the systems running in Docker.


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/cfd38626
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/cfd38626
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/cfd38626

Branch: refs/heads/develop
Commit: cfd38626cdff84fe9621cf61a0c2d5c94ba2d5c8
Parents: 9c09781
Author: niclas <niclas@spicter.com>
Authored: Sun Mar 19 16:37:04 2017 +0800
Committer: niclas <niclas@spicter.com>
Committed: Sun Mar 19 16:37:05 2017 +0800

----------------------------------------------------------------------
 .../test/indexing/AbstractAnyQueryTest.java     | 26 ++---
 .../test/indexing/AbstractComplexQueryTest.java | 10 +-
 .../test/indexing/AbstractEntityFinderTest.java | 10 +-
 .../test/indexing/AbstractNamedQueryTest.java   | 10 +-
 .../test/indexing/AbstractQueryTest.java        | 18 ++--
 .../polygene/test/indexing/NameableAssert.java  |  2 +-
 .../apache/polygene/test/indexing/TestData.java | 22 ++---
 .../AbstractMultiLayeredIndexingTest.java       |  2 +-
 .../test/indexing/layered/Suite1Case1.java      |  4 +-
 .../test/indexing/layered/Suite1Case2.java      |  4 +-
 .../indexing/layered/assembly/AccessLayer.java  | 65 -------------
 .../layered/assembly/AccountModule.java         | 50 ----------
 .../layered/assembly/ApplicationAssembler.java  | 71 --------------
 .../indexing/layered/assembly/ConfigLayer.java  | 37 --------
 .../indexing/layered/assembly/ConfigModule.java | 41 --------
 .../indexing/layered/assembly/DomainLayer.java  | 38 --------
 .../indexing/layered/assembly/FamilyModule.java | 52 ----------
 .../layered/assembly/IndexingLayer.java         | 38 --------
 .../layered/assembly/PersistenceLayer.java      | 37 --------
 .../layered/assembly/PersistenceModule.java     | 44 ---------
 .../layered/assembly/TestExecutionModule.java   | 46 ---------
 .../layered/assembly/TestSuite1Module.java      | 53 -----------
 .../layered/assembly/TestSuite2Module.java      | 38 --------
 .../layered/assembly/TestSuite3Module.java      | 38 --------
 .../polygene/test/indexing/model/Account.java   | 30 ------
 .../polygene/test/indexing/model/Address.java   | 32 -------
 .../polygene/test/indexing/model/Alive.java     | 27 ------
 .../polygene/test/indexing/model/Cat.java       | 27 ------
 .../polygene/test/indexing/model/City.java      | 32 -------
 .../polygene/test/indexing/model/Dog.java       | 27 ------
 .../polygene/test/indexing/model/Domain.java    | 30 ------
 .../polygene/test/indexing/model/Female.java    | 32 -------
 .../polygene/test/indexing/model/File.java      | 32 -------
 .../polygene/test/indexing/model/Host.java      | 30 ------
 .../polygene/test/indexing/model/Male.java      | 32 -------
 .../polygene/test/indexing/model/Nameable.java  | 31 ------
 .../polygene/test/indexing/model/Person.java    | 99 --------------------
 .../polygene/test/indexing/model/Pet.java       | 28 ------
 .../polygene/test/indexing/model/Port.java      | 32 -------
 .../polygene/test/indexing/model/Protocol.java  | 30 ------
 .../test/indexing/model/QueryParam.java         | 32 -------
 .../polygene/test/indexing/model/URL.java       | 46 ---------
 .../polygene/test/indexing/model/package.html   | 24 -----
 .../org/apache/polygene/test/model/Account.java | 30 ++++++
 .../org/apache/polygene/test/model/Address.java | 32 +++++++
 .../org/apache/polygene/test/model/Alive.java   | 27 ++++++
 .../org/apache/polygene/test/model/Cat.java     | 27 ++++++
 .../org/apache/polygene/test/model/City.java    | 32 +++++++
 .../org/apache/polygene/test/model/Dog.java     | 27 ++++++
 .../org/apache/polygene/test/model/Domain.java  | 30 ++++++
 .../org/apache/polygene/test/model/Female.java  | 32 +++++++
 .../org/apache/polygene/test/model/File.java    | 32 +++++++
 .../org/apache/polygene/test/model/Host.java    | 30 ++++++
 .../org/apache/polygene/test/model/Male.java    | 32 +++++++
 .../apache/polygene/test/model/Nameable.java    | 31 ++++++
 .../org/apache/polygene/test/model/Owner.java   | 24 +++++
 .../org/apache/polygene/test/model/Person.java  | 99 ++++++++++++++++++++
 .../org/apache/polygene/test/model/Pet.java     | 28 ++++++
 .../org/apache/polygene/test/model/PetShop.java | 31 ++++++
 .../org/apache/polygene/test/model/Port.java    | 32 +++++++
 .../apache/polygene/test/model/Protocol.java    | 30 ++++++
 .../apache/polygene/test/model/QueryParam.java  | 32 +++++++
 .../org/apache/polygene/test/model/Staff.java   | 24 +++++
 .../org/apache/polygene/test/model/URL.java     | 46 +++++++++
 .../test/model/assembly/AccessLayer.java        | 65 +++++++++++++
 .../test/model/assembly/AccountModule.java      | 50 ++++++++++
 .../model/assembly/ApplicationAssembler.java    | 71 ++++++++++++++
 .../test/model/assembly/ConfigLayer.java        | 37 ++++++++
 .../test/model/assembly/ConfigModule.java       | 41 ++++++++
 .../test/model/assembly/DomainLayer.java        | 39 ++++++++
 .../test/model/assembly/FamilyModule.java       | 52 ++++++++++
 .../test/model/assembly/IndexingLayer.java      | 38 ++++++++
 .../test/model/assembly/PersistenceLayer.java   | 37 ++++++++
 .../test/model/assembly/PersistenceModule.java  | 44 +++++++++
 .../test/model/assembly/PetShopModule.java      | 51 ++++++++++
 .../model/assembly/TestExecutionModule.java     | 46 +++++++++
 .../test/model/assembly/TestSuite1Module.java   | 53 +++++++++++
 .../test/model/assembly/TestSuite2Module.java   | 38 ++++++++
 .../test/model/assembly/TestSuite3Module.java   | 38 ++++++++
 .../org/apache/polygene/test/model/package.html | 24 +++++
 .../cassandra/CassandraMapEntityStoreTest.java  |  3 +-
 .../entitystore/jclouds/JCloudsS3Test.java      |  2 +-
 .../riak/RiakMapEntityStoreTest.java            |  2 +-
 .../riak/RiakMapEntityStoreWithCacheTest.java   |  2 +-
 extensions/entitystore-sql/build.gradle         |  1 +
 .../entitystore/sql/MySQLEntityStoreTest.java   |  3 +-
 .../sql/PostgreSQLEntityStoreTest.java          |  2 +-
 .../polygene/index/rdf/RdfNamedQueryTest.java   | 98 +++++++++----------
 .../postgresql/PostgreSQLComplexQueryTest.java  |  2 +-
 .../postgresql/PostgreSQLDBIntegrityTest.java   |  2 +-
 .../postgresql/PostgreSQLEntityFinderTest.java  |  2 +-
 .../sql/postgresql/PostgreSQLQueryTest.java     |  2 +-
 .../polygene/test/internal/DelayChecker.java    | 60 ++++++++++++
 .../polygene/test/internal/DockerRule.java      | 87 ++++++++++++++++-
 libraries/http/build.gradle                     |  1 +
 95 files changed, 1693 insertions(+), 1417 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
index 1c52e24..b2872e9 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractAnyQueryTest.java
@@ -25,19 +25,19 @@ import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
-import org.apache.polygene.test.indexing.model.Account;
-import org.apache.polygene.test.indexing.model.Address;
-import org.apache.polygene.test.indexing.model.Cat;
-import org.apache.polygene.test.indexing.model.City;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.File;
-import org.apache.polygene.test.indexing.model.Host;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Port;
-import org.apache.polygene.test.indexing.model.Protocol;
-import org.apache.polygene.test.indexing.model.QueryParam;
-import org.apache.polygene.test.indexing.model.URL;
+import org.apache.polygene.test.model.Account;
+import org.apache.polygene.test.model.Address;
+import org.apache.polygene.test.model.Cat;
+import org.apache.polygene.test.model.City;
+import org.apache.polygene.test.model.Domain;
+import org.apache.polygene.test.model.Female;
+import org.apache.polygene.test.model.File;
+import org.apache.polygene.test.model.Host;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Port;
+import org.apache.polygene.test.model.Protocol;
+import org.apache.polygene.test.model.QueryParam;
+import org.apache.polygene.test.model.URL;
 
 /**
  * Abstract satisfiedBy with tests for any queries against Index/Query engines.

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractComplexQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractComplexQueryTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractComplexQueryTest.java
index 19895fd..78eb77e 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractComplexQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractComplexQueryTest.java
@@ -31,11 +31,11 @@ import org.apache.polygene.api.query.Query;
 import org.apache.polygene.api.query.QueryBuilder;
 import org.apache.polygene.api.value.ValueBuilder;
 import org.apache.polygene.spi.query.IndexExporter;
-import org.apache.polygene.test.indexing.model.Address;
-import org.apache.polygene.test.indexing.model.Person;
-import org.apache.polygene.test.indexing.model.Protocol;
-import org.apache.polygene.test.indexing.model.QueryParam;
-import org.apache.polygene.test.indexing.model.URL;
+import org.apache.polygene.test.model.Address;
+import org.apache.polygene.test.model.Person;
+import org.apache.polygene.test.model.Protocol;
+import org.apache.polygene.test.model.QueryParam;
+import org.apache.polygene.test.model.URL;
 
 import static org.apache.polygene.api.query.QueryExpressions.contains;
 import static org.apache.polygene.api.query.QueryExpressions.containsAll;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
index 630829e..9e0b845 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractEntityFinderTest.java
@@ -36,11 +36,11 @@ import org.apache.polygene.api.service.ServiceReference;
 import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.spi.query.EntityFinder;
 import org.apache.polygene.spi.query.IndexExporter;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Nameable;
-import org.apache.polygene.test.indexing.model.Person;
+import org.apache.polygene.test.model.Domain;
+import org.apache.polygene.test.model.Female;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Nameable;
+import org.apache.polygene.test.model.Person;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractNamedQueryTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractNamedQueryTest.java
index 4d12d40..a2b269e 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractNamedQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractNamedQueryTest.java
@@ -29,11 +29,11 @@ import org.apache.polygene.api.query.Query;
 import org.apache.polygene.api.query.grammar.OrderBy;
 import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.spi.query.IndexExporter;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Nameable;
-import org.apache.polygene.test.indexing.model.Person;
+import org.apache.polygene.test.model.Domain;
+import org.apache.polygene.test.model.Female;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Nameable;
+import org.apache.polygene.test.model.Person;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractQueryTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractQueryTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractQueryTest.java
index f323a50..24fb780 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractQueryTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/AbstractQueryTest.java
@@ -37,15 +37,15 @@ import org.apache.polygene.api.query.QueryBuilder;
 import org.apache.polygene.api.query.grammar.OrderBy;
 import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.spi.query.IndexExporter;
-import org.apache.polygene.test.indexing.model.Account;
-import org.apache.polygene.test.indexing.model.City;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.File;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Nameable;
-import org.apache.polygene.test.indexing.model.Person;
-import org.apache.polygene.test.indexing.model.QueryParam;
+import org.apache.polygene.test.model.Account;
+import org.apache.polygene.test.model.City;
+import org.apache.polygene.test.model.Domain;
+import org.apache.polygene.test.model.Female;
+import org.apache.polygene.test.model.File;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Nameable;
+import org.apache.polygene.test.model.Person;
+import org.apache.polygene.test.model.QueryParam;
 import org.junit.Ignore;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/NameableAssert.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/NameableAssert.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/NameableAssert.java
index 057d61c..58dde55 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/NameableAssert.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/NameableAssert.java
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.polygene.api.entity.EntityReference;
 import org.apache.polygene.api.identity.Identity;
-import org.apache.polygene.test.indexing.model.Nameable;
+import org.apache.polygene.test.model.Nameable;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNull.notNullValue;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/TestData.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/TestData.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/TestData.java
index 1fa897b..aaa8bac 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/TestData.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/TestData.java
@@ -32,17 +32,17 @@ import org.apache.polygene.api.structure.Module;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.polygene.api.value.ValueBuilder;
-import org.apache.polygene.test.indexing.model.Account;
-import org.apache.polygene.test.indexing.model.Address;
-import org.apache.polygene.test.indexing.model.Cat;
-import org.apache.polygene.test.indexing.model.City;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Person;
-import org.apache.polygene.test.indexing.model.Protocol;
-import org.apache.polygene.test.indexing.model.QueryParam;
-import org.apache.polygene.test.indexing.model.URL;
+import org.apache.polygene.test.model.Account;
+import org.apache.polygene.test.model.Address;
+import org.apache.polygene.test.model.Cat;
+import org.apache.polygene.test.model.City;
+import org.apache.polygene.test.model.Domain;
+import org.apache.polygene.test.model.Female;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Person;
+import org.apache.polygene.test.model.Protocol;
+import org.apache.polygene.test.model.QueryParam;
+import org.apache.polygene.test.model.URL;
 
 import static java.time.ZoneOffset.UTC;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/AbstractMultiLayeredIndexingTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/AbstractMultiLayeredIndexingTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/AbstractMultiLayeredIndexingTest.java
index 833ebc8..a5b4b5a 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/AbstractMultiLayeredIndexingTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/AbstractMultiLayeredIndexingTest.java
@@ -34,7 +34,7 @@ import org.apache.polygene.api.usecase.UsecaseBuilder;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.layered.ModuleAssembler;
 import org.apache.polygene.test.indexing.TestData;
-import org.apache.polygene.test.indexing.layered.assembly.ApplicationAssembler;
+import org.apache.polygene.test.model.assembly.ApplicationAssembler;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case1.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case1.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case1.java
index a9f4b82..8477b18 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case1.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case1.java
@@ -27,8 +27,8 @@ import org.apache.polygene.api.query.QueryBuilderFactory;
 import org.apache.polygene.api.query.QueryExpressions;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.api.unitofwork.UnitOfWorkFactory;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Person;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Person;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case2.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case2.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case2.java
index 63326fb..6c54831 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case2.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/Suite1Case2.java
@@ -28,8 +28,8 @@ import org.apache.polygene.api.query.QueryExpressions;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.api.unitofwork.UnitOfWorkFactory;
 import org.apache.polygene.api.unitofwork.concern.UnitOfWorkPropagation;
-import org.apache.polygene.test.indexing.model.Male;
-import org.apache.polygene.test.indexing.model.Person;
+import org.apache.polygene.test.model.Male;
+import org.apache.polygene.test.model.Person;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccessLayer.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccessLayer.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccessLayer.java
deleted file mode 100644
index c02c485..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccessLayer.java
+++ /dev/null
@@ -1,65 +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.polygene.test.indexing.layered.assembly;
-
-import java.lang.reflect.InvocationTargetException;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-class AccessLayer extends LayeredLayerAssembler
-{
-
-    private final Class<?> testClass;
-
-    AccessLayer( Class<?> testClass )
-    {
-        this.testClass = testClass;
-    }
-
-    @Override
-    public LayerAssembly assemble( LayerAssembly layer )
-        throws AssemblyException
-    {
-        createModule( layer, TestExecutionModule.class );
-        createModule( layer, TestSuite1Module.class );
-        createModule( layer, TestSuite2Module.class );
-        createModule( layer, TestSuite3Module.class );
-        return layer;
-    }
-
-    @Override
-    protected ModuleAssembler instantiateAssembler( LayerAssembly layer,
-                                                    Class<? extends ModuleAssembler> moduleAssemblerClass
-    )
-        throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException
-    {
-        if( moduleAssemblerClass.equals(TestExecutionModule.class))
-        {
-            return new TestExecutionModule( testClass );
-        }
-        else
-        {
-            return super.instantiateAssembler( layer, moduleAssemblerClass );
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccountModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccountModule.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccountModule.java
deleted file mode 100644
index 41d5c44..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/AccountModule.java
+++ /dev/null
@@ -1,50 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.test.indexing.model.Account;
-import org.apache.polygene.test.indexing.model.Domain;
-import org.apache.polygene.test.indexing.model.File;
-import org.apache.polygene.test.indexing.model.Host;
-import org.apache.polygene.test.indexing.model.Port;
-import org.apache.polygene.test.indexing.model.Protocol;
-import org.apache.polygene.test.indexing.model.QueryParam;
-import org.apache.polygene.test.indexing.model.URL;
-
-class AccountModule
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        module.entities( Account.class, Domain.class ).visibleIn( Visibility.layer );
-        module.values( File.class, Host.class, Port.class, Protocol.class, QueryParam.class, URL.class )
-            .visibleIn( Visibility.layer );
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ApplicationAssembler.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ApplicationAssembler.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ApplicationAssembler.java
deleted file mode 100644
index eba127a..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ApplicationAssembler.java
+++ /dev/null
@@ -1,71 +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.polygene.test.indexing.layered.assembly;
-
-import java.lang.reflect.InvocationTargetException;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.IllegalLayerAssemblerException;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredApplicationAssembler;
-
-public class ApplicationAssembler extends LayeredApplicationAssembler
-{
-
-    private final Class<?> testClass;
-
-    public ApplicationAssembler( String name, String version, Application.Mode mode, Class<?> testClass )
-        throws AssemblyException
-    {
-        super( name, version, mode );
-        this.testClass = testClass;
-    }
-
-    @Override
-    protected void assembleLayers( ApplicationAssembly assembly )
-        throws AssemblyException
-    {
-        LayerAssembly accessLayer = createLayer( AccessLayer.class );
-        LayerAssembly domainLayer = createLayer( DomainLayer.class );
-        LayerAssembly persistenceLayer = createLayer( PersistenceLayer.class );
-        LayerAssembly indexingLayer = createLayer( IndexingLayer.class );
-        LayerAssembly configLayer = createLayer( ConfigLayer.class );
-        accessLayer.uses( domainLayer );
-        domainLayer.uses( persistenceLayer, indexingLayer );
-        persistenceLayer.uses( configLayer );
-        indexingLayer.uses( configLayer );
-    }
-
-    @Override
-    protected <T extends LayerAssembler> LayerAssembler instantiateLayerAssembler( Class<T> layerAssemblerClass,
-                                                                                   LayerAssembly layer
-    )
-        throws InstantiationException, IllegalAccessException, InvocationTargetException, IllegalLayerAssemblerException
-    {
-        if( layerAssemblerClass.equals( AccessLayer.class ))
-        {
-            return new AccessLayer( testClass );
-        }
-        return super.instantiateLayerAssembler( layerAssemblerClass, layer );
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigLayer.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigLayer.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigLayer.java
deleted file mode 100644
index e40e301..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigLayer.java
+++ /dev/null
@@ -1,37 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-class ConfigLayer extends LayeredLayerAssembler
-{
-
-    @Override
-    public LayerAssembly assemble( LayerAssembly layer )
-        throws AssemblyException
-    {
-        createModule( layer, ConfigModule.class );
-        return layer;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigModule.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigModule.java
deleted file mode 100644
index beaa1a1..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/ConfigModule.java
+++ /dev/null
@@ -1,41 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
-
-class ConfigModule
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/DomainLayer.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/DomainLayer.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/DomainLayer.java
deleted file mode 100644
index fbd822c..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/DomainLayer.java
+++ /dev/null
@@ -1,38 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-class DomainLayer extends LayeredLayerAssembler
-{
-
-    @Override
-    public LayerAssembly assemble( LayerAssembly layer )
-        throws AssemblyException
-    {
-        createModule( layer, FamilyModule.class );
-        createModule( layer, AccountModule.class );
-        return layer;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/FamilyModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/FamilyModule.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/FamilyModule.java
deleted file mode 100644
index fd4bdee..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/FamilyModule.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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.test.indexing.model.Address;
-import org.apache.polygene.test.indexing.model.Cat;
-import org.apache.polygene.test.indexing.model.City;
-import org.apache.polygene.test.indexing.model.Dog;
-import org.apache.polygene.test.indexing.model.Female;
-import org.apache.polygene.test.indexing.model.Male;
-
-class FamilyModule
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        module.entities( Male.class,
-                         Female.class,
-                         City.class,
-                         Cat.class,
-                         Dog.class ).visibleIn( Visibility.application );
-
-        module.values( Address.class ).visibleIn( Visibility.application );
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/IndexingLayer.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/IndexingLayer.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/IndexingLayer.java
deleted file mode 100644
index fa302a5..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/IndexingLayer.java
+++ /dev/null
@@ -1,38 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-import org.apache.polygene.test.indexing.layered.AbstractMultiLayeredIndexingTest;
-
-class IndexingLayer extends LayeredLayerAssembler
-{
-
-    @Override
-    public LayerAssembly assemble( LayerAssembly layer )
-        throws AssemblyException
-    {
-        createModule( layer, AbstractMultiLayeredIndexingTest.indexingAssembler );
-        return layer;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceLayer.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceLayer.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceLayer.java
deleted file mode 100644
index c82798f..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceLayer.java
+++ /dev/null
@@ -1,37 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-class PersistenceLayer extends LayeredLayerAssembler
-{
-
-    @Override
-    public LayerAssembly assemble( LayerAssembly layer )
-        throws AssemblyException
-    {
-        createModule( layer, PersistenceModule.class );
-        return layer;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceModule.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceModule.java
deleted file mode 100644
index 30f4be7..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/PersistenceModule.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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.value.ValueSerialization;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
-import org.apache.polygene.valueserialization.orgjson.OrgJsonValueSerializationService;
-
-class PersistenceModule
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        module.services( OrgJsonValueSerializationService.class ).taggedWith( ValueSerialization.Formats.JSON );
-        module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.application );
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestExecutionModule.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestExecutionModule.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestExecutionModule.java
deleted file mode 100644
index 8c2ac15..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestExecutionModule.java
+++ /dev/null
@@ -1,46 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-public class TestExecutionModule
-    implements ModuleAssembler
-{
-    private final Class<?> testClass;
-
-    public TestExecutionModule( Class<?> testClass)
-    {
-        this.testClass = testClass;
-    }
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        module.objects( testClass ).visibleIn( Visibility.layer );
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite1Module.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite1Module.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite1Module.java
deleted file mode 100644
index 61a0caf..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite1Module.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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.test.indexing.layered.Suite1Case1;
-import org.apache.polygene.test.indexing.layered.Suite1Case2;
-import org.apache.polygene.test.indexing.layered.TestCase;
-
-class TestSuite1Module
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        declareTestCase( module, Suite1Case1.class );
-        declareTestCase( module, Suite1Case2.class );
-        return module;
-    }
-
-    private void declareTestCase( ModuleAssembly module, Class<?> testcaseMixin )
-    {
-        module.services( TestCase.class )
-            .withMixins( testcaseMixin )
-            .visibleIn( Visibility.layer )
-            .taggedWith( testcaseMixin.getSimpleName() );
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite2Module.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite2Module.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite2Module.java
deleted file mode 100644
index 5da5336..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite2Module.java
+++ /dev/null
@@ -1,38 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-class TestSuite2Module
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite3Module.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite3Module.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite3Module.java
deleted file mode 100644
index b3e8d25..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/layered/assembly/TestSuite3Module.java
+++ /dev/null
@@ -1,38 +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.polygene.test.indexing.layered.assembly;
-
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-class TestSuite3Module
-    implements ModuleAssembler
-{
-
-    @Override
-    public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
-        throws AssemblyException
-    {
-        return module;
-    }
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Account.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Account.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Account.java
deleted file mode 100644
index 3ce9116..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Account.java
+++ /dev/null
@@ -1,30 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Account
-{
-    Property<String> number();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Address.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Address.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Address.java
deleted file mode 100644
index 74fc845..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Address.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-import org.apache.polygene.api.value.ValueComposite;
-
-public interface Address extends ValueComposite // necessary, @See POLYGENE-137
-{
-    Property<String> line1();
-
-    Property<String> line2();
-
-    Property<String> zipcode();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Alive.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Alive.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Alive.java
deleted file mode 100644
index e00685c..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Alive.java
+++ /dev/null
@@ -1,27 +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.polygene.test.indexing.model;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Alive
-{
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Cat.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Cat.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Cat.java
deleted file mode 100644
index 404d256..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Cat.java
+++ /dev/null
@@ -1,27 +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.polygene.test.indexing.model;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Cat extends Pet
-{
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/City.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/City.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/City.java
deleted file mode 100644
index 0b13660..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/City.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface City extends Nameable
-{
-    Property<String> country();
-
-    Property<String> county();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Dog.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Dog.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Dog.java
deleted file mode 100644
index b2fb0b1..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Dog.java
+++ /dev/null
@@ -1,27 +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.polygene.test.indexing.model;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Dog extends Pet
-{
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Domain.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Domain.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Domain.java
deleted file mode 100644
index 35d2c05..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Domain.java
+++ /dev/null
@@ -1,30 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Domain extends Nameable
-{
-    Property<String> description();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Female.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Female.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Female.java
deleted file mode 100644
index 11e70ed..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Female.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.association.Association;
-import org.apache.polygene.api.common.Optional;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Female extends Person
-{
-    @Optional
-    Association<Male> husband();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/File.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/File.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/File.java
deleted file mode 100644
index 5bfcc1c..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/File.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.entity.Queryable;
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-@Queryable( false )
-public interface File
-{
-    Property<String> value();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Host.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Host.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Host.java
deleted file mode 100644
index 5a993f7..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Host.java
+++ /dev/null
@@ -1,30 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-public interface Host
-{
-    Property<String> value();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Male.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Male.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Male.java
deleted file mode 100644
index 7f362e2..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Male.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.association.Association;
-import org.apache.polygene.api.common.Optional;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Male extends Person
-{
-    @Optional
-    Association<Female> wife();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Nameable.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Nameable.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Nameable.java
deleted file mode 100644
index d53cd7a..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Nameable.java
+++ /dev/null
@@ -1,31 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Nameable extends HasIdentity
-{
-    Property<String> name();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Person.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Person.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Person.java
deleted file mode 100644
index 17ed48c..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Person.java
+++ /dev/null
@@ -1,99 +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.polygene.test.indexing.model;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
-import java.util.Map;
-import org.apache.polygene.api.association.Association;
-import org.apache.polygene.api.association.ManyAssociation;
-import org.apache.polygene.api.association.NamedAssociation;
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.entity.Queryable;
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Person
-    extends Nameable, Alive
-{
-    enum Title
-    {
-        MR, MS, MRS, DR
-    }
-
-    Property<Title> title();
-
-    @Optional
-    Association<City> placeOfBirth();
-
-    Property<Integer> yearOfBirth();
-
-    @Optional
-    Property<Address> address();
-
-    @Optional
-    Association<Female> mother();
-
-    @Optional
-    Association<Male> father();
-
-    ManyAssociation<Domain> interests();
-
-    @Optional
-    Property<String> email();
-
-    @Optional
-    Property<URL> personalWebsite();
-
-    @Queryable( false )
-    Property<String> password();
-
-    @Optional
-    Association<Account> mainAccount();
-
-    NamedAssociation<Account> accounts();
-
-    @Optional
-    Property<Map<String, String>> additionalInfo();
-
-    @Optional
-    Property<BigInteger> bigInteger();
-
-    @Optional
-    Property<BigDecimal> bigDecimal();
-
-    @Optional
-    Property<Instant> instantValue();
-
-    @Optional
-    Property<ZonedDateTime> dateTimeValue();
-
-    @Optional
-    Property<LocalDateTime> localDateTimeValue();
-
-    @Optional
-    Property<LocalDate> localDateValue();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Pet.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Pet.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Pet.java
deleted file mode 100644
index 2e5fa27..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Pet.java
+++ /dev/null
@@ -1,28 +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.polygene.test.indexing.model;
-
-/**
- * JAVADOC Add JavaDoc
- */
-public interface Pet
-    extends Nameable, Alive
-{
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Port.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Port.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Port.java
deleted file mode 100644
index a578325..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Port.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.entity.Queryable;
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-public interface Port
-{
-    @Queryable( false )
-    Property<Integer> value();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Protocol.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Protocol.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Protocol.java
deleted file mode 100644
index e178bb8..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/Protocol.java
+++ /dev/null
@@ -1,30 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-public interface Protocol
-{
-    Property<String> value();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/QueryParam.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/QueryParam.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/QueryParam.java
deleted file mode 100644
index 42aaa9b..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/QueryParam.java
+++ /dev/null
@@ -1,32 +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.polygene.test.indexing.model;
-
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-public interface QueryParam
-{
-    Property<String> name();
-
-    Property<String> value();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/URL.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/URL.java b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/URL.java
deleted file mode 100644
index 7823e04..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/URL.java
+++ /dev/null
@@ -1,46 +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.polygene.test.indexing.model;
-
-import java.util.Collection;
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.entity.Queryable;
-import org.apache.polygene.api.property.Property;
-
-/**
- * JAVADOC Add JavaDoc.
- */
-public interface URL
-{
-    Property<Protocol> protocol();
-
-    @Optional
-    @Queryable( false )
-    Property<Host> host();
-
-    @Optional
-    Property<Port> port();
-
-    @Optional
-    Property<File> file();
-
-    @Optional
-    Property<Collection<QueryParam>> queryParams();
-}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cfd38626/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/package.html
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/package.html b/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/package.html
deleted file mode 100644
index f006a94..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/indexing/model/package.html
+++ /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.
-  ~
-  ~
-  -->
-<html>
-    <body>
-        <h2>Index/Query SPI Test Support - Model.</h2>
-    </body>
-</html>


Mime
View raw message