You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/03/14 23:29:20 UTC
[7/8] ISIS-362: upgrading to JMock 2.6.0
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
index f239946..c293161 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
@@ -29,7 +29,6 @@ import java.io.PrintWriter;
import org.apache.log4j.Logger;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
index 4fa7b44..a35dbd0 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
@@ -28,6 +28,8 @@ import java.util.List;
import java.util.zip.CRC32;
import org.apache.commons.lang.NotImplementedException;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -36,7 +38,6 @@ import org.apache.isis.objectstore.nosql.NoSqlCommandContext;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
import org.apache.isis.objectstore.nosql.db.StateReader;
-import org.apache.log4j.Logger;
public class FileServerDb implements NoSqlDataDatabase {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerPersistorMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerPersistorMechanismInstaller.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerPersistorMechanismInstaller.java
index 5cdc19d..28e7a07 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerPersistorMechanismInstaller.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerPersistorMechanismInstaller.java
@@ -21,9 +21,6 @@ package org.apache.isis.objectstore.nosql.db.file;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
import org.apache.isis.objectstore.nosql.db.NoSqlPersistorMechanismInstaller;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriter.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriter.java
index 7ab6829..b63c079 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriter.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriter.java
@@ -21,15 +21,16 @@ package org.apache.isis.objectstore.nosql.db.file;
import java.util.List;
+import com.google.common.collect.Lists;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
import org.apache.isis.objectstore.nosql.db.StateWriter;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import com.google.common.collect.Lists;
public class JsonStateWriter implements StateWriter {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
index bdd7f71..3b7a8a6 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
@@ -19,16 +19,17 @@
package org.apache.isis.objectstore.nosql.db.mongo;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.objectstore.nosql.NoSqlCommandContext;
import org.apache.isis.objectstore.nosql.db.StateWriter;
-import org.apache.log4j.Logger;
-
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBObject;
public class MongoClientCommandContext implements NoSqlCommandContext {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
index ae10c49..4ed25d3 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
@@ -23,6 +23,16 @@ import java.net.UnknownHostException;
import java.util.Iterator;
import java.util.List;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+import com.mongodb.Mongo;
+import com.mongodb.MongoException;
+
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -33,15 +43,6 @@ import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
import org.apache.isis.objectstore.nosql.db.StateReader;
import org.apache.isis.objectstore.nosql.db.StateWriter;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
-import org.apache.log4j.Logger;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
public class MongoDb implements NoSqlDataDatabase {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
index 50078fb..85be83a 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
@@ -22,16 +22,17 @@ package org.apache.isis.objectstore.nosql.db.mongo;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.objectstore.nosql.db.StateReader;
-import org.apache.log4j.Logger;
-
import com.mongodb.BasicDBList;
import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
+import org.apache.log4j.Logger;
+
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.objectstore.nosql.db.StateReader;
+
public class MongoStateReader implements StateReader {
private static final Logger LOG = Logger.getLogger(MongoStateReader.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
index ad76a8e..8495693 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
@@ -21,18 +21,19 @@ package org.apache.isis.objectstore.nosql.db.mongo;
import java.util.List;
+import com.google.common.collect.Lists;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.objectstore.nosql.db.StateWriter;
-import org.apache.log4j.Logger;
-
-import com.google.common.collect.Lists;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
public class MongoStateWriter implements StateWriter {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/DestroyObjectCommandImplementationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/DestroyObjectCommandImplementationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/DestroyObjectCommandImplementationTest.java
index 8d78c13..1eff942 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/DestroyObjectCommandImplementationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/DestroyObjectCommandImplementationTest.java
@@ -19,22 +19,21 @@
package org.apache.isis.objectstore.nosql;
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.nosql.NoSqlCommandContext;
-import org.apache.isis.objectstore.nosql.NoSqlDestroyObjectCommand;
import org.apache.isis.objectstore.nosql.versions.VersionCreatorDefault;
-import org.jmock.Expectations;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
public class DestroyObjectCommandImplementationTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
index e4b05c9..133ba24 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -34,10 +35,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.persistence.IdentifierGenerator;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.nosql.NoSqlIdentifierGenerator;
import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
public class NoSqlIdentifierGeneratorTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
index 1af534d..dd231c1 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest.java
@@ -22,6 +22,7 @@ package org.apache.isis.objectstore.nosql;
import static org.junit.Assert.assertEquals;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -33,7 +34,6 @@ import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest_reference.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest_reference.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest_reference.java
index b1284af..83d67f8 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest_reference.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlKeyCreatorTest_reference.java
@@ -22,6 +22,7 @@ package org.apache.isis.objectstore.nosql;
import static org.junit.Assert.assertEquals;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -30,7 +31,6 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
index eacf86c..a7f5d64 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
@@ -30,16 +30,14 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
import org.jmock.Sequence;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.runtime.system.persistence.OidGenerator;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.nosql.NoSqlIdentifierGenerator;
-import org.apache.isis.objectstore.nosql.NoSqlObjectStore;
import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
import org.apache.isis.objectstore.nosql.versions.VersionCreator;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
index 87c8638..9c230b6 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
@@ -29,6 +29,7 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
import org.jmock.Sequence;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -42,11 +43,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.system.persistence.OidGenerator;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.nosql.NoSqlIdentifierGenerator;
-import org.apache.isis.objectstore.nosql.NoSqlObjectStore;
import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
import org.apache.isis.objectstore.nosql.versions.VersionCreator;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/WriteObjectCommandTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/WriteObjectCommandTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/WriteObjectCommandTest.java
index c8de593..5850846 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/WriteObjectCommandTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/WriteObjectCommandTest.java
@@ -24,6 +24,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import java.util.ArrayList;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -39,11 +40,8 @@ import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.tck.dom.refs.ParentEntity;
import org.apache.isis.core.tck.dom.refs.ReferencingEntity;
import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.nosql.NoSqlCommandContext;
-import org.apache.isis.objectstore.nosql.WriteObjectCommand;
import org.apache.isis.objectstore.nosql.db.StateWriter;
import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
import org.apache.isis.objectstore.nosql.versions.VersionCreator;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
index b9e4eec..137177f 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
@@ -31,12 +31,9 @@ import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.IoUtils;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.objectstore.nosql.db.file.ClientConnection;
-import org.apache.isis.objectstore.nosql.db.file.RemotingException;
public class ClientConnectionTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReaderTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReaderTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReaderTest.java
index e1b5441..bbdb7d7 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReaderTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReaderTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.objectstore.nosql.db.StateReader;
-import org.apache.isis.objectstore.nosql.db.file.JsonStateReader;
public class JsonStateReaderTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriterTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriterTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriterTest.java
index 366c2a4..cdc8f8e 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriterTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/JsonStateWriterTest.java
@@ -23,14 +23,14 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.objectstore.nosql.db.StateWriter;
-import org.apache.isis.objectstore.nosql.db.file.JsonStateWriter;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
public class JsonStateWriterTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataReaderTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataReaderTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataReaderTest.java
index 0a62fb1..a3694ed 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataReaderTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataReaderTest.java
@@ -31,10 +31,6 @@ import java.io.FileWriter;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.isis.objectstore.nosql.db.file.server.DataFileReader;
-import org.apache.isis.objectstore.nosql.db.file.server.FileServerException;
-import org.apache.isis.objectstore.nosql.db.file.server.Util;
-
public class DataReaderTest {
private DataFileReader reader;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
index ddc449a..fb5d2e6 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
@@ -33,10 +33,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.objectstore.nosql.db.file.server.DataFileWriter;
-import org.apache.isis.objectstore.nosql.db.file.server.FileContent;
-import org.apache.isis.objectstore.nosql.db.file.server.Util;
-
public class DataWriterTest {
private static final String TARGET_DIRECTORY = "target/test/";
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerTest.java
index 7a4dda5..3df438b 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerTest.java
@@ -42,9 +42,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.isis.core.commons.lang.IoUtils;
-import org.apache.isis.objectstore.nosql.db.file.server.FileServerProcessor;
-import org.apache.isis.objectstore.nosql.db.file.server.ServerConnection;
-import org.apache.isis.objectstore.nosql.db.file.server.Util;
public class FileServerTest {
private FileServerProcessor server;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LockManagerTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LockManagerTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LockManagerTest.java
index 59f0d09..cdf12d3 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LockManagerTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LockManagerTest.java
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.objectstore.nosql.db.file.server.LockManager;
-
public class LockManagerTest {
private LockManager manager;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LogWriterTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LogWriterTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LogWriterTest.java
index 848ff63..f4573f2 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LogWriterTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/LogWriterTest.java
@@ -34,11 +34,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.isis.objectstore.nosql.db.file.server.DataFileWriter;
-import org.apache.isis.objectstore.nosql.db.file.server.FileContent;
-import org.apache.isis.objectstore.nosql.db.file.server.LogWriter;
-import org.apache.isis.objectstore.nosql.db.file.server.Util;
-
public class LogWriterTest {
private LogWriter logger;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoIntegrationTest.java
index f9da16a..09a58aa 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoIntegrationTest.java
@@ -39,8 +39,6 @@ import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.objectstore.nosql.db.mongo.MongoDb;
-import org.apache.isis.objectstore.nosql.db.mongo.MongoPersistorMechanismInstaller;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
public class MongoIntegrationTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
index d05e74f..a3ee9e7 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
@@ -36,7 +36,6 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.objectstore.nosql.db.mongo.MongoStateReader;
public class MongoStateReaderIntegrationTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
index 42b1f07..9dc33ef 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
@@ -36,7 +36,6 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.objectstore.nosql.db.mongo.MongoStateWriter;
public class MongoStateWriterIntegrationTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
index 4448fd0..140ec28 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/ObjectReaderMongoIntegrationTest.java
@@ -29,6 +29,7 @@ import java.util.Map;
import org.hamcrest.CoreMatchers;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -42,20 +43,16 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.tck.dom.refs.ParentEntity;
import org.apache.isis.core.tck.dom.refs.ReferencingEntity;
import org.apache.isis.core.tck.dom.refs.SimpleEntity;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.objectstore.nosql.ObjectReader;
import org.apache.isis.objectstore.nosql.db.StateReader;
-import org.apache.isis.objectstore.nosql.db.mongo.MongoPersistorMechanismInstaller;
import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
import org.apache.isis.objectstore.nosql.versions.VersionCreator;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
index 0908be9..c9cf53c 100755
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
@@ -27,6 +27,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.google.common.collect.Lists;
+
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -40,8 +42,6 @@ import org.apache.isis.objectstore.sql.ObjectMappingLookup;
import org.apache.isis.objectstore.sql.VersionMapping;
import org.apache.isis.objectstore.sql.mapping.FieldMapping;
-import com.google.common.collect.Lists;
-
/**
* Used to map 1-to-many collections by creating, in the child table, 1 column
* per parent collection. The column is named by combining the final part of the
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/DefaultsTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/DefaultsTest.java b/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/DefaultsTest.java
index 12ddb4e..86b5db4 100644
--- a/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/DefaultsTest.java
+++ b/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/DefaultsTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.objectstore.sql.Defaults;
public class DefaultsTest {
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/jdbc/helpers/SimplePasswordEncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/jdbc/helpers/SimplePasswordEncoderDecoderTest.java b/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/jdbc/helpers/SimplePasswordEncoderDecoderTest.java
index 407a82d..e2a976a 100644
--- a/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/jdbc/helpers/SimplePasswordEncoderDecoderTest.java
+++ b/component/objectstore/sql/sql-impl/src/test/java/org/apache/isis/objectstore/sql/jdbc/helpers/SimplePasswordEncoderDecoderTest.java
@@ -19,7 +19,6 @@ package org.apache.isis.objectstore.sql.jdbc.helpers;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
-import org.apache.isis.objectstore.sql.jdbc.helpers.SimplePasswordEncoderDecoder;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
index 2f6a0fe..3e76efe 100755
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
@@ -18,9 +18,6 @@
*/
package org.apache.isis.objectstore.sql.common;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -35,7 +32,6 @@ import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.runners.MethodSorters;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.tck.dom.poly.ReferencingPolyTypesEntity;
import org.apache.isis.core.tck.dom.sqlos.SqlDomainObjectRepository;
import org.apache.isis.core.tck.dom.sqlos.data.SqlDataClass;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
index 687afb4..4ff5205 100644
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
@@ -47,8 +47,6 @@ import org.apache.isis.applib.value.Percentage;
import org.apache.isis.applib.value.Time;
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntity;
import org.apache.isis.core.tck.dom.sqlos.SqlDomainObjectRepository;
import org.apache.isis.core.tck.dom.sqlos.data.SimpleClass;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/MySqlIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/MySqlIntegrationTest.java b/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/MySqlIntegrationTest.java
index eab01ea..25e838a 100644
--- a/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/MySqlIntegrationTest.java
+++ b/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/MySqlIntegrationTest.java
@@ -24,7 +24,6 @@ package org.apache.isis.objectstore.sql;
import java.util.Properties;
-import org.apache.isis.objectstore.sql.SqlObjectStore;
import org.apache.isis.objectstore.sql.common.SqlIntegrationTestData;
public class MySqlIntegrationTest extends SqlIntegrationTestData {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/PostgreSqlIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/PostgreSqlIntegrationTest.java b/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/PostgreSqlIntegrationTest.java
index 5540fd9..b3ca865 100644
--- a/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/PostgreSqlIntegrationTest.java
+++ b/component/objectstore/sql/sql-tests-served/src/test/java/org/apache/isis/objectstore/sql/PostgreSqlIntegrationTest.java
@@ -24,7 +24,6 @@ package org.apache.isis.objectstore.sql;
import java.util.Properties;
-import org.apache.isis.objectstore.sql.SqlObjectStore;
import org.apache.isis.objectstore.sql.common.SqlIntegrationTestData;
public class PostgreSqlIntegrationTest extends SqlIntegrationTestData {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
index 68a9abe..fbe7fed 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
@@ -55,7 +55,6 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.objectstore.xml.internal.clock.Clock;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
index 69f99e3..b986c93 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
import org.apache.isis.objectstore.xml.internal.data.DataManager;
import org.apache.isis.objectstore.xml.internal.data.ObjectData;
-import org.apache.isis.objectstore.xml.internal.version.FileVersion;
abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract {
private static final Logger LOG = Logger.getLogger(AbstractXmlPersistenceCommand.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/CollectionData.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/CollectionData.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/CollectionData.java
index e45b034..e77096b 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/CollectionData.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/CollectionData.java
@@ -21,7 +21,6 @@ package org.apache.isis.objectstore.xml.internal.data;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.objectstore.xml.internal.version.FileVersion;
/**
* A logical collection of elements of a specified type
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/Data.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/Data.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/Data.java
index baa48fd..03fd257 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/Data.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/Data.java
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public abstract class Data {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/ObjectData.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/ObjectData.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/ObjectData.java
index cd1e682..62cc7aa 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/ObjectData.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/data/ObjectData.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
-import org.apache.isis.objectstore.xml.internal.version.FileVersion;
/**
* A logical collection of elements of a specified type
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_isFixturesInstalled.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_isFixturesInstalled.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_isFixturesInstalled.java
index 8a58492..086e7f0 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_isFixturesInstalled.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_isFixturesInstalled.java
@@ -21,15 +21,14 @@ package org.apache.isis.objectstore.xml;
import static org.junit.Assert.assertFalse;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.xml.XmlObjectStore;
public class XmlObjectStoreTest_isFixturesInstalled {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_name.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_name.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_name.java
index 1b7267c..1bc7e89 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_name.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_name.java
@@ -22,15 +22,14 @@ package org.apache.isis.objectstore.xml;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.xml.XmlObjectStore;
public class XmlObjectStoreTest_name {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_persist.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_persist.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_persist.java
index 9011fd3..1110193 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_persist.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_persist.java
@@ -26,7 +26,6 @@ import org.apache.isis.core.integtestsupport.tck.ObjectStoreContractTest_persist
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.unittestsupport.files.Files;
import org.apache.isis.core.unittestsupport.files.Files.Recursion;
-import org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller;
public class XmlObjectStoreTest_persist extends ObjectStoreContractTest_persist {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_toRefactor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_toRefactor.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_toRefactor.java
index b798ff5..e7d4b46 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_toRefactor.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlObjectStoreTest_toRefactor.java
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.List;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -42,11 +43,8 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.xml.XmlObjectStore;
-import org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller;
import org.apache.isis.objectstore.xml.internal.clock.DefaultClock;
public class XmlObjectStoreTest_toRefactor {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlPersistenceMechanismInstallerTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
index 504a133..949d958 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/XmlPersistenceMechanismInstallerTest.java
@@ -21,6 +21,7 @@ package org.apache.isis.objectstore.xml;
import static org.junit.Assert.assertTrue;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -28,10 +29,8 @@ import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller;
public class XmlPersistenceMechanismInstallerTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/DefaultClockTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/DefaultClockTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/DefaultClockTest.java
index 16e121f..2df0f92 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/DefaultClockTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/DefaultClockTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.objectstore.xml.internal.clock.DefaultClock;
public class DefaultClockTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/TestClock.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/TestClock.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/TestClock.java
index c7cf58c..5a5d437 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/TestClock.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/clock/TestClock.java
@@ -19,7 +19,6 @@
package org.apache.isis.objectstore.xml.internal.clock;
-import org.apache.isis.objectstore.xml.internal.clock.Clock;
public class TestClock implements Clock {
long time = 0;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataTest.java
index 40585f7..eb5e490 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataTest.java
@@ -27,7 +27,6 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
import org.apache.isis.objectstore.xml.internal.clock.DefaultClock;
-import org.apache.isis.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class ObjectDataTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataVectorTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataVectorTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataVectorTest.java
index 152cd48..0796a1f 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataVectorTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ObjectDataVectorTest.java
@@ -31,8 +31,6 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
-import org.apache.isis.objectstore.xml.internal.data.ObjectData;
-import org.apache.isis.objectstore.xml.internal.data.ObjectDataVector;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class ObjectDataVectorTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ReferenceVectorTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ReferenceVectorTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ReferenceVectorTest.java
index e202feb..5bd19e3 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ReferenceVectorTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/ReferenceVectorTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.objectstore.xml.internal.data.ListOfRootOid;
public class ReferenceVectorTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
index ac2017d..84645b7 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest.java
@@ -45,8 +45,6 @@ import org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller;
import org.apache.isis.objectstore.xml.internal.clock.DefaultClock;
import org.apache.isis.objectstore.xml.internal.data.ListOfRootOid;
import org.apache.isis.objectstore.xml.internal.data.ObjectData;
-import org.apache.isis.objectstore.xml.internal.data.xml.Utils;
-import org.apache.isis.objectstore.xml.internal.data.xml.XmlDataManager;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class XmlDataManagerTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest_instances.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest_instances.java b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest_instances.java
index 31c798d..3cb5050 100644
--- a/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest_instances.java
+++ b/component/objectstore/xml/src/test/java/org/apache/isis/objectstore/xml/internal/data/xml/XmlDataManagerTest_instances.java
@@ -42,8 +42,6 @@ import org.apache.isis.objectstore.xml.XmlPersistenceMechanismInstaller;
import org.apache.isis.objectstore.xml.internal.clock.DefaultClock;
import org.apache.isis.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.objectstore.xml.internal.data.ObjectDataVector;
-import org.apache.isis.objectstore.xml.internal.data.xml.Utils;
-import org.apache.isis.objectstore.xml.internal.data.xml.XmlDataManager;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class XmlDataManagerTest_instances {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/profilestore/xml/src/main/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriter.java
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/src/main/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriter.java b/component/profilestore/xml/src/main/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriter.java
index d38f0d7..62a345e 100644
--- a/component/profilestore/xml/src/main/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriter.java
+++ b/component/profilestore/xml/src/main/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriter.java
@@ -19,15 +19,12 @@
package org.apache.isis.profilestore.xml.internal;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.Writer;
import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
-import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
import org.apache.isis.core.commons.xml.ContentWriter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriterTest.java
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriterTest.java b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriterTest.java
index 3e5301a..2de9fb9 100644
--- a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriterTest.java
+++ b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileContentWriterTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.core.runtime.userprofile.UserProfile;
-import org.apache.isis.profilestore.xml.internal.UserProfileContentWriter;
public class UserProfileContentWriterTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
index 1fc7ed0..2457e2c 100644
--- a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
+++ b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
@@ -27,6 +27,16 @@ import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.List;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
@@ -41,18 +51,8 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactoryDefault;
import org.apache.isis.core.runtime.userprofile.Options;
import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.profilestore.xml.internal.UserProfileDataHandler;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
public class UserProfileDataHandlerTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/progmodel/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java b/component/progmodel/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
index 61574b2..34eb6d9 100644
--- a/component/progmodel/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
+++ b/component/progmodel/wrapper/wrapper-metamodel/src/test/java/org/apache/isis/progmodel/wrapper/WrappedFactoryDefaultTest_wrappedObject_transient.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -56,7 +57,6 @@ import org.apache.isis.core.progmodel.facets.properties.accessor.PropertyAccesso
import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetViaSetterMethod;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.tck.dom.claimapp.employees.Employee;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest.java
----------------------------------------------------------------------
diff --git a/component/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest.java b/component/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest.java
index f49c0d2..ac73771 100644
--- a/component/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest.java
+++ b/component/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest.java
@@ -28,7 +28,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.shiro.SecurityUtils;
@@ -36,6 +35,7 @@ import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.Factory;
+import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/security/shiro/src/test/java/org/apache/isis/security/shiro/util/UtilTest_parse.java
----------------------------------------------------------------------
diff --git a/component/security/shiro/src/test/java/org/apache/isis/security/shiro/util/UtilTest_parse.java b/component/security/shiro/src/test/java/org/apache/isis/security/shiro/util/UtilTest_parse.java
index 250c840..f7d436c 100644
--- a/component/security/shiro/src/test/java/org/apache/isis/security/shiro/util/UtilTest_parse.java
+++ b/component/security/shiro/src/test/java/org/apache/isis/security/shiro/util/UtilTest_parse.java
@@ -18,13 +18,14 @@
*/
package org.apache.isis.security.shiro.util;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
import java.util.List;
import java.util.Map;
-import org.apache.isis.security.shiro.util.Util;
import org.junit.Test;
public class UtilTest_parse {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java b/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
index b1f517b..66420b9 100644
--- a/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
+++ b/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java
@@ -49,7 +49,6 @@ import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.internal.InitialisationSession;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.viewer.bdd.common.components.BddAuthenticationManagerInstaller;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
----------------------------------------------------------------------
diff --git a/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java b/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
index 53d939d..573dbd6 100644
--- a/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
+++ b/component/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
@@ -25,7 +25,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.ObjectStore;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java
index b256e35..08f163b 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/combined/TwoPartViewSpecification.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.dnd.combined;
import java.util.List;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
index 8defc75..9f548a1 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
@@ -23,7 +23,6 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
index 170a558..639856d 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ObjectView.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.dnd.view.base;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.Persistor;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -34,11 +33,8 @@ import org.apache.isis.viewer.dnd.view.DragEvent;
import org.apache.isis.viewer.dnd.view.DragStart;
import org.apache.isis.viewer.dnd.view.Placement;
import org.apache.isis.viewer.dnd.view.Toolkit;
-import org.apache.isis.viewer.dnd.view.UserActionSet;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.ViewSpecification;
-import org.apache.isis.viewer.dnd.view.Workspace;
-import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
public abstract class ObjectView extends AbstractView {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
index 24ac58d..535819a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
@@ -34,7 +34,6 @@ import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.MessageBroker;
import org.apache.isis.core.runtime.system.transaction.UpdateNotifier;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java
index 0e37682..156fa30 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java
@@ -24,7 +24,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.dnd.view.Command;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
index bce6b88..2d54ed3 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
@@ -38,7 +38,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.authentication.exploration.MultiUserExplorationSession;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.userprofile.PerspectiveEntry;
import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
index 66abf38..833a9c7 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
@@ -24,13 +24,13 @@ import static org.junit.Assert.assertEquals;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
+import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.dnd.DummyContent;