polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [31/35] polygene-java git commit: Merge remote-tracking branch 'origin/develop' into yeoman-work
Date Sun, 28 May 2017 16:10:51 GMT
Merge remote-tracking branch 'origin/develop' into yeoman-work

Signed-off-by: niclas <niclas@hedhman.org>

# Conflicts:
#	extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
#	extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
#	tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java


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

Branch: refs/heads/develop
Commit: 61fe4e72f6c1376b09a3e1753d94394e4766489d
Parents: c94b506 0bcde3d
Author: niclas <niclas@hedhman.org>
Authored: Sun May 28 07:48:14 2017 +0800
Committer: niclas <niclas@hedhman.org>
Committed: Sun May 28 07:48:14 2017 +0800

----------------------------------------------------------------------
 .../polygene/gradle/code/CodePlugin.groovy      |  10 +-
 .../gradle/structure/ProjectGroupTasks.groovy   |  36 ++
 .../gradle/structure/core/CorePlugin.groovy     |   3 +
 .../distributions/DistributionsPlugin.groovy    |  11 +-
 .../structure/extensions/ExtensionPlugin.groovy |   3 +
 .../structure/libraries/LibraryPlugin.groovy    |   5 +
 .../structure/samples/SamplePlugin.groovy       |   3 +
 .../gradle/structure/tools/ToolPlugin.groovy    |   3 +
 .../structure/tutorials/TutorialPlugin.groovy   |   3 +
 core/api/build.gradle                           |   1 +
 core/api/src/docs/serialization.txt             |   1 +
 .../org/apache/polygene/api/OperatorsTest.java  |  16 +-
 .../activation/PassivationExceptionTest.java    |  61 ++-
 .../api/docsupport/ApplicationDocs.java         |  33 +-
 .../api/value/DocumentationSupport.java         |  19 +-
 .../bootstrap/ApplicationAssembler.java         |   1 +
 .../bootstrap/ApplicationAssemblerAdapter.java  |   1 -
 .../polygene/bootstrap/ApplicationName.java     |   1 -
 .../apache/polygene/bootstrap/Assembler.java    |   1 +
 .../apache/polygene/bootstrap/LayerName.java    |   1 -
 .../polygene/bootstrap/ModuleAssembly.java      |  30 +-
 .../apache/polygene/bootstrap/ModuleName.java   |   1 -
 .../polygene/bootstrap/SingletonAssembler.java  |   8 +-
 .../bootstrap/builder/ApplicationBuilder.java   |  56 ++-
 .../bootstrap/builder/LayerDeclaration.java     |   2 -
 .../bootstrap/builder/ModuleDeclaration.java    |   3 -
 .../DefaultIdentityGeneratorAssembler.java      |  39 ++
 .../DefaultMetricsProviderAssembler.java        |  37 ++
 .../defaults/DefaultSerializationAssembler.java |  52 +++
 .../defaults/DefaultUnitOfWorkAssembler.java    |  58 +++
 .../polygene/bootstrap/defaults/package.html    |  24 ++
 .../DefaultIdentityGeneratorAssembler.java      |  39 --
 .../layered/LayeredApplicationAssembler.java    |   1 -
 .../DefaultSerializationAssembler.java          |  52 ---
 .../unitofwork/DefaultUnitOfWorkAssembler.java  |  58 ---
 .../polygene/bootstrap/ClassScannerTest.java    |  13 +-
 .../bootstrap/DocumentationSupport.java         | 419 +++++++++----------
 core/runtime/src/docs/runtime.txt               |   2 +-
 .../ApplicationAssemblyFactoryImpl.java         |   3 -
 .../bootstrap/ApplicationModelFactoryImpl.java  | 125 ++++--
 .../runtime/bootstrap/ModuleAssemblyImpl.java   |  86 ++--
 .../polygene/runtime/structure/LayerModel.java  |   2 -
 .../runtime/structure/ModuleInstance.java       |  23 +-
 .../polygene/runtime/structure/ModuleModel.java |   4 +
 .../runtime/structure/UsedLayersModel.java      |   6 +
 .../runtime/unitofwork/ModuleUnitOfWork.java    |  11 -
 .../bootstrap/ApplicationAssemblerTest.java     |  30 +-
 .../polygene/bootstrap/ErrorReportingTest.java  |   2 -
 .../polygene/bootstrap/RuntimeMixinsTest.java   |  69 +--
 ...ceCollisionWithUnrelatedReturnTypesTest.java |   1 +
 .../polygene/regression/qi382/Qi382Test.java    |   5 +-
 .../polygene/regression/qi383/Qi383Test.java    |   5 +-
 .../polygene/regression/qi78/IssueTest.java     |  23 +-
 .../activation/ApplicationActivationTest.java   |  19 +-
 .../ImportedServiceActivationTest.java          |  68 ++-
 .../runtime/activation/LayerActivationTest.java |  19 +-
 .../activation/ModuleActivationTest.java        |  19 +-
 .../activation/ServiceActivationTest.java       |  26 +-
 .../AppliesToOrConditionQI241Test.java          |   2 +
 .../association/AssociationAssignmentTest.java  |   5 +-
 .../bootstrap/docs/DocumentationSupport.java    |  25 +-
 .../runtime/concerns/GenericConcernTest.java    |   2 +
 .../runtime/defaults/UseDefaultsTest.java       |   2 +
 .../entity/EntityBuilderWithStateTest.java      |   2 -
 .../runtime/entity/EntityVisibilityTest.java    |  17 +-
 .../ConstructorInjectionOfThisTest.java         |  51 +--
 .../injection/InvocationInjectionTest.java      |  17 +-
 .../runtime/injection/ServiceInjectionTest.java |  60 +--
 .../objects/ObjectBuilderFactoryTest.java       |  64 +--
 .../runtime/objects/ObjectConcernTest.java      |  14 +-
 .../runtime/objects/ObjectVisibilityTest.java   |  20 +-
 .../property/ValueNestedBuilderTest.java        |   2 +
 .../runtime/query/IterableQuerySourceTest.java  |  14 +-
 .../runtime/query/NonQueryableTest.java         |   1 +
 .../runtime/service/AvailableServiceTest.java   |  10 +-
 .../runtime/service/ServiceVisibilityTest.java  |  18 +-
 .../runtime/structure/MixinVisibilityTest.java  | 213 +++-------
 .../polygene/runtime/structure/ModuleTest.java  |  54 +--
 .../PrivateCompositeVisibilityTest.java         |   4 +-
 .../runtime/structure/StructureTest.java        |  39 +-
 .../structure/TypeToCompositeLookupTest.java    |   9 -
 .../transients/TransientVisibilityTest.java     |   9 -
 .../unitofwork/PrivateEntityUnitOfWorkTest.java |  13 +-
 .../runtime/value/AssociationToValueTest.java   |   5 +-
 .../runtime/value/NestedValueBuilderTest.java   |   2 +
 .../runtime/value/ValueComposite2Test.java      |   6 +-
 .../runtime/value/ValueCompositeBasicsTest.java |   2 +
 .../runtime/value/ValueVisibilityTest.java      |   8 -
 .../runtime/value/ValueWithAssociationTest.java |   5 +-
 .../visibility/VisibilityInUnitOfWorkTest.java  |   8 +-
 .../memory/MemoryEntityStoreTest.java           |   2 +
 .../helpers/JSONManyAssociationStateTest.java   |   1 +
 .../helpers/JsonNamedAssociationStateTest.java  |   1 +
 .../polygene/test/AbstractPolygeneTest.java     |   4 -
 .../polygene/test/EntityTestAssembler.java      |  21 +-
 .../cache/AbstractEntityStoreWithCacheTest.java |   1 -
 ...bstractConfigurationDeserializationTest.java |   6 +-
 .../test/entity/AbstractEntityStoreTest.java    |   2 -
 .../test/indexing/AbstractAnyQueryTest.java     |   2 -
 .../AbstractMultiLayeredIndexingTest.java       |   3 +-
 .../metrics/AbstractPolygeneMetricsTest.java    |   4 +-
 .../test/metrics/AbstractTimingCaptureTest.java |   2 -
 .../test/model/assembly/AccessLayer.java        |   2 -
 .../test/model/assembly/AccountModule.java      |   2 -
 .../model/assembly/ApplicationAssembler.java    |   1 -
 .../test/model/assembly/ConfigLayer.java        |   3 -
 .../test/model/assembly/ConfigModule.java       |   3 -
 .../test/model/assembly/DomainLayer.java        |   3 -
 .../test/model/assembly/FamilyModule.java       |   3 -
 .../test/model/assembly/IndexingLayer.java      |   3 -
 .../test/model/assembly/PersistenceLayer.java   |   3 -
 .../test/model/assembly/PersistenceModule.java  |   3 -
 .../test/model/assembly/PetShopModule.java      |   3 -
 .../model/assembly/TestExecutionModule.java     |   2 -
 .../test/model/assembly/TestSuite1Module.java   |   2 -
 .../test/model/assembly/TestSuite2Module.java   |   2 -
 .../test/model/assembly/TestSuite3Module.java   |   2 -
 .../AbstractCollectionSerializationTest.java    |   2 -
 .../ehcache/assembly/EhCacheAssembler.java      |   2 -
 .../memcache/assembly/MemcacheAssembler.java    |   2 -
 .../assembly/CassandraEntityStoreAssembler.java |   2 -
 .../cassandra/CassandraEntityStoreTest.java     |   2 +-
 .../file/assembly/FileEntityStoreAssembler.java |   2 -
 .../entitystore/file/FileEntityStoreTest.java   |   2 +-
 .../file/FileEntityStoreWithCacheTest.java      |   2 +-
 .../assembly/GeodeEntityStoreAssembler.java     |   2 -
 .../entitystore/geode/GeodeEntityStoreTest.java |   2 +-
 .../geode/GeodeEntityStoreWithCacheTest.java    |   2 +-
 .../assembly/HazelcastEntityStoreAssembler.java |   2 -
 .../hazelcast/HazelcastEntityStoreTest.java     |   2 +-
 .../HazelcastEntityStoreWithCacheTest.java      |   2 +-
 .../assembly/JCloudsEntityStoreAssembler.java   |   2 -
 .../jclouds/JCloudsFilesystemTest.java          |   2 +-
 .../entitystore/jclouds/JCloudsS3Test.java      |   2 +-
 .../jclouds/JCloudsTransientTest.java           |   2 +-
 .../jclouds/JCloudsWithCacheTest.java           |   2 +-
 .../jdbm/assembly/JdbmEntityStoreAssembler.java |   2 -
 .../entitystore/jdbm/JdbmEntityStoreTest.java   |   2 +-
 .../jdbm/JdbmEntityStoreWithCacheTest.java      |   2 +-
 .../assembly/LevelDBEntityStoreAssembler.java   |   2 -
 .../leveldb/JavaLevelDBEntityStoreTest.java     |   2 +-
 .../leveldb/JniLevelDBEntityStoreTest.java      |   2 +-
 .../LevelDBEntityStoreWithCacheTest.java        |   2 +-
 .../assembly/MemoryEntityStoreAssembler.java    |   2 -
 .../memory/MemoryEntityStoreTest.java           |   1 +
 .../memory/MemoryEntityStoreWithCacheTest.java  |   1 +
 .../assembly/MongoDBEntityStoreAssembler.java   |   2 -
 .../mongodb/EmbedMongoDBMapEntityStoreTest.java |   2 +-
 .../mongodb/MongoDBEntityStoreTest.java         |   2 +-
 .../MongoDBEntityStoreWithCacheTest.java        |   2 +-
 .../PreferencesEntityStoreAssembler.java        |   2 -
 .../preferences/PreferencesEntityStoreTest.java |   4 +-
 .../assembly/RedisEntityStoreAssembler.java     |   2 -
 .../entitystore/redis/RedisEntityStoreTest.java |   2 +-
 .../redis/RedisEntityStoreWithCacheTest.java    |   2 +-
 .../riak/assembly/RiakEntityStoreAssembler.java |   3 +-
 .../entitystore/riak/RiakEntityStoreTest.java   |   2 +-
 .../riak/RiakEntityStoreWithCacheTest.java      |   2 +-
 .../sql/DerbySQLEntityStoreTest.java            |   2 +-
 .../entitystore/sql/H2SQLEntityStoreTest.java   |   2 +-
 .../entitystore/sql/MySQLEntityStoreTest.java   |   2 +-
 .../sql/PostgreSQLEntityStoreTest.java          |   2 +-
 .../entitystore/sql/SQLiteEntityStoreTest.java  |   2 +-
 .../assembly/ESClientIndexQueryAssembler.java   |   3 +-
 .../assembly/ESClusterIndexQueryAssembler.java  |   2 -
 .../ESFilesystemIndexQueryAssembler.java        |   2 -
 .../index/elasticsearch/ESEmbeddedRule.java     |   9 +-
 .../ElasticSearchQueryMultimoduleTest.java      |   2 -
 .../rdf/assembly/RdfMemoryStoreAssembler.java   |   2 -
 .../assembly/RdfNativeSesameStoreAssembler.java |   2 -
 .../assembly/RdfRdbmsSesameStoreAssembler.java  |   2 -
 .../index/rdf/RdfNamedQueryMultimoduleTest.java |   3 -
 .../index/rdf/RdfQueryMultimoduleTest.java      |   4 -
 .../apache/polygene/index/rdf/RdfQueryTest.java |   2 -
 .../polygene/index/rdf/qi95/Qi95IssueTest.java  | 185 +++-----
 .../AbstractSQLIndexQueryAssembler.java         |   1 -
 .../assembly/CodahaleMetricsAssembler.java      |   2 -
 .../polygene/migration/MigrationTest.java       |  58 +--
 .../polygene/index/reindexer/ReindexerTest.java |   2 +-
 ...vaxJsonConfigurationDeserializationTest.java |   8 +
 .../library/alarm/AlarmSystemAssembler.java     |   2 -
 .../fileconfig/FileConfigurationAssembler.java  |   2 -
 .../fileconfig/FileConfigurationTest.java       |  42 +-
 .../library/http/JettyServiceAssembler.java     |   4 +-
 .../http/VirtualHostJettyServiceTest.java       |   2 -
 .../polygene/library/jmx/JMXAssembler.java      |   2 -
 .../apache/polygene/library/jmx/JMXTest.java    |  15 +-
 .../log/assemblies/LoggingAssembler.java        |   2 -
 .../trace/assemblies/TracingAssembler.java      |   2 -
 .../polygene/library/rdf/Model2XMLTest.java     |  35 +-
 .../library/rest/client/ClientAssembler.java    |   3 +-
 .../ContextResourceClientFactoryTest.java       |   2 +
 .../rest/client/ContinuousIntegrationTest.java  |   2 +
 .../library/rest/client/RssReaderTest.java      |   2 +
 .../library/rest/common/ValueAssembler.java     |   2 -
 .../server/assembler/RestServerAssembler.java   |   3 +-
 .../library/rest/admin/RestAssembler.java       |   2 -
 .../polygene/library/rest/admin/RestTest.java   |   4 +-
 .../restlet/assembly/CrudServiceAssembler.java  |   2 -
 .../restlet/assembly/GenericRestLayer.java      |   2 -
 .../assembly/RestApplicationAssembler.java      |   1 -
 .../RestletCrudConnectivityAssembler.java       |   2 -
 .../assembly/RestletCrudModuleAssembler.java    |   2 -
 .../configuration/ConfigurationLayer.java       |   2 -
 .../configuration/ConfigurationModule.java      |   2 -
 .../connectivity/ConnectivityLayer.java         |   2 -
 .../assembly/connectivity/RestModule.java       |   2 -
 .../assembly/connectivity/SecurityModule.java   |   2 -
 .../restlet/assembly/domain/CrudModule.java     |   2 -
 .../restlet/assembly/domain/DomainLayer.java    |   2 -
 .../infrastructue/FileStorageModule.java        |   4 +-
 .../assembly/infrastructue/IndexingModule.java  |   2 -
 .../infrastructue/InfrastructureLayer.java      |   2 -
 .../infrastructue/SerializationModule.java      |   2 -
 .../assembly/resource/ResourceLayer.java        |   2 -
 .../library/scripting/HelloSpeakerTest.java     |  27 +-
 .../shiro/assembly/PasswordDomainAssembler.java |   2 -
 .../assembly/PermissionsDomainAssembler.java    |   2 -
 .../assembly/StandaloneShiroAssembler.java      |   2 -
 .../shiro/web/assembly/HttpShiroAssembler.java  |   2 -
 .../PolygeneApplicationFactoryBean.java         |   4 +-
 .../importer/SpringImporterAssembler.java       |   3 +-
 .../sql/liquibase/LiquibaseAssembler.java       |   2 -
 ...bstractPooledDataSourceServiceAssembler.java |   2 -
 .../sql/assembly/DataSourceAssembler.java       |   2 -
 .../sql/assembly/DataSourceJMXAssembler.java    |   2 -
 .../assembly/ExternalDataSourceAssembler.java   |   2 -
 ...taSourceConfigurationManagerServiceTest.java |   3 -
 .../assembly/PersistingSequencingAssembler.java |   2 -
 .../assembly/TransientSequencingAssembler.java  |   2 -
 .../uid/uuid/assembly/UuidServiceAssembler.java |   2 -
 .../uowfile/bootstrap/UoWFileAssembler.java     |   2 -
 .../moneytransfer/test/TransferMoneyTest.java   |  21 +-
 .../moneytransfer/test/TransferMoneyTest2.java  |  29 +-
 .../sample/forum/assembler/ForumAssembler.java  |   2 -
 .../apache/polygene/sample/forum/web/Main.java  |   4 +-
 .../sample/rental/web/assembly/PagesModule.java |   2 -
 .../assembly/RentalApplicationAssembler.java    |   2 -
 .../rental/web/assembly/RentalModule.java       |   2 -
 .../rental/web/assembly/StorageModule.java      |   2 -
 .../sample/sqlsupport/AppAssembler.java         |   2 -
 .../swing/binding/SwingBindingAssembler.java    |   2 +-
 .../sample/swing/binding/example/Main.java      |  20 +-
 .../jdbm/JdbmEntityStorePerformanceTest.java    |   2 +-
 .../MemoryEntityStorePerformanceTest.java       |  13 +-
 .../sql/DerbySQLEntityStorePerformanceTest.java |  45 +-
 .../PostgreSQLEntityStorePerformanceTest.java   |  57 ++-
 .../indexing/rdf/QueryPerformanceTest.java      |   5 -
 .../CompositeCreationPerformanceTest.java       |  14 +-
 .../composite/InvocationPerformanceTest.java    |   4 +-
 .../PropertyMixinInvocationPerformanceTest.java |   4 +-
 .../object/ObjectCreationPerformanceTest.java   |  16 +-
 .../ServiceInvocationPerformanceTest.java       |  12 +-
 .../test/regression/ConcernsOnPropertyTest.java |   6 +-
 .../java/org/apache/polygene/envisage/Main.java |   7 +-
 .../envisage/school/EnvisageSchoolSample.java   |   4 +-
 .../cargo/step2/SequencingConcernTest.java      |  34 +-
 .../composites/tutorial10/HelloWorldTest.java   |  16 +-
 .../composites/tutorial3/HelloWorldTest.java    |  16 +-
 .../composites/tutorial4/HelloWorldTest.java    |  16 +-
 .../composites/tutorial5/HelloWorldTest.java    |  16 +-
 .../composites/tutorial6/HelloWorldTest.java    |  16 +-
 .../composites/tutorial7/HelloWorldTest.java    |  16 +-
 .../composites/tutorial8/HelloWorldTest.java    |  18 +-
 .../composites/tutorial9/HelloWorldTest.java    |  18 +-
 .../polygene/tutorials/hello/HelloTest4.java    |   1 +
 266 files changed, 1388 insertions(+), 2106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/CodePlugin.groovy
