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/11 15:44:01 UTC
[9/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 2), also renamed IriSet -> IRISet and IriUtils -> IRIUtils
CLEREZZA-983: Adapted to new casing of rdf-core (part 2), also renamed IriSet -> IRISet and IriUtils -> IRIUtils
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f2811c72
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f2811c72
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f2811c72
Branch: refs/heads/rdf-commons
Commit: f2811c721b94395057f27af3a09e57cc916f49d3
Parents: 60d73ea
Author: Reto Gmuer <re...@apache.org>
Authored: Sat Apr 11 13:40:22 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Sat Apr 11 13:40:22 2015 +0000
----------------------------------------------------------------------
.../platform/config/PlatformConfig.java | 8 +--
.../PlatformGraphNodeProvider.scala | 24 ++++----
.../apache/clerezza/platform/BootMonitor.java | 18 +++---
.../src/main/scala/GlobalMenuRenderlet.scala | 10 ++--
.../src/main/scala/HeadedPageRenderlet.scala | 4 +-
.../jaxrs/TypeHandlerSpace.java | 4 +-
.../typehandlerspace/TypeHandlerSpaceTest.java | 14 ++---
.../src/main/scala/Ontology.scala | 4 +-
.../scala/RenderletDescriptionRenderlet.scala | 2 +-
.../typerendering/scala/AbstractRenderlet.scala | 2 +-
.../typerendering/scala/PageRenderlet.scala | 4 +-
.../typerendering/scala/RenderedPage.scala | 6 +-
.../typerendering/scala/SRenderlet.scala | 2 +-
.../typerendering/scala/XmlResult.scala | 6 +-
.../platform/typerendering/RendererFactory.java | 2 +-
.../typerendering/exception-template.ssp | 2 +-
.../platform/usermanager/UserManager.java | 8 +--
.../UserGraphAcessPermissionProvider.scala | 4 +-
.../platform/users/WebIdGraphsService.scala | 8 +--
.../clerezza/platform/users/WebIdInfo.scala | 4 +-
.../rdf/virtuoso/storage/VirtuosoBNode.java | 2 +-
.../rdf/virtuoso/storage/access/DataAccess.java | 16 ++---
.../clerezza/rdf/core/test/RandomGraph.java | 48 +++++++--------
.../clerezza/rdf/core/test/TcProviderTest.java | 56 ++++++++---------
.../rdf/file/storage/FileGraphTest.java | 8 +--
.../rdf/jena/commons/Jena2TriaUtil.java | 4 +-
.../rdf/jena/sparql/HashMapSolutionMapping.java | 4 +-
.../clerezza/rdf/jena/tdb/internals/IRISet.java | 62 +++++++++++++++++++
.../clerezza/rdf/jena/tdb/internals/IriSet.java | 62 -------------------
.../rdf/jena/tdb/internals/ModelGraph.java | 2 +-
.../tdb/storage/SingleTdbDatasetTcProvider.java | 16 ++---
.../clerezza/rdf/scala/utils/NameSpace.scala | 10 ++--
.../clerezza/rdf/scala/utils/EzMGraphTest.scala | 18 +++---
.../rdf/scala/utils/RichGraphNodeTest.scala | 18 +++---
.../rdf/scala/utils/TypeConversionTest.scala | 16 ++---
rdf/storage.web/src/main/scala/WebProxy.scala | 36 +++++------
.../apache/clerezza/rdf/utils/GraphNode.java | 4 +-
.../org/apache/clerezza/rdf/utils/IRIUtil.java | 63 ++++++++++++++++++++
.../org/apache/clerezza/rdf/utils/IriUtil.java | 63 --------------------
.../org/apache/clerezza/rdf/utils/RdfList.java | 34 +++++------
.../clerezza/rdf/utils/UriMutatingGraph.java | 38 ++++++------
.../rdf/utils/smushing/BaseSmusher.java | 10 ++--
.../rdf/utils/smushing/SameAsSmusher.java | 4 +-
.../apache/clerezza/rdf/utils/IfpSmushTest.java | 4 +-
.../clerezza/rdf/utils/TestGraphNode.java | 20 +++----
.../rdf/utils/smushing/SameAsSmushTest.java | 2 +-
.../rdf/web/core/BackupMessageBodyWriter.java | 6 +-
.../clerezza/rdf/web/core/graph-management.ssp | 6 +-
.../clerezza/rdf/web/core/sparql-endpoint.ssp | 2 +-
.../templating/seedsnipe/GraphNodeTest.java | 2 +-
50 files changed, 386 insertions(+), 386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
index 16aa8cf..b05f0c1 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
@@ -115,10 +115,10 @@ public class PlatformConfig {
* @return
*/
public GraphNode getPlatformInstance() {
- return new GraphNode(getPlatformInstanceRdfTerm(), systemGraph);
+ return new GraphNode(getPlatformInstanceRDFTerm(), systemGraph);
}
- private BlankNodeOrIRI getPlatformInstanceRdfTerm() {
+ private BlankNodeOrIRI getPlatformInstanceRDFTerm() {
Lock l = systemGraph.getLock().readLock();
l.lock();
try {
@@ -164,7 +164,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be added to the platform instance
*/
public void addBaseUri(IRI baseUri) {
- systemGraph.add(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
+ systemGraph.add(new TripleImpl(getPlatformInstanceRDFTerm(), PLATFORM.baseUri, baseUri));
}
/**
@@ -173,7 +173,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be removed from the platform instance
*/
public void removeBaseUri(IRI baseUri) {
- systemGraph.remove(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
+ systemGraph.remove(new TripleImpl(getPlatformInstanceRDFTerm(), PLATFORM.baseUri, baseUri));
}
protected void activate(ComponentContext componentContext) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
index a06e971..54e0d78 100644
--- a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
+++ b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
@@ -47,7 +47,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
* Get a GraphNode for the specified resource, see class comments for details.
*/
- def get(uriRef: Iri): GraphNode = {
+ def get(uriRef: IRI): GraphNode = {
val uriString = uriRef.getUnicodeString
val isLocal: Boolean = {
import scala.collection.JavaConversions._
@@ -59,10 +59,10 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
* Get a GraphNode for the specified resource, The resource is assumed to be local, i.e. the method behaves like
- * get(Iri) for a Uri with an authority section contained in the Set retuned by
+ * get(IRI) for a Uri with an authority section contained in the Set retuned by
* <code>org.apache.clerezza.platform.config.PlatformConfig#getBaseUris()</code>
*/
- def getLocal(uriRef: Iri): GraphNode = {
+ def getLocal(uriRef: IRI): GraphNode = {
get(uriRef, true)
}
@@ -70,17 +70,17 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
*return true iff getLocal(uriRef).getNodeContext.size > 0
*/
- def existsLocal(uriRef: Iri): Boolean = {
+ def existsLocal(uriRef: IRI): Boolean = {
val cgGraph = cgProvider.getContentGraph
lazy val localInstanceUri = {
val uri = new java.net.URI(uriRef.getUnicodeString)
- new Iri(Constants.URN_LOCAL_INSTANCE + uri.getPath)
+ new IRI(Constants.URN_LOCAL_INSTANCE + uri.getPath)
}
//TODO handle /user/
existsInGraph(uriRef,cgGraph) || existsInGraph(localInstanceUri, cgGraph)
}
- private[this] def existsInGraph(nodeUri: Iri, tc: Graph): Boolean = {
+ private[this] def existsInGraph(nodeUri: IRI, tc: Graph): Boolean = {
var readLock: Lock = tc.getLock.readLock
readLock.lock
try {
@@ -92,7 +92,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
- private def get(uriRef: Iri, isLocal: Boolean): GraphNode = {
+ private def get(uriRef: IRI, isLocal: Boolean): GraphNode = {
val uriString = uriRef.getUnicodeString
@@ -106,7 +106,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
uri.getScheme+"://"+uri.getAuthority
}
- val anyHostUri = new Iri(Constants.URN_LOCAL_INSTANCE + uriPath)
+ val anyHostUri = new IRI(Constants.URN_LOCAL_INSTANCE + uriPath)
var mGraphs: List[Graph] = Nil
@@ -129,12 +129,12 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
val nextSlash = uriPath.indexOf('/',6)
if (nextSlash != -1) {
val userName = uriPath.substring(6, nextSlash)
- val webIdOption = AccessController.doPrivileged(new PrivilegedAction[Option[Iri]]() {
- def run(): Option[Iri] = {
+ val webIdOption = AccessController.doPrivileged(new PrivilegedAction[Option[IRI]]() {
+ def run(): Option[IRI] = {
val userNode: GraphNode = userManager.getUserInSystemGraph(userName)
if (userNode != null) {
userNode.getNode match {
- case u: Iri => Some(u)
+ case u: IRI => Some(u)
case _ => None
}
} else {
@@ -191,7 +191,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
}
- addToUnion(tcManager.getGraph(new Iri(graphUriString)))
+ addToUnion(tcManager.getGraph(new IRI(graphUriString)))
}
val unionGraph = new UnionGraph(mGraphs:_*);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
----------------------------------------------------------------------
diff --git a/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java b/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
index 22d0e2d..bc00e5f 100644
--- a/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
+++ b/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
@@ -51,7 +51,7 @@ import org.osgi.service.component.ComponentContext;
* see thread starting at http://www.mail-archive.com/users@felix.apache.org/msg07647.html
*/
@Component(enabled = true, immediate = true)
-@Reference(name = "jaxrsRdfTerm",
+@Reference(name = "jaxrsRDFTerm",
cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
policy = ReferencePolicy.DYNAMIC,
referenceInterface = Object.class,
@@ -60,7 +60,7 @@ public class BootMonitor {
@Reference(target = "(javax.script.language=scala)")
private ScriptEngineFactory scalaScriptEngineFactory;
- private Set<Object> rootRdfTerms =
+ private Set<Object> rootRDFTerms =
Collections.synchronizedSet(new HashSet<Object>());
/**
* true when the user has been notified that clerezza started
@@ -86,23 +86,23 @@ public class BootMonitor {
t.start();
}
- protected void bindJaxrsRdfTerm(Object p) {
- rootRdfTerms.add(p);
- if (!clerezzaStarted && (rootRdfTerms.size() == 35)) {
+ protected void bindJaxrsRDFTerm(Object p) {
+ rootRDFTerms.add(p);
+ if (!clerezzaStarted && (rootRDFTerms.size() == 35)) {
Thread t = new Thread() {
@Override
public void run() {
int lastSize = 0;
for (int i = 0; i < 100; i++) {
- if (rootRdfTerms.size() == lastSize) {
+ if (rootRDFTerms.size() == lastSize) {
clerezzaStarted = true;
if (activated) {
logger.info("The Apache Clerezza Platform is now operational.");
return;
}
}
- lastSize = rootRdfTerms.size();
+ lastSize = rootRDFTerms.size();
try {
Thread.sleep(500);
} catch (InterruptedException ex) {
@@ -115,7 +115,7 @@ public class BootMonitor {
}
}
- protected void unbindJaxrsRdfTerm(Object p) {
- rootRdfTerms.remove(p);
+ protected void unbindJaxrsRDFTerm(Object p) {
+ rootRDFTerms.remove(p);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
index 85efc6f..0e85384 100644
--- a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
@@ -50,10 +50,10 @@ class GlobalMenuRenderlet extends SRenderlet {
<a href={href}>{label}</a>
}
override def content = {
- def menu(s: Any) = new Iri("http://clerezza.org/2009/11/global-menu#"+s)
-def rdfs(s: Any) = new Iri("http://www.w3.org/2000/01/rdf-schema#"+s)
-def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
-def dct(s: Any) = new Iri("http://purl.org/dc/terms/"+s)
+ def menu(s: Any) = new IRI("http://clerezza.org/2009/11/global-menu#"+s)
+def rdfs(s: Any) = new IRI("http://www.w3.org/2000/01/rdf-schema#"+s)
+def platform(s: Any) = new IRI("http://clerezza.org/2009/08/platform#"+s)
+def dct(s: Any) = new IRI("http://purl.org/dc/terms/"+s)
<div class="column nav">
<ul>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
index a39c0c8..b74163a 100644
--- a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
+++ b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import org.apache.clerezza.platform.typerendering.scala._
import org.apache.clerezza.rdf.ontologies.DC
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
/**
* A Renderlet for the menu
@@ -92,7 +92,7 @@ resultDocModifier.addScriptReference("/scripts/status-message.js");
<div class="zz-control">
<div class="login">
{
- def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
+ def platform(s: Any) = new IRI("http://clerezza.org/2009/08/platform#"+s)
val userName = context/platform("user")/platform("userName")*
val displayName = if ((context/platform("user")/FOAF.name).length == 0) {
userName
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
index 2485850..11c37dc 100644
--- a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
+++ b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
@@ -95,7 +95,7 @@ public class TypeHandlerSpace {
Lock lock =node.readLock();
lock.lock();
try {
- Set<IRI> rdfTypes = getRdfTypesOfIri(node);
+ Set<IRI> rdfTypes = getRdfTypesOfIRI(node);
return typeHandlerDiscovery.getTypeHandler(rdfTypes);
} finally {
lock.unlock();
@@ -105,7 +105,7 @@ public class TypeHandlerSpace {
return null;
}
- private Set<IRI> getRdfTypesOfIri(GraphNode node) {
+ private Set<IRI> getRdfTypesOfIRI(GraphNode node) {
Set<IRI> rdfTypes = new HashSet<IRI>();
Iterator<RDFTerm> types = node.getObjects(RDF.type);
while (types.hasNext()) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
index 1e89023..739a49b 100644
--- a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
+++ b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
@@ -34,7 +34,7 @@ public class TypeHandlerSpaceTest {
//
// private static LockableGraph mGraph = new LockableGraphWrapper(new SimpleGraph());
//
-// Iri myType = new Iri("org.example/myType");
+// IRI myType = new IRI("org.example/myType");
//
// @Path("/myTypeHandler")
// public static class MyTypeHandler {
@@ -74,7 +74,7 @@ public class TypeHandlerSpaceTest {
//
// int port = createTestWebServer().getPort();
//
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
// mGraph.add(triple);
@@ -109,7 +109,7 @@ public class TypeHandlerSpaceTest {
// public void testGet() throws IOException {
//
// int port = createTestWebServer().getPort();
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -138,7 +138,7 @@ public class TypeHandlerSpaceTest {
// public void testGetDescription() throws IOException {
//
// int port = createTestWebServer().getPort();
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -177,7 +177,7 @@ public class TypeHandlerSpaceTest {
// TypeHandlerSpace typeHandlerSpace = new TypeHandlerSpace();
// typeHandlerSpace.tcManager = new TcManager(){
// @Override
-// public LockableGraph getGraph(Iri name) {
+// public LockableGraph getGraph(IRI name) {
// return new LockableGraph() {
//
// @Override
@@ -191,7 +191,7 @@ public class TypeHandlerSpaceTest {
// }
//
// @Override
-// public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+// public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
// return mGraph.filter(subject, predicate, object);
// }
//
@@ -281,7 +281,7 @@ public class TypeHandlerSpaceTest {
// typeHandlerSpace.typeHandlerDiscovery = new TypeHandlerDiscovery() {
//
// @Override
-// public Object getTypeHandler(Set<Iri> rdfTypes) {
+// public Object getTypeHandler(Set<IRI> rdfTypes) {
// if (rdfTypes.contains(myType)){
// return typeHandler;
// }
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.gui/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/Ontology.scala b/platform/typerendering.gui/src/main/scala/Ontology.scala
index fef2077..b09c32d 100644
--- a/platform/typerendering.gui/src/main/scala/Ontology.scala
+++ b/platform/typerendering.gui/src/main/scala/Ontology.scala
@@ -21,11 +21,11 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
object Ontology {
- private def p(s: String) = new Iri("http://clerezza.org/2011/25/renderletgui#"+s)
+ private def p(s: String) = new IRI("http://clerezza.org/2011/25/renderletgui#"+s)
val RenderletOverviewPage = p("RenderletOverviewPage")
val Renderlet = p("Renderlet")
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
index b186d8b..849160c 100644
--- a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
+++ b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.typerendering.gui
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
index e1c4924..5d8e9ad 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
index 4140b3f..cad4f43 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
@@ -40,7 +40,7 @@ import org.apache.clerezza.rdf.scala.utils.Preamble._
abstract class PageRenderlet extends AbstractRenderlet {
def renderedPage(renderingArguments: RenderedPage.Arguments): RenderedPage
- def rdfType: Iri
+ def rdfType: IRI
def mode = "naked"
var renderletManager: RenderletManager = null;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
index edbd5f5..48fb6a2 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
@@ -83,7 +83,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri): Seq[Node] = {
+ def render(resource: IRI): Seq[Node] = {
modeOption match {
case Some(m) => render(resource, m)
case None => render(resource, "naked")
@@ -94,7 +94,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri, mode: String) = {
+ def render(resource: IRI, mode: String) = {
def parseNodeSeq(string: String) = {
_root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
index ab40c2e..6bec953 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.TypeRenderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
index f0b8935..c291bdf 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.nio.charset.Charset
import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
@@ -85,7 +85,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri): Seq[Node] = {
+ def render(resource: IRI): Seq[Node] = {
modeOption match {
case Some(m) => render(resource, m)
case None => render(resource, "naked")
@@ -96,7 +96,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri, mode: String) = {
+ def render(resource: IRI, mode: String) = {
def parseNodeSeq(string: String) = {
_root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
index f0736cf..b91ee12 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
@@ -130,7 +130,7 @@ public class RendererFactory {
types.add(((Literal) resource.getNode()).getDataType());
} else {
// extract rdf types
- Iterator<IRI> it = resource.getIriObjects(RDF.type);
+ Iterator<IRI> it = resource.getIRIObjects(RDF.type);
while (it.hasNext()) {
final IRI rdfType = it.next();
types.add(rdfType);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
index a450e08..f70a59b 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
+++ b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
@@ -19,7 +19,7 @@
*
*/
-def typerendering(s: Any) = new Iri("http://clerezza.org/2009/04/typerendering#"+s)
+def typerendering(s: Any) = new IRI("http://clerezza.org/2009/04/typerendering#"+s)
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
index 41bb488..4b8d7af 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
@@ -57,7 +57,7 @@ public interface UserManager {
/**
*
* @param title
- * @return BlankNodeOrIRI which is either a BlankNode or a Iri
+ * @return BlankNodeOrIRI which is either a BlankNode or a IRI
*/
public BlankNodeOrIRI getRoleByTitle(String title);
@@ -70,7 +70,7 @@ public interface UserManager {
/**
*
* @param user
- * the user is either a BlankNode or a Iri
+ * the user is either a BlankNode or a IRI
*
* @return Iterator defining all the Roles the specified user owns
*/
@@ -95,7 +95,7 @@ public interface UserManager {
/**
*
* @param role
- * the role is either a BlankNode or an Iri
+ * the role is either a BlankNode or an IRI
*
* @return Iterator defining all permissions of a role
*/
@@ -234,7 +234,7 @@ public interface UserManager {
/**
*
* @param user
- * the user is either a BlankNode or a Iri
+ * the user is either a BlankNode or a IRI
* @return Iterator defining all permissions of the specified user
*/
public Iterator<BlankNodeOrIRI> getPermissionsOfUser(BlankNodeOrIRI user);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
index dd9a6f5..84755b9 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
@@ -18,11 +18,11 @@
/*package org.apache.clerezza.platform.users
import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
class UserGraphAcessPermissionProvider extends WebIdBasedPermissionProvider {
- override def getPermissions(webId: Iri) : java.util.Collection[String] = {
+ override def getPermissions(webId: IRI) : java.util.Collection[String] = {
import scala.collection.JavaConversions._
val uriString = webId.getUnicodeString
def uriStringWithoutFragment = {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
index dba0e7d..535a2d3 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
@@ -27,7 +27,7 @@ import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.config.SystemConfig
import org.apache.clerezza.commons.rdf.Graph
import org.apache.clerezza.commons.rdf.Graph
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.core.access.NoSuchEntityException
import org.apache.clerezza.rdf.core.access.SecuredGraph
import org.apache.clerezza.rdf.core.access.TcManager
@@ -78,7 +78,7 @@ class WebIdGraphsService {
* @param uri the Web-Id
* @return a WebIdInfo allowing to access the graphs of the user
*/
- def getWebIdInfo(uri: Iri): WebIdInfo = {
+ def getWebIdInfo(uri: IRI): WebIdInfo = {
return new WebIdInfo {
private val uriString = uri.getUnicodeString
@@ -103,7 +103,7 @@ class WebIdGraphsService {
private lazy val localGraphUri = {
if (isLocal) uri
else {
- new Iri("urn:x-localinstance:/user/"+hashTruncatedUriString)
+ new IRI("urn:x-localinstance:/user/"+hashTruncatedUriString)
}
}
@@ -118,7 +118,7 @@ class WebIdGraphsService {
private lazy val profileDocumentUri = {
- new Iri(profileDocumentUriString)
+ new IRI(profileDocumentUriString)
}
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
index 28eca05..1338d4b 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
@@ -28,14 +28,14 @@ package org.apache.clerezza.platform.users
*
*/
import org.apache.clerezza.commons.rdf.Graph
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
trait WebIdInfo {
/**
* The WebID this instance is about
*/
- def webId: Iri
+ def webId: IRI
/**
* The WebId profile graph, for remote users this is immutable
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
index e8cc46f..53de9c0 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
@@ -30,7 +30,7 @@ public class VirtuosoBNode extends BNode {
return skolemId;
}
- public String asSkolemIri(){
+ public String asSkolemIRI(){
return new StringBuilder().append('<').append(skolemId).append('>').toString();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
index f44a9c1..6b328a9 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
@@ -678,9 +678,9 @@ public class DataAccess {
if (object == null)
return null;
if (object instanceof UriRef) {
- return toVirtIri((UriRef) object);
+ return toVirtIRI((UriRef) object);
} else if (object instanceof BNode) {
- return toVirtBnode((BNode) object).asSkolemIri();
+ return toVirtBnode((BNode) object).asSkolemIRI();
} else if (object instanceof PlainLiteral) {
return toVirtPlainLiteral((PlainLiteral) object);
} else if (object instanceof TypedLiteral) {
@@ -708,7 +708,7 @@ public class DataAccess {
.equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral"));
return new StringBuilder().append('"').append('"').append('"')
.append(prepared).append('"').append('"').append('"')
- .append("^^").append(toVirtIri(dt)).toString();
+ .append("^^").append(toVirtIRI(dt)).toString();
}
private StringBuilder prepareString(String str, boolean xml) {
@@ -766,11 +766,11 @@ public class DataAccess {
logger.debug("toVirtPredicate(UriRef {}) ", predicate);
if (predicate == null)
return null;
- return toVirtIri(predicate);
+ return toVirtIRI(predicate);
}
- private String toVirtIri(UriRef ur) {
- logger.debug("toVirtIri(UriRef {})", ur);
+ private String toVirtIRI(UriRef ur) {
+ logger.debug("toVirtIRI(UriRef {})", ur);
return "<" + ur.getUnicodeString() + ">";
}
@@ -786,9 +786,9 @@ public class DataAccess {
return null;
}
if (subject instanceof UriRef) {
- return toVirtIri((UriRef) subject);
+ return toVirtIRI((UriRef) subject);
} else if (subject instanceof BNode) {
- return toVirtBnode((BNode) subject).asSkolemIri();
+ return toVirtBnode((BNode) subject).asSkolemIRI();
} else {
// These should be the only 2 implementations
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
index 7e6741b..996ef6f 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
@@ -120,21 +120,21 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new BlankNodeOrIRI
- RDFTerm newRdfTerm;
+ RDFTerm newRDFTerm;
do {
- newRdfTerm = createRandomRdfTerm();
- } while (!(newRdfTerm instanceof BlankNodeOrIRI));
- return (BlankNodeOrIRI) newRdfTerm;
+ newRDFTerm = createRandomRDFTerm();
+ } while (!(newRDFTerm instanceof BlankNodeOrIRI));
+ return (BlankNodeOrIRI) newRDFTerm;
default: // get existing BlankNodeOrIRI
- RDFTerm existingRdfTerm;
+ RDFTerm existingRDFTerm;
do {
- existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof BlankNodeOrIRI));
+ } while (!(existingRDFTerm instanceof BlankNodeOrIRI));
- return (BlankNodeOrIRI) existingRdfTerm;
+ return (BlankNodeOrIRI) existingRDFTerm;
}
}
@@ -145,16 +145,16 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new IRI
- return createRandomIri();
+ return createRandomIRI();
default: // get existing IRI
- RDFTerm existingRdfTerm;
+ RDFTerm existingRDFTerm;
do {
- existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof IRI));
- return (IRI) existingRdfTerm;
+ } while (!(existingRDFTerm instanceof IRI));
+ return (IRI) existingRDFTerm;
}
}
@@ -165,13 +165,13 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new resource
- return createRandomRdfTerm();
+ return createRandomRDFTerm();
default: // get existing resource
- RDFTerm existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ RDFTerm existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- return existingRdfTerm;
+ return existingRDFTerm;
}
}
@@ -179,19 +179,19 @@ public class RandomGraph extends GraphWrapper {
return Double.valueOf(Math.random() * faces).intValue();
}
- private RDFTerm createRandomRdfTerm() {
+ private RDFTerm createRandomRDFTerm() {
switch (rollDice(3)) {
case 0:
return new BlankNode();
case 1:
- return createRandomIri();
+ return createRandomIRI();
case 2:
return new PlainLiteralImpl(RandomStringUtils.random(rollDice(100) + 1));
}
- throw new RuntimeException("in createRandomRdfTerm()");
+ throw new RuntimeException("in createRandomRDFTerm()");
}
- private RDFTerm getExistingRdfTerm() {
+ private RDFTerm getExistingRDFTerm() {
Triple triple = getRandomTriple();
if (triple == null) {
return null;
@@ -207,7 +207,7 @@ public class RandomGraph extends GraphWrapper {
return null;
}
- private IRI createRandomIri() {
+ private IRI createRandomIRI() {
return new IRI("http://" + UUID.randomUUID().toString());
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
index 856bdcc..bea479d 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
@@ -49,8 +49,8 @@ public abstract class TcProviderTest {
protected final IRI uriRefB1 = generateUri("b1");
protected final IRI uriRefC = generateUri("c");
- protected final IRI graphIri = generateUri("myGraph");
- protected final IRI otherGraphIri = new IRI(graphIri.getUnicodeString());
+ protected final IRI graphIRI = generateUri("myGraph");
+ protected final IRI otherGraphIRI = new IRI(graphIRI.getUnicodeString());
@Test
public void testCreateImmutableGraph() {
@@ -223,7 +223,7 @@ public abstract class TcProviderTest {
// simpleTcmProvider.createGraph(uriRefA, graph);
// simpleTcmProvider.createGraph(uriRefC, graph);
//
-// Set<Iri> names = simpleTcmProvider.getNames(graph);
+// Set<IRI> names = simpleTcmProvider.getNames(graph);
//
// assertTrue(names.contains(uriRefA));
// assertTrue(names.contains(uriRefC));
@@ -236,80 +236,80 @@ public abstract class TcProviderTest {
public void testCreateGraphExtended() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
- graph = provider.getGraph(graphIri);
+ graph = provider.getGraph(graphIRI);
assertNotNull(graph);
//check that there is no such graph, but only the mgraph
boolean expThrown = false;
try {
- ImmutableGraph g = provider.getImmutableGraph(graphIri);
+ ImmutableGraph g = provider.getImmutableGraph(graphIRI);
} catch(NoSuchEntityException e) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateImmutableGraphExtended() throws Exception {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, null);
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
- graph = provider.getImmutableGraph(graphIri);
+ graph = provider.getImmutableGraph(graphIRI);
assertNotNull(graph);
//check that there is no such mgraph, but only the graph
boolean expThrown = false;
try {
- Graph g = provider.getMGraph(graphIri);
+ Graph g = provider.getMGraph(graphIRI);
} catch(NoSuchEntityException e) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateGraphNoDuplicateNames() throws Exception {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, null);
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
assertNotNull(graph);
boolean expThrown = false;
try {
- ImmutableGraph other = provider.createImmutableGraph(otherGraphIri, null);
+ ImmutableGraph other = provider.createImmutableGraph(otherGraphIRI, null);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateGraphNoDuplicateNames2() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
assertNotNull(graph);
boolean expThrown = false;
try {
- Graph other = provider.createGraph(otherGraphIri);
+ Graph other = provider.createGraph(otherGraphIRI);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
@@ -319,11 +319,11 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, createTestTripleCollection(t1));
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
assertEquals(1, graph.size());
assertTrue(graph.contains(t1));
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
@@ -335,7 +335,7 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, createTestTripleCollection(t1));
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
boolean expThrown = false;
@@ -384,7 +384,7 @@ public abstract class TcProviderTest {
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
// This tests can not pass, because equals in AbstractGraph is not implemented
@@ -395,11 +395,11 @@ public abstract class TcProviderTest {
// TcProvider provider = getInstance();
//
// Graph triples = createTestTripleCollection(createTestTriple());
-// ImmutableGraph graph = provider.createGraph(graphIri, triples);
+// ImmutableGraph graph = provider.createGraph(graphIRI, triples);
//
// provider = getInstance();
-// Set<Iri> names = provider.getNames(graph);
-// assertTrue(names.contains(graphIri));
+// Set<IRI> names = provider.getNames(graph);
+// assertTrue(names.contains(graphIRI));
// }
//
// @Test
@@ -414,7 +414,7 @@ public abstract class TcProviderTest {
// IRI name2 = new IRI("http://myGraph2");
// ImmutableGraph secondGraph = provider.createGraph(name2, triples);
//
-// Set<Iri> names = provider.getNames(graph);
+// Set<IRI> names = provider.getNames(graph);
// assertNotNull(names);
// assertEquals(2, names.size());
// }
@@ -457,11 +457,11 @@ public abstract class TcProviderTest {
public void testGetTriplesGraph() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
- Graph tc = provider.getGraph(graphIri);
+ Graph tc = provider.getGraph(graphIRI);
assertNotNull(tc);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
private Triple createTestTriple() {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
index 048e976..a43a5fa 100644
--- a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
+++ b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
@@ -55,9 +55,9 @@ public class FileGraphTest {
@BeforeClass
public static void setup() throws Exception {
- createTempFileFromRdfTerm(NT_FILE_NAME);
- createTempFileFromRdfTerm(RDF_FILE_NAME);
- createTempFileFromRdfTerm(TURTLE_FILE_NAME);
+ createTempFileFromRDFTerm(NT_FILE_NAME);
+ createTempFileFromRDFTerm(RDF_FILE_NAME);
+ createTempFileFromRDFTerm(TURTLE_FILE_NAME);
}
@AfterClass
@@ -67,7 +67,7 @@ public class FileGraphTest {
deleteTempFile(TURTLE_FILE_NAME);
}
- private static void createTempFileFromRdfTerm(String resourceName)
+ private static void createTempFileFromRDFTerm(String resourceName)
throws FileNotFoundException, IOException {
InputStream in = FileTcProviderTest.class.getResourceAsStream(resourceName);
File file = new File(URI.create(getTempFileUri(resourceName)));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
index 1be13fe..809d8ac 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
@@ -103,7 +103,7 @@ public class Jena2TriaUtil {
if (node.isLiteral()) {
return convertJenaLiteral2Literal(node);
}
- throw new RuntimeException("cannot convert " + node + " to RdfTerm");
+ throw new RuntimeException("cannot convert " + node + " to RDFTerm");
}
/**
@@ -124,7 +124,7 @@ public class Jena2TriaUtil {
if (node.isURI()) {
return convertJenaUri2UriRef(node);
}
- throw new RuntimeException("cannot convert " + node + " to BlankNodeOrIri");
+ throw new RuntimeException("cannot convert " + node + " to BlankNodeOrIRI");
}
public Triple convertTriple(com.hp.hpl.jena.graph.Triple triple) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
index f7d4431..404a23d 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
@@ -40,7 +40,7 @@ class HashMapSolutionMapping extends HashMap<Variable, RDFTerm> implements Solut
final Iterator<String> varNames = querySolution.varNames();
while (varNames.hasNext()) {
final String varName = varNames.next();
- put(new Variable(varName), toRdfTerm(querySolution.get(varName)));
+ put(new Variable(varName), toRDFTerm(querySolution.get(varName)));
}
}
@Override
@@ -48,7 +48,7 @@ class HashMapSolutionMapping extends HashMap<Variable, RDFTerm> implements Solut
return get(new Variable(name));
}
- private RDFTerm toRdfTerm(RDFNode node) {
+ private RDFTerm toRDFTerm(RDFNode node) {
return convertor.convertJenaNode2Resource(node.asNode());
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IRISet.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IRISet.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IRISet.java
new file mode 100644
index 0000000..7520810
--- /dev/null
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IRISet.java
@@ -0,0 +1,62 @@
+package org.apache.clerezza.rdf.jena.tdb.internals;
+
+import java.util.AbstractSet;
+import java.util.Iterator;
+
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.rdf.ontologies.RDF;
+
+/**
+ * Represents a set of uri ref Set<IRI>
+ * @author Minto van der Sluis
+ */
+public class IRISet extends AbstractSet<IRI> {
+ private ModelGraph graphNameIndex;
+ private IRI graphType;
+
+ public IRISet(ModelGraph index, IRI object) {
+ graphNameIndex = index;
+ graphType = object;
+ }
+
+ @Override
+ public int size() {
+ // TODO: How to get the proper size based on graphType
+ return graphNameIndex.getGraph().size();
+ }
+
+ @Override
+ public Iterator<IRI> iterator() {
+ final Iterator<Triple> indexIter = graphNameIndex.getGraph().filter( null, RDF.type, graphType );
+ return new Iterator<IRI>() {
+ @Override
+ public boolean hasNext() {
+ return indexIter.hasNext();
+ }
+
+ @Override
+ public IRI next() {
+ return IRI.class.cast(indexIter.next().getSubject());
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ @Override
+ public boolean add(IRI o) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ if (o instanceof IRI) {
+ return graphNameIndex.getGraph().filter(IRI.class.cast(o), RDF.type, graphType).hasNext();
+ }
+ return false;
+ }
+};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
deleted file mode 100644
index 3e5b2a2..0000000
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.clerezza.rdf.jena.tdb.internals;
-
-import java.util.AbstractSet;
-import java.util.Iterator;
-
-import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.IRI;
-import org.apache.clerezza.rdf.ontologies.RDF;
-
-/**
- * Represents a set of uri ref Set<Iri>
- * @author Minto van der Sluis
- */
-public class IriSet extends AbstractSet<IRI> {
- private ModelGraph graphNameIndex;
- private IRI graphType;
-
- public IriSet(ModelGraph index, IRI object) {
- graphNameIndex = index;
- graphType = object;
- }
-
- @Override
- public int size() {
- // TODO: How to get the proper size based on graphType
- return graphNameIndex.getGraph().size();
- }
-
- @Override
- public Iterator<IRI> iterator() {
- final Iterator<Triple> indexIter = graphNameIndex.getGraph().filter( null, RDF.type, graphType );
- return new Iterator<IRI>() {
- @Override
- public boolean hasNext() {
- return indexIter.hasNext();
- }
-
- @Override
- public IRI next() {
- return IRI.class.cast(indexIter.next().getSubject());
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
- }
-
- @Override
- public boolean add(IRI o) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean contains(Object o) {
- if (o instanceof IRI) {
- return graphNameIndex.getGraph().filter(IRI.class.cast(o), RDF.type, graphType).hasNext();
- }
- return false;
- }
-};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
index 4a8258d..7044fe1 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
* Represents the Jena {@link Model} and the Clerezza {@link ImmutableGraph} or
* {@link Graph}. It also provide access to the {@link JenaGraphAdaptor}
* so that this component can add parsed data to {@link ImmutableGraph}s created
- * by calls to {@link SingleTdbDatasetTcProvider#createGraph(Iri, TripleCollection)}.
+ * by calls to {@link SingleTdbDatasetTcProvider#createGraph(IRI, TripleCollection)}.
* @author Rupert Westenthaler
*
*/
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
index 0e84390..d08b7b1 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
@@ -27,7 +27,7 @@ import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.jena.tdb.internals.ModelGraph;
import org.apache.clerezza.rdf.jena.tdb.internals.Symbols;
-import org.apache.clerezza.rdf.jena.tdb.internals.IriSet;
+import org.apache.clerezza.rdf.jena.tdb.internals.IRISet;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -62,7 +62,7 @@ import org.apache.clerezza.rdf.core.access.TcManager;
* such as <code>"${myHome}/myRdfStore"</code><p>
* The {@link #DEFAULT_GRAPH_NAME} property can be used to define the
* name of the ImmutableGraph that exposes the {@link Dataset#getDefaultModel()} as
- * both {@link TcProvider#getGraph(Iri)} and {@link TcProvider#getGraph(Iri)}.
+ * both {@link TcProvider#getGraph(IRI)} and {@link TcProvider#getGraph(IRI)}.
* This easily allows to access the union graph of the Jena TDB dataset.<p>
* This {@link TcProvider} {@link ConfigurationPolicy#REQUIRE requires} an
* configuration and uses the {@link Component#configurationFactory()
@@ -401,7 +401,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -422,7 +422,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public Graph getMGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -443,7 +443,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public Graph getGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -467,7 +467,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listImmutableGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, Symbols.ImmutableGraph ));
+ return new HashSet(new IRISet( graphNameIndex, Symbols.ImmutableGraph ));
} finally {
datasetLock.readLock().unlock();
}
@@ -481,7 +481,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listMGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, Symbols.Graph ));
+ return new HashSet(new IRISet( graphNameIndex, Symbols.Graph ));
} finally {
datasetLock.readLock().unlock();
}
@@ -495,7 +495,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, null ));
+ return new HashSet(new IRISet( graphNameIndex, null ));
} finally {
datasetLock.readLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
index fc44b29..513098e 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.scala.utils
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
/**
* A IRI-namespace prefix
@@ -26,12 +26,12 @@ import org.apache.clerezza.commons.rdf.Iri
class NameSpace(prefix: String) {
/**
- * returns a Iri applying this namespace prefix to the given symbol
+ * returns a IRI applying this namespace prefix to the given symbol
*/
- def +(s: Symbol) = new Iri(prefix + s.name)
+ def +(s: Symbol) = new IRI(prefix + s.name)
/**
- * returns a Iri applying this prefix to the given string
+ * returns a IRI applying this prefix to the given string
*/
- def +(s: String) = new Iri(prefix + s)
+ def +(s: String) = new IRI(prefix + s)
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
index d5e6544..bc9bd55 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.scala.utils
import org.apache.clerezza.commons.rdf.BlankNode
import org.apache.clerezza.commons.rdf.ImmutableGraph
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.commons.rdf.Language
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
@@ -48,11 +48,11 @@ class EzGraphTest {
/**import some references in order to reduce dependencies */
- final val hex: Iri = new Iri("http://www.w3.org/ns/auth/cert#hex")
- final val identity: Iri = new Iri("http://www.w3.org/ns/auth/cert#identity")
- final val RSAPublicKey: Iri = new Iri("http://www.w3.org/ns/auth/rsa#RSAPublicKey")
- final val modulus: Iri = new Iri("http://www.w3.org/ns/auth/rsa#modulus")
- final val public_exponent: Iri = new Iri("http://www.w3.org/ns/auth/rsa#public_exponent")
+ final val hex: IRI = new IRI("http://www.w3.org/ns/auth/cert#hex")
+ final val identity: IRI = new IRI("http://www.w3.org/ns/auth/cert#identity")
+ final val RSAPublicKey: IRI = new IRI("http://www.w3.org/ns/auth/rsa#RSAPublicKey")
+ final val modulus: IRI = new IRI("http://www.w3.org/ns/auth/rsa#modulus")
+ final val public_exponent: IRI = new IRI("http://www.w3.org/ns/auth/rsa#public_exponent")
val henryUri: String = "http://bblfish.net/#hjs"
val retoUri: String = "http://farewellutopia.com/reto/#me"
@@ -63,13 +63,13 @@ class EzGraphTest {
val gr = new SimpleGraph
val reto = new BlankNode()
val danny = new BlankNode()
- val henry = new Iri(henryUri)
+ val henry = new IRI(henryUri)
gr.add(new TripleImpl(reto, RDF.`type`, FOAF.Person))
gr.add(new TripleImpl(reto, FOAF.name, new PlainLiteralImpl("Reto Bachman-Gmür", new Language("rm"))))
//it is difficult to remember that one needs to put a string literal if one does not want to specify a language
gr.add(new TripleImpl(reto, FOAF.title, new TypedLiteralImpl("Mr", XSD.string)))
- gr.add(new TripleImpl(reto, FOAF.currentProject, new Iri("http://clerezza.org/")))
+ gr.add(new TripleImpl(reto, FOAF.currentProject, new IRI("http://clerezza.org/")))
gr.add(new TripleImpl(reto, FOAF.knows, henry))
gr.add(new TripleImpl(reto, FOAF.knows, danny))
@@ -79,7 +79,7 @@ class EzGraphTest {
gr.add(new TripleImpl(danny, FOAF.knows, reto))
gr.add(new TripleImpl(henry, FOAF.name, new TypedLiteralImpl("Henry Story", XSD.string))) //It is tricky to remember that one needs this for pure strings
- gr.add(new TripleImpl(henry, FOAF.currentProject, new Iri("http://webid.info/")))
+ gr.add(new TripleImpl(henry, FOAF.currentProject, new IRI("http://webid.info/")))
gr.add(new TripleImpl(henry, RDF.`type`, FOAF.Person))
gr.add(new TripleImpl(henry, FOAF.knows, danny))
gr.add(new TripleImpl(henry, FOAF.knows, reto))
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
index 5240cc7..fa0a8b0 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
@@ -24,7 +24,7 @@ import org.apache.clerezza.rdf.core.impl._
import org.apache.clerezza.rdf.ontologies._
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.Language
import org.apache.clerezza.commons.rdf.Literal
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
@@ -36,10 +36,10 @@ import Preamble._
class RichGraphNodeTest {
- private val johnUri = new Iri("http://example.org/john")
- private val susanneUri = new Iri("http://example.org/susanne")
- private val listUri = new Iri("http://example.org/list")
- private val greetingsUri = new Iri("http://example.org/greetings")
+ private val johnUri = new IRI("http://example.org/john")
+ private val susanneUri = new IRI("http://example.org/susanne")
+ private val listUri = new IRI("http://example.org/list")
+ private val greetingsUri = new IRI("http://example.org/greetings")
private val billBlankNode = new BlankNode()
private var node : RichGraphNode = null;
private var mGraph = new SimpleGraph()
@@ -96,9 +96,9 @@ class RichGraphNodeTest {
def testIterate = {
val simple: Graph = new SimpleGraph();
val node = new GraphNode(new BlankNode(), simple);
- node.addProperty(DCTERMS.provenance, new Iri("http://example.org/foo"));
- node.addProperty(DCTERMS.language, new Iri("http://www.bluewin.ch/"));
- simple.add(new TripleImpl(new Iri("http://www.bluewin.ch/"),RDF.`type`, RDFS.Container));
+ node.addProperty(DCTERMS.provenance, new IRI("http://example.org/foo"));
+ node.addProperty(DCTERMS.language, new IRI("http://www.bluewin.ch/"));
+ simple.add(new TripleImpl(new IRI("http://www.bluewin.ch/"),RDF.`type`, RDFS.Container));
node.addProperty(RDF.`type`, PLATFORM.HeadedPage);
node.addProperty(RDF.`type`, RDFS.Class);
val test: CollectedIter[RichGraphNode] = node/DCTERMS.language/RDF.`type`;
@@ -158,7 +158,7 @@ class RichGraphNodeTest {
@Test
def literalAsObject = {
val dateLiteral = new TypedLiteralImpl("2009-01-01T01:33:58Z",
- new Iri("http://www.w3.org/2001/XMLSchema#dateTime"))
+ new IRI("http://www.w3.org/2001/XMLSchema#dateTime"))
val node = new GraphNode(dateLiteral, new SimpleGraph())
Assert.assertNotNull(node.as[java.util.Date])
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
index d73d5f6..f60b1eb 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
@@ -18,7 +18,7 @@ package org.apache.clerezza.rdf.scala.utils
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.commons.rdf.Language
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
@@ -34,27 +34,27 @@ class TypeConversionTest {
@Test
def useStringAsObject {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value")
Assert.assertEquals(literalFactory.createTypedLiteral("a value"), t.getObject)
}
/*@Test
def useStringWithLanguageTag {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value"("en"))
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value"("en"))
Assert.assertEquals(new PlainLiteralImpl("a value", new Language("en")), t.getObject)
}*/
@Test
def useStringWithLanguageTag {
val lit = new PlainLiteralImpl("a value", new Language("en"))
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value" lang "en")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value" lang "en")
Assert.assertEquals(lit, t.getObject)
}
@Test
def useStringWithType {
- val typeUri = new Iri("http://example.org/dt")
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value"^^typeUri)
+ val typeUri = new IRI("http://example.org/dt")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value"^^typeUri)
Assert.assertEquals(new TypedLiteralImpl("a value", typeUri), t.getObject)
}
@@ -67,8 +67,8 @@ class TypeConversionTest {
@Test
def dotUri {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "http://example.org".iri)
- Assert.assertEquals(new Iri("http://example.org"), t.getObject)
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "http://example.org".iri)
+ Assert.assertEquals(new IRI("http://example.org"), t.getObject)
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/storage.web/src/main/scala/WebProxy.scala
----------------------------------------------------------------------
diff --git a/rdf/storage.web/src/main/scala/WebProxy.scala b/rdf/storage.web/src/main/scala/WebProxy.scala
index e51d91c..d501595 100644
--- a/rdf/storage.web/src/main/scala/WebProxy.scala
+++ b/rdf/storage.web/src/main/scala/WebProxy.scala
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.storage.web
import org.apache.clerezza.commons.rdf.ImmutableGraph
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.commons.rdf._
import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph
import org.osgi.service.component.ComponentContext
@@ -96,10 +96,10 @@ class WebProxy extends WeightedTcProvider with Logging {
* @return
* @throws NoSuchEntityException
*/
- def getMGraph(name: Iri): Graph = {
+ def getMGraph(name: IRI): Graph = {
val graph = getImmutableGraph(name)
return new AbstractGraph() {
- protected def performFilter(subject: BlankNodeOrIri, predicate: Iri, `object` : RdfTerm): java.util.Iterator[Triple] = {
+ protected def performFilter(subject: BlankNodeOrIRI, predicate: IRI, `object` : RDFTerm): java.util.Iterator[Triple] = {
graph.filter(subject, predicate, `object`)
}
@@ -107,7 +107,7 @@ class WebProxy extends WeightedTcProvider with Logging {
}
}
- def getImmutableGraph(name: Iri): ImmutableGraph = {
+ def getImmutableGraph(name: IRI): ImmutableGraph = {
try {
getGraph(name, Cache.Fetch)
} catch {
@@ -119,24 +119,24 @@ class WebProxy extends WeightedTcProvider with Logging {
}
}
- def getGraph(name: Iri): Graph = {
+ def getGraph(name: IRI): Graph = {
return getMGraph(name)
}
- def createGraph(name: Iri): Graph = {
+ def createGraph(name: IRI): Graph = {
throw new UnsupportedOperationException
}
- def createImmutableGraph(name: Iri, triples: Graph): ImmutableGraph = {
+ def createImmutableGraph(name: IRI, triples: Graph): ImmutableGraph = {
throw new UnsupportedOperationException
}
- def deleteGraph(name: Iri): Unit = {
+ def deleteGraph(name: IRI): Unit = {
throw new UnsupportedOperationException
}
- def getNames(graph: ImmutableGraph): java.util.Set[Iri] = {
- var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
+ def getNames(graph: ImmutableGraph): java.util.Set[IRI] = {
+ var result: java.util.Set[IRI] = new java.util.HashSet[IRI]
import collection.JavaConversions._
for (name <- listGraphs) {
if (getImmutableGraph(name).equals(graph)) {
@@ -146,27 +146,27 @@ class WebProxy extends WeightedTcProvider with Logging {
return result
}
- def listGraphs: java.util.Set[Iri] = {
- var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
+ def listGraphs: java.util.Set[IRI] = {
+ var result: java.util.Set[IRI] = new java.util.HashSet[IRI]
result.addAll(listMGraphs)
result.addAll(listImmutableGraphs)
return result
}
- def listMGraphs: java.util.Set[Iri] = {
+ def listMGraphs: java.util.Set[IRI] = {
//or should we list graphs for which we have a cached version?
- return java.util.Collections.emptySet[Iri]
+ return java.util.Collections.emptySet[IRI]
}
- def listImmutableGraphs: java.util.Set[Iri] = {
- return java.util.Collections.emptySet[Iri]
+ def listImmutableGraphs: java.util.Set[IRI] = {
+ return java.util.Collections.emptySet[IRI]
}
/**
* The semantics of this resource
* @param update if a remote URI, update information on the resource first
*/
- def getGraph(name: Iri, updatePolicy: Cache.Value): ImmutableGraph = {
+ def getGraph(name: IRI, updatePolicy: Cache.Value): ImmutableGraph = {
logger.debug("getting graph " + name)
if (name.getUnicodeString.indexOf('#') != -1) {
logger.debug("not dereferencing URI with hash sign. Please see CLEREZZA-533 for debate.")
@@ -176,7 +176,7 @@ class WebProxy extends WeightedTcProvider with Logging {
//these are not dereferenceable
throw new NoSuchEntityException(name)
}
- val cacheGraphName = new Iri("urn:x-localinstance:/cache/" + name.getUnicodeString)
+ val cacheGraphName = new IRI("urn:x-localinstance:/cache/" + name.getUnicodeString)
//todo: follow redirects and keep track of them
//todo: keep track of headers especially date and etag. test for etag similarity
//todo: for https connection allow user to specify his webid and send his key: ie allow web server to be an agent
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
index c710699..b052b01 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
@@ -398,7 +398,7 @@ public class GraphNode {
};
}
- public Iterator<IRI> getIriObjects(IRI property) {
+ public Iterator<IRI> getIRIObjects(IRI property) {
return getTypeSelectedObjects(property, IRI.class);
}
@@ -450,7 +450,7 @@ public class GraphNode {
/**
*
* @param triples
- * @returnan {@link Iterator}<{@link Iri}> containing the predicates from
+ * @returnan {@link Iterator}<{@link IRI}> containing the predicates from
* an {@link Iterator}<{@link Triple}>
*/
private Iterator<IRI> getUniquePredicates(final Iterator<Triple> triples) {