Merge branch 'develop' into serialization-3.0
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/f85dbcba Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/f85dbcba Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/f85dbcba Branch: refs/heads/serialization-3.0 Commit: f85dbcba7fc1e8b9975cbc72a0a467b2ccaa0ccc Parents: 9dcb18e 30c5ff2 Author: Paul Merlin <[email protected]> Authored: Mon Feb 27 00:30:35 2017 +0100 Committer: Paul Merlin <[email protected]> Committed: Mon Feb 27 00:30:35 2017 +0100 ---------------------------------------------------------------------- .../cassandra/CassandraMapEntityStoreTest.java | 16 ++++----- .../entitystore/sql/MySQLEntityStoreTest.java | 4 +-- .../src/test/resources/logback.xml | 4 +-- .../test/resources/mysql-datasource.properties | 2 +- .../src/docs/tutorials/howto-build-system.txt | 34 +++++++------------- .../src/docs/tutorials/howto-writing-docs.txt | 4 +-- manual/src/docs/website/home.txt | 3 +- 7 files changed, 25 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f85dbcba/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java ---------------------------------------------------------------------- diff --cc extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java index f5e2988,9b1f0ac..0801b8a --- a/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java +++ b/extensions/entitystore-cassandra/src/test/java/org/apache/polygene/entitystore/cassandra/CassandraMapEntityStoreTest.java @@@ -22,14 -22,17 +22,13 @@@ package org.apache.polygene.entitystore 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.CassandraDBEntityStoreAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.entity.AbstractEntityStoreTest; +import org.apache.polygene.test.entity.CanRemoveAll; - import org.junit.BeforeClass; - - import static org.apache.polygene.test.util.Assume.assumeConnectivity; ++import org.apache.polygene.test.internal.DockerRule; + import org.junit.ClassRule; -import static org.apache.polygene.test.util.Assume.assumeConnectivity; - /** * Test the CassandraEntityStoreService. * <p>Installing Cassandra and starting it should suffice as the test use Cassandra defaults: 127.0.0.1:3000</p> http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f85dbcba/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/MySQLEntityStoreTest.java ----------------------------------------------------------------------