----------------------------------------------------------------------
diff --cc buildSrc/src/main/groovy/org/apache/polygene/gradle/code/CodePlugin.groovy
index 1aa7b5a,a912b85..4e61247
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/CodePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/code/CodePlugin.groovy
@@@ -19,10 -19,13 +19,9 @@@ package org.apache.polygene.gradle.cod
  
  import groovy.transform.CompileStatic
  import org.apache.polygene.gradle.BasePlugin
- import org.apache.polygene.gradle.TaskGroups
  import org.apache.polygene.gradle.dependencies.DependenciesDeclarationExtension
  import org.apache.polygene.gradle.dependencies.DependenciesPlugin
 -import org.gradle.api.Action
 -import org.gradle.api.JavaVersion
 -import org.gradle.api.Plugin
 -import org.gradle.api.Project
 -import org.gradle.api.Task
 +import org.gradle.api.*
  import org.gradle.api.plugins.JavaPluginConvention
  import org.gradle.api.plugins.osgi.OsgiManifest
  import org.gradle.api.tasks.bundling.AbstractArchiveTask

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java
----------------------------------------------------------------------
diff --cc core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java
index 31f0289,c18d240..7301907
--- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java
+++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/layered/LayeredApplicationAssembler.java
@@@ -131,15 -131,8 +131,14 @@@ public abstract class LayeredApplicatio
  
      @Override
      public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )
