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 E1116179AB for ; Tue, 14 Apr 2015 13:12:43 +0000 (UTC) Received: (qmail 73937 invoked by uid 500); 14 Apr 2015 13:12:38 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 73886 invoked by uid 500); 14 Apr 2015 13:12:38 -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 73184 invoked by uid 99); 14 Apr 2015 13:12:38 -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; Tue, 14 Apr 2015 13:12:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB191E03B4; Tue, 14 Apr 2015 13:12:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reto@apache.org To: commits@clerezza.apache.org Date: Tue, 14 Apr 2015 13:13:27 -0000 Message-Id: <915b5412ffbd4d7a8835414165a2a752@git.apache.org> In-Reply-To: <79f2aa157d6c416d8d4f2d2b5548c555@git.apache.org> References: <79f2aa157d6c416d8d4f2d2b5548c555@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [52/87] [abbrv] clerezza git commit: CLEREZZA-979: ported typerendering and a bunch of dependencies CLEREZZA-979: ported typerendering and a bunch of dependencies Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/0e209798 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/0e209798 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/0e209798 Branch: refs/heads/master Commit: 0e2097985bbdb2ddf5925e4bc1da56187de710a6 Parents: 7022023 Author: Reto Gmuer Authored: Mon Mar 23 17:58:25 2015 +0000 Committer: Reto Gmuer Committed: Mon Mar 23 17:58:25 2015 +0000 ---------------------------------------------------------------------- platform/config/pom.xml | 12 ++-- .../platform/config/PlatformConfig.java | 60 ++++++++++---------- .../clerezza/platform/config/SystemConfig.java | 39 +++++++------ .../TcPermissionDescriptionsProvider.java | 8 +-- platform/platform/pom.xml | 4 +- .../apache/clerezza/platform/BootMonitor.java | 18 +++--- .../org/apache/clerezza/platform/Constants.java | 14 ++--- platform/typepriority/pom.xml | 12 ++-- .../platform/typepriority/TypePrioritizer.java | 52 ++++++++--------- .../typepriority/TypePrioritizerTest.java | 32 +++-------- platform/typerendering.gui/pom.xml | 4 +- platform/typerendering.scala/pom.xml | 8 +-- .../platform.typerendering.core/pom.xml | 20 +++---- .../typerendering/CallbackRenderer.java | 6 +- .../typerendering/CallbackRendererImpl.java | 4 +- .../typerendering/GenericGraphNodeMBW.java | 6 +- .../platform/typerendering/RendererFactory.java | 28 ++++----- .../typerendering/RenderingException.java | 16 +++--- .../RenderingspecificationException.java | 12 ++-- .../typerendering/RenderletManager.java | 4 +- .../typerendering/RenderletManagerImpl.java | 20 +++---- .../typerendering/RenderletRendererImpl.java | 4 +- .../TypeRenderingExceptionMapper.java | 4 +- .../platform/typerendering/TypeRenderlet.java | 4 +- .../platform.typerendering.ontologies/pom.xml | 9 +-- platform/typerendering/pom.xml | 4 +- 26 files changed, 190 insertions(+), 214 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/config/pom.xml ---------------------------------------------------------------------- diff --git a/platform/config/pom.xml b/platform/config/pom.xml index 111680c..e2251bc 100644 --- a/platform/config/pom.xml +++ b/platform/config/pom.xml @@ -24,8 +24,8 @@ org.apache.clerezza clerezza - 0.5 - ../parent + 7-SNAPSHOT + org.apache.clerezza platform.config @@ -44,17 +44,17 @@ org.apache.clerezza rdf.core - 0.14 + 1.0.0-SNAPSHOT org.apache.clerezza rdf.ontologies - 0.12 + 1.0.0-SNAPSHOT org.apache.clerezza rdf.utils - 0.14 + 1.0.0-SNAPSHOT org.apache.felix @@ -63,7 +63,7 @@ org.apache.clerezza platform - 0.2 + 1.0.0-SNAPSHOT org.apache.clerezza http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/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 ebc0bf9..284acff 100644 --- a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java +++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java @@ -30,17 +30,17 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; -import org.apache.clerezza.rdf.core.NonLiteral; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.Triple; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.access.LockableMGraph; +import org.apache.commons.rdf.BlankNodeOrIri; +import org.apache.commons.rdf.RdfTerm; +import org.apache.commons.rdf.Triple; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.core.access.NoSuchEntityException; import org.apache.clerezza.rdf.core.access.TcManager; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.commons.rdf.impl.utils.TripleImpl; import org.apache.clerezza.rdf.ontologies.PLATFORM; import org.apache.clerezza.rdf.ontologies.RDF; import org.apache.clerezza.rdf.utils.GraphNode; +import org.apache.commons.rdf.Graph; /** * This class provides a OSGi service for getting system properties from @@ -53,7 +53,7 @@ import org.apache.clerezza.rdf.utils.GraphNode; public class PlatformConfig { @Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER) - private LockableMGraph systemGraph; + private Graph systemGraph; private BundleContext context; private static String DEFAULT_PORT = "8080"; @@ -61,7 +61,7 @@ public class PlatformConfig { * @deprecated use org.apache.clerezza.platform.Contants instead */ @Deprecated - public static final UriRef CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI; + public static final Iri CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI; /** * A filter that can be used to get the config graph as OSGi service, @@ -78,27 +78,27 @@ public class PlatformConfig { * Returns the default base URI of the Clerezza platform instance. * @return the base URI of the Clerezza platform */ - public UriRef getDefaultBaseUri() { - return AccessController.doPrivileged(new PrivilegedAction() { + public Iri getDefaultBaseUri() { + return AccessController.doPrivileged(new PrivilegedAction() { @Override - public UriRef run() { + public Iri run() { GraphNode platformInstance = getPlatformInstance(); Lock l = platformInstance.readLock(); l.lock(); try { - Iterator triples = platformInstance.getObjects(PLATFORM.defaultBaseUri); + Iterator triples = platformInstance.getObjects(PLATFORM.defaultBaseUri); if (triples.hasNext()) { - return (UriRef) triples.next(); + return (Iri) triples.next(); } else { String port = context.getProperty("org.osgi.service.http.port"); if (port == null) { port = DEFAULT_PORT; } if (port.equals("80")) { - return new UriRef("http://localhost/"); + return new Iri("http://localhost/"); } - return new UriRef("http://localhost:" + port + "/"); + return new Iri("http://localhost:" + port + "/"); } } finally { l.unlock(); @@ -109,16 +109,16 @@ public class PlatformConfig { /** * Returns the platforminstance as GraphNode of the system - * graph (a LockableMGraph). Access controls applies to the system graph + * graph (a LockableGraph). Access controls applies to the system graph * instance underlying the GraphNode. * * @return */ public GraphNode getPlatformInstance() { - return new GraphNode(getPlatformInstanceResource(), systemGraph); + return new GraphNode(getPlatformInstanceRdfTerm(), systemGraph); } - private NonLiteral getPlatformInstanceResource() { + private BlankNodeOrIri getPlatformInstanceRdfTerm() { Lock l = systemGraph.getLock().readLock(); l.lock(); try { @@ -138,17 +138,17 @@ public class PlatformConfig { * @return the base URI of the Clerezza platform */ //todo: if this is the only class that sets and reads base uris then getBaseURIs should keep a cache - public Set getBaseUris() { + public Set getBaseUris() { - return AccessController.doPrivileged(new PrivilegedAction>() { + return AccessController.doPrivileged(new PrivilegedAction>() { @Override - public Set run() { - Iterator baseUrisIter = getPlatformInstance(). + public Set run() { + Iterator baseUrisIter = getPlatformInstance(). getObjects(PLATFORM.baseUri); - Set baseUris = new HashSet(); + Set baseUris = new HashSet(); while (baseUrisIter.hasNext()) { - UriRef baseUri = (UriRef) baseUrisIter.next(); + Iri baseUri = (Iri) baseUrisIter.next(); baseUris.add(baseUri); } baseUris.add(getDefaultBaseUri()); @@ -163,8 +163,8 @@ public class PlatformConfig { * * @param baseUri The base URI which will be added to the platform instance */ - public void addBaseUri(UriRef baseUri) { - systemGraph.add(new TripleImpl(getPlatformInstanceResource(), PLATFORM.baseUri, baseUri)); + public void addBaseUri(Iri baseUri) { + systemGraph.add(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri)); } /** @@ -172,16 +172,16 @@ public class PlatformConfig { * * @param baseUri The base URI which will be removed from the platform instance */ - public void removeBaseUri(UriRef baseUri) { - systemGraph.remove(new TripleImpl(getPlatformInstanceResource(), PLATFORM.baseUri, baseUri)); + public void removeBaseUri(Iri baseUri) { + systemGraph.remove(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri)); } protected void activate(ComponentContext componentContext) { this.context = componentContext.getBundleContext(); try { - tcManager.getMGraph(Constants.CONFIG_GRAPH_URI); + tcManager.getGraph(Constants.CONFIG_GRAPH_URI); } catch (NoSuchEntityException nsee) { - tcManager.createMGraph(Constants.CONFIG_GRAPH_URI); + tcManager.createGraph(Constants.CONFIG_GRAPH_URI); } } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java ---------------------------------------------------------------------- diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java index 285300d..537733f 100644 --- a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java +++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java @@ -24,18 +24,17 @@ import java.net.URL; import java.util.Collections; import java.util.Set; import org.apache.clerezza.platform.Constants; -import org.apache.clerezza.rdf.core.Graph; +import org.apache.commons.rdf.ImmutableGraph; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; import org.osgi.service.component.ComponentContext; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.TripleCollection; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Graph; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException; import org.apache.clerezza.rdf.core.access.EntityUndeletableException; import org.apache.clerezza.rdf.core.access.NoSuchEntityException; import org.apache.clerezza.rdf.core.access.WeightedTcProvider; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.core.serializedform.Parser; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.slf4j.Logger; @@ -68,7 +67,7 @@ public class SystemConfig implements WeightedTcProvider { * @deprecated use org.apache.clerezza.platform.Contants instead */ @Deprecated - public static final UriRef SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI; + public static final Iri SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI; /** * A filter that can be used to get the system graph as OSGi service, that * is provided by @@ -87,14 +86,14 @@ public class SystemConfig implements WeightedTcProvider { "("+SupportedFormat.supportedFormat+"=" + SupportedFormat.N_TRIPLE + ")"; @Reference(target = SERIALIZER_FILTER) private Serializer serializer; - private MGraph systemGraph; + private Graph systemGraph; @Activate protected void activate(ComponentContext componentContext) { final BundleContext bundleContext = componentContext.getBundleContext(); File systemGraphFile = bundleContext.getDataFile(DATA_FILE_SYSTEM_GRAPH); boolean dataFileExisted = systemGraphFile.exists(); - //yould be good to use IndexedMGraph to be faster + //yould be good to use IndexedGraph to be faster systemGraph = new FileMGraph(systemGraphFile, parser, serializer); if (!dataFileExisted) { readConfigGraphFile(systemGraph); @@ -107,7 +106,7 @@ public class SystemConfig implements WeightedTcProvider { systemGraph = null; } - private void readConfigGraphFile(MGraph mGraph) { + private void readConfigGraphFile(Graph mGraph) { URL config = getClass().getResource(DEFAULT_SYSTEM_GRAPH); if (config == null) { throw new RuntimeException("no config file found"); @@ -123,7 +122,7 @@ public class SystemConfig implements WeightedTcProvider { /* * Reason to be high: don't allow overwriting of system graph (by accident or as an attack) - * Reason to be low: avoid that TcManager always first tries to create TripleCollections using this provider + * Reason to be low: avoid that TcManager always first tries to create Graphs using this provider */ @Override public int getWeight() { @@ -131,12 +130,12 @@ public class SystemConfig implements WeightedTcProvider { } @Override - public Graph getGraph(UriRef name) throws NoSuchEntityException { + public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException { throw new NoSuchEntityException(name); } @Override - public MGraph getMGraph(UriRef name) throws NoSuchEntityException { + public Graph getMGraph(Iri name) throws NoSuchEntityException { if (name.equals(Constants.SYSTEM_GRAPH_URI)) { return systemGraph; } else { @@ -145,42 +144,42 @@ public class SystemConfig implements WeightedTcProvider { } @Override - public TripleCollection getTriples(UriRef name) throws NoSuchEntityException { + public Graph getGraph(Iri name) throws NoSuchEntityException { return getMGraph(name); } @Override - public Set listGraphs() { + public Set listImmutableGraphs() { return Collections.emptySet(); } @Override - public Set listMGraphs() { + public Set listMGraphs() { return Collections.singleton(Constants.SYSTEM_GRAPH_URI); } @Override - public Set listTripleCollections() { + public Set listGraphs() { return listMGraphs(); } @Override - public MGraph createMGraph(UriRef name) throws UnsupportedOperationException, EntityAlreadyExistsException { + public Graph createGraph(Iri name) throws UnsupportedOperationException, EntityAlreadyExistsException { throw new UnsupportedOperationException("Not supported yet."); } @Override - public Graph createGraph(UriRef name, TripleCollection triples) throws UnsupportedOperationException, EntityAlreadyExistsException { + public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws UnsupportedOperationException, EntityAlreadyExistsException { throw new UnsupportedOperationException("Not supported yet."); } @Override - public void deleteTripleCollection(UriRef name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException { + public void deleteGraph(Iri name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException { throw new UnsupportedOperationException("Not supported yet."); } @Override - public Set getNames(Graph graph) { + public Set getNames(ImmutableGraph graph) { return Collections.emptySet(); } } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/config/src/main/java/org/apache/clerezza/platform/config/TcPermissionDescriptionsProvider.java ---------------------------------------------------------------------- diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/TcPermissionDescriptionsProvider.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/TcPermissionDescriptionsProvider.java index dd5199f..caa2009 100644 --- a/platform/config/src/main/java/org/apache/clerezza/platform/config/TcPermissionDescriptionsProvider.java +++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/TcPermissionDescriptionsProvider.java @@ -46,19 +46,19 @@ public class TcPermissionDescriptionsProvider implements PermissionDescriptionsP private static final Set GRAPH_ACCESS_PERMISSION_DESCRIPTIONS = new HashSet(); static { - GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("System Graph Read Permission", + GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("System ImmutableGraph Read Permission", "Grants permission to the user to read the system graph", null, TcPermission.class, "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/system.graph\" \"read\")")); - GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("System Graph Read/Write Permission", + GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("System ImmutableGraph Read/Write Permission", "Grants permission to the user to read and write the system graph", null, TcPermission.class, "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/system.graph\" \"readwrite\")")); - GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Configuration Graph Read Permission", + GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Configuration ImmutableGraph Read Permission", "Grants permission to the user to read the configuration graph", null, TcPermission.class, "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/config.graph\" \"read\")")); - GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Configuration Graph Read/Write Permission", + GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Configuration ImmutableGraph Read/Write Permission", "Grants permission to the user to read and write the configuration graph", null, TcPermission.class, "(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/config.graph\" \"readwrite\")")); } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/platform/pom.xml ---------------------------------------------------------------------- diff --git a/platform/platform/pom.xml b/platform/platform/pom.xml index 7b552c3..a690800 100644 --- a/platform/platform/pom.xml +++ b/platform/platform/pom.xml @@ -31,7 +31,7 @@ platform bundle 1.0.0-SNAPSHOT - Clerezza - Platform - Bootmonitor + Clerezza - Platform - Bootmonitor and Constants Artifact with dependencies to the clerezza platform components providing documentation and boot-status monitoring. @@ -51,7 +51,7 @@ org.apache.clerezza rdf.core - 0.14 + 1.0.0-SNAPSHOT \ No newline at end of file http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/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 88eb2f3..22d0e2d 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 = "jaxrsResource", +@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 rootResources = + 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 bindJaxrsResource(Object p) { - rootResources.add(p); - if (!clerezzaStarted && (rootResources.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 (rootResources.size() == lastSize) { + if (rootRdfTerms.size() == lastSize) { clerezzaStarted = true; if (activated) { logger.info("The Apache Clerezza Platform is now operational."); return; } } - lastSize = rootResources.size(); + lastSize = rootRdfTerms.size(); try { Thread.sleep(500); } catch (InterruptedException ex) { @@ -115,7 +115,7 @@ public class BootMonitor { } } - protected void unbindJaxrsResource(Object p) { - rootResources.remove(p); + protected void unbindJaxrsRdfTerm(Object p) { + rootRdfTerms.remove(p); } } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java ---------------------------------------------------------------------- diff --git a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java index 68ff58a..8d412f8 100644 --- a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java +++ b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java @@ -17,7 +17,7 @@ package org.apache.clerezza.platform; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; /** * This class gropus some constant values used by the clerezza.platform components @@ -40,8 +40,8 @@ public class Constants { /** * the uri of the system graph */ - public static final UriRef SYSTEM_GRAPH_URI = - new UriRef(SYSTEM_GRAPH_URI_STRING); + public static final Iri SYSTEM_GRAPH_URI = + new Iri(SYSTEM_GRAPH_URI_STRING); /** * the uri of the config graph as string @@ -51,8 +51,8 @@ public class Constants { /** * the uri of the config graph as string */ - public static final UriRef CONFIG_GRAPH_URI = - new UriRef(CONFIG_GRAPH_URI_STRING); + public static final Iri CONFIG_GRAPH_URI = + new Iri(CONFIG_GRAPH_URI_STRING); /** * the uri of the content graph as string @@ -62,8 +62,8 @@ public class Constants { /** * the uri of the content graph */ - public static final UriRef CONTENT_GRAPH_URI = - new UriRef(CONTENT_GRAPH_URI_STRING); + public static final Iri CONTENT_GRAPH_URI = + new Iri(CONTENT_GRAPH_URI_STRING); /** http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typepriority/pom.xml ---------------------------------------------------------------------- diff --git a/platform/typepriority/pom.xml b/platform/typepriority/pom.xml index ae33845..519811a 100644 --- a/platform/typepriority/pom.xml +++ b/platform/typepriority/pom.xml @@ -24,8 +24,8 @@ org.apache.clerezza clerezza - 0.5 - ../parent + 7-SNAPSHOT + org.apache.clerezza platform.typepriority @@ -44,17 +44,17 @@ org.apache.clerezza rdf.core - 0.14 + 1.0.0-SNAPSHOT org.apache.clerezza rdf.utils - 0.14 + 1.0.0-SNAPSHOT org.apache.clerezza rdf.ontologies - 0.12 + 1.0.0-SNAPSHOT org.apache.felix @@ -63,7 +63,7 @@ org.apache.clerezza platform.config - 0.4 + 1.0.0-SNAPSHOT junit http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java ---------------------------------------------------------------------- diff --git a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java index 36e6d97..73c4003 100644 --- a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java +++ b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java @@ -32,14 +32,12 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; import org.apache.felix.scr.annotations.References; import org.apache.felix.scr.annotations.Service; -import org.osgi.service.component.ComponentContext; import org.apache.clerezza.platform.config.SystemConfig; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.access.LockableMGraph; +import org.apache.commons.rdf.RdfTerm; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.ontologies.RDFS; import org.apache.clerezza.rdf.utils.RdfList; +import org.apache.commons.rdf.Graph; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,26 +49,26 @@ import org.slf4j.LoggerFactory; @References({ @Reference(name="systemGraph", cardinality=ReferenceCardinality.MANDATORY_UNARY, - referenceInterface=LockableMGraph.class, + referenceInterface=Graph.class, target=SystemConfig.SYSTEM_GRAPH_FILTER)}) public class TypePrioritizer { - public static final UriRef typePriorityListUri = new UriRef("urn:x-localinstance:/typePriorityList"); + public static final Iri typePriorityListUri = new Iri("urn:x-localinstance:/typePriorityList"); - private List typePriorityList; + private List typePriorityList; private static final Logger log = LoggerFactory.getLogger(TypePrioritizer.class); - LockableMGraph systemGraph; + Graph systemGraph; - protected void bindSystemGraph(LockableMGraph systemGraph) { + protected void bindSystemGraph(Graph systemGraph) { Lock l = systemGraph.getLock().readLock(); l.lock(); try { - List rdfTypePriorityList = new RdfList( + List rdfTypePriorityList = new RdfList( typePriorityListUri, systemGraph); - typePriorityList = new ArrayList(rdfTypePriorityList.size()); - for (Resource resource : rdfTypePriorityList) { - if (resource instanceof UriRef) { - typePriorityList.add((UriRef) resource); + typePriorityList = new ArrayList(rdfTypePriorityList.size()); + for (RdfTerm resource : rdfTypePriorityList) { + if (resource instanceof Iri) { + typePriorityList.add((Iri) resource); } else { log.warn("Type priority list contains a resource " + "that is not a uri, skipping."); @@ -79,10 +77,10 @@ public class TypePrioritizer { } finally { l.unlock(); } - this.systemGraph = (LockableMGraph) systemGraph; + this.systemGraph = (Graph) systemGraph; } - protected void unbindSystemGraph(LockableMGraph systemGraph) { + protected void unbindSystemGraph(Graph systemGraph) { typePriorityList = null; this.systemGraph = null; } @@ -92,17 +90,17 @@ public class TypePrioritizer { * @param rdfTypes the rdf types to be sorted * @return a sorted iterator of the types */ - public Iterator iterate(final Collection rdfTypes) { - return new Iterator() { - final Set remaining = new HashSet(rdfTypes); + public Iterator iterate(final Collection rdfTypes) { + return new Iterator() { + final Set remaining = new HashSet(rdfTypes); boolean rdfsResourceRemovedAndNotYetReturned = remaining.remove(RDFS.Resource); - final Iterator typePriorityIter = typePriorityList.iterator(); - Iterator remainingIter = null; - UriRef next = prepareNext(); + final Iterator typePriorityIter = typePriorityList.iterator(); + Iterator remainingIter = null; + Iri next = prepareNext(); - private UriRef prepareNext() { + private Iri prepareNext() { while (typePriorityIter.hasNext()) { - UriRef nextPriority = typePriorityIter.next(); + Iri nextPriority = typePriorityIter.next(); if (remaining.contains(nextPriority)) { remaining.remove(nextPriority); return nextPriority; @@ -129,11 +127,11 @@ public class TypePrioritizer { } @Override - public UriRef next() { + public Iri next() { if (next == null) { throw new NoSuchElementException(); } - UriRef current = next; + Iri current = next; next = prepareNext(); return current; } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java ---------------------------------------------------------------------- diff --git a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java index 080bb14..fba8cc7 100644 --- a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java +++ b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java @@ -19,34 +19,17 @@ package org.apache.clerezza.platform.typepriority; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.concurrent.locks.Lock; - -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.apache.felix.scr.annotations.References; -import org.apache.felix.scr.annotations.Service; -import org.osgi.service.component.ComponentContext; -import org.apache.clerezza.platform.config.SystemConfig; -import org.apache.clerezza.rdf.core.MGraph; -import org.apache.clerezza.rdf.core.Resource; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.access.LockableMGraph; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; -import org.apache.clerezza.rdf.core.test.LockableMGraphWrapperForTesting; +import org.apache.commons.rdf.Graph; +import org.apache.commons.rdf.Iri; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.ontologies.FOAF; import org.apache.clerezza.rdf.ontologies.RDF; import org.apache.clerezza.rdf.utils.RdfList; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author rbn @@ -58,22 +41,21 @@ public class TypePrioritizerTest { @Before public void before() { typePrioritizer = new TypePrioritizer(); - MGraph mGraph = new SimpleMGraph(); + Graph mGraph = new SimpleGraph(); RdfList rdfList = new RdfList(TypePrioritizer.typePriorityListUri, mGraph); rdfList.add(FOAF.Person); rdfList.add(FOAF.Group); rdfList.add(FOAF.Agent); - final LockableMGraph systemGraph = new LockableMGraphWrapperForTesting(mGraph); - typePrioritizer.bindSystemGraph(systemGraph); + typePrioritizer.bindSystemGraph(mGraph); } @Test public void oderList() { - List l = new ArrayList(); + List l = new ArrayList(); l.add(FOAF.Agent); l.add(RDF.Bag); l.add(FOAF.Person); - Iterator iter = typePrioritizer.iterate(l); + Iterator iter = typePrioritizer.iterate(l); Assert.assertEquals(FOAF.Person, iter.next()); Assert.assertEquals(FOAF.Agent, iter.next()); Assert.assertEquals(RDF.Bag, iter.next()); http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering.gui/pom.xml ---------------------------------------------------------------------- diff --git a/platform/typerendering.gui/pom.xml b/platform/typerendering.gui/pom.xml index 7ab17c3..1215a5d 100644 --- a/platform/typerendering.gui/pom.xml +++ b/platform/typerendering.gui/pom.xml @@ -25,7 +25,7 @@ org.apache.clerezza clerezza 7-SNAPSHOT - ../parent + platform.typerendering.gui 1.0.0-SNAPSHOT @@ -53,7 +53,7 @@ org.apache.clerezza platform.globalmenu.api - 1.0.0-SNAPSHOT + 0.3 org.apache.clerezza http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering.scala/pom.xml ---------------------------------------------------------------------- diff --git a/platform/typerendering.scala/pom.xml b/platform/typerendering.scala/pom.xml index 30917dd..e559ed7 100644 --- a/platform/typerendering.scala/pom.xml +++ b/platform/typerendering.scala/pom.xml @@ -24,8 +24,8 @@ org.apache.clerezza clerezza - 0.5 - ../parent + 7-SNAPSHOT + org.apache.clerezza platform.typerendering.scala @@ -42,12 +42,12 @@ org.apache.clerezza rdf.scala.utils - 0.4 + 1.0.0-SNAPSHOT org.apache.clerezza platform.typerendering.core - 0.3 + 1.0.0-SNAPSHOT org.scala-lang http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/pom.xml b/platform/typerendering/platform.typerendering.core/pom.xml index 609fe60..bc6f83f 100644 --- a/platform/typerendering/platform.typerendering.core/pom.xml +++ b/platform/typerendering/platform.typerendering.core/pom.xml @@ -23,8 +23,9 @@ 4.0.0 org.apache.clerezza - platform.typerendering - 0.7 + clerezza + 7-SNAPSHOT + org.apache.clerezza platform.typerendering.core @@ -51,32 +52,27 @@ org.apache.clerezza rdf.core - 0.14 + 1.0.0-SNAPSHOT org.apache.clerezza rdf.utils - 0.14 - - - org.apache.clerezza - platform.graphnodeprovider - 0.2 + 1.0.0-SNAPSHOT org.apache.clerezza platform.typepriority - 0.2 + 1.0.0-SNAPSHOT org.apache.clerezza platform.typerendering.ontologies - 0.3 + 1.0.0-SNAPSHOT org.apache.clerezza platform.config - 0.4 + 1.0.0-SNAPSHOT org.apache.felix http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java index 05c0784..1f8793e 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java @@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering; import java.io.IOException; import java.io.OutputStream; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.utils.GraphNode; /** @@ -48,7 +48,7 @@ public interface CallbackRenderer { /** * Renders a specified named resource using the GraphNode returned by - * org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.clerezza.rdf.core.UriRef). + * org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.commons.rdf.Iri). * * Otherwise same as render(GraphNode, .GraphNode, String, OutputStream) * @@ -58,7 +58,7 @@ public interface CallbackRenderer { * @param os * @throws IOException */ - public void render(UriRef resource, GraphNode context, String mode, + public void render(Iri resource, GraphNode context, String mode, OutputStream os) throws IOException; } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java index 0f0a82a..72df3c4 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java @@ -30,7 +30,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.utils.GraphNode; import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider; @@ -71,7 +71,7 @@ public class CallbackRendererImpl implements CallbackRenderer { } @Override - public void render(final UriRef resource, GraphNode context, String mode, + public void render(final Iri resource, GraphNode context, String mode, OutputStream os) throws IOException { final GraphNode resourceNode = AccessController.doPrivileged( new PrivilegedAction() { @Override http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java index 6f06e64..957ff18 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java @@ -59,8 +59,8 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; -import org.apache.clerezza.rdf.core.BNode; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.commons.rdf.BlankNode; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.utils.GraphNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -214,7 +214,7 @@ public class GenericGraphNodeMBW implements MessageBodyWriter { } private GraphNode getUserContext() { - GraphNode contextNode = new GraphNode(new BNode(), new SimpleMGraph()); + GraphNode contextNode = new GraphNode(new BlankNode(), new SimpleGraph()); synchronized(contextProviders) { Iterator providersIter = contextProviders.iterator(); while (providersIter.hasNext()) { http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/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 ed3f372..489b88d 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java @@ -25,11 +25,11 @@ import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider; import org.apache.clerezza.platform.typepriority.TypePrioritizer; import org.apache.clerezza.platform.typerendering.utils.MediaTypeMap; import org.apache.clerezza.platform.typerendering.utils.RegexMap; -import org.apache.clerezza.rdf.core.TypedLiteral; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.ontologies.RDF; import org.apache.clerezza.rdf.ontologies.RDFS; import org.apache.clerezza.rdf.utils.GraphNode; +import org.apache.commons.rdf.Literal; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; @@ -91,8 +91,8 @@ public class RendererFactory { } } - private Map>> typeRenderletMap = - Collections.synchronizedMap(new HashMap>>()); + private Map>> typeRenderletMap = + Collections.synchronizedMap(new HashMap>>()); private BundleContext bundleContext; @@ -125,14 +125,14 @@ public class RendererFactory { */ public Renderer createRenderer(GraphNode resource, String mode, List acceptableMediaTypes) { - Set types = new HashSet(); - if (resource.getNode() instanceof TypedLiteral) { - types.add(((TypedLiteral) resource.getNode()).getDataType()); + Set types = new HashSet(); + if (resource.getNode() instanceof Literal) { + types.add(((Literal) resource.getNode()).getDataType()); } else { // extract rdf types - Iterator it = resource.getUriRefObjects(RDF.type); + Iterator it = resource.getIriObjects(RDF.type); while (it.hasNext()) { - final UriRef rdfType = it.next(); + final Iri rdfType = it.next(); types.add(rdfType); } types.add(RDFS.Resource); @@ -140,11 +140,11 @@ public class RendererFactory { return getRenderer(types, mode, acceptableMediaTypes); } - private Renderer getRenderer(Set types, String mode, + private Renderer getRenderer(Set types, String mode, List acceptableMediaTypes) { - Iterator sortedTypes = typePrioritizer.iterate(types); + Iterator sortedTypes = typePrioritizer.iterate(types); while (sortedTypes.hasNext()) { - final UriRef currentType = sortedTypes.next(); + final Iri currentType = sortedTypes.next(); final RegexMap> regexMap = typeRenderletMap.get(currentType); if (regexMap != null) { Iterator> mediaTypeMapIter = regexMap.getMatching(mode); @@ -190,7 +190,7 @@ public class RendererFactory { } private void registerRenderlet(TypeRenderlet typeRenderlet, int startLevel) { - final UriRef rdfType = typeRenderlet.getRdfType(); + final Iri rdfType = typeRenderlet.getRdfType(); RegexMap> regexMap = typeRenderletMap.get(rdfType); if (regexMap == null) { regexMap = new RegexMap>(); @@ -208,7 +208,7 @@ public class RendererFactory { protected void unbindTypeRenderlet(TypeRenderlet typeRenderlet) { TypeRenderletStartLevel typeRenderletStartLevel = new TypeRenderletStartLevel(typeRenderlet, 0); - for (Map.Entry>> typeEntry: typeRenderletMap.entrySet()) { + for (Map.Entry>> typeEntry: typeRenderletMap.entrySet()) { final RegexMap> regexMap = typeEntry.getValue(); for (Map.Entry> regexEntry: regexMap.entrySet()) { final MediaTypeMap mediaTypeMap = regexEntry.getValue(); http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java index aa48941..ae7ae42 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java @@ -22,13 +22,13 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.net.URI; import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING; -import org.apache.clerezza.rdf.core.BNode; -import org.apache.clerezza.rdf.core.PlainLiteral; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.commons.rdf.BlankNode; +import org.apache.commons.rdf.Iri; +import org.apache.commons.rdf.impl.utils.PlainLiteralImpl; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.utils.GraphNode; import org.apache.clerezza.rdf.ontologies.RDF; +import org.apache.commons.rdf.Literal; /** * This exception is thrown when an exception occured while rendering a @@ -51,15 +51,15 @@ public class RenderingException extends TypeRenderingException { @Override public GraphNode getExceptionGraphNode() { - GraphNode result = new GraphNode(new BNode(), new SimpleMGraph()); + GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph()); result.addProperty(RDF.type, TYPERENDERING.Exception); - result.addProperty(TYPERENDERING.errorSource, new UriRef(renderingSpecification.toString())); + result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString())); result.addProperty(TYPERENDERING.message, new PlainLiteralImpl(getMessage())); result.addProperty(TYPERENDERING.stackTrace, getStackTraceLiteral()); return result; } - private PlainLiteral getStackTraceLiteral() { + private Literal getStackTraceLiteral() { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); cause.printStackTrace(pw); http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java index c045815..e9f470b 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java @@ -20,11 +20,11 @@ package org.apache.clerezza.platform.typerendering; import java.net.URI; import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING; -import org.apache.clerezza.rdf.core.BNode; import org.apache.clerezza.rdf.core.LiteralFactory; -import org.apache.clerezza.rdf.core.UriRef; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.commons.rdf.BlankNode; +import org.apache.commons.rdf.Iri; +import org.apache.commons.rdf.impl.utils.PlainLiteralImpl; +import org.apache.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.ontologies.RDF; import org.apache.clerezza.rdf.utils.GraphNode; @@ -121,10 +121,10 @@ public class RenderingspecificationException extends TypeRenderingException{ @Override public GraphNode getExceptionGraphNode() { - GraphNode result = new GraphNode(new BNode(), new SimpleMGraph()); + GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph()); result.addProperty(RDF.type, TYPERENDERING.Exception); LiteralFactory factory = LiteralFactory.getInstance(); - result.addProperty(TYPERENDERING.errorSource, new UriRef(renderingSpecification.toString())); + result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString())); if (lineNumber != -1) { result.addProperty(TYPERENDERING.line, factory.createTypedLiteral(new Integer(lineNumber))); } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java index f4d940f..5da9436 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java @@ -18,7 +18,7 @@ package org.apache.clerezza.platform.typerendering; import javax.ws.rs.core.MediaType; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; /** * Over the RenderletManagerImpl renderlets can be registered. @@ -48,6 +48,6 @@ public interface RenderletManager { * required. * @param mediaType The media type of the rendered * @param builtIn ignored - */ void registerRenderlet(String renderletServiceName, final UriRef renderingSpecification, final UriRef rdfType, final String mode, final MediaType mediaType, boolean builtIn); + */ void registerRenderlet(String renderletServiceName, final Iri renderingSpecification, final Iri rdfType, final String mode, final MediaType mediaType, boolean builtIn); } http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java index 0e98a80..a2ef2f0 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java @@ -33,7 +33,7 @@ import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.ws.rs.core.MediaType; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.utils.GraphNode; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; @@ -67,12 +67,12 @@ public class RenderletManagerImpl implements RenderletManager { private static class RegistrationRequest { String renderletServiceName; - UriRef renderingSpecification; - UriRef rdfType; + Iri renderingSpecification; + Iri rdfType; String mode; MediaType mediaType; - public RegistrationRequest(String renderletServiceName, UriRef renderingSpecification, UriRef rdfType, String mode, MediaType mediaType) { + public RegistrationRequest(String renderletServiceName, Iri renderingSpecification, Iri rdfType, String mode, MediaType mediaType) { this.renderletServiceName = renderletServiceName; this.renderingSpecification = renderingSpecification; this.rdfType = rdfType; @@ -112,8 +112,8 @@ public class RenderletManagerImpl implements RenderletManager { * @param builtIn ignored */ public void registerRenderlet(String renderletServiceName, - final UriRef renderingSpecification, - final UriRef rdfType, + final Iri renderingSpecification, + final Iri rdfType, final String mode, final MediaType mediaType, boolean builtIn) { RegistrationRequest registrationRequest = new RegistrationRequest(renderletServiceName, @@ -232,8 +232,8 @@ public class RenderletManagerImpl implements RenderletManager { private boolean attemptRegistration(RegistrationRequest registrationRequest) { final String renderletServiceName = registrationRequest.renderletServiceName; - UriRef renderingSpecification = registrationRequest.renderingSpecification; - final UriRef rdfType = registrationRequest.rdfType; + Iri renderingSpecification = registrationRequest.renderingSpecification; + final Iri rdfType = registrationRequest.rdfType; final String modePattern = registrationRequest.mode; final MediaType mediaType = registrationRequest.mediaType; @@ -252,7 +252,7 @@ public class RenderletManagerImpl implements RenderletManager { TypeRenderlet typeRenderlet = new TypeRenderlet() { @Override - public UriRef getRdfType() { + public Iri getRdfType() { return rdfType; } @@ -304,7 +304,7 @@ public class RenderletManagerImpl implements RenderletManager { return true; } - private ServiceRegistration getAlreadyRegisteredServiceReg(UriRef rdfType, + private ServiceRegistration getAlreadyRegisteredServiceReg(Iri rdfType, MediaType mediaType, String modePattern) { for (ServiceRegistration serviceRegistration : registeredTypeRenderlets) { http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java index f984ddb..b3b57ed 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java @@ -28,7 +28,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.utils.GraphNode; import org.osgi.framework.BundleContext; import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider; @@ -52,7 +52,7 @@ class RenderletRendererImpl implements Renderer { private GraphNodeProvider graphNodeProvider; - RenderletRendererImpl(UriRef renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider, + RenderletRendererImpl(Iri renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider, Renderlet renderlet, MediaType mediaType, RendererFactory rendererFactory, BundleContext bundleContext) { http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java ---------------------------------------------------------------------- diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java index d8de204..502b5ac 100644 --- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java +++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java @@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.commons.rdf.Iri; import org.apache.clerezza.rdf.ontologies.RDF; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; @@ -81,7 +81,7 @@ public class TypeRenderingExceptionMapper implements ExceptionMapper4.0.0 org.apache.clerezza - platform.typerendering - 0.7 + clerezza + 7-SNAPSHOT + org.apache.clerezza platform.typerendering.ontologies @@ -38,7 +39,7 @@ org.apache.clerezza rdf.core - 0.14 + 1.0.0-SNAPSHOT @@ -60,7 +61,7 @@ - 0.4 + 1.0.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/clerezza/blob/0e209798/platform/typerendering/pom.xml ---------------------------------------------------------------------- diff --git a/platform/typerendering/pom.xml b/platform/typerendering/pom.xml index 1167e73..65f9c35 100644 --- a/platform/typerendering/pom.xml +++ b/platform/typerendering/pom.xml @@ -24,8 +24,8 @@ org.apache.clerezza clerezza - 0.5 - ../parent + 7-SNAPSHOT + org.apache.clerezza platform.typerendering