clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [7/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of rdf-core (part 1)
Date Sat, 11 Apr 2015 13:43:59 GMT
CLEREZZA-983: Adapted to new casing of rdf-core (part 1)


Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/60d73ea7
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/60d73ea7
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/60d73ea7

Branch: refs/heads/rdf-commons
Commit: 60d73ea787f0dd3787a706ab1dd4995ff9b96800
Parents: 1ad142e
Author: Reto Gmuer <reto@apache.org>
Authored: Sat Apr 11 12:59:25 2015 +0000
Committer: Reto Gmuer <reto@apache.org>
Committed: Sat Apr 11 12:59:25 2015 +0000

----------------------------------------------------------------------
 .../jaxrs/rdf/providers/GraphNodeWriter.java    |  36 ++--
 .../ResultSetCsvMessageBodyWriter.java          |  14 +-
 .../ResultSetJsonMessageBodyWriter.java         |  14 +-
 .../ResultSetTsvMessageBodyWriter.java          |  12 +-
 .../ResultSetXmlMessageBodyWriter.java          |  15 +-
 .../platform/config/PlatformConfig.java         |  40 ++---
 .../clerezza/platform/config/SystemConfig.java  |  24 +--
 .../content/ContentGraphProvider.java           |  22 +--
 .../platform/logging/LoggingManager.java        |   4 +-
 .../org/apache/clerezza/platform/Constants.java |  14 +-
 .../jaxrs/TypeHandlerSpace.java                 |  22 +--
 .../typehandlerspace/TypeHandlerDiscovery.java  |   4 +-
 .../impl/TypeHandlerDiscoveryImpl.java          |  17 +-
 .../platform/typepriority/TypePrioritizer.java  |  38 ++---
 .../typepriority/TypePrioritizerTest.java       |   6 +-
 .../ScalaServerPagesService.java                |   6 +-
 .../scalaserverpages/SspTypeRenderlet.java      |   8 +-
 .../seedsnipe/WebRenderingFunctions.java        |  20 +--
 .../typerendering/seedsnipe/GenericTest.java    |   4 +-
 .../seedsnipe/WebRenderingFunctionsTest.java    |   4 +-
 .../typerendering/CallbackRenderer.java         |   6 +-
 .../typerendering/CallbackRendererImpl.java     |   4 +-
 .../platform/typerendering/RendererFactory.java |  22 +--
 .../typerendering/RenderingException.java       |   4 +-
 .../RenderingspecificationException.java        |   4 +-
 .../typerendering/RenderletManager.java         |   4 +-
 .../typerendering/RenderletManagerImpl.java     |  20 +--
 .../typerendering/RenderletRendererImpl.java    |   4 +-
 .../TypeRenderingExceptionMapper.java           |   7 +-
 .../platform/typerendering/TypeRenderlet.java   |   4 +-
 .../platform/usermanager/UserManager.java       |  20 +--
 .../platform/usermanager/UserManagerImpl.java   |  91 +++++-----
 .../clerezza/rdf/core/test/GraphTest.java       |  46 ++---
 .../clerezza/rdf/core/test/GraphWrapper.java    |   8 +-
 .../test/LockableMGraphWrapperForTesting.java   |   8 +-
 .../clerezza/rdf/core/test/RandomGraph.java     |  48 +++---
 .../clerezza/rdf/core/test/TcProviderTest.java  |  36 ++--
 .../rdf/core/InvalidLiteralTypeException.java   |   4 +-
 .../access/EntityAlreadyExistsException.java    |   8 +-
 .../core/access/EntityUndeletableException.java |   8 +-
 .../access/ImmutableGraphServiceFactory.java    |   6 +-
 .../rdf/core/access/MGraphServiceFactory.java   |   6 +-
 .../rdf/core/access/NoSuchEntityException.java  |   8 +-
 .../rdf/core/access/QueryableTcProvider.java    |   4 +-
 .../clerezza/rdf/core/access/SecuredGraph.java  |  12 +-
 .../clerezza/rdf/core/access/TcManager.java     |  66 +++----
 .../clerezza/rdf/core/access/TcProvider.java    |  22 +--
 .../rdf/core/access/TcProviderMultiplexer.java  |  52 +++---
 .../access/security/TcAccessController.java     |  72 ++++----
 .../rdf/core/impl/WriteBlockedGraph.java        |   8 +-
 .../core/impl/util/PrivilegedGraphWrapper.java  |  10 +-
 .../core/impl/util/SimpleLiteralFactory.java    |  44 ++---
 .../rdf/core/serializedform/Parser.java         |   6 +-
 .../core/serializedform/ParsingProvider.java    |   4 +-
 .../rdf/core/sparql/SolutionMapping.java        |   6 +-
 .../rdf/core/sparql/SparqlPreParser.java        |   8 +-
 .../clerezza/rdf/core/sparql/query/DataSet.java |   6 +-
 .../rdf/core/sparql/query/FunctionCall.java     |  10 +-
 .../core/sparql/query/GroupGraphPattern.java    |   4 +-
 .../rdf/core/sparql/query/InlineData.java       |   4 +-
 .../rdf/core/sparql/query/PredicatePath.java    |   8 +-
 .../core/sparql/query/ResourceOrVariable.java   |  12 +-
 .../rdf/core/sparql/query/UriRefExpression.java |  10 +-
 .../rdf/core/sparql/query/UriRefOrVariable.java |  10 +-
 .../core/sparql/query/impl/SimpleDataSet.java   |  14 +-
 .../query/impl/SimpleGroupGraphPattern.java     |  10 +-
 .../sparql/query/impl/SimpleInlineData.java     |   8 +-
 .../query/impl/SimplePropertyPathPattern.java   |  16 +-
 .../rdf/core/sparql/query/impl/SimpleQuery.java |   6 +-
 .../query/impl/SimpleStringQuerySerializer.java |  10 +-
 .../sparql/query/impl/SimpleTriplePattern.java  |  20 +--
 .../clerezza/rdf/core/sparql/update/Update.java |   4 +-
 .../rdf/core/sparql/update/UpdateOperation.java |   6 +-
 .../sparql/update/impl/BaseUpdateOperation.java |  18 +-
 .../update/impl/ClearOrDropOperation.java       |   8 +-
 .../sparql/update/impl/CreateOperation.java     |   6 +-
 .../core/sparql/update/impl/LoadOperation.java  |   6 +-
 .../sparql/update/impl/ModifyOperation.java     |  20 +--
 .../core/sparql/update/impl/SimpleUpdate.java   |   6 +-
 .../update/impl/SimpleUpdateOperation.java      |  14 +-
 .../update/impl/UpdateOperationWithQuads.java   |  10 +-
 .../core/sparql/JavaCCGeneratedQueryParser.jj   |  64 +++----
 .../sparql/JavaCCGeneratedSparqlPreParser.jj    | 154 ++++++++---------
 .../clerezza/rdf/core/LiteralFactoryTest.java   |  12 +-
 .../apache/clerezza/rdf/core/UriRefTest.java    |  12 +-
 .../clerezza/rdf/core/access/SecurityTest.java  |  34 ++--
 .../clerezza/rdf/core/access/TcManagerTest.java |  10 +-
 .../rdf/core/access/providers/WeightedA.java    |  24 +--
 .../rdf/core/access/providers/WeightedA1.java   |  24 +--
 .../core/access/providers/WeightedAHeavy.java   |  24 +--
 .../core/access/providers/WeightedBlight.java   |  24 +--
 .../core/access/providers/WeightedDummy.java    |  26 +--
 .../impl/util/SimpleLiteralFactoryTest.java     |  14 +-
 .../rdf/core/serializedform/ParserTest.java     |   6 +-
 .../TestServiceManagedProvider.java             |   4 +-
 .../rdf/core/sparql/QueryParserTest.java        |  26 +--
 .../rdf/core/sparql/QuerySerializerTest.java    |  32 ++--
 .../rdf/core/sparql/SparqlPreParserTest.java    | 108 ++++++------
 .../clerezza/rdf/file/storage/FileGraph.java    |  14 +-
 .../rdf/file/storage/FileTcProvider.java        |  32 ++--
 .../rdf/file/storage/FileGraphTest.java         |  20 +--
 .../rdf/file/storage/FileTcProviderTest.java    |   8 +-
 .../rdf/jena/commons/Jena2TriaUtil.java         |  36 ++--
 .../rdf/jena/commons/Tria2JenaUtil.java         |  22 +--
 .../clerezza/rdf/jena/facade/JenaGraph.java     |  12 +-
 .../rdf/facade/blackbox/TestBasics.java         |   6 +-
 .../rdf/jena/parser/JenaParserProvider.java     |   5 +-
 .../rdf/jena/parser/JenaParserProviderTest.java |   4 +-
 .../serializer/TestJenaSerializerProvider.java  |  14 +-
 .../rdf/jena/sparql/HashMapSolutionMapping.java |   8 +-
 .../rdf/jena/sparql/JenaSparqlEngine.java       |  10 +-
 .../rdf/jena/sparql/TcDatasetGraph.java         |  10 +-
 .../clerezza/rdf/jena/sparql/SimpleTest.java    |  16 +-
 .../rdf/jena/storage/JenaGraphAdaptor.java      |   8 +-
 .../clerezza/rdf/jena/tdb/internals/IriSet.java |  22 +--
 .../rdf/jena/tdb/internals/ModelGraph.java      |   2 +-
 .../rdf/jena/tdb/internals/Symbols.java         |  10 +-
 .../rdf/jena/tdb/storage/BaseTdbTcProvider.java |   4 +-
 .../tdb/storage/SingleTdbDatasetTcProvider.java |  58 +++----
 .../rdf/jena/tdb/storage/TdbTcProvider.java     |  42 ++---
 .../MultiThreadedSingleTdbDatasetTest.java      |  10 +-
 .../rdf/jena/tdb/storage/MultiThreadedTest.java |   8 +-
 .../tdb/storage/MultiThreadedTestSingleTdb.java |   8 +-
 .../tdb/storage/SingleTdbDatasetGraphTest.java  |   8 +-
 .../storage/SingleTdbDatasetTcProviderTest.java |  40 ++---
 .../rdf/jena/tdb/storage/TdbGraphTest.java      |   8 +-
 .../clerezza/rdf/rdfa/ClerezzaRDFaParser.java   |   6 +-
 .../rdf/rdfa/ClerezzaStatementSink.java         |  20 +--
 .../clerezza/rdf/scala/utils/EzLiteral.scala    |   8 +-
 .../clerezza/rdf/scala/utils/EzMGraph.scala     |  10 +-
 .../clerezza/rdf/scala/utils/Preamble.scala     |  12 +-
 .../rdf/scala/utils/RichGraphNode.scala         |  46 ++---
 .../clerezza/rdf/schemagen/SchemaGen.java       |  84 ++++-----
 .../rdf/simple/storage/SimpleTcProvider.java    |  32 ++--
 .../rdf/simple/storage/AccessViaTcManager.java  |   4 +-
 .../apache/clerezza/rdf/utils/GraphNode.java    | 170 +++++++++----------
 .../apache/clerezza/rdf/utils/GraphUtils.java   |   8 +-
 .../org/apache/clerezza/rdf/utils/RdfList.java  |  46 ++---
 .../clerezza/rdf/utils/SeeAlsoExpander.java     |  28 +--
 .../apache/clerezza/rdf/utils/UnionGraph.java   |  10 +-
 .../clerezza/rdf/utils/UriMutatingGraph.java    |  24 +--
 .../graphnodeprovider/GraphNodeProvider.java    |  14 +-
 .../rdf/utils/smushing/BaseSmusher.java         |  44 ++---
 .../clerezza/rdf/utils/smushing/IfpSmusher.java |  30 ++--
 .../rdf/utils/smushing/SameAsSmusher.java       |  24 +--
 .../clerezza/rdf/utils/GraphUtilsTest.java      |   8 +-
 .../apache/clerezza/rdf/utils/IfpSmushTest.java |  18 +-
 .../apache/clerezza/rdf/utils/RdfListTest.java  |  24 +--
 .../clerezza/rdf/utils/SameAsSmushTest.java     |   6 +-
 .../clerezza/rdf/utils/TestGraphNode.java       |  58 +++----
 .../clerezza/rdf/utils/UnionGraphTest.java      |  18 +-
 .../rdf/utils/smushing/SameAsSmushTest.java     |  10 +-
 .../rdf/web/core/BackupMessageBodyWriter.java   |  10 +-
 .../apache/clerezza/rdf/web/core/Delete.java    |   4 +-
 .../clerezza/rdf/web/core/GraphManagement.java  |   8 +-
 .../apache/clerezza/rdf/web/core/Restorer.java  |  10 +-
 .../web/core/ResultSetMessageBodyWriter.java    |  15 +-
 .../org/apache/clerezza/rdf/web/core/Smush.java |   6 +-
 .../clerezza/rdf/web/core/SparqlEndpoint.java   |  29 ++--
 .../apache/clerezza/rdf/web/core/WebAccess.java |   8 +-
 .../rdf/web/core/BackupAndRestoreTest.java      |  26 +--
 .../GraphNodeDataFieldResolver.java             |  39 +++--
 .../templating/seedsnipe/GraphNodeTest.java     |  64 +++----
 163 files changed, 1638 insertions(+), 1646 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 256806d..264fc77 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,10 +38,10 @@ import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
-import org.apache.clerezza.commons.rdf.RdfTerm;
+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.IRI;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.rdf.utils.GraphNode;
 
@@ -100,15 +100,15 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
 
     private Graph getExpandedContext(GraphNode node) {
         final Graph result = new SimpleGraph(node.getNodeContext());
-        final Set<RdfTerm> expandedResources = new HashSet<RdfTerm>();
+        final Set<RDFTerm> expandedResources = new HashSet<RDFTerm>();
         expandedResources.add(node.getNode());
         while (true) {
-            Set<RdfTerm> additionalExpansionRes = getAdditionalExpansionResources(result);
+            Set<RDFTerm> additionalExpansionRes = getAdditionalExpansionResources(result);
             additionalExpansionRes.removeAll(expandedResources);
             if (additionalExpansionRes.size() == 0) {
                 return result;
             }
-            for (RdfTerm resource : additionalExpansionRes) {
+            for (RDFTerm resource : additionalExpansionRes) {
                 final GraphNode additionalNode = new GraphNode(resource, node.getGraph());
                 result.addAll(additionalNode.getNodeContext());
                 expandedResources.add(resource);
@@ -116,14 +116,14 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
         }
     }
 
-    private Set<RdfTerm> getAdditionalExpansionResources(Graph tc) {
-        final Set<Iri> subjectExpansionProperties = getSubjectExpansionProperties();
-        final Set<Iri> objectExpansionProperties = getObjectExpansionProperties();
-        final Set<RdfTerm> result = new HashSet<RdfTerm>();
+    private Set<RDFTerm> getAdditionalExpansionResources(Graph tc) {
+        final Set<IRI> subjectExpansionProperties = getSubjectExpansionProperties();
+        final Set<IRI> objectExpansionProperties = getObjectExpansionProperties();
+        final Set<RDFTerm> result = new HashSet<RDFTerm>();
         if ((subjectExpansionProperties.size() > 0)
                 || (objectExpansionProperties.size() > 0)) {
             for (Triple triple : tc) {
-                final Iri predicate = triple.getPredicate();
+                final IRI predicate = triple.getPredicate();
                 if (subjectExpansionProperties.contains(predicate)) {
                     result.add(triple.getSubject());
                 }
@@ -135,28 +135,28 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
         return result;
     }
 
-    private Set<Iri> getSubjectExpansionProperties() {
+    private Set<IRI> getSubjectExpansionProperties() {
         final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
         final List<String> paramValues = queryParams.get(SUBJ_EXP_PARAM);
         if (paramValues == null) {
-            return new HashSet<Iri>(0);
+            return new HashSet<IRI>(0);
         }
-        final Set<Iri> result = new HashSet<Iri>(paramValues.size());
+        final Set<IRI> result = new HashSet<IRI>(paramValues.size());
         for (String uriString : paramValues) {
-            result.add(new Iri(uriString));
+            result.add(new IRI(uriString));
         }
         return result;
     }
 
-    private Set<Iri> getObjectExpansionProperties() {
+    private Set<IRI> getObjectExpansionProperties() {
         final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
         final List<String> paramValues = queryParams.get(OBJ_EXP_PARAM);
         if (paramValues == null) {
-            return new HashSet<Iri>(0);
+            return new HashSet<IRI>(0);
         }
-        final Set<Iri> result = new HashSet<Iri>(paramValues.size());
+        final Set<IRI> result = new HashSet<IRI>(paramValues.size());
         for (String uriString : paramValues) {
-            result.add(new Iri(uriString));
+            result.add(new IRI(uriString));
         }
         return result;
     }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 967b56f..9a4a3c3 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
@@ -33,8 +33,8 @@ import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
 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.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.commons.rdf.Literal;
@@ -179,7 +179,7 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
       if( !first ) {
         outputStream.write( separator );
       }
-      RdfTerm resource = lineData.get( header );
+      RDFTerm resource = lineData.get( header );
       if( resource != null ) {
         writeEscaped( outputStream, getResourceValue( resource ) );
       }
@@ -189,12 +189,12 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
   }
 
   /**
-   * Helper to get the proper string representation for the given RdfTerm.
+   * Helper to get the proper string representation for the given RDFTerm.
    */
-  private String getResourceValue( RdfTerm resource ) {
+  private String getResourceValue( RDFTerm resource ) {
     StringBuilder value = new StringBuilder();
-    if( resource instanceof Iri ) {
-      value.append( ((Iri) resource).getUnicodeString() );
+    if( resource instanceof IRI ) {
+      value.append(((IRI) resource).getUnicodeString() );
     } else if( resource instanceof Literal ) {
       value.append( ((Literal) resource).getLexicalForm() );
     } else if( resource instanceof BlankNode ) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a78c9a0..a56baf1 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
@@ -34,8 +34,8 @@ import javax.ws.rs.ext.Provider;
 
 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.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;
@@ -114,15 +114,15 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
 	}
 
 	/**
-	 * Helper: creates value element from {@link RdfTerm} depending on its
+	 * Helper: creates value element from {@link RDFTerm} depending on its
 	 * class
 	 *
 	 */
-	private JSONObject createResultElement(RdfTerm resource) {
+	private JSONObject createResultElement(RDFTerm resource) {
 		JSONObject element = new JSONObject();
-		if (resource instanceof Iri) {
+		if (resource instanceof IRI) {
 			element.put("type", "uri");
-			element.put("value", Iri.class.cast(resource).getUnicodeString());
+			element.put("value", IRI.class.cast(resource).getUnicodeString());
 		} else if (resource instanceof Literal) {
 			element.put("type", "literal");
 			element.put("value", Literal.class.cast(resource).getLexicalForm());
@@ -151,7 +151,7 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
 		JSONObject result = new JSONObject();
 		Set<Variable> keys = solutionMap.keySet();
 		for (Variable key : keys) {
-			result.put(key.getName(), createResultElement((RdfTerm) solutionMap.get(key)));
+			result.put(key.getName(), createResultElement((RDFTerm) solutionMap.get(key)));
 		}
 		return result;
 	}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 5b5fefe..2db72aa 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
@@ -33,8 +33,8 @@ import javax.ws.rs.ext.MessageBodyWriter;
 import javax.ws.rs.ext.Provider;
 
 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.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.commons.rdf.Literal;
@@ -179,7 +179,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
       if( !first ) {
         outputStream.write( separator );
       }
-      RdfTerm resource = lineData.get( header );
+      RDFTerm resource = lineData.get( header );
       if( resource != null ) {
         writeEscaped( outputStream, getResourceValue( resource ) );
       }
@@ -189,11 +189,11 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
   }
 
   /**
-   * Helper to get the proper string representation for the given RdfTerm.
+   * Helper to get the proper string representation for the given RDFTerm.
    */
-  private String getResourceValue( RdfTerm resource ) {
+  private String getResourceValue( RDFTerm resource ) {
     StringBuilder value = new StringBuilder();
-    if( resource instanceof Iri ) {
+    if( resource instanceof IRI ) {
       value.append( resource.toString() );
     } else if( resource instanceof Literal ) {
       value.append( "\"" );

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 f4abb17..1250edd 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
@@ -41,8 +41,8 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 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.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;
@@ -147,15 +147,15 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
 
 
 	/**
-	 * Helper: creates value element from {@link RdfTerm} depending on its
+	 * Helper: creates value element from {@link RDFTerm} depending on its
 	 * class
 	 *
 	 */
-	private Element createValueElement(RdfTerm resource, Document doc) {
+	private Element createValueElement(RDFTerm resource, Document doc) {
 		Element value = null;
-		if (resource instanceof Iri) {
+		if (resource instanceof IRI) {
 			value = doc.createElement("uri");
-			value.appendChild(doc.createTextNode(((Iri) resource)
+			value.appendChild(doc.createTextNode(((IRI) resource)
 					.getUnicodeString()));
 		} else if (resource instanceof Literal) {
 			value = doc.createElement("literal");
@@ -185,8 +185,7 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
 		for (Variable key : keys) {
 			Element bindingElement = doc.createElement("binding");
 			bindingElement.setAttribute("name", key.getName());
-			bindingElement.appendChild(createValueElement(
-					(RdfTerm) solutionMap.get(key), doc));
+			bindingElement.appendChild(createValueElement((RDFTerm) solutionMap.get(key), doc));
 			result.appendChild(bindingElement);
 		}
 	}

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 003df78..16aa8cf 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,10 +30,10 @@ 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.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+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.IRI;
 import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -61,7 +61,7 @@ public class PlatformConfig {
      * @deprecated use org.apache.clerezza.platform.Contants instead
      */
     @Deprecated
-    public static final Iri CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI;
+    public static final IRI CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI;
 
     /**
      * A filter that can be used to get the config graph as OSGi service,
@@ -78,27 +78,27 @@ public class PlatformConfig {
      * Returns the default base URI of the Clerezza platform instance.
      * @return the base URI of the Clerezza platform
      */
-    public Iri getDefaultBaseUri() {
-        return AccessController.doPrivileged(new PrivilegedAction<Iri>() {
+    public IRI getDefaultBaseUri() {
+        return AccessController.doPrivileged(new PrivilegedAction<IRI>() {
 
             @Override
-            public Iri run() {
+            public IRI run() {
                 GraphNode platformInstance = getPlatformInstance();
                 Lock l = platformInstance.readLock();
                 l.lock();
                 try {
-                    Iterator<RdfTerm> triples = platformInstance.getObjects(PLATFORM.defaultBaseUri);
+                    Iterator<RDFTerm> triples = platformInstance.getObjects(PLATFORM.defaultBaseUri);
                     if (triples.hasNext()) {
-                        return (Iri) triples.next();
+                        return (IRI) triples.next();
                     } else {
                         String port = context.getProperty("org.osgi.service.http.port");
                         if (port == null) {
                             port = DEFAULT_PORT;
                         }
                         if (port.equals("80")) {
-                            return new Iri("http://localhost/");
+                            return new IRI("http://localhost/");
                         }
-                        return new Iri("http://localhost:" + port + "/");
+                        return new IRI("http://localhost:" + port + "/");
                     }
                 } finally {
                     l.unlock();
@@ -118,7 +118,7 @@ public class PlatformConfig {
         return new GraphNode(getPlatformInstanceRdfTerm(), systemGraph);
     }
 
-    private BlankNodeOrIri getPlatformInstanceRdfTerm() {
+    private BlankNodeOrIRI getPlatformInstanceRdfTerm() {
         Lock l = systemGraph.getLock().readLock();
         l.lock();
         try {
@@ -138,17 +138,17 @@ public class PlatformConfig {
      * @return the base URI of the Clerezza platform
      */
     //todo: if this is the only class that sets and reads base uris then getBaseURIs should keep a cache
-    public Set<Iri> getBaseUris() {
+    public Set<IRI> getBaseUris() {
 
-        return AccessController.doPrivileged(new PrivilegedAction<Set<Iri>>() {
+        return AccessController.doPrivileged(new PrivilegedAction<Set<IRI>>() {
 
             @Override
-            public Set<Iri> run() {
-                Iterator<RdfTerm> baseUrisIter = getPlatformInstance().
+            public Set<IRI> run() {
+                Iterator<RDFTerm> baseUrisIter = getPlatformInstance().
                         getObjects(PLATFORM.baseUri);
-                Set<Iri> baseUris = new HashSet<Iri>();
+                Set<IRI> baseUris = new HashSet<IRI>();
                 while (baseUrisIter.hasNext()) {
-                    Iri baseUri = (Iri) baseUrisIter.next();
+                    IRI baseUri = (IRI) baseUrisIter.next();
                     baseUris.add(baseUri);
                 }
                 baseUris.add(getDefaultBaseUri());
@@ -163,7 +163,7 @@ public class PlatformConfig {
      *
      * @param baseUri The base URI which will be added to the platform instance
      */
-    public void addBaseUri(Iri baseUri) {
+    public void addBaseUri(IRI baseUri) {
         systemGraph.add(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
     }
 
@@ -172,7 +172,7 @@ public class PlatformConfig {
      *
      * @param baseUri The base URI which will be removed from the platform instance
      */
-    public void removeBaseUri(Iri baseUri) {
+    public void removeBaseUri(IRI baseUri) {
         systemGraph.remove(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 e5fc314..1527ee4 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
@@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.osgi.service.component.ComponentContext;
 import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+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;
@@ -65,7 +65,7 @@ public class SystemConfig implements WeightedTcProvider {
      * @deprecated use org.apache.clerezza.platform.Contants instead
      */
     @Deprecated
-    public static final Iri SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI;
+    public static final IRI SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI;
     /**
      * A filter that can be used to get the system graph as OSGi service, that
      * is provided by
@@ -128,12 +128,12 @@ public class SystemConfig implements WeightedTcProvider {
     }
 
     @Override
-    public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+    public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
         throw new NoSuchEntityException(name);
     }
 
     @Override
-    public Graph getMGraph(Iri name) throws NoSuchEntityException {
+    public Graph getMGraph(IRI name) throws NoSuchEntityException {
         if (name.equals(Constants.SYSTEM_GRAPH_URI)) {
             return systemGraph;
         } else {
@@ -142,42 +142,42 @@ public class SystemConfig implements WeightedTcProvider {
     }
 
     @Override
-    public Graph getGraph(Iri name) throws NoSuchEntityException {
+    public Graph getGraph(IRI name) throws NoSuchEntityException {
         return getMGraph(name);
     }
 
     @Override
-    public Set<Iri> listImmutableGraphs() {
+    public Set<IRI> listImmutableGraphs() {
         return Collections.emptySet();
     }
 
     @Override
-    public Set<Iri> listMGraphs() {
+    public Set<IRI> listMGraphs() {
         return Collections.singleton(Constants.SYSTEM_GRAPH_URI);
     }
 
     @Override
-    public Set<Iri> listGraphs() {
+    public Set<IRI> listGraphs() {
         return listMGraphs();
     }
 
     @Override
-    public Graph createGraph(Iri name) throws UnsupportedOperationException, EntityAlreadyExistsException {
+    public Graph createGraph(IRI name) throws UnsupportedOperationException, EntityAlreadyExistsException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws UnsupportedOperationException, EntityAlreadyExistsException {
+    public ImmutableGraph createImmutableGraph(IRI name, Graph triples) throws UnsupportedOperationException, EntityAlreadyExistsException {
         throw new UnsupportedOperationException("Not supported yet."); 
     }
 
     @Override
-    public void deleteGraph(Iri name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
+    public void deleteGraph(IRI name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public Set<Iri> getNames(ImmutableGraph graph) {
+    public Set<IRI> getNames(ImmutableGraph graph) {
         return Collections.emptySet();
     }
 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 9b79d85..9891444 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
@@ -26,7 +26,7 @@ import org.apache.clerezza.platform.Constants;
 
 import org.osgi.service.component.ComponentContext;
 import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.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.clerezza.rdf.utils.UnionGraph;
@@ -73,7 +73,7 @@ public class ContentGraphProvider {
     /**
      * The URIs of the read-only addition-<code>Graph</code>s
      */
-    private Iri[] additions;
+    private IRI[] additions;
 
     private ReentrantReadWriteLock configLock = new ReentrantReadWriteLock();
 
@@ -85,9 +85,9 @@ public class ContentGraphProvider {
         }
         String[] additionUriStrings = (String[]) context.getProperties().get(
                 CONTENT_ADDITIONS);
-        additions = new Iri[additionUriStrings.length];
+        additions = new IRI[additionUriStrings.length];
         for (int i = 0; i < additionUriStrings.length; i++) {
-            additions[i] = new Iri(additionUriStrings[i]);
+            additions[i] = new IRI(additionUriStrings[i]);
 
         }
     }
@@ -98,7 +98,7 @@ public class ContentGraphProvider {
             Graph[] united = new Graph[additions.length + 1];
             int i = 0;
             united[i++] = tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
-            for (Iri uriRef : additions) {
+            for (IRI uriRef : additions) {
                 united[i++] = tcManager.getGraph(uriRef);
             }
             return new UnionGraph(united);
@@ -107,25 +107,25 @@ public class ContentGraphProvider {
         }
     }
 
-    public void addTemporaryAdditionGraph(Iri graphName) {
+    public void addTemporaryAdditionGraph(IRI graphName) {
         configLock.writeLock().lock();
         try {
-            Set<Iri> additionsSet = new HashSet<Iri>(Arrays
+            Set<IRI> additionsSet = new HashSet<IRI>(Arrays
                     .asList(additions));
             additionsSet.add(graphName);
-            additions = additionsSet.toArray(new Iri[additionsSet.size()]);
+            additions = additionsSet.toArray(new IRI[additionsSet.size()]);
         } finally {
             configLock.writeLock().unlock();
         }
     }
 
-    public void removeTemporaryAdditionGraph(Iri graphName) {
+    public void removeTemporaryAdditionGraph(IRI graphName) {
         configLock.writeLock().lock();
         try {
-            Set<Iri> additionsSet = new HashSet<Iri>(Arrays
+            Set<IRI> additionsSet = new HashSet<IRI>(Arrays
                     .asList(additions));
             additionsSet.remove(graphName);
-            additions = additionsSet.toArray(new Iri[additionsSet.size()]);
+            additions = additionsSet.toArray(new IRI[additionsSet.size()]);
         } finally {
             configLock.writeLock().unlock();
         }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 85a41bc..9129a41 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
@@ -45,7 +45,7 @@ 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.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Iri;
+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;
@@ -78,7 +78,7 @@ public class LoggingManager implements GlobalMenuItemsProvider {
     public void activate(ComponentContext context)
             throws URISyntaxException, IOException {
         renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new Iri(getClass().getResource(
+                new IRI(getClass().getResource(
                 "config-page-naked.ssp").toURI().toString()),
                 LOGGING.LoggingConfigPage, "naked",
                 MediaType.APPLICATION_XHTML_XML_TYPE, true);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 49c4a49..b31e9ea 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.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 
 /**
  * This class gropus some constant values used by the clerezza.platform components
@@ -40,8 +40,8 @@ public class Constants {
     /**
      * the uri of the system graph
      */
-    public static final Iri SYSTEM_GRAPH_URI =
-            new Iri(SYSTEM_GRAPH_URI_STRING);
+    public static final IRI SYSTEM_GRAPH_URI =
+            new IRI(SYSTEM_GRAPH_URI_STRING);
 
     /**
      * the uri of the config graph as string
@@ -51,8 +51,8 @@ public class Constants {
     /**
      * the uri of the config graph as string
      */
-    public static final Iri CONFIG_GRAPH_URI =
-            new Iri(CONFIG_GRAPH_URI_STRING);
+    public static final IRI CONFIG_GRAPH_URI =
+            new IRI(CONFIG_GRAPH_URI_STRING);
 
     /**
      * the uri of the content graph as string
@@ -62,8 +62,8 @@ public class Constants {
     /**
      * the uri of the content graph
      */
-    public static final Iri CONTENT_GRAPH_URI =
-            new Iri(CONTENT_GRAPH_URI_STRING);
+    public static final IRI CONTENT_GRAPH_URI =
+            new IRI(CONTENT_GRAPH_URI_STRING);
 
 
     /**

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 80c2bed..2485850 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.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.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;
@@ -89,13 +89,13 @@ public class TypeHandlerSpace {
     }
 
     private Object getTypeHandler(String absoluteUriPath) {
-        Iri uri = new Iri(absoluteUriPath);
+        IRI uri = new IRI(absoluteUriPath);
         if (gnp.existsLocal(uri)) {
             GraphNode node = gnp.getLocal(uri);
             Lock lock =node.readLock();
             lock.lock();
             try {
-                Set<Iri> rdfTypes = getRdfTypesOfIri(node);
+                Set<IRI> rdfTypes = getRdfTypesOfIri(node);
                 return typeHandlerDiscovery.getTypeHandler(rdfTypes);
             } finally {
                 lock.unlock();
@@ -105,17 +105,17 @@ public class TypeHandlerSpace {
         return null;
     }
 
-    private Set<Iri> getRdfTypesOfIri(GraphNode node) {
-        Set<Iri> rdfTypes = new HashSet<Iri>();
-        Iterator<RdfTerm> types = node.getObjects(RDF.type);
+    private Set<IRI> getRdfTypesOfIri(GraphNode node) {
+        Set<IRI> rdfTypes = new HashSet<IRI>();
+        Iterator<RDFTerm> types = node.getObjects(RDF.type);
         while (types.hasNext()) {
-            RdfTerm typeStmtObj = types.next();
-            if (!(typeStmtObj instanceof Iri)) {
+            RDFTerm typeStmtObj = types.next();
+            if (!(typeStmtObj instanceof IRI)) {
                 throw new RuntimeException(
                         "RDF type is expected to be a URI but is " + typeStmtObj
                         + "(of " + node.getNode() + ")");
             }
-            Iri rdfType = (Iri) typeStmtObj;
+            IRI rdfType = (IRI) typeStmtObj;
             rdfTypes.add(rdfType);
         }
         
@@ -128,7 +128,7 @@ public class TypeHandlerSpace {
         public Object getDescription(@Context UriInfo uriInfo){
             String absoluteUriPath = uriInfo.getAbsolutePath().toString();
             //Graph contentGraph = cgp.getContentGraph();
-                Iri uri = new Iri(absoluteUriPath.substring(0,
+                IRI uri = new IRI(absoluteUriPath.substring(0,
                         absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
                 GraphNode graphNode = gnp.getLocal(uri);
                 return graphNode.getNodeContext();

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 580f59c..746103e 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.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 
 /**
  * Implementations of this interface map RDF-types to type handlers. A type
@@ -41,6 +41,6 @@ public interface TypeHandlerDiscovery {
      *            be handled
      * @return the type handler for most important rdf-type in the set
      */
-    public Object getTypeHandler(Set<Iri> rdfTypes);
+    public Object getTypeHandler(Set<IRI> rdfTypes);
 
 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a3f9c35..c5cb673 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.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 import org.apache.clerezza.rdf.ontologies.RDFS;
 import org.apache.felix.scr.annotations.ReferencePolicy;
 
@@ -56,8 +56,7 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
     @Reference
     private TypePrioritizer typePrioritizer;
 
-    private final Map<Iri, Object> typeHandlerMap = Collections.synchronizedMap(
-            new HashMap<Iri, Object>());
+    private final Map<IRI, Object> typeHandlerMap = Collections.synchronizedMap(new HashMap<IRI, Object>());
     
     protected void bindTypeHandler(Object typeHandler) {
         SupportedTypes supportedTypes = typeHandler.getClass()
@@ -66,17 +65,17 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
             return;
         }
         for (String typeUriString : supportedTypes.types()) {
-            Iri typeUri = new Iri(typeUriString);
+            IRI typeUri = new IRI(typeUriString);
             typeHandlerMap.put(typeUri, typeHandler);
         }
     }
         
     protected void unbindTypeHandler(Object typeHandler) {
-        Iterator<Iri> keys = typeHandlerMap.keySet().iterator();
-        Set<Iri> toRemove = new HashSet<Iri>(typeHandlerMap.size());
+        Iterator<IRI> keys = typeHandlerMap.keySet().iterator();
+        Set<IRI> toRemove = new HashSet<IRI>(typeHandlerMap.size());
         synchronized(typeHandlerMap) {
             while (keys.hasNext()) {
-                Iri uriRef = keys.next();
+                IRI uriRef = keys.next();
                 if(typeHandlerMap.get(uriRef) == typeHandler) {
                     toRemove.add(uriRef);
                 }
@@ -89,12 +88,12 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
     }
 
     @Override
-    public Object getTypeHandler(final Set<Iri> types) {
+    public Object getTypeHandler(final Set<IRI> types) {
         return AccessController.doPrivileged(new PrivilegedAction<Object>() {
 
             @Override
             public Object run() {
-                Iterator<Iri> prioritizedTypes = typePrioritizer.iterate(types);
+                Iterator<IRI> prioritizedTypes = typePrioritizer.iterate(types);
                 while (prioritizedTypes.hasNext()) {
                     Object result = typeHandlerMap.get(prioritizedTypes.next());
                     if (result != null) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 487726d..4fc0f8b 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,8 +33,8 @@ 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.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.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.clerezza.commons.rdf.Graph;
@@ -52,9 +52,9 @@ import org.slf4j.LoggerFactory;
         referenceInterface=Graph.class,
         target=SystemConfig.SYSTEM_GRAPH_FILTER)})
 public class TypePrioritizer {
-    public static final Iri typePriorityListUri = new Iri("urn:x-localinstance:/typePriorityList");
+    public static final IRI typePriorityListUri = new IRI("urn:x-localinstance:/typePriorityList");
 
-    private List<Iri> typePriorityList;
+    private List<IRI> typePriorityList;
     private static final Logger log = LoggerFactory.getLogger(TypePrioritizer.class);
     
     Graph systemGraph;
@@ -63,12 +63,12 @@ public class TypePrioritizer {
         Lock l = systemGraph.getLock().readLock();
         l.lock();
         try {
-            List<RdfTerm> rdfTypePriorityList = new RdfList(
+            List<RDFTerm> rdfTypePriorityList = new RdfList(
                  typePriorityListUri, systemGraph);
-            typePriorityList  = new ArrayList<Iri>(rdfTypePriorityList.size());
-            for (RdfTerm resource : rdfTypePriorityList) {
-                if (resource instanceof Iri) {
-                    typePriorityList.add((Iri) resource);
+            typePriorityList  = new ArrayList<IRI>(rdfTypePriorityList.size());
+            for (RDFTerm resource : rdfTypePriorityList) {
+                if (resource instanceof IRI) {
+                    typePriorityList.add((IRI) resource);
                 } else {
                     log.warn("Type priority list contains a resource "
                             + "that is not a uri, skipping.");
@@ -90,17 +90,17 @@ public class TypePrioritizer {
      * @param rdfTypes the rdf types to be sorted
      * @return a sorted iterator of the types
      */
-    public Iterator<Iri> iterate(final Collection<Iri> rdfTypes) {
-        return new Iterator<Iri>() {
-            final Set<Iri> remaining = new HashSet<Iri>(rdfTypes);
+    public Iterator<IRI> iterate(final Collection<IRI> rdfTypes) {
+        return new Iterator<IRI>() {
+            final Set<IRI> remaining = new HashSet<IRI>(rdfTypes);
             boolean rdfsResourceRemovedAndNotYetReturned = remaining.remove(RDFS.Resource);
-            final Iterator<Iri> typePriorityIter = typePriorityList.iterator();
-            Iterator<Iri> remainingIter = null;
-            Iri next = prepareNext();
+            final Iterator<IRI> typePriorityIter = typePriorityList.iterator();
+            Iterator<IRI> remainingIter = null;
+            IRI next = prepareNext();
             
-            private Iri prepareNext() {
+            private IRI prepareNext() {
                 while (typePriorityIter.hasNext()) {
-                    Iri nextPriority = typePriorityIter.next();
+                    IRI nextPriority = typePriorityIter.next();
                     if (remaining.contains(nextPriority)) {
                         remaining.remove(nextPriority);
                         return nextPriority;
@@ -127,11 +127,11 @@ public class TypePrioritizer {
             }
 
             @Override
-            public Iri next() {
+            public IRI next() {
                 if (next == null) {
                     throw new NoSuchElementException();
                 }
-                Iri current = next;
+                IRI current = next;
                 next = prepareNext();
                 return current;
             }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 ccaa75d..ff95059 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
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+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;
@@ -51,11 +51,11 @@ public class TypePrioritizerTest {
 
     @Test
     public void oderList() {
-        List<Iri> l = new ArrayList<Iri>();
+        List<IRI> l = new ArrayList<IRI>();
         l.add(FOAF.Agent);
         l.add(RDF.Bag);
         l.add(FOAF.Person);
-        Iterator<Iri> iter = typePrioritizer.iterate(l);
+        Iterator<IRI> iter = typePrioritizer.iterate(l);
         Assert.assertEquals(FOAF.Person, iter.next());
         Assert.assertEquals(FOAF.Agent, iter.next());
         Assert.assertEquals(RDF.Bag, iter.next());

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 4e37f0d..738fbaa 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.clerezza.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;
@@ -66,7 +66,7 @@ public class ScalaServerPagesService {
      * @param mediaType
      * @return
      */
-    public ServiceRegistration registerScalaServerPage(URL location,  Iri rdfType,
+    public ServiceRegistration registerScalaServerPage(URL location,  IRI rdfType,
             String modePattern, MediaType mediaType) {
         return registerScalaServerPage(location, rdfType, modePattern, mediaType, bundleContext);
     }
@@ -83,7 +83,7 @@ public class ScalaServerPagesService {
      * @param callerBundleContext
      * @return
      */
-    public ServiceRegistration registerScalaServerPage(URL location,  Iri rdfType,
+    public ServiceRegistration registerScalaServerPage(URL location,  IRI rdfType,
             String modePattern, MediaType mediaType, BundleContext callerBundleContext) {
         TypeRenderlet sspTypeRenderlet = new SspTypeRenderlet(location, rdfType,
                 modePattern, mediaType, scalaCompilerService);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 501fd9b..c6d547b 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.clerezza.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;
@@ -53,7 +53,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
             + lineSeparator + "}" + lineSeparator + "}" + lineSeparator).toCharArray();
     
 
-    private Iri rdfType;
+    private IRI rdfType;
     private String modePattern;
     private MediaType mediaType;
     private URL sspLocation;
@@ -61,7 +61,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
     private TypeRenderlet lastCompiledSsp = null;
     private CompilerService scalaCompilerService;
 
-    SspTypeRenderlet(URL sspLocation, Iri rdfType, String modePattern, MediaType mediaType,
+    SspTypeRenderlet(URL sspLocation, IRI rdfType, String modePattern, MediaType mediaType,
                      CompilerService scalaCompilerService) {
         this.sspLocation = sspLocation;
         this.rdfType = rdfType;
@@ -71,7 +71,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
     }
 
     @Override
-    public Iri getRdfType() {
+    public IRI getRdfType() {
         return rdfType;
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 eda3b7b..2f560a8 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
@@ -31,11 +31,11 @@ import org.apache.clerezza.rdf.core.LiteralFactory;
 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.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.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
 import org.apache.clerezza.commons.rdf.Graph;
 
 /**
@@ -44,9 +44,9 @@ import org.apache.clerezza.commons.rdf.Graph;
  */
 class WebRenderingFunctions implements RenderingFunctions {
 
-    private static final Iri XML_DATE_LITERAL = new Iri(
+    private static final IRI XML_DATE_LITERAL = new IRI(
             "http://www.w3.org/2001/XMLSchema#dateTime");
-    private final static Iri RDF_XML_LITERAL = new Iri(
+    private final static IRI RDF_XML_LITERAL = new IRI(
             "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
     private Graph graph;
     private GraphNode context;
@@ -84,8 +84,8 @@ class WebRenderingFunctions implements RenderingFunctions {
                     }
                     stringValue = ((Literal) value).getLexicalForm();
                 } else {
-                    if (value instanceof Iri) {
-                        stringValue = ((Iri) value).getUnicodeString();
+                    if (value instanceof IRI) {
+                        stringValue = ((IRI) value).getUnicodeString();
                     } else {
                         stringValue = value.toString();
                     }
@@ -138,7 +138,7 @@ class WebRenderingFunctions implements RenderingFunctions {
 
         @Override
         public String process(Object... values) throws IOException {
-            BlankNodeOrIri resource = (BlankNodeOrIri) values[0];
+            BlankNodeOrIRI resource = (BlankNodeOrIRI) values[0];
             GraphNode graphNode = new GraphNode(resource, graph);
             String mode = null;
             if (values.length > 1) {
@@ -185,10 +185,10 @@ class WebRenderingFunctions implements RenderingFunctions {
      * A function that returns the Datatype of a Literal or null if the
      * Literal has no language or if the object is not a Literal
      */
-    private static RenderingFunction datatypeFunction = new RenderingFunction<Object, Iri>() {
+    private static RenderingFunction datatypeFunction = new RenderingFunction<Object, IRI>() {
 
         @Override
-        public Iri process(Object... values) {
+        public IRI process(Object... values) {
             Object value = values[0];
             if (value instanceof Literal) {
                 return ((Literal) value).getDataType();
@@ -225,7 +225,7 @@ class WebRenderingFunctions implements RenderingFunctions {
             if (value instanceof Literal) {
                 return "literal";
             }
-            if (value instanceof Iri) {
+            if (value instanceof IRI) {
                 return "iri";
             }
             if (value instanceof BlankNode) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a7f3858..0622b33 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
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 import org.apache.clerezza.rdf.core.serializedform.Parser;
 import org.apache.clerezza.rdf.utils.GraphNode;
 
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils.GraphNode;
  */
 public class GenericTest {
 
-    private final Iri root = new Iri("http://tests.clerezza.org/root#");
+    private final IRI root = new IRI("http://tests.clerezza.org/root#");
     private final SeedsnipeRenderlet renderlet = new SeedsnipeRenderlet();
 
     @Test

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 520e54d..e326ae2 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
@@ -27,7 +27,7 @@ import org.apache.clerezza.rdf.core.LiteralFactory;
 import org.junit.Assert;
 import org.junit.Test;
 import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 import org.apache.clerezza.templating.RenderingFunction;
 
 /**
@@ -105,7 +105,7 @@ public class WebRenderingFunctionsTest {
                 null, null, null, null);
         RenderingFunction<Object, Boolean> function = webRenderingFunctions
                 .getNamedFunctions().get("contains");
-        Iri testObject = new Iri("http://example.org/bla#fooBar");
+        IRI testObject = new IRI("http://example.org/bla#fooBar");
         Assert.assertTrue(function.process(testObject, "bla"));
         Assert.assertFalse(function.process(testObject, "hello"));
     }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 5a0cb10..0148cd3 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.clerezza.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.clerezza.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)
      *
@@ -58,7 +58,7 @@ public interface CallbackRenderer {
      * @param os
      * @throws IOException
      */
-    public void render(Iri resource, GraphNode context, String mode,
+    public void render(IRI resource, GraphNode context, String mode,
             OutputStream os) throws IOException;
 
 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a0b31e8..aa77cc6 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.clerezza.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;
 
@@ -71,7 +71,7 @@ public class CallbackRendererImpl implements CallbackRenderer {
     }
 
     @Override
-    public void render(final Iri resource, GraphNode context, String mode,
+    public void render(final IRI resource, GraphNode context, String mode,
             OutputStream os) throws IOException {
         final GraphNode resourceNode = AccessController.doPrivileged( new PrivilegedAction<GraphNode>() {
                     @Override

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 91886fc..f0736cf 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,7 +25,7 @@ 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.clerezza.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;
@@ -91,8 +91,8 @@ public class RendererFactory {
         }
     }
 
-    private Map<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeRenderletMap =
-            Collections.synchronizedMap(new HashMap<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>>());
+    private Map<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeRenderletMap =
+            Collections.synchronizedMap(new HashMap<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>>());
 
     private BundleContext bundleContext;
 
@@ -125,14 +125,14 @@ public class RendererFactory {
      */
     public Renderer createRenderer(GraphNode resource, String mode,
             List<MediaType> acceptableMediaTypes) {
-        Set<Iri> types = new HashSet<Iri>();
+        Set<IRI> types = new HashSet<IRI>();
         if (resource.getNode() instanceof Literal) {
             types.add(((Literal) resource.getNode()).getDataType());
         } else {
             // extract rdf types
-            Iterator<Iri> it = resource.getIriObjects(RDF.type);
+            Iterator<IRI> it = resource.getIriObjects(RDF.type);
             while (it.hasNext()) {
-                final Iri rdfType = it.next();
+                final IRI rdfType = it.next();
                 types.add(rdfType);
             }
             types.add(RDFS.Resource);
@@ -140,11 +140,11 @@ public class RendererFactory {
         return getRenderer(types, mode, acceptableMediaTypes);
     }
 
-    private Renderer getRenderer(Set<Iri> types, String mode,
+    private Renderer getRenderer(Set<IRI> types, String mode,
             List<MediaType> acceptableMediaTypes) {
-        Iterator<Iri> sortedTypes = typePrioritizer.iterate(types);
+        Iterator<IRI> sortedTypes = typePrioritizer.iterate(types);
         while (sortedTypes.hasNext()) {
-            final Iri currentType = sortedTypes.next();
+            final IRI currentType = sortedTypes.next();
             final RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeRenderletMap.get(currentType);
             if (regexMap != null) {
                 Iterator<MediaTypeMap<TypeRenderletStartLevel>> mediaTypeMapIter = regexMap.getMatching(mode);
@@ -190,7 +190,7 @@ public class RendererFactory {
     }
 
     private void registerRenderlet(TypeRenderlet typeRenderlet, int startLevel) {
-        final Iri rdfType = typeRenderlet.getRdfType();
+        final IRI rdfType = typeRenderlet.getRdfType();
         RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeRenderletMap.get(rdfType);
         if (regexMap == null) {
             regexMap = new RegexMap<MediaTypeMap<TypeRenderletStartLevel>>();
@@ -208,7 +208,7 @@ public class RendererFactory {
 
     protected void unbindTypeRenderlet(TypeRenderlet typeRenderlet) {
         TypeRenderletStartLevel typeRenderletStartLevel = new TypeRenderletStartLevel(typeRenderlet, 0);
-        for (Map.Entry<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeEntry: typeRenderletMap.entrySet()) {
+        for (Map.Entry<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeEntry: typeRenderletMap.entrySet()) {
             final RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeEntry.getValue();
             for (Map.Entry<String, MediaTypeMap<TypeRenderletStartLevel>> regexEntry: regexMap.entrySet()) {
                 final MediaTypeMap<TypeRenderletStartLevel> mediaTypeMap = regexEntry.getValue();

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 cbe1469..8b0cbe9 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
@@ -23,7 +23,7 @@ import java.io.StringWriter;
 import java.net.URI;
 import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
 import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Iri;
+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;
@@ -53,7 +53,7 @@ public class RenderingException extends TypeRenderingException {
     public GraphNode getExceptionGraphNode() {
         GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph());
         result.addProperty(RDF.type, TYPERENDERING.Exception);
-        result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString()));
+        result.addProperty(TYPERENDERING.errorSource, new IRI(renderingSpecification.toString()));
         result.addProperty(TYPERENDERING.message, new PlainLiteralImpl(getMessage()));
         result.addProperty(TYPERENDERING.stackTrace, getStackTraceLiteral());
         return result;

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a186180..b92da78 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
@@ -22,7 +22,7 @@ import java.net.URI;
 import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
 import org.apache.clerezza.rdf.core.LiteralFactory;
 import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Iri;
+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;
@@ -124,7 +124,7 @@ public class RenderingspecificationException extends TypeRenderingException{
         GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph());
         result.addProperty(RDF.type, TYPERENDERING.Exception);
         LiteralFactory factory = LiteralFactory.getInstance();
-        result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString()));
+        result.addProperty(TYPERENDERING.errorSource, new IRI(renderingSpecification.toString()));
         if (lineNumber != -1) {
             result.addProperty(TYPERENDERING.line, factory.createTypedLiteral(new Integer(lineNumber)));
         }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 29e3d6d..cc0011b 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.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 
 /**
  * Over the RenderletManagerImpl renderlets can be registered.
@@ -48,6 +48,6 @@ public interface RenderletManager {
      * required.
      * @param mediaType The media type of the rendered
      * @param builtIn ignored
-     */ void registerRenderlet(String renderletServiceName, final Iri renderingSpecification, final Iri rdfType, final String mode, final MediaType mediaType, boolean builtIn);
+     */ void registerRenderlet(String renderletServiceName, final IRI renderingSpecification, final IRI rdfType, final String mode, final MediaType mediaType, boolean builtIn);
 
 }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 201b670..71907d5 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.clerezza.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;
@@ -67,12 +67,12 @@ public class RenderletManagerImpl implements RenderletManager {
     private static class RegistrationRequest {
 
         String renderletServiceName;
-        Iri renderingSpecification;
-        Iri rdfType;
+        IRI renderingSpecification;
+        IRI rdfType;
         String mode;
         MediaType mediaType;
 
-        public RegistrationRequest(String renderletServiceName, Iri renderingSpecification, Iri rdfType, String mode, MediaType mediaType) {
+        public RegistrationRequest(String renderletServiceName, IRI renderingSpecification, IRI rdfType, String mode, MediaType mediaType) {
             this.renderletServiceName = renderletServiceName;
             this.renderingSpecification = renderingSpecification;
             this.rdfType = rdfType;
@@ -112,8 +112,8 @@ public class RenderletManagerImpl implements RenderletManager {
      * @param builtIn ignored
      */
     public void registerRenderlet(String renderletServiceName,
-            final Iri renderingSpecification,
-            final Iri rdfType,
+            final IRI renderingSpecification,
+            final IRI rdfType,
             final String mode,
             final MediaType mediaType, boolean builtIn) {
         RegistrationRequest registrationRequest = new RegistrationRequest(renderletServiceName,
@@ -232,8 +232,8 @@ public class RenderletManagerImpl implements RenderletManager {
 
     private boolean attemptRegistration(RegistrationRequest registrationRequest) {
         final String renderletServiceName = registrationRequest.renderletServiceName;
-        Iri renderingSpecification = registrationRequest.renderingSpecification;
-        final Iri rdfType = registrationRequest.rdfType;
+        IRI renderingSpecification = registrationRequest.renderingSpecification;
+        final IRI rdfType = registrationRequest.rdfType;
         final String modePattern = registrationRequest.mode;
         final MediaType mediaType = registrationRequest.mediaType;
 
@@ -252,7 +252,7 @@ public class RenderletManagerImpl implements RenderletManager {
         TypeRenderlet typeRenderlet = new TypeRenderlet() {
 
             @Override
-            public Iri getRdfType() {
+            public IRI getRdfType() {
                 return rdfType;
             }
 
@@ -304,7 +304,7 @@ public class RenderletManagerImpl implements RenderletManager {
         return true;
     }
 
-    private ServiceRegistration getAlreadyRegisteredServiceReg(Iri rdfType, 
+    private ServiceRegistration getAlreadyRegisteredServiceReg(IRI rdfType, 
             MediaType mediaType, String modePattern) {
         
         for (ServiceRegistration serviceRegistration : registeredTypeRenderlets) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 3bde164..8b87ec7 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.clerezza.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;
@@ -52,7 +52,7 @@ class RenderletRendererImpl implements Renderer {
     private GraphNodeProvider graphNodeProvider;
 
 
-    RenderletRendererImpl(Iri renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider,
+    RenderletRendererImpl(IRI renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider,
             Renderlet renderlet, MediaType mediaType, 
             RendererFactory rendererFactory,
             BundleContext bundleContext) {


Mime
View raw message