This is an automated email from the ASF dual-hosted git repository.
hasan pushed a commit to branch reunited
in repository https://gitbox.apache.org/repos/asf/clerezza.git
The following commit(s) were added to refs/heads/reunited by this push:
new ec1f7a6 CLEREZZA-1044: Move SimpleGraph, SimpleMGraph, and
SimpleImmutableGraph to package org.apache.clerezza.implementation.in_memory
ec1f7a6 is described below
commit ec1f7a635b89fa5193ddbd621b82da2720b16dbc
Author: Hasan <[email protected]>
AuthorDate: Tue Jul 30 01:08:48 2019 +0200
CLEREZZA-1044: Move SimpleGraph, SimpleMGraph, and SimpleImmutableGraph to
package org.apache.clerezza.implementation.in_memory
---
.../java/org/apache/clerezza/implementation/graph/AbstractGraph.java | 1 +
.../apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java | 1 +
.../apache/clerezza/implementation/graphmatching/GraphMatcher.java | 2 +-
.../clerezza/implementation/{graph => in_memory}/SimpleGraph.java | 3 ++-
.../implementation/{graph => in_memory}/SimpleImmutableGraph.java | 4 +++-
.../clerezza/implementation/{graph => in_memory}/SimpleMGraph.java | 3 ++-
.../org/apache/clerezza/implementation/graph/SimpleGraphTest.java | 1 +
.../clerezza/implementation/graphmatching/GraphMatcherTest.java | 2 +-
.../apache/clerezza/implementation/graphmatching/Utils4Testing.java | 2 +-
api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java | 2 +-
api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java | 2 +-
.../src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java | 2 +-
.../src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java | 2 +-
.../src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala | 4 ++--
.../src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala | 2 +-
.../main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala | 3 +--
api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java | 2 +-
api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java | 2 +-
api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java | 2 +-
.../src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java | 2 +-
api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java | 2 +-
api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java | 2 +-
.../test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java | 2 +-
.../src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala | 2 +-
.../scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala | 2 +-
dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java | 2 +-
dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java | 2 +-
.../java/org/apache/clerezza/simple/storage/SimpleTcProvider.java | 4 ++--
dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java | 2 +-
.../test/java/org/apache/clerezza/dataset/providers/WeightedA.java | 2 +-
.../test/java/org/apache/clerezza/dataset/providers/WeightedA1.java | 2 +-
.../java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java | 2 +-
.../java/org/apache/clerezza/dataset/providers/WeightedBlight.java | 2 +-
.../java/org/apache/clerezza/dataset/providers/WeightedDummy.java | 4 ++--
.../java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java | 2 +-
.../java/org/apache/clerezza/simple/storage/AccessViaTcManager.java | 2 +-
.../org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java | 2 +-
.../java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java | 2 +-
.../java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java | 2 +-
.../src/main/java/org/apache/clerezza/representation/Parser.java | 2 +-
40 files changed, 47 insertions(+), 41 deletions(-)
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
index dafd146..237a7bd 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/AbstractGraph.java
@@ -19,6 +19,7 @@ package org.apache.clerezza.implementation.graph;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.debug.ReentrantReadWriteLockTracker;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
import java.util.AbstractCollection;
import java.util.Collection;
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
index 291d1dc..63dc81d 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/PrivilegedGraphWrapper.java
@@ -18,6 +18,7 @@
package org.apache.clerezza.implementation.graph;
import org.apache.clerezza.*;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
import java.security.AccessController;
import java.security.PrivilegedAction;
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
index a6c8ba6..cd594d9 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/graphmatching/GraphMatcher.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.implementation.graphmatching;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import java.util.Iterator;
import java.util.Map;
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleGraph.java
similarity index 98%
rename from
api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
rename to
api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleGraph.java
index 4a9d6c4..1bf27cb 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleGraph.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleGraph.java
@@ -15,9 +15,10 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.implementation.graph;
+package org.apache.clerezza.implementation.in_memory;
import org.apache.clerezza.*;
+import org.apache.clerezza.implementation.graph.AbstractGraph;
import java.lang.ref.SoftReference;
import java.util.*;
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleImmutableGraph.java
similarity index 92%
rename from
api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
rename to
api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleImmutableGraph.java
index e0e9396..c996b46 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleImmutableGraph.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleImmutableGraph.java
@@ -15,9 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.implementation.graph;
+package org.apache.clerezza.implementation.in_memory;
import org.apache.clerezza.*;
+import org.apache.clerezza.implementation.graph.AbstractImmutableGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import java.util.Iterator;
diff --git
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleMGraph.java
similarity index 92%
rename from
api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
rename to
api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleMGraph.java
index d58b2b9..579c2e1 100644
---
a/api-implementation/src/main/java/org/apache/clerezza/implementation/graph/SimpleMGraph.java
+++
b/api-implementation/src/main/java/org/apache/clerezza/implementation/in_memory/SimpleMGraph.java
@@ -15,10 +15,11 @@
* either express or implied. See the License for the specific
* language governing permissions and limitations under the License.
*/
-package org.apache.clerezza.implementation.graph;
+package org.apache.clerezza.implementation.in_memory;
import org.apache.clerezza.Graph;
import org.apache.clerezza.Triple;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import java.util.Collection;
import java.util.Iterator;
diff --git
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
index e4f504d..553257f 100644
---
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
+++
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graph/SimpleGraphTest.java
@@ -20,6 +20,7 @@ package org.apache.clerezza.implementation.graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
index d39660c..3140a46 100644
---
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
+++
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/GraphMatcherTest.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.BlankNode;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
index d8b5c2c..f2dbb34 100644
---
a/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
+++
b/api-implementation/src/test/java/org/apache/clerezza/implementation/graphmatching/Utils4Testing.java
@@ -23,7 +23,7 @@ import org.apache.clerezza.BlankNodeOrIRI;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
/**
* @author reto
diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
index 73def9d..a2e25bd 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphNode.java
@@ -19,7 +19,7 @@ package org.apache.clerezza.utils;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.LiteralFactory;
import java.util.*;
diff --git a/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
index 0c349cd..c1f6e62 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/GraphUtils.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.utils;
import org.apache.clerezza.*;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import java.util.HashSet;
import java.util.Iterator;
diff --git
a/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
index 39073c4..621fc8b 100644
--- a/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
+++ b/api.utils/src/main/java/org/apache/clerezza/utils/UriMutatingGraph.java
@@ -19,7 +19,7 @@ package org.apache.clerezza.utils;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
import java.util.Collection;
import java.util.Iterator;
diff --git
a/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
index c58c964..f39998e 100644
---
a/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
+++
b/api.utils/src/main/java/org/apache/clerezza/utils/smushing/BaseSmusher.java
@@ -19,7 +19,7 @@ package org.apache.clerezza.utils.smushing;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.ontologies.OWL;
import java.util.*;
diff --git
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
index 9da6c3c..500e01b 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/EzMGraph.scala
@@ -19,8 +19,8 @@ package org.apache.clerezza.scala.utils
import org.apache.clerezza
import org.apache.clerezza._
-import org.apache.clerezza.implementation.graph._
-import org.apache.clerezza.implementation.graph.{AbstractGraph, SimpleGraph}
+import org.apache.clerezza.implementation.graph.AbstractGraph
+import org.apache.clerezza.implementation.in_memory.SimpleGraph
import _root_.scala.collection.mutable.HashMap
diff --git
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
index 41fb1f8..5fba362 100644
--- a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
+++ b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/Preamble.scala
@@ -26,7 +26,7 @@ import org.apache.clerezza._
import org.apache.clerezza.implementation.graph._
import org.apache.clerezza.implementation.literal._
import org.apache.clerezza.utils.GraphNode
-import org.apache.clerezza.implementation.graph.{SimpleGraph,
SimpleImmutableGraph}
+import org.apache.clerezza.implementation.in_memory.{SimpleGraph,
SimpleImmutableGraph}
import org.apache.clerezza.implementation.literal.{LiteralFactory,
PlainLiteralImpl}
import org.apache.clerezza.utils.GraphNode
diff --git
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
index 994904f..800dda4 100644
---
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
+++
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
@@ -21,10 +21,9 @@ import java.util.Iterator
import org.apache.clerezza.{Graph, IRI, Literal, RDFTerm}
import org.apache.clerezza._
-import org.apache.clerezza.implementation.graph.SimpleGraph
import org.apache.clerezza.implementation.literal.LiteralFactory
import org.apache.clerezza.utils.{GraphNode, UnionGraph}
-import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.in_memory.SimpleGraph
import org.apache.clerezza.implementation.literal.LiteralFactory
import org.apache.clerezza.ontologies.RDF
import org.apache.clerezza.utils.{GraphNode, UnionGraph}
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
index f7844c4..8dcb20c 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
@@ -21,7 +21,7 @@ import org.apache.clerezza.BlankNode;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
index 2380f3f..8f210d9 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
@@ -21,7 +21,7 @@ import org.apache.clerezza.BlankNode;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
index 889899e..f6f31d1 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.BlankNode;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.junit.Test;
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
index bf4f5c9..fc14e0a 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.IRI;
import org.apache.clerezza.Literal;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
index e3801f5..214954d 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.utils;
import junit.framework.Assert;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.test.utils.RandomGraph;
import org.junit.Test;
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
index 39458d1..d66e30f 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
index 1378353..722818b 100644
---
a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
+++
b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.IRI;
import org.apache.clerezza.Literal;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
diff --git
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
index 489cccf..f369905 100644
---
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
+++
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
@@ -23,7 +23,7 @@ import org.apache.clerezza.implementation.literal._
import Preamble._
import org.apache.clerezza.{BlankNode, IRI, ImmutableGraph, Language}
import org.apache.clerezza.implementation.TripleImpl
-import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.in_memory.SimpleGraph
import org.apache.clerezza.implementation.literal.{LiteralFactory,
PlainLiteralImpl, TypedLiteralImpl}
import org.apache.clerezza.ontologies._
import org.junit._
diff --git
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
index fe9cf23..1d42d60 100644
---
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
+++
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
@@ -25,7 +25,7 @@ import Preamble._
import org.apache.clerezza._
import org.apache.clerezza.utils._
import org.apache.clerezza.implementation.TripleImpl
-import org.apache.clerezza.implementation.graph.SimpleGraph
+import org.apache.clerezza.implementation.in_memory.SimpleGraph
import org.apache.clerezza.implementation.literal.{PlainLiteralImpl,
TypedLiteralImpl}
import org.apache.clerezza.ontologies._
import org.apache.clerezza.utils.{GraphNode, RdfList}
diff --git
a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
index c667ed4..c265673 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/SecuredGraph.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.dataset;
import org.apache.clerezza.*;
-import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
import org.apache.clerezza.implementation.graph.WriteBlockedGraph;
import org.apache.clerezza.dataset.security.TcAccessController;
diff --git a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
index 39afc95..514daa7 100644
--- a/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
+++ b/dataset/src/main/java/org/apache/clerezza/dataset/TcManager.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.dataset;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.graph.WriteBlockedGraph;
import org.apache.clerezza.dataset.security.TcAccessController;
import org.apache.clerezza.sparql.*;
diff --git
a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
index dd09b0b..6d6d5c6 100644
---
a/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
+++
b/dataset/src/main/java/org/apache/clerezza/simple/storage/SimpleTcProvider.java
@@ -21,8 +21,8 @@ package org.apache.clerezza.simple.storage;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
-import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
import org.apache.clerezza.dataset.*;
import org.osgi.service.component.annotations.Component;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
index f301639..9b481cc 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/TcManagerTest.java
@@ -23,7 +23,7 @@ import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.apache.clerezza.dataset.providers.WeightedA;
import org.apache.clerezza.dataset.providers.WeightedA1;
import org.apache.clerezza.dataset.providers.WeightedAHeavy;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
index 25cdaad..07ef6cf 100644
--- a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
+++ b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
index ea42d24..c9eafd5 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedA1.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
index ed4c8fd..d879464 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedAHeavy.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
index 0ffca3c..79033e8 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedBlight.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcManagerTest;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
index c565914..28e6a3c 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/providers/WeightedDummy.java
@@ -21,8 +21,8 @@ package org.apache.clerezza.dataset.providers;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.implementation.graph.SimpleImmutableGraph;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleImmutableGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.apache.clerezza.dataset.EntityAlreadyExistsException;
import org.apache.clerezza.dataset.EntityUndeletableException;
import org.apache.clerezza.dataset.NoSuchEntityException;
diff --git
a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
index 7651a0b..52f445e 100644
---
a/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
+++
b/dataset/src/test/java/org/apache/clerezza/dataset/test/utils/TcProviderTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.dataset.test.utils;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.dataset.EntityAlreadyExistsException;
import org.apache.clerezza.dataset.NoSuchEntityException;
import org.apache.clerezza.dataset.TcProvider;
diff --git
a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
index d1894d8..1989797 100644
---
a/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
+++
b/dataset/src/test/java/org/apache/clerezza/simple/storage/AccessViaTcManager.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.simple.storage;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.dataset.TcManager;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
index 941a8ac..f24d789 100644
---
a/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
+++
b/dataset/src/test/java/org/apache/clerezza/simple/storage/SimpleGraphGenericTest.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.simple.storage;
import org.apache.clerezza.Graph;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.test.utils.GraphTest;
/**
diff --git
a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
index b9d1f51..e7c93ba 100644
---
a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
+++
b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
@@ -21,7 +21,7 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.Triple;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.utils.GraphNode;
import org.apache.clerezza.representation.Serializer;
import org.apache.clerezza.representation.SupportedFormat;
diff --git
a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
index 482697b..7e8993c 100644
---
a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
+++
b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.jaxrs.rdf.providers;
import org.apache.clerezza.Graph;
-import org.apache.clerezza.implementation.graph.SimpleGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.representation.Parser;
import org.apache.clerezza.representation.SupportedFormat;
import org.osgi.service.component.annotations.Component;
diff --git
a/representation/src/main/java/org/apache/clerezza/representation/Parser.java
b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
index ea2b571..440ed7a 100644
---
a/representation/src/main/java/org/apache/clerezza/representation/Parser.java
+++
b/representation/src/main/java/org/apache/clerezza/representation/Parser.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.representation;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.ImmutableGraph;
-import org.apache.clerezza.implementation.graph.SimpleMGraph;
+import org.apache.clerezza.implementation.in_memory.SimpleMGraph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.*;
