clerezza-commits mailing list archives

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


http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 59911c4..aba1626 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.clerezza.commons.rdf.BlankNodeOrIri;
+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.commons.rdf.IRI;
 import org.apache.clerezza.rdf.ontologies.OWL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,36 +56,36 @@ public class SameAsSmusher extends BaseSmusher {
     	log.info("Starting smushing");
         
     	// This hashmap contains a uri (key) and the set of equivalent uris (value)
-    	final Map<BlankNodeOrIri, Set<BlankNodeOrIri>> node2EquivalenceSet = new HashMap<BlankNodeOrIri, Set<BlankNodeOrIri>>();
+    	final Map<BlankNodeOrIRI, Set<BlankNodeOrIRI>> node2EquivalenceSet = new HashMap<BlankNodeOrIRI, Set<BlankNodeOrIRI>>();
     	
     	log.info("Creating the sets of equivalent uris of each subject or object in the owl:sameAs statements");
     	// Determines for each subject and object in all the owl:sameAs statements the set of ewquivalent uris 
     	for (Iterator<Triple> it = owlSameStatements.iterator(); it.hasNext();) {            
     		final Triple triple = it.next();
-            final Iri predicate = triple.getPredicate();
+            final IRI predicate = triple.getPredicate();
             if (!predicate.equals(OWL.sameAs)) {
                 throw new RuntimeException("Statements must use only <http://www.w3.org/2002/07/owl#sameAs> predicate.");
             }
-            final BlankNodeOrIri subject = triple.getSubject();
+            final BlankNodeOrIRI subject = triple.getSubject();
             //literals not yet supported
-            final BlankNodeOrIri object = (BlankNodeOrIri)triple.getObject();
+            final BlankNodeOrIRI object = (BlankNodeOrIRI)triple.getObject();
             
-            Set<BlankNodeOrIri> equivalentNodes = node2EquivalenceSet.get(subject);
+            Set<BlankNodeOrIRI> equivalentNodes = node2EquivalenceSet.get(subject);
             
             // if there is not a set of equivalent uris then create a new set
             if (equivalentNodes == null) {
             	equivalentNodes = node2EquivalenceSet.get(object);
             	if (equivalentNodes == null) {
-                    equivalentNodes = new HashSet<BlankNodeOrIri>();
+                    equivalentNodes = new HashSet<BlankNodeOrIRI>();
                 }
             } else {
-                Set<BlankNodeOrIri> objectSet = node2EquivalenceSet.get(object);
+                Set<BlankNodeOrIRI> objectSet = node2EquivalenceSet.get(object);
                 if ((objectSet != null) && (objectSet != equivalentNodes)) {
                     //merge two sets
-                    for (BlankNodeOrIri res : objectSet) {
+                    for (BlankNodeOrIRI res : objectSet) {
                         node2EquivalenceSet.remove(res);
                     }
-                    for (BlankNodeOrIri res : objectSet) {
+                    for (BlankNodeOrIRI res : objectSet) {
                         node2EquivalenceSet.put(res,equivalentNodes);
                     }
                     equivalentNodes.addAll(objectSet);
@@ -105,7 +105,7 @@ public class SameAsSmusher extends BaseSmusher {
     	}
     	
     	// This set contains the sets of equivalent uris
-    	Set<Set<BlankNodeOrIri>> unitedEquivalenceSets = new HashSet<Set<BlankNodeOrIri>>(node2EquivalenceSet.values());
+    	Set<Set<BlankNodeOrIRI>> unitedEquivalenceSets = new HashSet<Set<BlankNodeOrIRI>>(node2EquivalenceSet.values());
         smush(mGraph, unitedEquivalenceSets, addCanonicalSameAsStatements);
     }
 

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 3b78422..2ec8af8 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
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.utils;
 
 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.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;
@@ -34,9 +34,9 @@ import org.junit.Test;
  */
 public class GraphUtilsTest {
 
-    final Iri u1 = new Iri("http://ex.org/1");
-    final Iri u2 = new Iri("http://ex.org/2");
-    final Iri u3 = new Iri("http://ex.org/3");
+    final IRI u1 = new IRI("http://ex.org/1");
+    final IRI u2 = new IRI("http://ex.org/2");
+    final IRI u3 = new IRI("http://ex.org/3");
 
     @Test
     public void removeSubGraph() throws NoSuchSubGraphException {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 58b377e..c9a8f0a 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
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.utils;
 
 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.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;
@@ -45,7 +45,7 @@ public class IfpSmushTest {
     @Test
     public void simpleBlankNode()  {
         Graph mGraph = new SimpleGraph();
-        Iri mbox1 = new Iri("mailto:foo@example.org");
+        IRI mbox1 = new IRI("mailto:foo@example.org");
         final BlankNode bNode1 = new BlankNode();
         mGraph.add(new TripleImpl(bNode1, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(bNode1, RDFS.comment, 
@@ -61,13 +61,13 @@ public class IfpSmushTest {
     @Test
     public void overlappingEquivalenceClasses()  {
         Graph mGraph = new SimpleGraph();
-        Iri mbox1 = new Iri("mailto:foo@example.org");
+        IRI mbox1 = new IRI("mailto:foo@example.org");
         final BlankNode bNode1 = new BlankNode();
         mGraph.add(new TripleImpl(bNode1, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(bNode1, RDFS.comment,
                 new PlainLiteralImpl("a comment")));
         final BlankNode bNode2 = new BlankNode();
-        Iri mbox2 = new Iri("mailto:bar@example.org");
+        IRI mbox2 = new IRI("mailto:bar@example.org");
         mGraph.add(new TripleImpl(bNode2, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(bNode2, FOAF.mbox, mbox2));
         mGraph.add(new TripleImpl(bNode2, RDFS.comment,
@@ -83,8 +83,8 @@ public class IfpSmushTest {
     @Test
     public void oneIri()  {
         Graph mGraph = new SimpleGraph();
-        Iri mbox1 = new Iri("mailto:foo@example.org");
-        final Iri resource = new Iri("http://example.org/");
+        IRI mbox1 = new IRI("mailto:foo@example.org");
+        final IRI resource = new IRI("http://example.org/");
         mGraph.add(new TripleImpl(resource, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(resource, RDFS.comment,
                 new PlainLiteralImpl("a comment")));
@@ -99,12 +99,12 @@ public class IfpSmushTest {
     @Test
     public void twoIris()  {
         Graph mGraph = new SimpleGraph();
-        Iri mbox1 = new Iri("mailto:foo@example.org");
-        final Iri resource1 = new Iri("http://example.org/");
+        IRI mbox1 = new IRI("mailto:foo@example.org");
+        final IRI resource1 = new IRI("http://example.org/");
         mGraph.add(new TripleImpl(resource1, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(resource1, RDFS.comment,
                 new PlainLiteralImpl("a comment")));
-        final Iri resource2 = new Iri("http://2.example.org/");
+        final IRI resource2 = new IRI("http://2.example.org/");
         mGraph.add(new TripleImpl(resource2, FOAF.mbox, mbox1));
         mGraph.add(new TripleImpl(resource2, RDFS.comment,
                 new PlainLiteralImpl("another comment")));

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 1e62180..c81547d 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
@@ -25,10 +25,10 @@ import junit.framework.Assert;
 
 import org.junit.Test;
 import org.apache.clerezza.commons.rdf.BlankNode;
-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.PlainLiteralImpl;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import static org.junit.Assert.*;
@@ -42,7 +42,7 @@ public class RdfListTest {
     @Test
     public void listCreationAndAccess() {
         Graph tc = new SimpleGraph();
-        List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
         assertEquals(0, list.size());
         list.add(new PlainLiteralImpl("hello"));
         list.add(new PlainLiteralImpl("world"));
@@ -61,7 +61,7 @@ public class RdfListTest {
         assertEquals(5, list.size());
         assertEquals(new PlainLiteralImpl("hello"), list.get(1));
         assertEquals(new PlainLiteralImpl("interesting"), list.get(2));
-        List<RdfTerm> list2 = new RdfList(new Iri("http://example.org/mytest"), tc);
+        List<RDFTerm> list2 = new RdfList(new IRI("http://example.org/mytest"), tc);
         assertEquals(5, list2.size());
         assertEquals(new PlainLiteralImpl("hello"), list2.get(1));
         assertEquals(new PlainLiteralImpl("interesting"), list2.get(2));
@@ -87,12 +87,12 @@ public class RdfListTest {
     @Test
     public void listCreationAndAccess2() {
         Graph tc = new SimpleGraph();
-        List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
         assertEquals(0, list.size());
         list.add(0,new PlainLiteralImpl("world"));
-        list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        list = new RdfList(new IRI("http://example.org/mytest"), tc);
         list.add(0,new PlainLiteralImpl("beautifuly"));
-        list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        list = new RdfList(new IRI("http://example.org/mytest"), tc);
         list.add(0,new PlainLiteralImpl("hello"));
         assertEquals(new PlainLiteralImpl("hello"), list.get(0));
         assertEquals(new PlainLiteralImpl("beautifuly"), list.get(1));
@@ -102,7 +102,7 @@ public class RdfListTest {
     @Test
     public void listCreationAndAccess3() {
         Graph tc = new SimpleGraph();
-        List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
         assertEquals(0, list.size());
         BlankNode node0 = new BlankNode() {};
         BlankNode node1 = new BlankNode() {};
@@ -118,7 +118,7 @@ public class RdfListTest {
     @Test
     public void secondButLastElementAccessTest() {
         Graph tc = new SimpleGraph();
-        List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest2"), tc);
+        List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest2"), tc);
         list.add(new PlainLiteralImpl("hello"));
         list.add(new PlainLiteralImpl("world"));
         list.remove(1);
@@ -128,7 +128,7 @@ public class RdfListTest {
     @Test
     public void cleanGraphAfterRemoval() {
         Graph tc = new SimpleGraph();
-        List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+        List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
         list.add(new PlainLiteralImpl("hello"));
         list.add(new PlainLiteralImpl("world"));
         list.remove(1);
@@ -139,8 +139,8 @@ public class RdfListTest {
     @Test
     public void findContainingListNodesAndfindContainingListsTest() {
         Graph tc = new SimpleGraph();
-        GraphNode listA = new GraphNode(new Iri("http:///listA"), tc);
-        GraphNode listB = new GraphNode(new Iri("http:///listB"), tc);
+        GraphNode listA = new GraphNode(new IRI("http:///listA"), tc);
+        GraphNode listB = new GraphNode(new IRI("http:///listB"), tc);
         BlankNode element1 = new BlankNode();
         BlankNode element2 = new BlankNode();
         BlankNode element3 = new BlankNode();

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 8512695..fc44ec2 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
@@ -23,7 +23,7 @@ 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.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;
@@ -40,8 +40,8 @@ import org.junit.Test;
  */
 public class SameAsSmushTest {
     
-    private final Iri uriA = new Iri("http://example.org/A");
-    private final Iri uriB = new Iri("http://example.org/B");
+    private final IRI uriA = new IRI("http://example.org/A");
+    private final IRI uriB = new IRI("http://example.org/B");
     private final Literal lit = new PlainLiteralImpl("That's me (and you)");
 
     private Graph sameAsStatements = new SimpleGraph();

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 45e2547..4386039 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
@@ -28,9 +28,9 @@ import org.junit.Test;
 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.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.commons.rdf.impl.utils.PlainLiteralImpl;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -47,8 +47,8 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
-        Iri property2 = new Iri("http://example.org/property2");
+        IRI property1 = new IRI("http://example.org/property1");
+        IRI property2 = new IRI("http://example.org/property2");
         g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
         g.add(new TripleImpl(bNode1, property2, property1));
         g.add(new TripleImpl(bNode2, property2, bNode1));
@@ -66,7 +66,7 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
+        IRI property1 = new IRI("http://example.org/property1");
         GraphNode n = new GraphNode(bNode1, g);
         n.addProperty(property1, bNode2);
         Assert.assertEquals(1, g.size());
@@ -78,10 +78,10 @@ public class TestGraphNode {
         for (int j = 0; j < 200; j++) {
             Triple randomTriple = graph.getRandomTriple();
             GraphNode node = new GraphNode(randomTriple.getSubject(), graph);
-            Iterator<Iri> properties = node.getProperties();
+            Iterator<IRI> properties = node.getProperties();
             while (properties.hasNext()) {
-                Iri property = properties.next();
-                Set<RdfTerm> objects = createSet(node.getObjects(property));
+                IRI property = properties.next();
+                Set<RDFTerm> objects = createSet(node.getObjects(property));
                 Iterator<GraphNode> objectNodes = node.getObjectNodes(property);
                 while (objectNodes.hasNext()) {
                     GraphNode graphNode = objectNodes.next();
@@ -93,10 +93,10 @@ public class TestGraphNode {
         for (int j = 0; j < 200; j++) {
             Triple randomTriple = graph.getRandomTriple();
             GraphNode node = new GraphNode(randomTriple.getObject(), graph);
-            Iterator<Iri> properties = node.getProperties();
+            Iterator<IRI> properties = node.getProperties();
             while (properties.hasNext()) {
-                Iri property = properties.next();
-                Set<RdfTerm> subjects = createSet(node.getSubjects(property));
+                IRI property = properties.next();
+                Set<RDFTerm> subjects = createSet(node.getSubjects(property));
                 Iterator<GraphNode> subjectNodes = node.getSubjectNodes(property);
                 while (subjectNodes.hasNext()) {
                     GraphNode graphNode = subjectNodes.next();
@@ -111,11 +111,11 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
-        Iri property2 = new Iri("http://example.org/property2");
-        Iri property3 = new Iri("http://example.org/property3");
-        Iri property4 = new Iri("http://example.org/property4");
-        ArrayList<Iri> props = new ArrayList<Iri>();
+        IRI property1 = new IRI("http://example.org/property1");
+        IRI property2 = new IRI("http://example.org/property2");
+        IRI property3 = new IRI("http://example.org/property3");
+        IRI property4 = new IRI("http://example.org/property4");
+        ArrayList<IRI> props = new ArrayList<IRI>();
         props.add(property1);
         props.add(property2);
         props.add(property3);
@@ -125,11 +125,11 @@ public class TestGraphNode {
         n.addProperty(property2, bNode2);
         n.addProperty(property3, bNode2);
         n.addProperty(property4, bNode2);
-        Iterator<Iri> properties = n.getProperties();
+        Iterator<IRI> properties = n.getProperties();
         int i = 0;
         while(properties.hasNext()){
             i++;
-            Iri prop = properties.next();
+            IRI prop = properties.next();
             Assert.assertTrue(props.contains(prop));
             props.remove(prop);
         }
@@ -143,8 +143,8 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
-        Iri property2 = new Iri("http://example.org/property2");
+        IRI property1 = new IRI("http://example.org/property1");
+        IRI property2 = new IRI("http://example.org/property2");
         //the two properties two be deleted
         g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
         g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("bla bla")));
@@ -162,8 +162,8 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
-        Iri property2 = new Iri("http://example.org/property2");
+        IRI property1 = new IRI("http://example.org/property1");
+        IRI property2 = new IRI("http://example.org/property2");
         //the properties two be deleted
         g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
         //this 4 properties should stay
@@ -182,9 +182,9 @@ public class TestGraphNode {
         BlankNode bNode1 = new BlankNode();
         BlankNode bNode2 = new BlankNode();
         BlankNode newBnode = new BlankNode();
-        Iri property1 = new Iri("http://example.org/property1");
-        Iri property2 = new Iri("http://example.org/property2");
-        Iri newIri = new Iri("http://example.org/newName");
+        IRI property1 = new IRI("http://example.org/property1");
+        IRI property2 = new IRI("http://example.org/property2");
+        IRI newIri = new IRI("http://example.org/newName");
         Literal literal1 = new PlainLiteralImpl("literal");
         Literal literal2 = new PlainLiteralImpl("bla bla");
 
@@ -250,7 +250,7 @@ public class TestGraphNode {
         Graph g = new SimpleGraph();
         BlankNode bNode1 = new BlankNode() {};
         BlankNode bNode2 = new BlankNode() {};
-        Iri property1 = new Iri("http://example.org/property1");
+        IRI property1 = new IRI("http://example.org/property1");
         GraphNode n = new GraphNode(bNode1, g);
         n.addProperty(property1, bNode2);
         Assert.assertTrue(n.equals(new GraphNode(bNode1, g)));
@@ -259,10 +259,10 @@ public class TestGraphNode {
         Assert.assertFalse(n.equals(n2));
     }
 
-    private Set<RdfTerm> createSet(Iterator<? extends RdfTerm> resources) {
-        Set<RdfTerm> set = new HashSet<RdfTerm>();
+    private Set<RDFTerm> createSet(Iterator<? extends RDFTerm> resources) {
+        Set<RDFTerm> set = new HashSet<RDFTerm>();
         while (resources.hasNext()) {
-            RdfTerm resource = resources.next();
+            RDFTerm resource = resources.next();
             set.add(resource);
         }
         return set;

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 8069438..53173f4 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
@@ -23,7 +23,7 @@ import org.junit.Test;
 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.IRI;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
 import org.junit.Assert;
@@ -34,14 +34,14 @@ import org.junit.Assert;
  */
 public class UnionGraphTest {
 
-    private final Iri uriRef1 =
-            new Iri("http://example.org/ontology#res1");
-    private final Iri uriRef2 =
-            new Iri("http://example.org/ontology#res2");
-    private final Iri uriRef3 =
-            new Iri("http://example.org/ontology#res3");
-    private final Iri uriRef4 =
-            new Iri("http://example.org/ontology#res4");
+    private final IRI uriRef1 =
+            new IRI("http://example.org/ontology#res1");
+    private final IRI uriRef2 =
+            new IRI("http://example.org/ontology#res2");
+    private final IRI uriRef3 =
+            new IRI("http://example.org/ontology#res3");
+    private final IRI uriRef4 =
+            new IRI("http://example.org/ontology#res4");
 
     @Test
     public void readAccess() {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 22a5385..f2d2539 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
@@ -24,7 +24,7 @@ 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.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;
@@ -41,9 +41,9 @@ import org.junit.Test;
  */
 public class SameAsSmushTest {
     
-    private final Iri uriA = new Iri("http://example.org/A");
-    private final Iri uriB = new Iri("http://example.org/B");
-    private final Iri uriC = new Iri("http://example.org/C");
+    private final IRI uriA = new IRI("http://example.org/A");
+    private final IRI uriB = new IRI("http://example.org/B");
+    private final IRI uriC = new IRI("http://example.org/C");
     
     private final Literal lit = new PlainLiteralImpl("That's me (and you)");
 
@@ -64,7 +64,7 @@ public class SameAsSmushTest {
         SameAsSmusher smusher = new SameAsSmusher() {
 
             @Override
-            protected Iri getPreferedIri(Set<Iri> uriRefs) {
+            protected IRI getPreferedIri(Set<IRI> uriRefs) {
                 if (!uriRefs.contains(uriA)) throw new RuntimeException("not the set we excpect");
                 if (!uriRefs.contains(uriB)) throw new RuntimeException("not the set we excpect");
                 return uriC;

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 2619e14..ea34a4f 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
@@ -47,7 +47,7 @@ import org.apache.clerezza.commons.rdf.Graph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.TcManager;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -105,7 +105,7 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
         }
     }
 
-    private String getTcFileName(Iri tcUri, String extension,
+    private String getTcFileName(IRI tcUri, String extension,
             Map<String, Integer> fileNameCount) {
         String fileName = tcUri.getUnicodeString();
         fileName = fileName.substring(fileName.lastIndexOf("/")+1);
@@ -128,10 +128,10 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
 
             compressedTcs.putNextEntry(new ZipEntry(folder));
 
-            Set<Iri> tripleCollections = tcManager.listGraphs();
-            Iterator<Iri> tcIris = tripleCollections.iterator();
+            Set<IRI> tripleCollections = tcManager.listGraphs();
+            Iterator<IRI> tcIris = tripleCollections.iterator();
             while (tcIris.hasNext()) {
-                Iri tcUri = tcIris.next();
+                IRI tcUri = tcIris.next();
                 String fileName = folder + getTcFileName(tcUri, ".nt",
                         fileNameCount);
                 Graph tripleCollection = tcManager.getGraph(tcUri);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 7f3d8f5..98e1aee 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
@@ -32,7 +32,7 @@ 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.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.simple.SimpleGraph;
@@ -60,7 +60,7 @@ public class Delete {
 
     
     @POST
-    public Response delete(@Context UriInfo uriInfo, @FormParam("graphName") Iri graphName) {
+    public Response delete(@Context UriInfo uriInfo, @FormParam("graphName") IRI graphName) {
         tcManager.deleteGraph(graphName);
         return RedirectUtil.createSeeOtherResponse("./", uriInfo);
     }

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 4ae100b..fadd9be 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
@@ -41,7 +41,7 @@ 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.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
 import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -74,7 +74,7 @@ public class GraphManagement implements GlobalMenuItemsProvider {
     protected void activate(ComponentContext componentContext) {
         URL templateURL = getClass().getResource("graph-management.ssp");
         renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new Iri(templateURL.toString()), GRAPHMANAGEMENT.GraphManagementPage,
+                new IRI(templateURL.toString()), GRAPHMANAGEMENT.GraphManagementPage,
                 "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
     }
 
@@ -84,8 +84,8 @@ public class GraphManagement implements GlobalMenuItemsProvider {
         TrailingSlash.enforcePresent(uriInfo);
         final SimpleGraph resultGraph = new SimpleGraph();
         GraphNode graphNode = new GraphNode(new BlankNode(), resultGraph);
-        Set<Iri> tripleCollections = tcManager.listGraphs();
-        for (Iri uriRef : tripleCollections) {
+        Set<IRI> tripleCollections = tcManager.listGraphs();
+        for (IRI uriRef : tripleCollections) {
             graphNode.addProperty(GRAPHMANAGEMENT.tripleCollection, uriRef);
             final Graph tripleCollection = tcManager.getGraph(uriRef);
             resultGraph.add(new TripleImpl(uriRef,GRAPHMANAGEMENT.size,

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 a5c4a33..728be7a 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
@@ -38,7 +38,7 @@ 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.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;
@@ -130,7 +130,7 @@ public class Restorer {
                 Graph mGraph;
                 boolean created = false;
                 try {
-                    mGraph = target.getGraph((Iri)graphGN.getNode());
+                    mGraph = target.getGraph((IRI)graphGN.getNode());
                     try {
                         mGraph.clear();
                     } catch (UnsupportedOperationException ex) {
@@ -139,7 +139,7 @@ public class Restorer {
                         continue;
                     }
                 } catch (NoSuchEntityException ex) {
-                    mGraph = target.createGraph((Iri)graphGN.getNode());
+                    mGraph = target.createGraph((IRI)graphGN.getNode());
                     created = true;
                 }
                 try {
@@ -158,7 +158,7 @@ public class Restorer {
                 String fileName = graphGN.getLiterals(BACKUP.file).next().getLexicalForm();
                 Graph extracted = extractedTc.get(fileName);
                 try {
-                    target.deleteGraph((Iri)graphGN.getNode());
+                    target.deleteGraph((IRI)graphGN.getNode());
                 } catch (UnsupportedOperationException ex) {
                     log.warn("could not restore "+graphGN.getNode()+" as the exsting triple "
                             + "collection could not be deleted");
@@ -166,7 +166,7 @@ public class Restorer {
                 } catch (NoSuchEntityException ex) {
                     log.debug("could not remove "+graphGN.getNode()+", no such entity");
                 }
-                target.createImmutableGraph((Iri)graphGN.getNode(), extracted);
+                target.createImmutableGraph((IRI)graphGN.getNode(), extracted);
             }
         }
         for (Map.Entry<String, Graph> pathTcPair : extractedTc.entrySet()) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 e596520..475f6f2 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
@@ -47,8 +47,8 @@ import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 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.access.TcManager;
 import org.apache.clerezza.rdf.core.sparql.ResultSet;
 import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
@@ -153,15 +153,15 @@ public class ResultSetMessageBodyWriter implements MessageBodyWriter<ResultSet>
 
 
     /**
-     * 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");
@@ -191,8 +191,7 @@ public class ResultSetMessageBodyWriter implements MessageBodyWriter<ResultSet>
         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/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 6194ca8..a6877bf 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
@@ -31,7 +31,7 @@ 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.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.simple.SimpleGraph;
@@ -53,7 +53,7 @@ import org.osgi.service.component.ComponentContext;
 @Property(name="javax.ws.rs", boolValue=true)
 @Path("/admin/graphs/smush")
 public class Smush {
-    private final Iri tBoxName = new Iri("urn:x-localinstance:/tbox.graph");
+    private final IRI tBoxName = new IRI("urn:x-localinstance:/tbox.graph");
 
     @Reference
     private TcManager tcManager;
@@ -80,7 +80,7 @@ public class Smush {
 
     
     @POST
-    public Response smush(@Context UriInfo uriInfo, @FormParam("graphName") Iri graphName) {
+    public Response smush(@Context UriInfo uriInfo, @FormParam("graphName") IRI graphName) {
         Graph mGraph = tcManager.getGraph(graphName);
         Smusher.smush(mGraph, tBox);
         return RedirectUtil.createSeeOtherResponse("./", uriInfo);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 e63e018..0ddc042 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
@@ -65,9 +65,9 @@ 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.RDFTerm;
 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.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -114,7 +114,7 @@ public class SparqlEndpoint {
     protected void activate(ComponentContext componentContext) {
         URL templateURL = getClass().getResource("sparql-endpoint.ssp");
         renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
-                new Iri(templateURL.toString()), SPARQLENDPOINT.SparqlEndpoint,
+                new IRI(templateURL.toString()), SPARQLENDPOINT.SparqlEndpoint,
                 null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
     }
 
@@ -124,8 +124,8 @@ public class SparqlEndpoint {
         AccessController.checkPermission(new SparqlEndpointAccessPermission());
         TrailingSlash.enforceNotPresent(uriInfo);
         GraphNode graphNode = new GraphNode(new BlankNode(), new SimpleGraph());
-        Set<Iri> tripleCollections = tcManager.listGraphs();
-        for (Iri uriRef : tripleCollections) {
+        Set<IRI> tripleCollections = tcManager.listGraphs();
+        for (IRI uriRef : tripleCollections) {
             graphNode.addProperty(SPARQLENDPOINT.tripleCollection, uriRef);
         }
         graphNode.addProperty(RDF.type, SPARQLENDPOINT.SparqlEndpoint);
@@ -143,7 +143,7 @@ public class SparqlEndpoint {
      * @param queryString
      *            URL encoded sparql query
      * @param defaultGraphUri
-     *            URI of the default graph, an {@link Iri} is expected
+     *            URI of the default graph, an {@link IRI} is expected
      * @param applyStyleSheet
      * @param serverSide
      * @param styleSheetUri 
@@ -151,7 +151,7 @@ public class SparqlEndpoint {
      */
     @POST
     public Object runFormQuery(@FormParam("query") String queryString,
-            @FormParam("default-graph-uri") Iri defaultGraphUri,
+            @FormParam("default-graph-uri") IRI defaultGraphUri,
             @FormParam("apply-style-sheet") String applyStyleSheet,
             @FormParam("server-side") String serverSide,
             @FormParam("style-sheet-uri") String styleSheetUri) {
@@ -174,7 +174,7 @@ public class SparqlEndpoint {
         try {
             if (defaultGraphUri == null
                     || defaultGraphUri.getUnicodeString().equals("")) {
-                defaultGraphUri = new Iri(Constants.CONTENT_GRAPH_URI_STRING);
+                defaultGraphUri = new IRI(Constants.CONTENT_GRAPH_URI_STRING);
                 //defaultGraph = contentGraph;
             } else {
                 //defaultGraph = tcManager.getTriples(defaultGraphUri);
@@ -224,7 +224,7 @@ public class SparqlEndpoint {
      */
     @GET
     public Object runGetQuery(@QueryParam("query") String queryString,
-            @QueryParam("default-graph-uri") Iri defaultGraphUri,
+            @QueryParam("default-graph-uri") IRI defaultGraphUri,
             @QueryParam("style-sheet-uri") String styleSheetUri,
             @QueryParam("server-side") String serverSide) {
         AccessController.checkPermission(new SparqlEndpointAccessPermission());
@@ -373,8 +373,7 @@ public class SparqlEndpoint {
             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);
             }
         }
@@ -382,15 +381,15 @@ public class SparqlEndpoint {
     }
 
     /**
-     * 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");

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 1369db8..eee056f 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
@@ -49,7 +49,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.rdf.core.access.NoSuchEntityException;
 import org.apache.clerezza.rdf.core.access.TcManager;
 import org.apache.clerezza.rdf.core.serializedform.Parser;
@@ -82,7 +82,7 @@ public class WebAccess {
      * @return
      */
     @GET
-    public Graph getTriples(@QueryParam("name") Iri name) {
+    public Graph getTriples(@QueryParam("name") IRI name) {
         AccessController.checkPermission(new WebAccessPermission());
         if (name == null) {
             Response r = Response.status(Response.Status.BAD_REQUEST)
@@ -112,7 +112,7 @@ public class WebAccess {
      * @param triples
      */
     @PUT
-    public void putTriples(@QueryParam("name") Iri name, Graph triples) {
+    public void putTriples(@QueryParam("name") IRI name, Graph triples) {
         AccessController.checkPermission(new WebAccessPermission());
         Graph mGraph;
         try {
@@ -193,7 +193,7 @@ public class WebAccess {
         }
         InputStream is = new ByteArrayInputStream(graph);
         ImmutableGraph parsedGraph = parser.parse(is, mediaType.toString());
-        Iri graphUri = new Iri(graphName);
+        IRI graphUri = new IRI(graphName);
         Graph mGraph;
         boolean newGraph = false;
         try {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 dbe5117..ca785be 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
@@ -33,7 +33,7 @@ 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.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;
@@ -63,24 +63,24 @@ public class BackupAndRestoreTest {
     private static String testGraphFileName = "test.graph";
 
     private static Graph testGraph0 = new SimpleGraph();
-    private static Iri testGraphUri0 = // the URI of testGraph0
-            new Iri("http://localhost/test0/"+testGraphFileName);
+    private static IRI testGraphUri0 = // the URI of testGraph0
+            new IRI("http://localhost/test0/"+testGraphFileName);
     // a resource in testGraph0
-    private    static Iri uri0 = new Iri("http://localhost/test0/testuri");
+    private    static IRI uri0 = new IRI("http://localhost/test0/testuri");
 
     private static Graph testGraph1 = new SimpleGraph();
-    private static Iri testGraphUri1 = // the URI of testGraph1
-            new Iri("http://localhost/test1/"+testGraphFileName);
+    private static IRI testGraphUri1 = // the URI of testGraph1
+            new IRI("http://localhost/test1/"+testGraphFileName);
 
     // a resource in testGraph1
-    private    static Iri uri1 = new Iri("http://localhost/test1/testuri");
+    private    static IRI uri1 = new IRI("http://localhost/test1/testuri");
 
     private static ImmutableGraph testGraphA;
-    private static Iri testGraphUriA = // the URI of testGraphA
-            new Iri("http://localhost/testA/"+testGraphFileName);
+    private static IRI testGraphUriA = // the URI of testGraphA
+            new IRI("http://localhost/testA/"+testGraphFileName);
 
     // a resource in testGraphA
-    private    static Iri uriA = new Iri("http://localhost/testA/testuri");
+    private    static IRI uriA = new IRI("http://localhost/testA/testuri");
     
 
     private static String backupContentFileName = "triplecollections.nt";
@@ -227,7 +227,7 @@ public class BackupAndRestoreTest {
 
         // Associates testGraphUri0 with testGraph0 and testGraphUri1 with testGraph1
         @Override
-        public Graph getGraph(Iri name) throws NoSuchEntityException {
+        public Graph getGraph(IRI name) throws NoSuchEntityException {
             if (name.equals(testGraphUri0)) {
                 return testGraph0;
             } else if (name.equals(testGraphUri1)) {
@@ -239,8 +239,8 @@ public class BackupAndRestoreTest {
         }
 
         @Override
-        public Set<Iri> listGraphs() {
-            Set<Iri> result = new HashSet<Iri>();
+        public Set<IRI> listGraphs() {
+            Set<IRI> result = new HashSet<IRI>();
             result.add(testGraphUri0);
             result.add(testGraphUri1);
             result.add(testGraphUriA);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 883bcd1..e505452 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.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.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;
@@ -61,10 +61,10 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
     }
 
     public static class PropertyKey {
-        private Iri property;
+        private IRI property;
         private boolean reverse;
         
-        public PropertyKey(Iri property, boolean reverse) {
+        public PropertyKey(IRI property, boolean reverse) {
             super();
             this.property = property;
             this.reverse = reverse;
@@ -101,7 +101,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
 
         
     }
-    private static final Iri RDF_NIL = new Iri(
+    private static final IRI RDF_NIL = new IRI(
             "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
     private RenderingFunctions renderingFunctions;
 
@@ -134,17 +134,17 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
     private class ExpandedNode {
 
         private GraphNode node;
-        private RdfTerm value;
+        private RDFTerm value;
         private Map<PropertyKey, List<ExpandedNode>> children;
-        private List<RdfTerm> list = null;
+        private List<RDFTerm> list = null;
 
-        private ExpandedNode(RdfTerm value) {
+        private ExpandedNode(RDFTerm value) {
             this.value = value;
             final Graph tc = expandedNode.node.getGraph();
             doListInitialization(tc);
         }
 
-        private ExpandedNode(GraphNode node, RdfTerm value) {
+        private ExpandedNode(GraphNode node, RDFTerm value) {
             this.value = value;
             this.node = node;
             doListInitialization(node.getGraph());
@@ -154,11 +154,10 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
          * @param tc
          */
         private void doListInitialization(Graph tc) {
-            if (value instanceof BlankNodeOrIri) {        
-                if ((tc.filter((BlankNodeOrIri) value, RDF.rest, null).hasNext())
-                        || (tc.filter(
-                        (BlankNodeOrIri) value, OWL.sameAs, RDF_NIL).hasNext())) {
-                    list = new RdfList((BlankNodeOrIri) value, tc);
+            if (value instanceof BlankNodeOrIRI) {        
+                if ((tc.filter((BlankNodeOrIRI) value, RDF.rest, null).hasNext())
+                        || (tc.filter((BlankNodeOrIRI) value, OWL.sameAs, RDF_NIL).hasNext())) {
+                    list = new RdfList((BlankNodeOrIRI) value, tc);
                 }
             }
         }
@@ -207,7 +206,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
                 inverseResolve = false;
             }
             String uriString = getUriFromCuri(fieldName);
-            Iri property = new Iri(uriString);
+            IRI property = new IRI(uriString);
             List<ExpandedNode> childList = getChildList(property, inverseResolve);
             if (arrayPos.length == 0) {
                 arrayPos = new int[1];
@@ -226,7 +225,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
 
         }
 
-        private List<ExpandedNode> getChildList(Iri property, boolean inverseResolve) {
+        private List<ExpandedNode> getChildList(IRI property, boolean inverseResolve) {
             PropertyKey propertyKey = new PropertyKey(property, inverseResolve); 
             List<ExpandedNode> result;
             if (children == null) {
@@ -238,16 +237,16 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
             if (result == null) {
                 result = new ArrayList<ExpandedNode>();
                 if (node == null) {
-                    node = new GraphNode((BlankNodeOrIri) value, expandedNode.node.getGraph());
+                    node = new GraphNode((BlankNodeOrIRI) value, expandedNode.node.getGraph());
                 }
                 if (inverseResolve) {
-                    Iterator<BlankNodeOrIri> subjects = node.getSubjects(property);
+                    Iterator<BlankNodeOrIRI> subjects = node.getSubjects(property);
                     while (subjects.hasNext()) {
                         ExpandedNode childNode = new ExpandedNode(subjects.next());
                         result.add(childNode);
                     }
                 } else {
-                    Iterator<RdfTerm> objects = node.getObjects(property);
+                    Iterator<RDFTerm> objects = node.getObjects(property);
                     while (objects.hasNext()) {
                         ExpandedNode childNode = new ExpandedNode(objects.next());
                         result.add(childNode);

http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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 c2903ef..c4b8fba 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
@@ -29,9 +29,9 @@ import org.junit.Assert;
 import org.junit.Test;
 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.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;
@@ -100,7 +100,7 @@ public class GraphNodeTest {
     @Test
     public void simple() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -117,8 +117,8 @@ public class GraphNodeTest {
     @Test
     public void inverse() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri subject = new Iri("http://example.org/subject");
-        Iri object = new Iri("http://example.org/object");
+        BlankNodeOrIRI subject = new IRI("http://example.org/subject");
+        IRI object = new IRI("http://example.org/object");
         mGraph.add(new TripleImpl(subject, RDFS.comment, object));
         GraphNode node = new GraphNode(object, mGraph);
         DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -134,7 +134,7 @@ public class GraphNodeTest {
     @Test
     public void defaultFunction() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -168,7 +168,7 @@ public class GraphNodeTest {
     @Test
     public void simpleIriRoot() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new Iri("http://example.org/");
+        BlankNodeOrIRI resource = new IRI("http://example.org/");
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
         DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -184,7 +184,7 @@ public class GraphNodeTest {
     @Test
     public void simpleWithNoOp() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -201,7 +201,7 @@ public class GraphNodeTest {
     @Test
     public void simpleWithUppercase() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -218,7 +218,7 @@ public class GraphNodeTest {
     @Test
     public void simpleWithLiteralUppercase() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -235,7 +235,7 @@ public class GraphNodeTest {
     @Test
     public void simpleWithCombinedFunctions() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -252,7 +252,7 @@ public class GraphNodeTest {
     @Test
     public void multiple() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("another resource")));
@@ -270,7 +270,7 @@ public class GraphNodeTest {
     @Test
     public void fieldTest() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -287,7 +287,7 @@ public class GraphNodeTest {
     @Test
     public void fieldTest2() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
@@ -310,7 +310,7 @@ public class GraphNodeTest {
         try {
             ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
             mGraph.addAll(deserializedGraph);
-            Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+            IRI document = new IRI("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
 
             Assert.assertTrue((mGraph.size() > 0));
 
@@ -346,7 +346,7 @@ public class GraphNodeTest {
         try {
             ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
             mGraph.addAll(deserializedGraph);
-            Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+            IRI document = new IRI("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
 
             Assert.assertTrue((mGraph.size() > 0));
 
@@ -381,12 +381,12 @@ public class GraphNodeTest {
     @Test
     public void rdfListAsPropertyValue() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
-        BlankNodeOrIri listNode = new BlankNode() {
+        BlankNodeOrIRI listNode = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDF.value, listNode));
-        List<RdfTerm> list = new RdfList(listNode, mGraph);
+        List<RDFTerm> list = new RdfList(listNode, mGraph);
         list.add(new PlainLiteralImpl("first"));
         list.add(new PlainLiteralImpl("second"));
         list.add(new PlainLiteralImpl("third"));
@@ -405,9 +405,9 @@ public class GraphNodeTest {
     @Test
     public void rdfListAsRoot() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
-        List<RdfTerm> list = new RdfList(resource, mGraph);
+        List<RDFTerm> list = new RdfList(resource, mGraph);
         list.add(new PlainLiteralImpl("first"));
         list.add(new PlainLiteralImpl("second"));
         list.add(new PlainLiteralImpl("third"));
@@ -425,9 +425,9 @@ public class GraphNodeTest {
     @Test
     public void rdfListAsRootElementProperties() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
-        List<RdfTerm> list = new RdfList(resource, mGraph);
+        List<RDFTerm> list = new RdfList(resource, mGraph);
         list.add(createLabeledRes("first", mGraph));
         list.add(createLabeledRes("second", mGraph));
         list.add(createLabeledRes("third", mGraph));
@@ -446,9 +446,9 @@ public class GraphNodeTest {
     @Test
     public void rdfListAsRootElementPropertiesWithPresenceTest() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
-        List<RdfTerm> list = new RdfList(resource, mGraph);
+        List<RDFTerm> list = new RdfList(resource, mGraph);
         list.add(createLabeledRes("first", mGraph));
         list.add(createLabeledRes("second", mGraph));
         list.add(createLabeledRes("third", mGraph));
@@ -467,7 +467,7 @@ public class GraphNodeTest {
     @Test
     public void compareFunctionResultInIf() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode();
+        BlankNodeOrIRI resource = new BlankNode();
         mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
         GraphNode node = new GraphNode(resource, mGraph);
         DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -484,18 +484,18 @@ public class GraphNodeTest {
     @Test
     public void loopWithEmptyList() throws IOException {
         Graph mGraph = new SimpleGraph();
-        BlankNodeOrIri resource = new BlankNode() {
+        BlankNodeOrIRI resource = new BlankNode() {
         };
 
-        BlankNodeOrIri listNode1 = new BlankNode() {
+        BlankNodeOrIRI listNode1 = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDF.value, listNode1));
-        List<RdfTerm> list1 = new RdfList(listNode1, mGraph);
+        List<RDFTerm> list1 = new RdfList(listNode1, mGraph);
         list1.add(new PlainLiteralImpl("first"));
         list1.add(new PlainLiteralImpl("second"));
         list1.add(new PlainLiteralImpl("third"));
 
-        BlankNodeOrIri listNode2 = new BlankNode() {
+        BlankNodeOrIRI listNode2 = new BlankNode() {
         };
         mGraph.add(new TripleImpl(resource, RDF.value, listNode2));
         RdfList.createEmptyList(listNode2, mGraph);
@@ -513,7 +513,7 @@ public class GraphNodeTest {
         Assert.assertEquals("\"first\"\"second\"\"third\"", writer.toString());
     }
 
-    private BlankNodeOrIri createLabeledRes(String label, Graph mGraph) {
+    private BlankNodeOrIRI createLabeledRes(String label, Graph mGraph) {
         BlankNode bNode = new BlankNode();
         Literal lit = new PlainLiteralImpl(label);
         mGraph.add(new TripleImpl(bNode, RDFS.label, lit));


Mime
View raw message