Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0A3217D11 for ; Sat, 11 Apr 2015 13:43:53 +0000 (UTC) Received: (qmail 79775 invoked by uid 500); 11 Apr 2015 13:43:53 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 79723 invoked by uid 500); 11 Apr 2015 13:43:53 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 79558 invoked by uid 99); 11 Apr 2015 13:43:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Apr 2015 13:43:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78886E0922; Sat, 11 Apr 2015 13:43:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: reto@apache.org To: commits@clerezza.apache.org Date: Sat, 11 Apr 2015 13:44:01 -0000 Message-Id: <27822d5ad16e46618bce301a196a529b@git.apache.org> In-Reply-To: <28eac9e4eb794e9289f670569107581e@git.apache.org> References: <28eac9e4eb794e9289f670569107581e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Sat Apr 11 13:40:22 2015 +0000 Committer: Reto Gmuer 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 * org.apache.clerezza.platform.config.PlatformConfig#getBaseUris() */ - 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 rootRdfTerms = + private Set rootRDFTerms = Collections.synchronizedSet(new HashSet()); /** * 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 { {label} } 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)
    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");