You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/09 19:39:44 UTC
[1/4] clerezza git commit: CLEREZZA-982: using new package names for
rdf-core
Repository: clerezza
Updated Branches:
refs/heads/rdf-commons 741e8dfd3 -> 1ad142ea4
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
index f3678a7..e596520 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
@@ -45,15 +45,15 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
index fa29fde..6194ca8 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
@@ -26,16 +26,16 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
index 69f318f..e63e018 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
@@ -61,16 +61,16 @@ import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPa
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.QueryParser;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
@@ -81,7 +81,7 @@ import org.apache.clerezza.rdf.core.sparql.query.Variable;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.web.ontologies.SPARQLENDPOINT;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.ProcessingInstruction;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
index 6a71c01..1369db8 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
@@ -43,13 +43,13 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
index a43a6a2..dbe5117 100644
--- a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
+++ b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
@@ -29,16 +29,16 @@ import java.util.Map;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
@@ -47,7 +47,7 @@ import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.web.ontologies.BACKUP;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
index a40ecf2..883bcd1 100644
--- a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
+++ b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
@@ -26,9 +26,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -40,7 +40,7 @@ import org.apache.clerezza.templating.seedsnipe.datastructure.FieldDoesNotHaveDi
import org.apache.clerezza.templating.seedsnipe.datastructure.FieldIndexOutOfBoundsException;
import org.apache.clerezza.templating.seedsnipe.datastructure.InvalidElementException;
import org.apache.clerezza.templating.seedsnipe.simpleparser.DefaultParser;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
/**
* Data Model for {@link GraphNode} to be used with {@link DefaultParser}.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
index 0a74afe..c2903ef 100644
--- a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
+++ b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
@@ -27,14 +27,14 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -46,8 +46,8 @@ import org.apache.clerezza.templating.RenderingFunctions;
import org.apache.clerezza.templating.seedsnipe.datastructure.DataFieldResolver;
import org.apache.clerezza.templating.seedsnipe.graphnodeadapter.GraphNodeDataFieldResolver;
import org.apache.clerezza.templating.seedsnipe.simpleparser.DefaultParser;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* Unit Test for RDF Templating.
[3/4] clerezza git commit: CLEREZZA-982: using new package names for
rdf-core
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
index 9b9961b..190d398 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* is thrown on an attempt to create an entity with a name which already exists
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
index a6cf537..43a16c1 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* is thrown on an attempt to delete an entity with a provider that
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
index b6ee4a1..aaa3e07 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
@@ -21,8 +21,8 @@ package org.apache.clerezza.rdf.core.access;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
index a231733..3f189d9 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.access;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
index 3678d2f..551d9b8 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* is thrown on an attempt to perform an operation on an entity (i.e. a
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
index e4e9cc1..4f804a1 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.Query;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
index add4c7d..51591b7 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
@@ -22,18 +22,18 @@ import java.security.AccessControlException;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.WatchableGraph;
-import org.apache.commons.rdf.event.FilterTriple;
-import org.apache.commons.rdf.event.GraphListener;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.WatchableGraph;
+import org.apache.clerezza.commons.rdf.event.FilterTriple;
+import org.apache.clerezza.commons.rdf.event.GraphListener;
/**
* A Secured triple collection wraps a triple collection checking each access
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
index 45ced37..35bfdd2 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
@@ -31,11 +31,11 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
import org.apache.clerezza.rdf.core.sparql.NoQueryEngineException;
import org.apache.clerezza.rdf.core.sparql.ParseException;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
index 2201e2a..ef8fa0b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
@@ -20,9 +20,9 @@ package org.apache.clerezza.rdf.core.access;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* A TC (Graph) Provider allows access to and optionally
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
index a084158..7b7eea9 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
@@ -30,10 +30,10 @@ import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
index c4d1264..1079a9d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
@@ -32,17 +32,17 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.utils.security.PermissionParser;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* Controls the permissions needed to access a triple collection provided by
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
index f89ba89..76a8b79 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
@@ -22,16 +22,16 @@ import java.util.AbstractCollection;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.ReadOnlyException;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.event.FilterTriple;
-import org.apache.commons.rdf.event.GraphListener;
-import org.apache.commons.rdf.impl.utils.AbstractGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.event.FilterTriple;
+import org.apache.clerezza.commons.rdf.event.GraphListener;
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
index bde1f16..5e1968c 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
@@ -23,15 +23,15 @@ import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.event.FilterTriple;
-import org.apache.commons.rdf.event.GraphListener;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.event.FilterTriple;
+import org.apache.clerezza.commons.rdf.event.GraphListener;
/**
* Calls the methods of the wrapped <code>Graph</code> as privileged
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedImmuatbleGraphWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedImmuatbleGraphWrapper.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedImmuatbleGraphWrapper.java
index fdf0b5a..edc3a14 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedImmuatbleGraphWrapper.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedImmuatbleGraphWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.impl.util;
-import org.apache.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
/**
* Calls the methods of the wrapped <code>ImmutableGraph</code> as privileged
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
index 2799379..9ee6979 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.impl.util;
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import java.math.BigInteger;
import java.text.DateFormat;
import java.text.ParseException;
@@ -31,10 +31,10 @@ import java.util.Set;
import org.apache.clerezza.rdf.core.InvalidLiteralTypeException;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.NoConvertorException;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.impl.util.Base64;
import org.apache.clerezza.rdf.core.impl.util.W3CDateFormat;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* An implementation of literal factory currently supporting only
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
index 944fd5d..bd28749 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
@@ -32,10 +32,10 @@ import java.util.ServiceLoader;
import java.util.Set;
import java.util.logging.Level;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
index 9f45c7a..24da826 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
@@ -20,8 +20,8 @@ package org.apache.clerezza.rdf.core.serializedform;
import java.io.InputStream;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* An instance of this class parses RDF-ImmutableGraph from one or more serialization
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
index 8624722..48fa0b7 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Serializer.java
@@ -32,7 +32,7 @@ import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java
index 2f49216..ecf4ab8 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/SerializingProvider.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.serializedform;
import java.io.OutputStream;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/QueryEngine.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/QueryEngine.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/QueryEngine.java
index 9bcdb70..0fb56bf 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/QueryEngine.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/QueryEngine.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.sparql.query.Query;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
index f1561c2..1868ec1 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
import java.util.Map;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RdfTerm;
/**
* A set of mapping from variable names to solutions.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
index 0829d2a..4ada2b8 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
@@ -22,7 +22,7 @@ import java.io.StringReader;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
index d4b95b6..f35a609 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* This interface definition is not yet stable and may change in future.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
index a20ebda..387ced6 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Defines a function call which is one form of {@link Expression}.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
index 95990a9..787cbdd 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Defines a group ImmutableGraph pattern.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
index 8670598..49e0b68 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RdfTerm;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/LiteralExpression.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/LiteralExpression.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/LiteralExpression.java
index 28aeab1..c564b09 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/LiteralExpression.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/LiteralExpression.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* Wraps a {@link Literal} in an {@link Expression}.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
index 18b0efe..9c0989d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
index c2d4fac..e9e14aa 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RdfTerm;
/**
* Wraps either a {@link RdfTerm} or a {@link Variable}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
index bfb01df..8d6206b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Wraps a {@link Iri} in an {@link Expression}.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
index 1b4feb1..a0e007f 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Wraps either a {@link Iri} or a {@link Variable}.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
index af1ea2f..1e1ddbe 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
index 5a92b41..b9d74db 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.BasicGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
index dd5b55b..8b193e7 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RdfTerm;
import org.apache.clerezza.rdf.core.sparql.query.InlineData;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
index 446e903..7a77138 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
import org.apache.clerezza.rdf.core.sparql.query.PropertyPathExpression;
import org.apache.clerezza.rdf.core.sparql.query.PropertyPathExpressionOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.PropertyPathPattern;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
index bad769b..7a60d8f 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
import org.apache.clerezza.rdf.core.sparql.query.GroupGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.InlineData;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
index 4a916c2..a27d12b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
@@ -20,9 +20,9 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.StringQuerySerializer;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
index 68571c4..1067e8b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
index 73fe749..4c13613 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
index 2623142..ba6b54e 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
index 41ce0ff..5aa0bdd 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
index 31730a2..eb68e56 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
index 4952497..3196043 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.update.impl;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
index cb1429e..f0de8fc 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
index f5b2f6d..c3ca5ce 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.query.GroupGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.impl.SimpleDataSet;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
index f075e7a..626bfc5 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.update.Update;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
index 5e02afa..72c87d4 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
index f641d0b..a0a412d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
index db5ad01..f8711c6 100644
--- a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
+++ b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
@@ -39,14 +39,14 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import org.apache.clerezza.rdf.core.sparql.query.GroupGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
index 1064cb8..35050c0 100644
--- a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
+++ b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
@@ -38,14 +38,14 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
import org.apache.clerezza.rdf.core.sparql.query.BinaryPropertyPathOperation;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LanguageTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LanguageTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LanguageTest.java
index 3242e33..e5a42fa 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LanguageTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LanguageTest.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core;
-import org.apache.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Language;
import org.junit.Test;
import junit.framework.Assert;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
index 71d21e6..e333535 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
@@ -19,8 +19,8 @@
package org.apache.clerezza.rdf.core;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Iri;
import java.util.Arrays;
import java.util.Date;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
index 2ce68a7..27ab33e 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
index 97a0fd4..35bf406 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
@@ -33,15 +33,15 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedDummy;
import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
index 138fe34..6e3ab07 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
@@ -24,16 +24,16 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedA1;
import org.apache.clerezza.rdf.core.access.providers.WeightedAHeavy;
import org.apache.clerezza.rdf.core.access.providers.WeightedBlight;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.sparql.NoQueryEngineException;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
index 364d252..0216dd6 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
@@ -22,15 +22,15 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
index 2fe8336..f121cdf 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
@@ -21,16 +21,16 @@ package org.apache.clerezza.rdf.core.access.providers;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
* Same weight as WeightedA, but later in string-ordering
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
index c0cec77..ef9497e 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
@@ -22,17 +22,17 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
index ef7068f..d528fbd 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
@@ -21,16 +21,16 @@ package org.apache.clerezza.rdf.core.access.providers;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.access.TcManagerTest;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
index b464033..64c164d 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
@@ -23,16 +23,16 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleMGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
index 886648b..36d3584 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
@@ -20,8 +20,8 @@ package org.apache.clerezza.rdf.core.impl.util;
import junit.framework.Assert;
import org.apache.clerezza.rdf.core.impl.util.SimpleLiteralFactory;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Iri;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
index 27a56d9..2919ba4 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.rdf.core.serializedform;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
import java.io.InputStream;
import junit.framework.Assert;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/SerializerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/SerializerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/SerializerTest.java
index f947a04..0cc59a6 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/SerializerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/SerializerTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.serializedform;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import java.io.OutputStream;
import junit.framework.Assert;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
index f344939..6bf5c91 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
@@ -19,10 +19,10 @@
package org.apache.clerezza.rdf.core.serializedform;
import java.io.InputStream;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* This class is listed in
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
index a923f8a..69f33bc 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
@@ -23,9 +23,9 @@ import java.util.List;
import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
import org.apache.clerezza.rdf.core.sparql.query.BasicGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
index d088dc1..f463ed8 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
index 490d296..8472dc6 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
index e9143f9..388bbdb 100644
--- a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
+++ b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
@@ -29,12 +29,12 @@ import java.net.URI;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
index 0b4fd33..40c29f2 100644
--- a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
+++ b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
@@ -33,9 +33,9 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.osgi.service.component.ComponentContext;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
index e24edb9..86f4a41 100644
--- a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
+++ b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
@@ -28,9 +28,9 @@ import java.util.Iterator;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
index aeff78d..7d9c9c4 100644
--- a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
+++ b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
@@ -31,15 +31,15 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.TcProviderTest;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
index 842c118..9a94c75 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
@@ -20,15 +20,15 @@ package org.apache.clerezza.rdf.jena.commons;
import com.hp.hpl.jena.graph.Node;
import java.util.Map;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.impl.utils.LiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.LiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/JenaBNodeWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/JenaBNodeWrapper.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/JenaBNodeWrapper.java
index 777986d..2c4d823 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/JenaBNodeWrapper.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/JenaBNodeWrapper.java
@@ -20,7 +20,7 @@
package org.apache.clerezza.rdf.jena.commons;
import com.hp.hpl.jena.graph.Node;
-import org.apache.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNode;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
index 5e878a6..c84a1a8 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
@@ -21,12 +21,12 @@ package org.apache.clerezza.rdf.jena.commons;
import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.graph.Node;
import java.util.Map;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java b/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
index 2a7c8a6..f59342c 100644
--- a/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
+++ b/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
@@ -27,11 +27,11 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil;
import org.wymiwyg.commons.util.collections.BidiMap;
@@ -57,14 +57,14 @@ public class JenaGraph extends GraphBase implements com.hp.hpl.jena.graph.Graph
- final org.apache.commons.rdf.Graph graph;
+ final org.apache.clerezza.commons.rdf.Graph graph;
final BidiMap<BlankNode, Node> tria2JenaBNodes = new BidiMapImpl<BlankNode, Node>();
final Jena2TriaUtil jena2TriaUtil =
new Jena2TriaUtil(tria2JenaBNodes.inverse());
final Tria2JenaUtil tria2JenaUtil =
new Tria2JenaUtil(tria2JenaBNodes);
- public JenaGraph(org.apache.commons.rdf.Graph graph) {
+ public JenaGraph(org.apache.clerezza.commons.rdf.Graph graph) {
this.graph = graph;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
----------------------------------------------------------------------
diff --git a/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java b/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
index 1a3d5e0..7896aa6 100644
--- a/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
+++ b/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
@@ -34,12 +34,12 @@ import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
import java.io.StringWriter;
import org.junit.Test;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java b/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
index a1167b5..6adfc8b 100644
--- a/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
+++ b/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
@@ -30,7 +30,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedParsingFormatException;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* A {@link org.apache.clerezza.rdf.core.serializedform.ParsingProvider} based on Jena
*
@@ -51,7 +51,7 @@ import org.apache.commons.rdf.Iri;
public class JenaParserProvider implements ParsingProvider {
@Override
- public void parse(org.apache.commons.rdf.Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(org.apache.clerezza.commons.rdf.Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
String jenaFormat = getJenaFormat(formatIdentifier);
com.hp.hpl.jena.graph.Graph graph = new JenaGraph(target);
Model model = ModelFactory.createModelForGraph(graph);
[4/4] clerezza git commit: CLEREZZA-982: using new package names for
rdf-core
Posted by re...@apache.org.
CLEREZZA-982: using new package names for rdf-core
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/1ad142ea
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/1ad142ea
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/1ad142ea
Branch: refs/heads/rdf-commons
Commit: 1ad142ea48a82e0f37811cb2a7aad53d18440bca
Parents: 741e8df
Author: Reto Gmuer <re...@apache.org>
Authored: Thu Apr 9 17:39:14 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Thu Apr 9 17:39:14 2015 +0000
----------------------------------------------------------------------
.../jaxrs/rdf/providers/GraphNodeWriter.java | 10 ++++----
.../jaxrs/rdf/providers/GraphReader.java | 4 +--
.../jaxrs/rdf/providers/GraphWriter.java | 2 +-
.../rdf/providers/ImmutableGraphReader.java | 2 +-
.../ResultSetCsvMessageBodyWriter.java | 8 +++---
.../ResultSetJsonMessageBodyWriter.java | 10 ++++----
.../ResultSetTsvMessageBodyWriter.java | 8 +++---
.../ResultSetXmlMessageBodyWriter.java | 8 +++---
.../platform/config/PlatformConfig.java | 12 ++++-----
.../clerezza/platform/config/SystemConfig.java | 6 ++---
.../PlatformGraphNodeProvider.scala | 2 +-
.../content/ContentGraphProvider.java | 4 +--
.../platform/logging/LoggingManager.java | 6 ++---
.../org/apache/clerezza/platform/Constants.java | 2 +-
.../src/main/scala/GlobalMenuRenderlet.scala | 2 +-
.../src/main/scala/HeadedPageRenderlet.scala | 2 +-
.../jaxrs/TypeHandlerSpace.java | 4 +--
.../typehandlerspace/TypeHandlerDiscovery.java | 2 +-
.../impl/TypeHandlerDiscoveryImpl.java | 2 +-
.../typehandlerspace/GraphWriterDummy.java | 2 +-
.../platform/typepriority/TypePrioritizer.java | 6 ++---
.../typepriority/TypePrioritizerTest.java | 6 ++---
.../src/main/scala/Activator.scala | 4 +--
.../src/main/scala/Ontology.scala | 2 +-
.../scala/RenderletDescriptionRenderlet.scala | 2 +-
.../typerendering/scala/AbstractRenderlet.scala | 2 +-
.../typerendering/scala/PageRenderlet.scala | 2 +-
.../typerendering/scala/RenderedPage.scala | 2 +-
.../typerendering/scala/SRenderlet.scala | 2 +-
.../typerendering/scala/XmlResult.scala | 2 +-
.../ScalaServerPagesService.java | 2 +-
.../scalaserverpages/SspTypeRenderlet.java | 2 +-
.../seedsnipe/WebRenderingFunctions.java | 12 ++++-----
.../typerendering/seedsnipe/GenericTest.java | 4 +--
.../seedsnipe/WebRenderingFunctionsTest.java | 4 +--
.../typerendering/CallbackRenderer.java | 4 +--
.../typerendering/CallbackRendererImpl.java | 2 +-
.../typerendering/GenericGraphNodeMBW.java | 4 +--
.../platform/typerendering/RendererFactory.java | 4 +--
.../typerendering/RenderingException.java | 10 ++++----
.../RenderingspecificationException.java | 8 +++---
.../typerendering/RenderletManager.java | 2 +-
.../typerendering/RenderletManagerImpl.java | 2 +-
.../typerendering/RenderletRendererImpl.java | 2 +-
.../TypeRenderingExceptionMapper.java | 2 +-
.../platform/typerendering/TypeRenderlet.java | 2 +-
.../platform/usermanager/UserComparator.java | 2 +-
.../platform/usermanager/UserManager.java | 2 +-
.../platform/usermanager/UserManagerImpl.java | 20 +++++++--------
.../UserGraphAcessPermissionProvider.scala | 2 +-
.../platform/users/WebIdGraphsService.scala | 8 +++---
.../clerezza/platform/users/WebIdInfo.scala | 4 +--
.../clerezza/rdf/core/test/GraphTest.java | 22 ++++++++---------
.../clerezza/rdf/core/test/GraphWrapper.java | 12 ++++-----
.../test/LockableMGraphWrapperForTesting.java | 10 ++++----
.../core/test/LockingIteratorForTesting.java | 2 +-
.../clerezza/rdf/core/test/RandomGraph.java | 16 ++++++------
.../clerezza/rdf/core/test/TcProviderTest.java | 16 ++++++------
.../rdf/core/InvalidLiteralTypeException.java | 2 +-
.../clerezza/rdf/core/LiteralFactory.java | 2 +-
.../access/EntityAlreadyExistsException.java | 2 +-
.../core/access/EntityUndeletableException.java | 2 +-
.../access/ImmutableGraphServiceFactory.java | 4 +--
.../rdf/core/access/MGraphServiceFactory.java | 2 +-
.../rdf/core/access/NoSuchEntityException.java | 2 +-
.../rdf/core/access/QueryableTcProvider.java | 4 +--
.../clerezza/rdf/core/access/SecuredGraph.java | 20 +++++++--------
.../clerezza/rdf/core/access/TcManager.java | 8 +++---
.../clerezza/rdf/core/access/TcProvider.java | 6 ++---
.../rdf/core/access/TcProviderMultiplexer.java | 8 +++---
.../access/security/TcAccessController.java | 16 ++++++------
.../rdf/core/impl/WriteBlockedGraph.java | 18 +++++++-------
.../core/impl/util/PrivilegedGraphWrapper.java | 18 +++++++-------
.../util/PrivilegedImmuatbleGraphWrapper.java | 2 +-
.../core/impl/util/SimpleLiteralFactory.java | 6 ++---
.../rdf/core/serializedform/Parser.java | 8 +++---
.../core/serializedform/ParsingProvider.java | 4 +--
.../rdf/core/serializedform/Serializer.java | 2 +-
.../serializedform/SerializingProvider.java | 2 +-
.../clerezza/rdf/core/sparql/QueryEngine.java | 2 +-
.../rdf/core/sparql/SolutionMapping.java | 2 +-
.../rdf/core/sparql/SparqlPreParser.java | 2 +-
.../clerezza/rdf/core/sparql/query/DataSet.java | 2 +-
.../rdf/core/sparql/query/FunctionCall.java | 2 +-
.../core/sparql/query/GroupGraphPattern.java | 2 +-
.../rdf/core/sparql/query/InlineData.java | 2 +-
.../core/sparql/query/LiteralExpression.java | 2 +-
.../rdf/core/sparql/query/PredicatePath.java | 2 +-
.../core/sparql/query/ResourceOrVariable.java | 2 +-
.../rdf/core/sparql/query/UriRefExpression.java | 2 +-
.../rdf/core/sparql/query/UriRefOrVariable.java | 2 +-
.../core/sparql/query/impl/SimpleDataSet.java | 2 +-
.../query/impl/SimpleGroupGraphPattern.java | 2 +-
.../sparql/query/impl/SimpleInlineData.java | 2 +-
.../query/impl/SimplePropertyPathPattern.java | 4 +--
.../rdf/core/sparql/query/impl/SimpleQuery.java | 2 +-
.../query/impl/SimpleStringQuerySerializer.java | 6 ++---
.../sparql/query/impl/SimpleTriplePattern.java | 6 ++---
.../clerezza/rdf/core/sparql/update/Update.java | 2 +-
.../rdf/core/sparql/update/UpdateOperation.java | 2 +-
.../sparql/update/impl/BaseUpdateOperation.java | 2 +-
.../update/impl/ClearOrDropOperation.java | 2 +-
.../sparql/update/impl/CreateOperation.java | 2 +-
.../core/sparql/update/impl/LoadOperation.java | 2 +-
.../sparql/update/impl/ModifyOperation.java | 2 +-
.../core/sparql/update/impl/SimpleUpdate.java | 2 +-
.../update/impl/SimpleUpdateOperation.java | 2 +-
.../update/impl/UpdateOperationWithQuads.java | 2 +-
.../core/sparql/JavaCCGeneratedQueryParser.jj | 14 +++++------
.../sparql/JavaCCGeneratedSparqlPreParser.jj | 14 +++++------
.../apache/clerezza/rdf/core/LanguageTest.java | 2 +-
.../clerezza/rdf/core/LiteralFactoryTest.java | 4 +--
.../apache/clerezza/rdf/core/UriRefTest.java | 2 +-
.../clerezza/rdf/core/access/SecurityTest.java | 12 ++++-----
.../clerezza/rdf/core/access/TcManagerTest.java | 12 ++++-----
.../rdf/core/access/providers/WeightedA.java | 10 ++++----
.../rdf/core/access/providers/WeightedA1.java | 12 ++++-----
.../core/access/providers/WeightedAHeavy.java | 14 +++++------
.../core/access/providers/WeightedBlight.java | 12 ++++-----
.../core/access/providers/WeightedDummy.java | 12 ++++-----
.../impl/util/SimpleLiteralFactoryTest.java | 4 +--
.../rdf/core/serializedform/ParserTest.java | 4 +--
.../rdf/core/serializedform/SerializerTest.java | 2 +-
.../TestServiceManagedProvider.java | 4 +--
.../rdf/core/sparql/QueryParserTest.java | 6 ++---
.../rdf/core/sparql/QuerySerializerTest.java | 2 +-
.../rdf/core/sparql/SparqlPreParserTest.java | 2 +-
.../clerezza/rdf/file/storage/FileGraph.java | 12 ++++-----
.../rdf/file/storage/FileTcProvider.java | 6 ++---
.../rdf/file/storage/FileGraphTest.java | 6 ++---
.../rdf/file/storage/FileTcProviderTest.java | 12 ++++-----
.../rdf/jena/commons/Jena2TriaUtil.java | 18 +++++++-------
.../rdf/jena/commons/JenaBNodeWrapper.java | 2 +-
.../rdf/jena/commons/Tria2JenaUtil.java | 12 ++++-----
.../clerezza/rdf/jena/facade/JenaGraph.java | 14 +++++------
.../rdf/facade/blackbox/TestBasics.java | 10 ++++----
.../rdf/jena/parser/JenaParserProvider.java | 4 +--
.../rdf/jena/parser/JenaParserProviderTest.java | 8 +++---
.../jena/serializer/JenaSerializerProvider.java | 2 +-
.../serializer/TestJenaSerializerProvider.java | 12 ++++-----
.../rdf/jena/sparql/HashMapSolutionMapping.java | 4 +--
.../rdf/jena/sparql/JenaSparqlEngine.java | 4 +--
.../rdf/jena/sparql/TcDatasetGraph.java | 4 +--
.../clerezza/rdf/jena/sparql/SimpleTest.java | 12 ++++-----
.../rdf/jena/storage/JenaGraphAdaptor.java | 12 ++++-----
.../rdf/jena/storage/RoundTripTest.java | 10 ++++----
.../clerezza/rdf/jena/tdb/internals/IriSet.java | 4 +--
.../rdf/jena/tdb/internals/ModelGraph.java | 10 ++++----
.../rdf/jena/tdb/internals/Symbols.java | 2 +-
.../rdf/jena/tdb/storage/BaseTdbTcProvider.java | 4 +--
.../tdb/storage/SingleTdbDatasetTcProvider.java | 26 ++++++++++----------
.../rdf/jena/tdb/storage/TdbTcProvider.java | 8 +++---
.../MultiThreadedSingleTdbDatasetTest.java | 14 +++++------
.../rdf/jena/tdb/storage/MultiThreadedTest.java | 16 ++++++------
.../tdb/storage/MultiThreadedTestSingleTdb.java | 16 ++++++------
.../tdb/storage/SingleTdbDatasetGraphTest.java | 4 +--
.../storage/SingleTdbDatasetTcProviderTest.java | 16 ++++++------
.../rdf/jena/tdb/storage/TdbGraphTest.java | 12 ++++-----
.../clerezza/rdf/rdfa/ClerezzaRDFaParser.java | 4 +--
.../rdf/rdfa/ClerezzaStatementSink.java | 20 +++++++--------
.../clerezza/rdf/scala/utils/EzLiteral.scala | 12 ++++-----
.../clerezza/rdf/scala/utils/EzMGraph.scala | 16 ++++++------
.../clerezza/rdf/scala/utils/NameSpace.scala | 2 +-
.../clerezza/rdf/scala/utils/Preamble.scala | 14 +++++------
.../rdf/scala/utils/RichGraphNode.scala | 10 ++++----
.../clerezza/rdf/scala/utils/EzMGraphTest.scala | 16 ++++++------
.../rdf/scala/utils/RichGraphNodeTest.scala | 18 +++++++-------
.../rdf/scala/utils/TypeConversionTest.scala | 10 ++++----
.../clerezza/rdf/schemagen/SchemaGen.java | 20 +++++++--------
.../rdf/simple/storage/SimpleTcProvider.java | 10 ++++----
.../rdf/simple/storage/AccessViaTcManager.java | 6 ++---
.../simple/storage/SimpleGraphGenericTest.java | 4 +--
rdf/storage.web/src/main/scala/WebProxy.scala | 8 +++---
.../apache/clerezza/rdf/utils/GraphNode.java | 6 ++---
.../apache/clerezza/rdf/utils/GraphUtils.java | 14 +++++------
.../org/apache/clerezza/rdf/utils/RdfList.java | 12 ++++-----
.../clerezza/rdf/utils/SeeAlsoExpander.java | 6 ++---
.../org/apache/clerezza/rdf/utils/Smusher.java | 2 +-
.../apache/clerezza/rdf/utils/UnionGraph.java | 12 ++++-----
.../clerezza/rdf/utils/UnionWatchableGraph.java | 8 +++---
.../clerezza/rdf/utils/UriMutatingGraph.java | 18 +++++++-------
.../graphnodeprovider/GraphNodeProvider.java | 2 +-
.../rdf/utils/smushing/BaseSmusher.java | 16 ++++++------
.../clerezza/rdf/utils/smushing/IfpSmusher.java | 10 ++++----
.../rdf/utils/smushing/SameAsSmusher.java | 8 +++---
.../clerezza/rdf/utils/GraphUtilsTest.java | 10 ++++----
.../apache/clerezza/rdf/utils/IfpSmushTest.java | 12 ++++-----
.../apache/clerezza/rdf/utils/RdfListTest.java | 14 +++++------
.../clerezza/rdf/utils/SameAsSmushTest.java | 16 ++++++------
.../clerezza/rdf/utils/TestGraphNode.java | 18 +++++++-------
.../clerezza/rdf/utils/UnionGraphTest.java | 12 ++++-----
.../rdf/utils/smushing/SameAsSmushTest.java | 16 ++++++------
.../apache/clerezza/rdf/web/core/Backup.java | 6 ++---
.../rdf/web/core/BackupMessageBodyWriter.java | 10 ++++----
.../apache/clerezza/rdf/web/core/Delete.java | 10 ++++----
.../clerezza/rdf/web/core/GraphManagement.java | 12 ++++-----
.../apache/clerezza/rdf/web/core/Restorer.java | 12 ++++-----
.../web/core/ResultSetMessageBodyWriter.java | 10 ++++----
.../org/apache/clerezza/rdf/web/core/Smush.java | 8 +++---
.../clerezza/rdf/web/core/SparqlEndpoint.java | 18 +++++++-------
.../apache/clerezza/rdf/web/core/WebAccess.java | 10 ++++----
.../rdf/web/core/BackupAndRestoreTest.java | 16 ++++++------
.../GraphNodeDataFieldResolver.java | 8 +++---
.../templating/seedsnipe/GraphNodeTest.java | 20 +++++++--------
204 files changed, 739 insertions(+), 739 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
----------------------------------------------------------------------
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 bde5c83..256806d 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
@@ -38,11 +38,11 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
----------------------------------------------------------------------
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 b1c4922..1475b7a 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
@@ -29,8 +29,8 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
index 9bcc33a..9437305 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
index c2af5a8..03884cf 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
@@ -30,7 +30,7 @@ import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
/**
* @scr.component
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
index a9b549e..967b56f 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
@@ -32,12 +32,12 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
index f80f4a8..a78c9a0 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
@@ -32,14 +32,14 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
index 22ebc7c..5b5fefe 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
@@ -32,12 +32,12 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
index 8d2657a..f4abb17 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
@@ -40,13 +40,13 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
index 284acff..003df78 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
@@ -30,17 +30,17 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
/**
* This class provides a OSGi service for getting system properties from
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
index cb07d36..e5fc314 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
@@ -24,12 +24,12 @@ import java.net.URL;
import java.util.Collections;
import java.util.Set;
import org.apache.clerezza.platform.Constants;
-import org.apache.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.osgi.service.component.ComponentContext;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
index 8d12669..a06e971 100644
--- a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
+++ b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
@@ -20,7 +20,7 @@ package org.apache.clerezza.platform.graphnodeprovider
*/
import java.net.{HttpURLConnection, URL}
-import org.apache.commons.rdf._
+import org.apache.clerezza.commons.rdf._
import org.slf4j.scala._
import org.apache.clerezza.rdf.core.access._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
index 80d5862..9b79d85 100644
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
+++ b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
@@ -25,8 +25,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.clerezza.platform.Constants;
import org.osgi.service.component.ComponentContext;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.utils.UnionGraph;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
----------------------------------------------------------------------
diff --git a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
index 95158fd..85a41bc 100644
--- a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
+++ b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
@@ -44,9 +44,9 @@ import org.apache.clerezza.platform.globalmenu.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.logging.ontologies.LOGGING;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
----------------------------------------------------------------------
diff --git a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
index 8d412f8..49c4a49 100644
--- a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
+++ b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
@@ -17,7 +17,7 @@
package org.apache.clerezza.platform;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* This class gropus some constant values used by the clerezza.platform components
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
index 75cf1eb..85efc6f 100644
--- a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
index 2ef6189..a39c0c8 100644
--- a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
+++ b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import org.apache.clerezza.platform.typerendering.scala._
import org.apache.clerezza.rdf.ontologies.DC
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
/**
* A Renderlet for the menu
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
index 84e3e85..80c2bed 100644
--- a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
+++ b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
@@ -31,8 +31,8 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
index 2db91ee..580f59c 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.platform.typehandlerspace;
import java.util.Set;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Implementations of this interface map RDF-types to type handlers. A type
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
index 789cc4d..a3f9c35 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
@@ -35,7 +35,7 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.typehandlerspace.SupportedTypes;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
import org.apache.clerezza.platform.typepriority.TypePrioritizer;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.felix.scr.annotations.ReferencePolicy;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
index 31222a7..391ac88 100644
--- a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
+++ b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
----------------------------------------------------------------------
diff --git a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
index 73c4003..487726d 100644
--- a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
+++ b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
@@ -33,11 +33,11 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.config.SystemConfig;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.RdfList;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
----------------------------------------------------------------------
diff --git a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
index fba8cc7..ccaa75d 100644
--- a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
+++ b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
@@ -21,9 +21,9 @@ package org.apache.clerezza.platform.typepriority;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.RdfList;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.gui/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/Activator.scala b/platform/typerendering.gui/src/main/scala/Activator.scala
index ef4dc2f..11938e9 100644
--- a/platform/typerendering.gui/src/main/scala/Activator.scala
+++ b/platform/typerendering.gui/src/main/scala/Activator.scala
@@ -21,8 +21,8 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.commons.rdf.BlankNode
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.BlankNode
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
import scala.collection.JavaConversions._
import org.apache.clerezza.platform.globalmenu.GlobalMenuItem
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.gui/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/Ontology.scala b/platform/typerendering.gui/src/main/scala/Ontology.scala
index bdbb4ac..fef2077 100644
--- a/platform/typerendering.gui/src/main/scala/Ontology.scala
+++ b/platform/typerendering.gui/src/main/scala/Ontology.scala
@@ -21,7 +21,7 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
object Ontology {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
index 931ed45..b186d8b 100644
--- a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
+++ b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.typerendering.gui
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
index 6214a86..e1c4924 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
index ba4c556..4140b3f 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
index dc75f76..edbd5f5 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.security.{PrivilegedAction, AccessController}
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
index 5ea0819..ab40c2e 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.TypeRenderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
index de29e51..f0b8935 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.nio.charset.Charset
import java.security.{PrivilegedAction, AccessController}
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
index a14f640..4e37f0d 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.platform.typerendering.scalaserverpages;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
index 6a328e3..501fd9b 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering.scalaserverpages;
import java.util.logging.Level;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
index 90e3cf4..eda3b7b 100644
--- a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
+++ b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
@@ -28,15 +28,15 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.templating.RenderingFunction;
import org.apache.clerezza.templating.RenderingFunctions;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Graph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
index 6c01a8d..a7f3858 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
@@ -23,8 +23,8 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.utils.GraphNode;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
index 3af878d..520e54d 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
@@ -26,8 +26,8 @@ import org.apache.clerezza.rdf.core.LiteralFactory;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.templating.RenderingFunction;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
index 1f8793e..5a0cb10 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
@@ -48,7 +48,7 @@ public interface CallbackRenderer {
/**
* Renders a specified named resource using the GraphNode returned by
- * <code>org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.commons.rdf.Iri)</code>.
+ * <code>org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.clerezza.commons.rdf.Iri)</code>.
*
* Otherwise same as render(GraphNode, .GraphNode, String, OutputStream)
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
index 72df3c4..a0b31e8 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
index 391acf8..4ed89ef 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
@@ -59,8 +59,8 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
index 489b88d..91886fc 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
@@ -25,11 +25,11 @@ import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
import org.apache.clerezza.platform.typepriority.TypePrioritizer;
import org.apache.clerezza.platform.typerendering.utils.MediaTypeMap;
import org.apache.clerezza.platform.typerendering.utils.RegexMap;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
index ae7ae42..cbe1469 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
@@ -22,13 +22,13 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URI;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* This exception is thrown when an exception occured while rendering a
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
index e9f470b..a186180 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
@@ -21,10 +21,10 @@ package org.apache.clerezza.platform.typerendering;
import java.net.URI;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
index 5da9436..29e3d6d 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.platform.typerendering;
import javax.ws.rs.core.MediaType;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Over the RenderletManagerImpl renderlets can be registered.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
index a2ef2f0..201b670 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
@@ -33,7 +33,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.ws.rs.core.MediaType;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
index b3b57ed..3bde164 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.osgi.framework.BundleContext;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
index 502b5ac..4dcee16 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
@@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
index fcbf25f..ecbaae5 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
@@ -25,7 +25,7 @@ import java.security.PrivilegedAction;
import java.util.Map;
import javax.ws.rs.core.*;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
index 2a8350d..ae28771 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.rdf.utils.GraphNode;
import java.util.Comparator;
import java.util.Iterator;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
public class UserComparator implements Comparator<GraphNode> {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
index b2b514f..6cc9691 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
index a48362c..847de60 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
@@ -38,17 +38,17 @@ import org.apache.felix.scr.annotations.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.SecuredGraph;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.DC;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OSGI;
@@ -57,7 +57,7 @@ import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.SIOC;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* @author hasan, tio
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
index 9758955..dd9a6f5 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
@@ -18,7 +18,7 @@
/*package org.apache.clerezza.platform.users
import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
class UserGraphAcessPermissionProvider extends WebIdBasedPermissionProvider {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
index 37d5c33..dba0e7d 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
@@ -25,14 +25,14 @@ import java.security.PrivilegedAction
import org.apache.clerezza.platform.Constants
import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.config.SystemConfig
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
import org.apache.clerezza.rdf.core.access.NoSuchEntityException
import org.apache.clerezza.rdf.core.access.SecuredGraph
import org.apache.clerezza.rdf.core.access.TcManager
import org.apache.clerezza.rdf.core.access.security.TcPermission
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.apache.clerezza.rdf.ontologies.PLATFORM
import org.apache.clerezza.rdf.storage.web.WebProxy
import org.apache.clerezza.rdf.utils.UnionGraph
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
index 648e0ba..28eca05 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
@@ -27,8 +27,8 @@ package org.apache.clerezza.platform.users
* many things are easier for user with URIs.
*
*/
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
trait WebIdInfo {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
index 06feaac..f4966b2 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
@@ -23,18 +23,18 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.junit.Test;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
index 57fd89a..e977eba 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
@@ -22,12 +22,12 @@ package org.apache.clerezza.rdf.core.test;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
index 3f009cc..3d49c2b 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
@@ -21,11 +21,11 @@ package org.apache.clerezza.rdf.core.test;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Wrappes an Graph as a LockableGraph. If a method is called that reads
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
index ae911d4..4c434ec 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockingIteratorForTesting.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.test;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Triple;
/**
* Wrapps an iterator<Triple> reading all elements to a cache on construction
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
index b478b4e..a71e298 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
@@ -20,14 +20,14 @@ package org.apache.clerezza.rdf.core.test;
import java.util.Iterator;
import java.util.UUID;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.commons.lang.RandomStringUtils;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
index beb2b2d..bafd251 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
@@ -23,18 +23,18 @@ import java.util.Iterator;
import java.util.Set;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
index 9a214a2..8238be6 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Thrown when a literal is of the wrong type for conversion to a java-type
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/core/src/main/java/org/apache/clerezza/rdf/core/LiteralFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/LiteralFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/LiteralFactory.java
index fafb854..2baa1c1 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/LiteralFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/LiteralFactory.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core;
import org.apache.clerezza.rdf.core.impl.util.SimpleLiteralFactory;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
/**
* This class provides methods to convert java objects to typed literals and
[2/4] clerezza git commit: CLEREZZA-982: using new package names for
rdf-core
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java b/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
index ce9e30e..6c48057 100644
--- a/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
+++ b/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
@@ -24,10 +24,10 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/serializer/src/main/java/org/apache/clerezza/rdf/jena/serializer/JenaSerializerProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/serializer/src/main/java/org/apache/clerezza/rdf/jena/serializer/JenaSerializerProvider.java b/rdf/jena/serializer/src/main/java/org/apache/clerezza/rdf/jena/serializer/JenaSerializerProvider.java
index 19baad1..4a3bbe5 100644
--- a/rdf/jena/serializer/src/main/java/org/apache/clerezza/rdf/jena/serializer/JenaSerializerProvider.java
+++ b/rdf/jena/serializer/src/main/java/org/apache/clerezza/rdf/jena/serializer/JenaSerializerProvider.java
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFWriter;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedSerializationFormatException;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
index d1e0726..6bf0f75 100644
--- a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
+++ b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
@@ -24,19 +24,19 @@ import java.io.InputStream;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
* Serializes a ImmutableGraph to different formats
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
index a8c83c3..f43b596 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
@@ -23,8 +23,8 @@ import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.rdf.model.RDFNode;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.RdfTerm;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
index 940b963..96ddf7d 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
@@ -43,10 +43,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.SparqlPreParser;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
index 9fe0cc8..e56b7ae 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
@@ -25,8 +25,8 @@ import com.hp.hpl.jena.sparql.core.DatasetGraph;
import com.hp.hpl.jena.sparql.core.Quad;
import com.hp.hpl.jena.sparql.util.Context;
import java.util.Iterator;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java b/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
index 8fabc4e..76d762b 100644
--- a/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
+++ b/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
@@ -22,13 +22,13 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.QueryParser;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
----------------------------------------------------------------------
diff --git a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
index 87df8b1..bf40c66 100644
--- a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
+++ b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
@@ -25,14 +25,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil;
-import org.apache.commons.rdf.impl.utils.AbstractGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
import org.wymiwyg.commons.util.collections.BidiMap;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java b/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java
index efe68cf..48daa7d 100644
--- a/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java
+++ b/rdf/jena/storage/src/test/java/org/apache/clerezza/rdf/jena/storage/RoundTripTest.java
@@ -25,9 +25,9 @@ import com.hp.hpl.jena.vocabulary.DC;
import com.hp.hpl.jena.vocabulary.RDFS;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
import org.apache.clerezza.rdf.ontologies.SKOS04;
import org.apache.clerezza.rdf.core.LiteralFactory;
@@ -40,11 +40,11 @@ public class RoundTripTest {
@Test
public void addAndCount() {
- org.apache.commons.rdf.Graph mGraph = new SimpleGraph();
+ org.apache.clerezza.commons.rdf.Graph mGraph = new SimpleGraph();
Graph jenaGraph = new JenaGraph(mGraph);
Model model = ModelFactory.createModelForGraph(jenaGraph);
model.add(DC.title, RDFS.label, "title");
- org.apache.commons.rdf.Graph rewrappedGraph = new JenaGraphAdaptor(jenaGraph);
+ org.apache.clerezza.commons.rdf.Graph rewrappedGraph = new JenaGraphAdaptor(jenaGraph);
Assert.assertEquals(1, rewrappedGraph.size());
rewrappedGraph.add(new TripleImpl(new BlankNode(), SKOS04.prefLabel,
LiteralFactory.getInstance().createTypedLiteral("foo")));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
index 1eb5d55..5f23953 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
@@ -3,8 +3,8 @@ package org.apache.clerezza.rdf.jena.tdb.internals;
import java.util.AbstractSet;
import java.util.Iterator;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDF;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
index 7ea89eb..80a5210 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
@@ -2,11 +2,11 @@ package org.apache.clerezza.rdf.jena.tdb.internals;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.util.PrivilegedGraphWrapper;
import org.apache.clerezza.rdf.core.impl.util.PrivilegedGraphWrapper;
import org.apache.clerezza.rdf.jena.storage.JenaGraphAdaptor;
@@ -16,7 +16,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.sparql.core.DatasetGraph;
import com.hp.hpl.jena.sparql.core.Quad;
import com.hp.hpl.jena.tdb.TDB;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
/**
* Represents the Jena {@link Model} and the Clerezza {@link ImmutableGraph} or
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
index 39ec2fd..0afa3fa 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.rdf.jena.tdb.internals;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
/**
* Provides static methods in order to represent classes used to
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
index feb5dcc..8c05d7b 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
@@ -3,7 +3,7 @@ package org.apache.clerezza.rdf.jena.tdb.storage;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.QueryableTcProvider;
import org.apache.clerezza.rdf.core.sparql.query.Query;
import org.apache.clerezza.rdf.jena.sparql.ResultSetWrapper;
@@ -18,7 +18,7 @@ import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.update.GraphStore;
import com.hp.hpl.jena.update.GraphStoreFactory;
import com.hp.hpl.jena.update.UpdateAction;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
abstract class BaseTdbTcProvider implements QueryableTcProvider{
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
index d18b20b..4264c2d 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
@@ -13,18 +13,18 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.QueryableTcProvider;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.jena.tdb.internals.ModelGraph;
import org.apache.clerezza.rdf.jena.tdb.internals.Symbols;
import org.apache.clerezza.rdf.jena.tdb.internals.IriSet;
@@ -396,7 +396,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.Iri)
*/
@Override
public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
@@ -417,7 +417,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.Iri)
*/
@Override
public Graph getMGraph(Iri name) throws NoSuchEntityException {
@@ -438,7 +438,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getTriples(org.apache.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getTriples(org.apache.clerezza.commons.rdf.Iri)
*/
@Override
public Graph getGraph(Iri name) throws NoSuchEntityException {
@@ -503,7 +503,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.Iri)
*/
@Override
public Graph createGraph(Iri name) throws UnsupportedOperationException,
@@ -526,7 +526,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.commons.rdf.Iri, org.apache.commons.rdf.Graph)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.Iri, org.apache.clerezza.commons.rdf.Graph)
*/
@Override
public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws UnsupportedOperationException,
@@ -556,7 +556,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#deleteGraph(org.apache.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#deleteGraph(org.apache.clerezza.commons.rdf.Iri)
*/
@Override
public void deleteGraph(Iri name) throws UnsupportedOperationException,
@@ -587,7 +587,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getNames(org.apache.commons.rdf.ImmutableGraph)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getNames(org.apache.clerezza.commons.rdf.ImmutableGraph)
*/
@Override
public Set<Iri> getNames(ImmutableGraph graph) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
index c9733ff..6c7578b 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
@@ -38,15 +38,15 @@ import java.util.logging.Level;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.util.PrivilegedGraphWrapper;
import org.apache.clerezza.rdf.jena.storage.JenaGraphAdaptor;
import org.apache.felix.scr.annotations.Component;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
index d08ce42..d348532 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
@@ -33,13 +33,13 @@ import java.util.Random;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
index 88a6cec..00ec289 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
@@ -28,14 +28,14 @@ import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.felix.scr.annotations.Activate;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
index 2554225..b76f676 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
@@ -31,15 +31,15 @@ import java.util.Hashtable;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.felix.scr.annotations.Activate;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
index 30451f3..1a5b78a 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
@@ -5,8 +5,8 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.test.GraphTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
index 2d3fe66..b90cfed 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
@@ -9,16 +9,16 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.TcProviderTest;
import org.junit.After;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
index 72a9f57..4dbaceb 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
@@ -23,16 +23,16 @@ import java.io.IOException;
import java.util.Date;
import java.util.Iterator;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNode;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.GraphTest;
-import org.apache.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
----------------------------------------------------------------------
diff --git a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
index 98e769a..d68173b 100644
--- a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
+++ b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import net.rootdev.javardfa.Parser;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
----------------------------------------------------------------------
diff --git a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
index 718a8fb..cbb90be 100644
--- a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
+++ b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
@@ -22,16 +22,16 @@ import java.util.HashMap;
import java.util.Map;
import net.rootdev.javardfa.StatementSink;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.Language;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Language;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
index c9fcc11..7fb0bb4 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
@@ -21,12 +21,12 @@ package org.apache.clerezza.rdf.scala.utils
//import org.apache.clerezza.rdf.core.impl.{TypedLiteralImpl, PlainLiteralImpl}
import org.apache.clerezza.rdf.ontologies.XSD
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Language
-import org.apache.commons.rdf.Literal
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl
-//import org.apache.commons.rdf.core.{TypedLiteral, Language, PlainLiteral, Iri}
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Language
+import org.apache.clerezza.commons.rdf.Literal
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl
+//import org.apache.clerezza.commons.rdf.core.{TypedLiteral, Language, PlainLiteral, Iri}
object EzLiteral extends EzLiteralImplicits
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
index 6ddb92b..1e86b50 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
@@ -21,14 +21,14 @@ package org.apache.clerezza.rdf.scala.utils
import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.core.impl._
-import org.apache.commons.rdf.BlankNode
-import org.apache.commons.rdf.BlankNodeOrIri
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.RdfTerm
-import org.apache.commons.rdf.Triple
-import org.apache.commons.rdf.impl.utils.AbstractGraph
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.BlankNode
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.RdfTerm
+import org.apache.clerezza.commons.rdf.Triple
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import scala.collection.mutable.HashMap
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
index 19be8aa..fc44b29 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.scala.utils
-import org.apache.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Iri
/**
* A IRI-namespace prefix
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
index 8af2452..f9c4c55 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
@@ -26,13 +26,13 @@ import java.net.URI
import java.net.URL
import java.util.Date
import org.apache.clerezza.rdf.core._
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Literal
-import org.apache.commons.rdf.RdfTerm
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Literal
+import org.apache.clerezza.commons.rdf.RdfTerm
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph
/**
* This object provides the implicit conversions. Typically this is used by
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
index 4f2addc..86d436c 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
@@ -24,11 +24,11 @@ import org.apache.clerezza.rdf.utils.GraphNode
import java.util.Iterator
import _root_.scala.collection.JavaConversions._
import _root_.scala.reflect.Manifest
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Literal
-import org.apache.commons.rdf.RdfTerm
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Literal
+import org.apache.clerezza.commons.rdf.RdfTerm
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.apache.clerezza.rdf.utils.UnionGraph
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
index 3e72d87..d5e6544 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
@@ -18,14 +18,14 @@
*/
package org.apache.clerezza.rdf.scala.utils
-import org.apache.commons.rdf.BlankNode
-import org.apache.commons.rdf.ImmutableGraph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Language
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl
-import org.apache.commons.rdf.impl.utils.TripleImpl
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.BlankNode
+import org.apache.clerezza.commons.rdf.ImmutableGraph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Language
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.junit._
import org.apache.clerezza.rdf.core._
import impl._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
index 2029c03..5240cc7 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
@@ -22,15 +22,15 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.core.impl._
import org.apache.clerezza.rdf.ontologies._
-import org.apache.commons.rdf.BlankNode
-import org.apache.commons.rdf.Graph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Language
-import org.apache.commons.rdf.Literal
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl
-import org.apache.commons.rdf.impl.utils.TripleImpl
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph
+import org.apache.clerezza.commons.rdf.BlankNode
+import org.apache.clerezza.commons.rdf.Graph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Language
+import org.apache.clerezza.commons.rdf.Literal
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.junit._
import Preamble._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
index 5798e86..d73d5f6 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
@@ -18,11 +18,11 @@ package org.apache.clerezza.rdf.scala.utils
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf.Language
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl
-import org.apache.commons.rdf.impl.utils.TripleImpl
-import org.apache.commons.rdf.impl.utils.TypedLiteralImpl
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.Language
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
+import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl
import org.junit._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
----------------------------------------------------------------------
diff --git a/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java b/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
index adbfbeb..ad73af9 100644
--- a/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
+++ b/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
@@ -34,15 +34,15 @@ import java.util.TreeSet;
import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.wymiwyg.commons.util.arguments.AnnotatedInterfaceArguments;
import org.wymiwyg.commons.util.arguments.ArgumentHandler;
import org.wymiwyg.commons.util.arguments.InvalidArgumentsException;
@@ -133,7 +133,7 @@ public class SchemaGen {
out.println(';');
}
out.println();
- out.println("import org.apache.commons.rdf.Iri;");
+ out.println("import org.apache.clerezza.commons.rdf.Iri;");
out.println();
out.print("public class ");
out.print(getSimpleName());
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java b/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
index 1754a9c..1dbdaa1 100644
--- a/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
+++ b/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
@@ -23,16 +23,16 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
import org.osgi.service.component.annotations.Component;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
----------------------------------------------------------------------
diff --git a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
index 4598cfb..9c86d60 100644
--- a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
+++ b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
@@ -16,9 +16,9 @@
package org.apache.clerezza.rdf.simple.storage;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/SimpleGraphGenericTest.java
----------------------------------------------------------------------
diff --git a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/SimpleGraphGenericTest.java b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/SimpleGraphGenericTest.java
index b98c459..99127e0 100644
--- a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/SimpleGraphGenericTest.java
+++ b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/SimpleGraphGenericTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.rdf.simple.storage;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.test.GraphTest;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/storage.web/src/main/scala/WebProxy.scala
----------------------------------------------------------------------
diff --git a/rdf/storage.web/src/main/scala/WebProxy.scala b/rdf/storage.web/src/main/scala/WebProxy.scala
index 3a03e3b..e51d91c 100644
--- a/rdf/storage.web/src/main/scala/WebProxy.scala
+++ b/rdf/storage.web/src/main/scala/WebProxy.scala
@@ -20,10 +20,10 @@
package org.apache.clerezza.rdf.storage.web
-import org.apache.commons.rdf.ImmutableGraph
-import org.apache.commons.rdf.Iri
-import org.apache.commons.rdf._
-import org.apache.commons.rdf.impl.utils.AbstractGraph
+import org.apache.clerezza.commons.rdf.ImmutableGraph
+import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf._
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph
import org.osgi.service.component.ComponentContext
import java.io.IOException
import java.net.{HttpURLConnection, URL}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
index a95608d..af8696c 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
@@ -18,13 +18,13 @@
*/
package org.apache.clerezza.rdf.utils;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import java.util.*;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.*;
+import org.apache.clerezza.commons.rdf.*;
/**
* This class represents a node in the context of a graph. It provides
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
index dc3943b..4ed57cd 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
@@ -22,13 +22,13 @@ package org.apache.clerezza.rdf.utils;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
/**
* Utility methods to manipulate <code>Graph</code>s
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
index db994e9..f6e4311 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
@@ -27,16 +27,16 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
index fef7e4b..9bcc652 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
@@ -23,9 +23,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.ontologies.RDFS;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/Smusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/Smusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/Smusher.java
index 8d0ea45..49daa75 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/Smusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/Smusher.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.utils;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.utils.smushing.IfpSmusher;
import org.apache.clerezza.rdf.utils.smushing.SameAsSmusher;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
index a928f79..d2bf031 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
@@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.AbstractGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionWatchableGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionWatchableGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionWatchableGraph.java
index 3892811..52ed1ba 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionWatchableGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionWatchableGraph.java
@@ -15,10 +15,10 @@
*/
package org.apache.clerezza.rdf.utils;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.WatchableGraph;
-import org.apache.commons.rdf.event.FilterTriple;
-import org.apache.commons.rdf.event.GraphListener;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.WatchableGraph;
+import org.apache.clerezza.commons.rdf.event.FilterTriple;
+import org.apache.clerezza.commons.rdf.event.GraphListener;
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
index 4b0a4dc..6834726 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
@@ -22,15 +22,15 @@ package org.apache.clerezza.rdf.utils;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.AbstractGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
/**
* This wrapps a Triplecollection changing a prefix for the Iris contained
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
index 03c73a5..a8c59f2 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
@@ -18,7 +18,7 @@ package org.apache.clerezza.rdf.utils.graphnodeprovider;
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
index 1841cd1..f296849 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
@@ -21,14 +21,14 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
index fad1d6b..5b3b410 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
@@ -25,11 +25,11 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
index e656a42..59911c4 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
@@ -24,10 +24,10 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.rdf.BlankNodeOrIri;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
index fa14977..3b78422 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
@@ -19,11 +19,11 @@
package org.apache.clerezza.rdf.utils;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.utils.GraphUtils.NoSuchSubGraphException;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
index d7a2b81..58b377e 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.clerezza.rdf.utils;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
index cd4045d..1e62180 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
@@ -24,13 +24,13 @@ import java.util.Set;
import junit.framework.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
index 66c4005..8512695 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
@@ -19,14 +19,14 @@
package org.apache.clerezza.rdf.utils;
import java.util.Iterator;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
index af8434a..45e2547 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
@@ -25,15 +25,15 @@ import java.util.Set;
import junit.framework.Assert;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.RdfTerm;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.RandomGraph;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
index 2881eb4..8069438 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
@@ -20,12 +20,12 @@ package org.apache.clerezza.rdf.utils;
import java.util.Iterator;
import org.junit.Test;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
index bab58e9..22a5385 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
@@ -20,14 +20,14 @@ package org.apache.clerezza.rdf.utils.smushing;
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Iri;
-import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
index 440e877..8558b48 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
@@ -22,10 +22,10 @@ import org.apache.clerezza.platform.Constants;
import org.apache.clerezza.platform.globalmenu.GlobalMenuItem;
import org.apache.clerezza.platform.globalmenu.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesService;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.web.ontologies.BACKUP;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
index 5029eea..2619e14 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
@@ -43,14 +43,14 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
index c00bf1b..7f3d8f5 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
@@ -26,17 +26,17 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
index 886d1e7..4ae100b 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
@@ -33,18 +33,18 @@ import org.apache.clerezza.platform.globalmenu.GlobalMenuItem;
import org.apache.clerezza.platform.globalmenu.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
-import org.apache.commons.rdf.BlankNode;
-import org.apache.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
-import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.TCPROVIDER;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1ad142ea/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
index d0ceed7..a5c4a33 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
@@ -33,12 +33,12 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.commons.rdf.ImmutableGraph;
-import org.apache.commons.rdf.Literal;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Triple;
-import org.apache.commons.rdf.Graph;
-import org.apache.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;