You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/14 15:13:55 UTC
[80/87] [abbrv] clerezza git commit: CLEREZZA-983: Adapted to new
casing of rdf-core (part 2),
also renamed IriSet -> IRISet and IriUtils -> IRIUtils
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
new file mode 100644
index 0000000..f33a351
--- /dev/null
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.rdf.utils;
+
+
+/**
+ * A utility class for IRI and String manipulations.
+ *
+ * @author tio
+ */
+public class IRIUtil {
+
+ /**
+ * Strips #x00 - #x1F and #x7F-#x9F from a Unicode string
+ * @see <a href="http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference">
+ * http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference</a> and
+ * replaces all US-ASCII space character with a "+".
+ *
+ * @param inputChars
+ * @return the stripped string
+ *
+ */
+ public static String stripNonIRIChars(CharSequence inputChars) {
+
+ if (inputChars == null) {
+ return "";
+ }
+
+ StringBuffer buffer = new StringBuffer();
+
+ for (int i = 0; i < inputChars.length(); i++) {
+ char c = inputChars.charAt(i);
+
+ if (!isIllegal(c)) {
+ buffer.append(c);
+ }
+ }
+ return buffer.toString().replaceAll("\\s+", "+");
+ }
+
+ private static boolean isIllegal(char ch) {
+ if ((ch >= 0x7F) && (ch <= 0x9F)) {
+ return true;
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
deleted file mode 100644
index 323c9f2..0000000
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.rdf.utils;
-
-
-/**
- * A utility class for Iri and String manipulations.
- *
- * @author tio
- */
-public class IriUtil {
-
- /**
- * Strips #x00 - #x1F and #x7F-#x9F from a Unicode string
- * @see <a href="http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference">
- * http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference</a> and
- * replaces all US-ASCII space character with a "+".
- *
- * @param inputChars
- * @return the stripped string
- *
- */
- public static String stripNonIriChars(CharSequence inputChars) {
-
- if (inputChars == null) {
- return "";
- }
-
- StringBuffer buffer = new StringBuffer();
-
- for (int i = 0; i < inputChars.length(); i++) {
- char c = inputChars.charAt(i);
-
- if (!isIllegal(c)) {
- buffer.append(c);
- }
- }
- return buffer.toString().replaceAll("\\s+", "+");
- }
-
- private static boolean isIllegal(char ch) {
- if ((ch >= 0x7F) && (ch <= 0x9F)) {
- return true;
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
index e9192ab..9419a5c 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
@@ -73,13 +73,13 @@ public class RdfList extends AbstractList<RDFTerm> {
* Get a list for the specified resource.
*
* If the list is modified using the created instance
- * <code>listRdfTerm</code> will always be the first list.
+ * <code>listRDFTerm</code> will always be the first list.
*
- * @param listRdfTerm
+ * @param listRDFTerm
* @param tc
*/
- public RdfList(BlankNodeOrIRI listRdfTerm, Graph tc) {
- firstList = listRdfTerm;
+ public RdfList(BlankNodeOrIRI listRDFTerm, Graph tc) {
+ firstList = listRDFTerm;
this.tc = tc;
}
@@ -95,23 +95,23 @@ public class RdfList extends AbstractList<RDFTerm> {
/**
* Creates an empty RdfList by writing a triple
- * "{@code listRdfTerm} owl:sameAs rdf.nil ." to {@code tc}.
+ * "{@code listRDFTerm} owl:sameAs rdf.nil ." to {@code tc}.
*
- * @param listRdfTerm
+ * @param listRDFTerm
* @param tc
* @return an empty rdf:List.
* @throws IllegalArgumentException
- * if the provided {@code listRdfTerm} is a non-empty rdf:List.
+ * if the provided {@code listRDFTerm} is a non-empty rdf:List.
*/
- public static RdfList createEmptyList(BlankNodeOrIRI listRdfTerm, Graph tc)
+ public static RdfList createEmptyList(BlankNodeOrIRI listRDFTerm, Graph tc)
throws IllegalArgumentException {
- if (!tc.filter(listRdfTerm, RDF.first, null).hasNext()) {
- RdfList list = new RdfList(listRdfTerm, tc);
- list.tc.add(new TripleImpl(listRdfTerm, OWL.sameAs, RDF_NIL));
+ if (!tc.filter(listRDFTerm, RDF.first, null).hasNext()) {
+ RdfList list = new RdfList(listRDFTerm, tc);
+ list.tc.add(new TripleImpl(listRDFTerm, OWL.sameAs, RDF_NIL));
return list;
} else {
- throw new IllegalArgumentException(listRdfTerm + "is a non-empty rdf:List.");
+ throw new IllegalArgumentException(listRDFTerm + "is a non-empty rdf:List.");
}
}
@@ -237,16 +237,16 @@ public class RdfList extends AbstractList<RDFTerm> {
return (BlankNodeOrIRI) tc.filter(list, RDF.rest, null).next().getObject();
}
- private RDFTerm getFirstEntry(final BlankNodeOrIRI listRdfTerm) {
+ private RDFTerm getFirstEntry(final BlankNodeOrIRI listRDFTerm) {
try {
- return tc.filter(listRdfTerm, RDF.first, null).next().getObject();
+ return tc.filter(listRDFTerm, RDF.first, null).next().getObject();
} catch (final NullPointerException e) {
RuntimeException runtimeEx = AccessController.doPrivileged(new PrivilegedAction<RuntimeException>() {
@Override
public RuntimeException run(){
try {
final FileOutputStream fileOutputStream = new FileOutputStream("/tmp/broken-list.nt");
- final GraphNode graphNode = new GraphNode(listRdfTerm, tc);
+ final GraphNode graphNode = new GraphNode(listRDFTerm, tc);
Serializer.getInstance().serialize(fileOutputStream, graphNode.getNodeContext(), SupportedFormat.N_TRIPLE);
fileOutputStream.flush();
logger.warn("GraphNode: " + graphNode);
@@ -254,7 +254,7 @@ public class RdfList extends AbstractList<RDFTerm> {
while (properties.hasNext()) {
logger.warn("available: " + properties.next());
}
- return new RuntimeException("broken list " + listRdfTerm, e);
+ return new RuntimeException("broken list " + listRDFTerm, e);
} catch (Exception ex) {
return new RuntimeException(ex);
}
@@ -265,7 +265,7 @@ public class RdfList extends AbstractList<RDFTerm> {
}
}
- public BlankNodeOrIRI getListRdfTerm() {
+ public BlankNodeOrIRI getListRDFTerm() {
return firstList;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
index 5513dca..d202388 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
@@ -33,7 +33,7 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
/**
- * This wrapps a Triplecollection changing a prefix for the Iris contained
+ * This wrapps a Triplecollection changing a prefix for the IRIs contained
* in subject or object position.
*
* Currently it only supports read opearations.
@@ -57,50 +57,50 @@ public class UriMutatingGraph implements Graph {
targetPrefixLength= targetPrefix.length();
}
- private <R extends RDFTerm> R toTargetRdfTerm(final R sourceRdfTerm) {
- if (sourceRdfTerm instanceof IRI) {
- final IRI sourceIri = (IRI) sourceRdfTerm;
- if (sourceIri.getUnicodeString().startsWith(sourcePrefix)) {
- final String uriRest = sourceIri.getUnicodeString()
+ private <R extends RDFTerm> R toTargetRDFTerm(final R sourceRDFTerm) {
+ if (sourceRDFTerm instanceof IRI) {
+ final IRI sourceIRI = (IRI) sourceRDFTerm;
+ if (sourceIRI.getUnicodeString().startsWith(sourcePrefix)) {
+ final String uriRest = sourceIRI.getUnicodeString()
.substring(sourcePrefixLength);
return (R) new IRI(targetPrefix+uriRest);
}
}
- return sourceRdfTerm;
+ return sourceRDFTerm;
}
private Triple toTargetTriple(Triple triple) {
if (triple == null) {
return null;
}
- return new TripleImpl(toTargetRdfTerm(triple.getSubject()),
- triple.getPredicate(), toTargetRdfTerm(triple.getObject()));
+ return new TripleImpl(toTargetRDFTerm(triple.getSubject()),
+ triple.getPredicate(), toTargetRDFTerm(triple.getObject()));
}
- private <R extends RDFTerm> R toSourceRdfTerm(final R targetRdfTerm) {
- if (targetRdfTerm instanceof IRI) {
- final IRI sourceIri = (IRI) targetRdfTerm;
- if (sourceIri.getUnicodeString().startsWith(targetPrefix)) {
- final String uriRest = sourceIri.getUnicodeString()
+ private <R extends RDFTerm> R toSourceRDFTerm(final R targetRDFTerm) {
+ if (targetRDFTerm instanceof IRI) {
+ final IRI sourceIRI = (IRI) targetRDFTerm;
+ if (sourceIRI.getUnicodeString().startsWith(targetPrefix)) {
+ final String uriRest = sourceIRI.getUnicodeString()
.substring(targetPrefixLength);
return (R) new IRI(sourcePrefix+uriRest);
}
}
- return targetRdfTerm;
+ return targetRDFTerm;
}
private Triple toSourceTriple(Triple triple) {
if (triple == null) {
return null;
}
- return new TripleImpl(toSourceRdfTerm(triple.getSubject()),
- triple.getPredicate(), toSourceRdfTerm(triple.getObject()));
+ return new TripleImpl(toSourceRDFTerm(triple.getSubject()),
+ triple.getPredicate(), toSourceRDFTerm(triple.getObject()));
}
@Override
public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- final Iterator<Triple> baseIter = base.filter(toSourceRdfTerm(subject),
- predicate, toSourceRdfTerm(object));
+ final Iterator<Triple> baseIter = base.filter(toSourceRDFTerm(subject),
+ predicate, toSourceRDFTerm(object));
return new WrappedIteraror(baseIter);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
index 90f3c26..bf25a99 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
@@ -105,15 +105,15 @@ public class BaseSmusher {
case 0:
return new BlankNode();
}
- final IRI preferedIri = getPreferedIri(uriRefs);
+ final IRI preferedIRI = getPreferedIRI(uriRefs);
final Iterator<IRI> uriRefIter = uriRefs.iterator();
while (uriRefIter.hasNext()) {
IRI uriRef = uriRefIter.next();
- if (!uriRef.equals(preferedIri)) {
- owlSameAsGraph.add(new TripleImpl(uriRef, OWL.sameAs, preferedIri));
+ if (!uriRef.equals(preferedIRI)) {
+ owlSameAsGraph.add(new TripleImpl(uriRef, OWL.sameAs, preferedIRI));
}
}
- return preferedIri;
+ return preferedIRI;
}
@@ -125,7 +125,7 @@ public class BaseSmusher {
* @param uriRefs
* @return
*/
- protected IRI getPreferedIri(Set<IRI> uriRefs) {
+ protected IRI getPreferedIRI(Set<IRI> uriRefs) {
final Iterator<IRI> uriRefIter = uriRefs.iterator();
//instead of an arbitrary one we might either decide lexicographically
//or look at their frequency in mGraph
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 aba1626..78e8893 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
@@ -44,10 +44,10 @@ public class SameAsSmusher extends BaseSmusher {
/**
* This will ensure that all properties of sameAs resources are associated
- * to the preferedIri as returned by {@code getPreferedIri}
+ * to the preferedIRI as returned by {@code getPreferedIRI}
* @param mGraph
* @param owlSameStatements
- * @param addCanonicalSameAsStatements if true owl:sameAsStatements with the preferedIri as object will be added
+ * @param addCanonicalSameAsStatements if true owl:sameAsStatements with the preferedIRI as object will be added
*/
public void smush(Graph mGraph,
Graph owlSameStatements,
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 c9a8f0a..2d9e4c6 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
@@ -81,7 +81,7 @@ public class IfpSmushTest {
}
@Test
- public void oneIri() {
+ public void oneIRI() {
Graph mGraph = new SimpleGraph();
IRI mbox1 = new IRI("mailto:foo@example.org");
final IRI resource = new IRI("http://example.org/");
@@ -97,7 +97,7 @@ public class IfpSmushTest {
}
@Test
- public void twoIris() {
+ public void twoIRIs() {
Graph mGraph = new SimpleGraph();
IRI mbox1 = new IRI("mailto:foo@example.org");
final IRI resource1 = new IRI("http://example.org/");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 4386039..2fdd2f4 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
@@ -184,7 +184,7 @@ public class TestGraphNode {
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 newIRI = new IRI("http://example.org/newName");
Literal literal1 = new PlainLiteralImpl("literal");
Literal literal2 = new PlainLiteralImpl("bla bla");
@@ -201,12 +201,12 @@ public class TestGraphNode {
GraphNode node = new GraphNode(property1,
new SimpleGraph(initialGraph.iterator()));
- node.replaceWith(newIri, true);
+ node.replaceWith(newIRI, true);
Assert.assertEquals(5, node.getGraph().size());
- Triple expectedTriple1 = new TripleImpl(bNode1, newIri, literal1);
- Triple expectedTriple2 = new TripleImpl(bNode1, property2, newIri);
- Triple expectedTriple3 = new TripleImpl(newIri, newIri, bNode2);
- Triple expectedTriple4 = new TripleImpl(newIri, newIri, literal2);
+ Triple expectedTriple1 = new TripleImpl(bNode1, newIRI, literal1);
+ Triple expectedTriple2 = new TripleImpl(bNode1, property2, newIRI);
+ Triple expectedTriple3 = new TripleImpl(newIRI, newIRI, bNode2);
+ Triple expectedTriple4 = new TripleImpl(newIRI, newIRI, literal2);
Assert.assertTrue(node.getGraph().contains(expectedTriple1));
Assert.assertTrue(node.getGraph().contains(expectedTriple2));
@@ -235,10 +235,10 @@ public class TestGraphNode {
Assert.assertTrue(node.getGraph().contains(expectedTriple8));
node = new GraphNode(property1, new SimpleGraph(initialGraph.iterator()));
- node.replaceWith(newIri);
- Triple expectedTriple9 = new TripleImpl(bNode1, property2, newIri);
- Triple expectedTriple10 = new TripleImpl(newIri, property1, bNode2);
- Triple expectedTriple11 = new TripleImpl(newIri, property1, literal2);
+ node.replaceWith(newIRI);
+ Triple expectedTriple9 = new TripleImpl(bNode1, property2, newIRI);
+ Triple expectedTriple10 = new TripleImpl(newIRI, property1, bNode2);
+ Triple expectedTriple11 = new TripleImpl(newIRI, property1, literal2);
Assert.assertTrue(node.getGraph().contains(triple1));
Assert.assertTrue(node.getGraph().contains(expectedTriple9));
Assert.assertTrue(node.getGraph().contains(expectedTriple10));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 f2d2539..6e67ed4 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
@@ -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/f2811c72/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 ea34a4f..c0584af 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
@@ -129,9 +129,9 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
compressedTcs.putNextEntry(new ZipEntry(folder));
Set<IRI> tripleCollections = tcManager.listGraphs();
- Iterator<IRI> tcIris = tripleCollections.iterator();
- while (tcIris.hasNext()) {
- IRI tcUri = tcIris.next();
+ Iterator<IRI> tcIRIs = tripleCollections.iterator();
+ while (tcIRIs.hasNext()) {
+ 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/f2811c72/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
index 85f32ee..802bd62 100644
--- a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
+++ b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
@@ -19,9 +19,9 @@
*
*/
-def gm(s: Any) = new Iri("http://clerezza.org/2010/03/graph-management#"+s)
-def rdf(s: Any) = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
-def tcp(s: Any) = new Iri("http://clerezza.org/2009/06/tcprovider#"+s)
+def gm(s: Any) = new IRI("http://clerezza.org/2010/03/graph-management#"+s)
+def rdf(s: Any) = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
+def tcp(s: Any) = new IRI("http://clerezza.org/2009/06/tcprovider#"+s)
resultDocModifier.setTitle("Manage Triple Collections");
resultDocModifier.addNodes2Elem("tx-module", <h1>Manage Triple Collections</h1>);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
index 5d2b0c1..4af5add 100644
--- a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
+++ b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
@@ -19,7 +19,7 @@
*
*/
-def se(s: Any) = new Iri("http://clerezza.org/2009/11/sparql-endpoint#"+s)
+def se(s: Any) = new IRI("http://clerezza.org/2009/11/sparql-endpoint#"+s)
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<title>SPARQL Endpoint</title>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 c4b8fba..6517caf 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
@@ -166,7 +166,7 @@ public class GraphNodeTest {
}
@Test
- public void simpleIriRoot() throws IOException {
+ public void simpleIRIRoot() throws IOException {
Graph mGraph = new SimpleGraph();
BlankNodeOrIRI resource = new IRI("http://example.org/");
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));