-         throws AssemblyException
      {
          assembly = applicationFactory.newApplicationAssembly();
 +        assembleApplication();
 +        return assembly;
 +    }
 +
 +    protected void assembleApplication()
 +    {
          assembly.setName( name );
          assembly.setVersion( version );
          assembly.setMode( mode );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/core/testsupport/src/main/java/org/apache/polygene/test/entity/AbstractEntityStoreTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/core/testsupport/src/main/java/org/apache/polygene/test/model/assembly/AccessLayer.java
----------------------------------------------------------------------
diff --cc core/testsupport/src/main/java/org/apache/polygene/test/model/assembly/AccessLayer.java
index 7095dc9,e76acca..9a20fdc
--- a/core/testsupport/src/main/java/org/apache/polygene/test/model/assembly/AccessLayer.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/model/assembly/AccessLayer.java
@@@ -21,9 -21,7 +21,8 @@@
  package org.apache.polygene.test.model.assembly;
  
  import java.lang.reflect.InvocationTargetException;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.LayerAssembly;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
  import org.apache.polygene.bootstrap.layered.ModuleAssembler;
  

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
index 8e2745a,0000000..e314171
mode 100644,000000..100644
--- a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
+++ b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraEntityStoreTest.java
@@@ -1,85 -1,0 +1,85 @@@
 +/*
 + *  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.entitystore.cassandra;
 +
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.cassandra.assembly.CassandraEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.docker.DockerRule;
 +import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 +import org.apache.polygene.test.entity.CanRemoveAll;
 +import org.junit.ClassRule;
 +
 +/**
 + * Test the CassandraEntityStoreService.
 + * <p>Installing Cassandra and starting it should suffice as the test use Cassandra defaults: 127.0.0.1:3000</p>
 + */
 +public class CassandraEntityStoreTest
 +    extends AbstractEntityStoreTest
 +{
 +    @ClassRule
 +    public static final DockerRule DOCKER = new DockerRule( "cassandra", "Starting listening for CQL clients" );
 +
 +    @Override
 +    // START SNIPPET: assembly
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        // END SNIPPET: assembly
 +        super.assemble( module );
 +
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +        module.services( CassandraEntityStoreService.class ).withTypes( CanRemoveAll.class ).withMixins( EmptyCassandraTableMixin.class );
 +
 +        // START SNIPPET: assembly
 +        new CassandraEntityStoreAssembler()
 +            .withConfig( config, Visibility.layer )
 +            .assemble( module );
 +        // END SNIPPET: assembly
 +
 +        CassandraEntityStoreConfiguration cassandraConfig = config.forMixin( CassandraEntityStoreConfiguration.class ).declareDefaults();
 +        String host = DOCKER.getDockerHost();
 +        int port = DOCKER.getExposedContainerPort( "9042/tcp" );
 +        System.out.println("Cassandra: " + host + ":" + port);
 +        cassandraConfig.hostnames().set( host + ':' + port );
 +        cassandraConfig.createIfMissing().set( true );
 +        // START SNIPPET: assembly
 +    }
 +    // END SNIPPET: assembly
 +
 +    @Override
 +    public void setUp()
 +        throws Exception
 +    {
 +        super.setUp();
 +    }
 +
 +    @Override
 +    public void tearDown()
 +        throws Exception
 +    {
 +        CanRemoveAll cleaner = serviceFinder.findService( CanRemoveAll.class ).get();
 +        cleaner.removeAll();
 +        super.tearDown();
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
index de87ccc,7784d9c..fbb68de
--- a/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
+++ b/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
@@@ -20,10 -20,9 +20,9 @@@
  package org.apache.polygene.entitystore.geode.assembly;
  
  import org.apache.polygene.bootstrap.Assemblers;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.ServiceDeclaration;
 -import org.apache.polygene.entitystore.geode.GeodeConfiguration;
 +import org.apache.polygene.entitystore.geode.GeodeEntityStoreConfiguration;
  import org.apache.polygene.entitystore.geode.GeodeEntityStoreService;
  
  /**

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
index f4c8cef,631ba54..ae5ad69
--- a/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
+++ b/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
@@@ -20,10 -20,9 +20,9 @@@
  package org.apache.polygene.entitystore.hazelcast.assembly;
  
  import org.apache.polygene.bootstrap.Assemblers;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.ServiceDeclaration;
 -import org.apache.polygene.entitystore.hazelcast.HazelcastConfiguration;
 +import org.apache.polygene.entitystore.hazelcast.HazelcastEntityStoreConfiguration;
  import org.apache.polygene.entitystore.hazelcast.HazelcastEntityStoreService;
  
  public class HazelcastEntityStoreAssembler

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
index fe99f13,1786d5e..d586f1b
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
@@@ -21,20 -21,18 +21,18 @@@
  package org.apache.polygene.entitystore.jclouds.assembly;
  
  import org.apache.polygene.bootstrap.Assemblers;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.ServiceDeclaration;
 -import org.apache.polygene.entitystore.jclouds.JCloudsMapEntityStoreConfiguration;
 -import org.apache.polygene.entitystore.jclouds.JCloudsMapEntityStoreService;
 +import org.apache.polygene.entitystore.jclouds.JCloudsEntityStoreConfiguration;
 +import org.apache.polygene.entitystore.jclouds.JCloudsEntityStoreService;
  
  public class JCloudsEntityStoreAssembler
      extends Assemblers.VisibilityIdentityConfig<JCloudsEntityStoreAssembler>
  {
      @Override
      public void assemble( ModuleAssembly module )
-         throws AssemblyException
      {
 -        ServiceDeclaration service = module.services( JCloudsMapEntityStoreService.class ).
 +        ServiceDeclaration service = module.services( JCloudsEntityStoreService.class ).
              visibleIn( visibility() ).
              instantiateOnStartup();
          if( hasIdentity() )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsFilesystemTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsFilesystemTest.java
index cb1303e,3dd6953..4c81082
--- a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsFilesystemTest.java
+++ b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsFilesystemTest.java
@@@ -41,10 -41,10 +41,10 @@@ public class JCloudsFilesystemTes
      {
          super.assemble( module );
          ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
+         new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
          new JCloudsEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 -        JCloudsMapEntityStoreConfiguration defaults = config.forMixin( JCloudsMapEntityStoreConfiguration.class )
 -                                                            .declareDefaults();
 +        JCloudsEntityStoreConfiguration defaults = config.forMixin( JCloudsEntityStoreConfiguration.class )
 +                                                         .declareDefaults();
          defaults.provider().set( "filesystem" );
          defaults.properties().set( Collections.singletonMap( FilesystemConstants.PROPERTY_BASEDIR,
                                                               tmpDir.getRoot().getAbsolutePath() ) );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
index 6bbb613,fc00581..405d857
--- a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
+++ b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
@@@ -37,11 -37,10 +37,11 @@@ public class JCloudsS3Test extends Abst
      {
          super.assemble( module );
          ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
+         new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
          new JCloudsEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 -        JCloudsMapEntityStoreConfiguration defaults = config.forMixin( JCloudsMapEntityStoreConfiguration.class )
 -                                                            .declareDefaults();
 +        JCloudsEntityStoreConfiguration defaults =
 +            config.forMixin( JCloudsEntityStoreConfiguration.class ).declareDefaults();
 +
          String host = DOCKER.getDockerHost();
          int port = DOCKER.getExposedContainerPort( "8000/tcp" );
          defaults.provider().set( "s3" );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
index 3a223ba,ac63299..175b6db
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
@@@ -20,10 -20,9 +20,9 @@@
  package org.apache.polygene.entitystore.jdbm.assembly;
  
  import org.apache.polygene.bootstrap.Assemblers;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.ServiceDeclaration;
 -import org.apache.polygene.entitystore.jdbm.JdbmConfiguration;
 +import org.apache.polygene.entitystore.jdbm.JdbmEntityStoreConfiguration;
  import org.apache.polygene.entitystore.jdbm.JdbmEntityStoreService;
  
  public class JdbmEntityStoreAssembler

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
index 1c3b780,60ea486..c3d40ec
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
@@@ -20,20 -20,18 +20,18 @@@
  package org.apache.polygene.entitystore.mongodb.assembly;
  
  import org.apache.polygene.bootstrap.Assemblers;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
  import org.apache.polygene.bootstrap.ServiceDeclaration;
 -import org.apache.polygene.entitystore.mongodb.MongoEntityStoreConfiguration;
 -import org.apache.polygene.entitystore.mongodb.MongoMapEntityStoreService;
 +import org.apache.polygene.entitystore.mongodb.MongoDBEntityStoreConfiguration;
 +import org.apache.polygene.entitystore.mongodb.MongoDBEntityStoreService;
  
  public class MongoDBEntityStoreAssembler
      extends Assemblers.VisibilityIdentityConfig<MongoDBEntityStoreAssembler>
  {
      @Override
      public void assemble( ModuleAssembly module )
-         throws AssemblyException
      {
 -        ServiceDeclaration service = module.services( MongoMapEntityStoreService.class ).visibleIn( visibility() );
 +        ServiceDeclaration service = module.services( MongoDBEntityStoreService.class ).visibleIn( visibility() );
          if( hasIdentity() )
          {
              service.identifiedBy( identity() );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/EmbedMongoDBMapEntityStoreTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/EmbedMongoDBMapEntityStoreTest.java
index 9f285aa,0000000..c362490
mode 100644,000000..100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/EmbedMongoDBMapEntityStoreTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/EmbedMongoDBMapEntityStoreTest.java
@@@ -1,88 -1,0 +1,88 @@@
 +/*
 + *  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.entitystore.mongodb;
 +
 +import de.flapdoodle.embed.mongo.MongodExecutable;
 +import de.flapdoodle.embed.mongo.MongodStarter;
 +import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
 +import de.flapdoodle.embed.mongo.config.Net;
 +import de.flapdoodle.embed.mongo.distribution.Version;
 +import de.flapdoodle.embed.process.runtime.Network;
 +import java.io.IOException;
 +import java.util.Collections;
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.mongodb.assembly.MongoDBEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 +import org.apache.polygene.test.util.FreePortFinder;
 +import org.junit.AfterClass;
 +import org.junit.BeforeClass;
 +import org.junit.Rule;
 +import org.junit.rules.TestName;
 +
 +public class EmbedMongoDBMapEntityStoreTest extends AbstractEntityStoreTest
 +{
 +    private static final MongodStarter MONGO_STARTER = MongodStarter.getDefaultInstance();
 +
 +    @Rule
 +    public TestName testName = new TestName();
 +    private static int port;
 +    private static MongodExecutable mongod;
 +
 +    @BeforeClass
 +    public static void startEmbedMongo()
 +        throws IOException
 +    {
 +        port = FreePortFinder.findFreePortOnLoopback();
 +        mongod = MONGO_STARTER.prepare( new MongodConfigBuilder()
 +                                            .version( Version.Main.PRODUCTION )
 +                                            .net( new Net( "localhost", port, Network.localhostIsIPv6() ) )
 +                                            .build() );
 +        mongod.start();
 +    }
 +
 +    @AfterClass
 +    public static void stopEmbedMongo()
 +    {
 +        if( mongod != null )
 +        {
 +            mongod.stop();
 +        }
 +    }
 +
 +    @Override
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        super.assemble( module );
 +
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +
 +        new MongoDBEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +
 +        MongoDBEntityStoreConfiguration mongoConfig = config.forMixin( MongoDBEntityStoreConfiguration.class )
 +                                                            .declareDefaults();
 +        mongoConfig.writeConcern().set( MongoDBEntityStoreConfiguration.WriteConcern.MAJORITY );
 +        mongoConfig.database().set( "polygene-test" );
 +        mongoConfig.collection().set( testName.getMethodName() );
 +        mongoConfig.nodes().set( Collections.singletonList( "localhost:" + port ) );
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
index eeeca64,0000000..4af9b7c
mode 100644,000000..100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
@@@ -1,88 -1,0 +1,88 @@@
 +/*
 + *  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.entitystore.mongodb;
 +
 +import com.mongodb.Mongo;
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.mongodb.assembly.MongoDBEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 +import org.junit.BeforeClass;
 +
 +import static org.apache.polygene.test.util.Assume.assumeConnectivity;
 +
 +/**
 + * Test the MongoDBEntityStoreService.
 + * <p>Installing mongodb and starting it should suffice as the test use mongodb defaults: 127.0.0.1:27017</p>
 + */
 +public class MongoDBEntityStoreTest extends AbstractEntityStoreTest
 +{
 +    @BeforeClass
 +    public static void beforeMongoMapEntityStoreTests()
 +    {
 +        assumeConnectivity( "localhost", 27017 );
 +    }
 +
 +    @Override
 +    // START SNIPPET: assembly
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        // END SNIPPET: assembly
 +        super.assemble( module );
 +
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +
 +        // START SNIPPET: assembly
 +        new MongoDBEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +        // END SNIPPET: assembly
 +
 +        MongoDBEntityStoreConfiguration mongoConfig = config.forMixin( MongoDBEntityStoreConfiguration.class ).declareDefaults();
 +        mongoConfig.writeConcern().set( MongoDBEntityStoreConfiguration.WriteConcern.MAJORITY );
 +        mongoConfig.database().set( "polygene:test" );
 +        mongoConfig.collection().set( "polygene:test:entities" );
 +        // START SNIPPET: assembly
 +    }
 +
 +    // END SNIPPET: assembly
 +    private Mongo mongo;
 +    private String dbName;
 +
 +    @Override
 +    public void setUp()
 +        throws Exception
 +    {
 +        super.setUp();
 +        MongoDBEntityStoreService es = serviceFinder.findService( MongoDBEntityStoreService.class ).get();
 +        mongo = es.mongoInstanceUsed();
 +        dbName = es.dbInstanceUsed().getName();
 +    }
 +
 +    @Override
 +    public void tearDown()
 +        throws Exception
 +    {
 +        mongo.dropDatabase( dbName );
 +        super.tearDown();
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
index bb077cb,0000000..4b63707
mode 100644,000000..100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
@@@ -1,84 -1,0 +1,84 @@@
 +/*
 + *  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.entitystore.mongodb;
 +
 +import com.mongodb.Mongo;
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.mongodb.assembly.MongoDBEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 +import org.junit.BeforeClass;
 +
 +import static org.apache.polygene.test.util.Assume.assumeConnectivity;
 +
 +/**
 + * Test the MongoDBEntityStoreService usage with a CachePool.
 + * <p>Installing mongodb and starting it should suffice as the test use mongodb defaults: 127.0.0.1:27017</p>
 + */
 +public class MongoDBEntityStoreWithCacheTest
 +    extends AbstractEntityStoreWithCacheTest
 +{
 +    @BeforeClass
 +    public static void beforeRedisMapEntityStoreTests()
 +    {
 +        assumeConnectivity( "localhost", 27017 );
 +    }
 +
 +    @Override
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        super.assemble( module );
 +
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +
 +        new MongoDBEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +
 +        MongoDBEntityStoreConfiguration mongoConfig = config.forMixin( MongoDBEntityStoreConfiguration.class ).declareDefaults();
 +        mongoConfig.writeConcern().set( MongoDBEntityStoreConfiguration.WriteConcern.MAJORITY );
 +        mongoConfig.database().set( "polygene:test" );
 +        mongoConfig.collection().set( "polygene:test:entities" );
 +    }
 +
 +    private Mongo mongo;
 +    private String dbName;
 +
 +    @Override
 +    public void setUp()
 +        throws Exception
 +    {
 +        super.setUp();
 +        MongoDBEntityStoreService es = serviceFinder.findService( MongoDBEntityStoreService.class ).get();
 +        mongo = es.mongoInstanceUsed();
 +        dbName = es.dbInstanceUsed().getName();
 +
 +    }
 +
 +    @Override
 +    public void tearDown()
 +        throws Exception
 +    {
 +        mongo.dropDatabase( dbName );
 +        super.tearDown();
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
index 1262e70,09902c2..4f521a2
--- a/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
+++ b/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
@@@ -34,9 -33,8 +33,8 @@@ public class RedisEntityStoreAssemble
  {
      @Override
      public void assemble( ModuleAssembly module )
-         throws AssemblyException
      {
 -        ServiceDeclaration service = module.services( RedisMapEntityStoreService.class ).visibleIn( visibility() );
 +        ServiceDeclaration service = module.services( RedisEntityStoreService.class ).visibleIn( visibility() );
          if( hasIdentity() )
          {
              service.identifiedBy( identity() );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
index f980e59,0000000..401f703
mode 100644,000000..100644
--- a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
+++ b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreTest.java
@@@ -1,80 -1,0 +1,80 @@@
 +/*
 + *  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.entitystore.redis;
 +
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.redis.assembly.RedisEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.docker.DockerRule;
 +import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 +import org.junit.ClassRule;
 +import redis.clients.jedis.Jedis;
 +import redis.clients.jedis.JedisPool;
 +
 +public class RedisEntityStoreTest
 +    extends AbstractEntityStoreTest
 +{
 +    @ClassRule
 +    public static final DockerRule DOCKER = new DockerRule( "redis", 6379 );
 +
 +    @Override
 +    // START SNIPPET: assembly
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        // END SNIPPET: assembly
 +        super.assemble( module );
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +        // START SNIPPET: assembly
 +        new RedisEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +        // END SNIPPET: assembly
 +        RedisEntityStoreConfiguration redisConfig = config.forMixin( RedisEntityStoreConfiguration.class )
 +                                                          .declareDefaults();
 +        redisConfig.host().set( DOCKER.getDockerHost() );
 +        redisConfig.port().set( DOCKER.getExposedContainerPort( "6379/tcp" ) );
 +        // START SNIPPET: assembly
 +    }
 +    // END SNIPPET: assembly
 +
 +    private JedisPool jedisPool;
 +
 +    @Override
 +    public void setUp()
 +        throws Exception
 +    {
 +        super.setUp();
 +        RedisEntityStoreService es = serviceFinder.findService( RedisEntityStoreService.class ).get();
 +        jedisPool = es.jedisPool();
 +    }
 +
 +    @Override
 +    public void tearDown()
 +        throws Exception
 +    {
 +        try( Jedis jedis = jedisPool.getResource() )
 +        {
 +            jedis.flushDB();
 +        }
 +        super.tearDown();
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
index d8c72d3,0000000..c51909c
mode 100644,000000..100644
--- a/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisEntityStoreWithCacheTest.java
@@@ -1,74 -1,0 +1,74 @@@
 +/*
 + *  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.entitystore.redis;
 +
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.redis.assembly.RedisEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 +import org.apache.polygene.test.docker.DockerRule;
 +import org.junit.ClassRule;
 +import redis.clients.jedis.Jedis;
 +import redis.clients.jedis.JedisPool;
 +
 +public class RedisEntityStoreWithCacheTest
 +    extends AbstractEntityStoreWithCacheTest
 +{
 +    @ClassRule
 +    public static final DockerRule DOCKER = new DockerRule( "redis", 6379 );
 +
 +    @Override
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        super.assemble( module );
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +        new RedisEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +        RedisEntityStoreConfiguration redisConfig = config.forMixin( RedisEntityStoreConfiguration.class )
 +                                                          .declareDefaults();
 +        redisConfig.host().set( DOCKER.getDockerHost() );
 +        redisConfig.port().set( DOCKER.getExposedContainerPort( "6379/tcp" ) );
 +    }
 +
 +    private JedisPool jedisPool;
 +
 +    @Override
 +    public void setUp()
 +        throws Exception
 +    {
 +        super.setUp();
 +        RedisEntityStoreService es = serviceFinder.findService( RedisEntityStoreService.class ).get();
 +        jedisPool = es.jedisPool();
 +    }
 +
 +    @Override
 +    public void tearDown()
 +        throws Exception
 +    {
 +        try( Jedis jedis = jedisPool.getResource() )
 +        {
 +            jedis.flushDB();
 +        }
 +        super.tearDown();
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
index 68f5e8d,0b0f194..ce538f6
--- a/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
@@@ -32,10 -31,10 +31,10 @@@ public class RiakEntityStoreAssemble
          extends Assemblers.VisibilityIdentityConfig<RiakEntityStoreAssembler>
  {
      @Override
-     public void assemble(ModuleAssembly module) throws AssemblyException
+     public void assemble(ModuleAssembly module)
      {
 -        ServiceDeclaration service = module.services( RiakMapEntityStoreService.class ).
 -                withMixins( RiakMapEntityStoreMixin.class ).
 +        ServiceDeclaration service = module.services( RiakEntityStoreService.class ).
 +            withMixins( RiakEntityStoreMixin.class ).
                  visibleIn( visibility() );
          if( hasIdentity() )
          {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
index 8656b62,0000000..9a52e30
mode 100644,000000..100644
--- a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
@@@ -1,71 -1,0 +1,71 @@@
 +/*
 + *  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.entitystore.riak;
 +
 +import java.util.Collections;
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.riak.assembly.RiakEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.docker.DockerRule;
 +import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 +import org.junit.ClassRule;
 +
 +public class RiakEntityStoreTest extends AbstractEntityStoreTest
 +{
 +    @ClassRule
 +    public static final DockerRule DOCKER = new DockerRule( "riak","riak_auth_mods started on node");
 +
 +    private RiakFixture riakFixture;
 +
 +    @Override
 +    public void setUp() throws Exception
 +    {
 +        super.setUp();
 +        RiakEntityStoreService es = serviceFinder.findService( RiakEntityStoreService.class ).get();
 +        riakFixture = new RiakFixture( es.riakClient(), es.riakNamespace() );
 +        riakFixture.waitUntilReady();
 +    }
 +
 +    @Override
 +    public void tearDown() throws Exception
 +    {
 +        riakFixture.deleteTestData();
 +        super.tearDown();
 +    }
 +
 +    @Override
 +    // START SNIPPET: assembly
 +    public void assemble( ModuleAssembly module )
 +    {
 +        // END SNIPPET: assembly
 +        super.assemble( module );
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +        // START SNIPPET: assembly
 +        new RiakEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +        // END SNIPPET: assembly
 +        RiakEntityStoreConfiguration riakConfig = config.forMixin( RiakEntityStoreConfiguration.class )
 +                                                        .declareDefaults();
 +        String host = DOCKER.getDockerHost();
 +        int port = DOCKER.getExposedContainerPort( "8087/tcp" );
 +        riakConfig.hosts().set( Collections.singletonList( host + ':' + port ) );
 +        // START SNIPPET: assembly
 +    }
 +    // END SNIPPET: assembly
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --cc extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
index 9bbecb0,0000000..13f5b36
mode 100644,000000..100644
--- a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
@@@ -1,69 -1,0 +1,69 @@@
 +/*
 + *  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.entitystore.riak;
 +
 +import java.util.Collections;
 +import org.apache.polygene.api.common.Visibility;
 +import org.apache.polygene.bootstrap.AssemblyException;
 +import org.apache.polygene.bootstrap.ModuleAssembly;
 +import org.apache.polygene.entitystore.riak.assembly.RiakEntityStoreAssembler;
 +import org.apache.polygene.test.EntityTestAssembler;
 +import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 +import org.apache.polygene.test.docker.DockerRule;
 +import org.junit.ClassRule;
 +
 +public class RiakEntityStoreWithCacheTest extends AbstractEntityStoreWithCacheTest
 +{
 +    @ClassRule
 +    public static final DockerRule DOCKER = new DockerRule( "riak","riak_auth_mods started on node");
 +
 +    private RiakFixture riakFixture;
 +
 +    @Override
 +    public void setUp() throws Exception
 +    {
 +        super.setUp();
 +        RiakEntityStoreService es = serviceFinder.findService( RiakEntityStoreService.class ).get();
 +        riakFixture = new RiakFixture( es.riakClient(), es.riakNamespace() );
 +        riakFixture.waitUntilReady();
 +    }
 +
 +    @Override
 +    public void tearDown() throws Exception
 +    {
 +        riakFixture.deleteTestData();
 +        super.tearDown();
 +    }
 +
 +    @Override
 +    public void assemble( ModuleAssembly module )
 +        throws AssemblyException
 +    {
 +        super.assemble( module );
 +        ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
++        new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 +        new RiakEntityStoreAssembler().withConfig( config, Visibility.layer ).assemble( module );
 +        RiakEntityStoreConfiguration riakConfig = config.forMixin( RiakEntityStoreConfiguration.class )
 +                                                        .declareDefaults();
 +        String host = DOCKER.getDockerHost();
 +        int port = DOCKER.getExposedContainerPort( "8087/tcp" );
 +        riakConfig.hosts().set( Collections.singletonList( host + ':' + port ) );
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/DerbySQLEntityStoreTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
----------------------------------------------------------------------
diff --cc extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
index e1ad4cf,b63e68b..1a8a3a2
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
@@@ -17,9 -17,8 +17,8 @@@
   */
  package org.apache.polygene.index.elasticsearch.assembly;
  
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.index.elasticsearch.ElasticSearchConfiguration;
 +import org.apache.polygene.index.elasticsearch.ElasticSearchIndexingConfiguration;
  import org.apache.polygene.index.elasticsearch.client.ESClientIndexQueryService;
  import org.apache.polygene.index.elasticsearch.internal.AbstractElasticSearchAssembler;
  import org.elasticsearch.client.Client;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
----------------------------------------------------------------------
diff --cc extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
index cb7da97,ed8e4b1..1dfb9bb
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
@@@ -19,9 -19,8 +19,8 @@@
   */
  package org.apache.polygene.index.elasticsearch.assembly;
  
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.index.elasticsearch.ElasticSearchConfiguration;
 +import org.apache.polygene.index.elasticsearch.ElasticSearchIndexingConfiguration;
  import org.apache.polygene.index.elasticsearch.filesystem.ESFilesystemIndexQueryService;
  import org.apache.polygene.index.elasticsearch.internal.AbstractElasticSearchAssembler;
  

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-elasticsearch/src/test/java/org/apache/polygene/index/elasticsearch/ElasticSearchQueryMultimoduleTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
index 351b2f9,be35b85..ef6f5bd
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
@@@ -21,9 -21,8 +21,8 @@@
  package org.apache.polygene.index.rdf.assembly;
  
  import org.apache.polygene.api.common.Visibility;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.index.rdf.RdfIndexingEngineService;
 +import org.apache.polygene.index.rdf.RdfIndexingService;
  import org.apache.polygene.index.rdf.query.RdfQueryParserFactory;
  import org.apache.polygene.library.rdf.entity.EntityStateSerializer;
  import org.apache.polygene.library.rdf.entity.EntityTypeSerializer;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
index f9e7724,133a6a2..7fb19a9
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
@@@ -20,9 -20,8 +20,8 @@@
  package org.apache.polygene.index.rdf.assembly;
  
  import org.apache.polygene.api.common.Visibility;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.index.rdf.RdfIndexingEngineService;
 +import org.apache.polygene.index.rdf.RdfIndexingService;
  import org.apache.polygene.index.rdf.query.RdfQueryParserFactory;
  import org.apache.polygene.library.rdf.entity.EntityStateSerializer;
  import org.apache.polygene.library.rdf.entity.EntityTypeSerializer;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
----------------------------------------------------------------------
diff --cc extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
index 6462e4f,14b4d5c..1176e16
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
@@@ -20,9 -20,8 +20,8 @@@
  package org.apache.polygene.index.rdf.assembly;
  
  import org.apache.polygene.api.common.Visibility;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.index.rdf.RdfIndexingEngineService;
 +import org.apache.polygene.index.rdf.RdfIndexingService;
  import org.apache.polygene.index.rdf.query.RdfQueryParserFactory;
  import org.apache.polygene.library.rdf.entity.EntityStateSerializer;
  import org.apache.polygene.library.rdf.entity.EntityTypeSerializer;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
----------------------------------------------------------------------
diff --cc extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
index 5e6dd79,6d03171..9e9bd14
--- a/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/polygene/index/rdf/qi95/Qi95IssueTest.java
@@@ -220,113 -215,47 +215,47 @@@ public class Qi95IssueTes
              throws AssemblyException;
      }
  
-     final ModuleAssemblyBuilder nativeRdf = new ModuleAssemblyBuilder()
-     {
-         @Override
-         public ModuleAssembly buildModuleAssembly( LayerAssembly layer, String name )
-             throws AssemblyException
-         {
-             return addModule( layer, name, new RdfNativeSesameStoreAssembler() );
-         }
-     };
+     final ModuleAssemblyBuilder nativeRdf =
+         ( layer, name ) -> addModule( layer, name, new RdfNativeSesameStoreAssembler() );
  
-     final ModuleAssemblyBuilder inMemoryStore = new ModuleAssemblyBuilder()
-     {
-         @Override
-         public ModuleAssembly buildModuleAssembly( LayerAssembly layer, String name )
-             throws AssemblyException
-         {
-             return addModule( layer, name, new EntityTestAssembler().visibleIn( Visibility.application ) );
-         }
-     };
+     final ModuleAssemblyBuilder inMemoryStore =
+         ( layer, name ) -> addModule( layer, name, new EntityTestAssembler().visibleIn( Visibility.application ) );
  
-     final ModuleAssemblyBuilder inMemoryRdf = new ModuleAssemblyBuilder()
-     {
-         @Override
-         public ModuleAssembly buildModuleAssembly( LayerAssembly layer, String name )
-             throws AssemblyException
-         {
-             return addModule( layer, name, new RdfMemoryStoreAssembler() );
-         }
-     };
+     final ModuleAssemblyBuilder inMemoryRdf =
+         ( layer, name ) -> addModule( layer, name, new RdfMemoryStoreAssembler() );
  
-     final ModuleAssemblyBuilder jdbmStore = new ModuleAssemblyBuilder()
-     {
-         @Override
-         public ModuleAssembly buildModuleAssembly( LayerAssembly layer, String name )
-             throws AssemblyException
-         {
-             return addModule( layer, name, jdbmEntityStoreAssembler() );
-         }
-     };
+     final ModuleAssemblyBuilder jdbmStore =
+         ( layer, name ) -> addModule( layer, name, module -> {
+             new JdbmEntityStoreAssembler().visibleIn( Visibility.application ).assemble( module );
+             module.defaultServices().visibleIn( Visibility.application );
+         } );
  
-     final ModuleAssemblyBuilder configModule = new ModuleAssemblyBuilder()
-     {
-         @Override
-         public ModuleAssembly buildModuleAssembly( LayerAssembly layer, String name )
-             throws AssemblyException
-         {
-             return addModule( layer, name, entityStoreConfigAssembler() );
-         }
-     };
+     final ModuleAssemblyBuilder configModule =
+         ( layer, name ) -> addModule( layer, name, entityStoreConfigAssembler() );
  
-     final LayerAssemblyBuilder domain = new LayerAssemblyBuilder()
-     {
-         @Override
-         public LayerAssembly buildLayerAssembly( ApplicationAssembly appAssembly )
-             throws AssemblyException
-         {
-             LayerAssembly domainLayer = appAssembly.layer( "Domain" );
-             addModule( domainLayer, "Domain", new Assembler()
-             {
-                 @Override
-                 @SuppressWarnings( "unchecked" )
-                 public void assemble( ModuleAssembly module )
-                     throws AssemblyException
-                 {
-                     module.entities( ItemTypeEntity.class );
-                 }
-             } );
+     final LayerAssemblyBuilder domain =
+         application -> {
+             LayerAssembly domainLayer = application.layer( "Domain" );
+             addModule( domainLayer, "Domain", module -> module.entities( ItemTypeEntity.class ) );
              return domainLayer;
-         }
-     };
- 
-     private Assembler entityStoreConfigAssembler()
-     {
-         return new Assembler()
-         {
-             @Override
-             public void assemble( ModuleAssembly module )
-                 throws AssemblyException
-             {
-                 new EntityTestAssembler().assemble( module );
- 
-                 module.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
-                 module.forMixin( NativeConfiguration.class )
-                     .declareDefaults()
-                     .dataDirectory()
-                     .set( rdfDirectory().getAbsolutePath() );
- 
-                 module.entities( JdbmEntityStoreConfiguration.class ).visibleIn( Visibility.application );
-                 module.forMixin( JdbmEntityStoreConfiguration.class )
-                     .declareDefaults()
-                     .file()
-                     .set( jdbmDirectory().getAbsolutePath() );
-             }
          };
-     }
  
-     private Assembler jdbmEntityStoreAssembler()
+     private Assembler entityStoreConfigAssembler()
      {
-         return new Assembler()
-         {
-             @Override
-             @SuppressWarnings( "unchecked" )
-             public void assemble( ModuleAssembly module )
-                 throws AssemblyException
-             {
-                 new JdbmEntityStoreAssembler().visibleIn( Visibility.application ).assemble( module );
-             }
+         return module -> {
+             new EntityTestAssembler().assemble( module );
+ 
+             module.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
+             module.forMixin( NativeConfiguration.class )
+                   .declareDefaults()
+                   .dataDirectory()
+                   .set( rdfDirectory().getAbsolutePath() );
+ 
 -            module.entities( JdbmConfiguration.class ).visibleIn( Visibility.application );
 -            module.forMixin( JdbmConfiguration.class )
++            module.entities( JdbmEntityStoreConfiguration.class ).visibleIn( Visibility.application );
++            module.forMixin( JdbmEntityStoreConfiguration.class )
+                   .declareDefaults()
+                   .file()
+                   .set( jdbmDirectory().getAbsolutePath() );
          };
      }
  
@@@ -391,8 -319,8 +319,7 @@@
          Property<String> name();
      }
  
--    interface ItemTypeEntity
-         extends ItemType, EntityComposite
 -        extends ItemType
++    interface ItemTypeEntity extends ItemType
      {
      }
  }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
----------------------------------------------------------------------
diff --cc extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
index 3ee1fcb,cf6dcd0..858cfc7
--- a/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
+++ b/extensions/reindexer/src/test/java/org/apache/polygene/index/reindexer/ReindexerTest.java
@@@ -74,10 -74,10 +74,10 @@@ public class ReindexerTes
  
          // Configuration
          ModuleAssembly config = module.layer().module( "config" );
-         new EntityTestAssembler().assemble( config );
+         new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( config );
 -        config.entities( JdbmConfiguration.class, NativeConfiguration.class, ReindexerConfiguration.class )
 +        config.entities( JdbmEntityStoreConfiguration.class, NativeConfiguration.class, ReindexerConfiguration.class )
                .visibleIn( Visibility.layer );
 -        config.forMixin( JdbmConfiguration.class ).declareDefaults()
 +        config.forMixin( JdbmEntityStoreConfiguration.class ).declareDefaults()
                .file().set( new File( tmpDir.getRoot(), ENTITIES_DIR ).getAbsolutePath() );
          config.forMixin( NativeConfiguration.class ).declareDefaults()
                .dataDirectory().set( new File( tmpDir.getRoot(), INDEX_DIR ).getAbsolutePath() );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
----------------------------------------------------------------------
diff --cc libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
index 94677ec,0a10b87..01630a0
--- a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
+++ b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
@@@ -40,17 -40,15 +39,16 @@@ public class HttpShiroAssembler extend
  {
      @Override
      public void assemble( ModuleAssembly module )
-         throws AssemblyException
      {
 -        addContextListeners( listen().
 -            with( EnvironmentLoaderService.class ) ).
 -            to( module );
 +        addContextListeners(
 +            listen().with( EnvironmentLoaderService.class ) )
 +            .to( module );
  
 -        addFilters( filter( "/*" ).
 -            through( ShiroFilterService.class ).
 -            on( REQUEST, FORWARD, INCLUDE, ERROR, ASYNC ) ).
 -            to( module );
 +        addFilters(
 +            filter( "/*" )
 +                .through( ShiroFilterService.class )
 +                .on( REQUEST, FORWARD, INCLUDE, ERROR, ASYNC ) )
 +            .to( module );
  
          if( hasConfig() )
          {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java
----------------------------------------------------------------------
diff --cc tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java
index fd7e6b0,23a8832..c8cca53
--- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java
+++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/jdbm/JdbmEntityStorePerformanceTest.java
@@@ -46,8 -46,8 +46,8 @@@ public class JdbmEntityStorePerformance
          {
              new JdbmEntityStoreAssembler().assemble( module );
              ModuleAssembly configModule = module.layer().module( "Config" );
 -            configModule.entities( JdbmConfiguration.class ).visibleIn( Visibility.layer );
 +            configModule.entities( JdbmEntityStoreConfiguration.class ).visibleIn( Visibility.layer );
-             new EntityTestAssembler().assemble( configModule );
+             new EntityTestAssembler().defaultServicesVisibleIn( Visibility.layer ).assemble( configModule );
  
              module.services( EhCachePoolService.class );
              configModule.entities( EhCacheConfiguration.class ).visibleIn( Visibility.layer );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java
----------------------------------------------------------------------
diff --cc tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java
index 2ece1bc,ddec968..42305a2
--- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java
+++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/DerbySQLEntityStorePerformanceTest.java
@@@ -24,9 -24,8 +24,8 @@@ import org.apache.polygene.api.common.V
  import org.apache.polygene.api.unitofwork.UnitOfWork;
  import org.apache.polygene.api.usecase.UsecaseBuilder;
  import org.apache.polygene.bootstrap.Assembler;
- import org.apache.polygene.bootstrap.AssemblyException;
  import org.apache.polygene.bootstrap.ModuleAssembly;
 -import org.apache.polygene.entitystore.sql.SQLMapEntityStoreConfiguration;
 +import org.apache.polygene.entitystore.sql.SQLEntityStoreConfiguration;
  import org.apache.polygene.entitystore.sql.assembly.DerbySQLEntityStoreAssembler;
  import org.apache.polygene.library.sql.assembly.DataSourceAssembler;
  import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler;

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/61fe4e72/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java
----------------------------------------------------------------------


Mime
View raw message