You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/14 15:13:34 UTC
[59/87] [abbrv] clerezza git commit: CLEREZZA-989: All bundle and
components in linked data launchers satisfied, some runtime problems
CLEREZZA-989: All bundle and components in linked data launchers satisfied, some runtime problems
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/c8c34941
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/c8c34941
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/c8c34941
Branch: refs/heads/master
Commit: c8c34941b1c8505ff9c5e30d0af74bae25270c5b
Parents: 9677f50
Author: Reto Gmuer <re...@apache.org>
Authored: Tue Mar 24 10:33:40 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Tue Mar 24 10:33:40 2015 +0000
----------------------------------------------------------------------
jaxrs.rdf.providers/pom.xml | 4 +-
.../jaxrs/rdf/providers/GraphNodeWriter.java | 46 +++----
.../jaxrs/rdf/providers/GraphReader.java | 12 +-
.../jaxrs/rdf/providers/GraphWriter.java | 10 +-
.../rdf/providers/ImmutableGraphReader.java | 66 ++++++++++
.../rdf/providers/TripleCollectionReader.java | 66 ----------
.../ResultSetCsvMessageBodyWriter.java | 27 ++---
.../ResultSetJsonMessageBodyWriter.java | 35 +++---
.../ResultSetTsvMessageBodyWriter.java | 27 ++---
.../ResultSetXmlMessageBodyWriter.java | 31 ++---
platform/config/pom.xml | 14 +++
platform/graphnodeprovider/pom.xml | 6 +-
.../PlatformGraphNodeProvider.scala | 39 +++---
platform/graphprovider.content/pom.xml | 8 ++
.../content/ContentGraphProvider.java | 8 +-
platform/typehandlerspace.jaxrs2/pom.xml | 8 +-
.../jaxrs/TypeHandlerSpace.java | 24 ++--
platform/typehandlerspace/pom.xml | 16 ++-
.../typehandlerspace/TypeHandlerDiscovery.java | 4 +-
.../impl/TypeHandlerDiscoveryImpl.java | 18 +--
.../typehandlerspace/GraphWriterDummy.java | 12 +-
.../typehandlerspace/TypeHandlerSpaceTest.java | 54 ++-------
platform/typepriority/pom.xml | 4 +
platform/typerendering.scalaserverpages/pom.xml | 8 ++
.../platform.typerendering.core/pom.xml | 8 ++
platform/usermanager/pom.xml | 4 +
.../launchers/linked-data-launcher/pom.xml | 20 ++--
provisioning/rdf.web/pom.xml | 17 ++-
provisioning/rdf/pom.xml | 2 +-
provisioning/security/pom.xml | 2 +-
provisioning/typehandlerspace/pom.xml | 12 +-
rdf.storage.web/src/main/scala/WebProxy.scala | 4 +-
rdf.web/pom.xml | 8 +-
rdf.web/rdf.web.core/pom.xml | 33 +++--
.../apache/clerezza/rdf/web/core/Backup.java | 10 +-
.../rdf/web/core/BackupMessageBodyWriter.java | 37 +++---
.../clerezza/rdf/web/core/BackupPermission.java | 4 +-
.../apache/clerezza/rdf/web/core/Delete.java | 16 +--
.../clerezza/rdf/web/core/GraphManagement.java | 28 ++---
.../web/core/GraphManagementAppPermission.java | 12 +-
.../apache/clerezza/rdf/web/core/Restorer.java | 36 +++---
.../web/core/ResultSetMessageBodyWriter.java | 35 +++---
.../org/apache/clerezza/rdf/web/core/Smush.java | 25 ++--
.../clerezza/rdf/web/core/SparqlEndpoint.java | 75 ++++++------
.../apache/clerezza/rdf/web/core/WebAccess.java | 53 ++++----
.../rdf/web/core/WebAccessPermission.java | 10 +-
.../rdf/web/core/BackupAndRestoreTest.java | 120 +++++++++----------
rdf.web/rdf.web.ontologies/pom.xml | 9 +-
rdf/jena/parser/pom.xml | 6 +-
rdf/jena/serializer/pom.xml | 8 ++
rdf/jena/tdb.storage/pom.xml | 8 ++
.../rdf/jena/tdb/storage/TdbTcProvider.java | 4 +-
52 files changed, 593 insertions(+), 560 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/pom.xml
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/pom.xml b/jaxrs.rdf.providers/pom.xml
index 2845b48..527f922 100644
--- a/jaxrs.rdf.providers/pom.xml
+++ b/jaxrs.rdf.providers/pom.xml
@@ -36,12 +36,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
index ceaff14..bde5c83 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
@@ -38,11 +38,11 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Triple;
+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.utils.GraphNode;
/**
@@ -98,17 +98,17 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
this.uriInfo = uriInfo;
}
- private TripleCollection getExpandedContext(GraphNode node) {
- final TripleCollection result = new SimpleMGraph(node.getNodeContext());
- final Set<Resource> expandedResources = new HashSet<Resource>();
+ private Graph getExpandedContext(GraphNode node) {
+ final Graph result = new SimpleGraph(node.getNodeContext());
+ final Set<RdfTerm> expandedResources = new HashSet<RdfTerm>();
expandedResources.add(node.getNode());
while (true) {
- Set<Resource> additionalExpansionRes = getAdditionalExpansionResources(result);
+ Set<RdfTerm> additionalExpansionRes = getAdditionalExpansionResources(result);
additionalExpansionRes.removeAll(expandedResources);
if (additionalExpansionRes.size() == 0) {
return result;
}
- for (Resource resource : additionalExpansionRes) {
+ for (RdfTerm resource : additionalExpansionRes) {
final GraphNode additionalNode = new GraphNode(resource, node.getGraph());
result.addAll(additionalNode.getNodeContext());
expandedResources.add(resource);
@@ -116,14 +116,14 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
}
}
- private Set<Resource> getAdditionalExpansionResources(TripleCollection tc) {
- final Set<UriRef> subjectExpansionProperties = getSubjectExpansionProperties();
- final Set<UriRef> objectExpansionProperties = getObjectExpansionProperties();
- final Set<Resource> result = new HashSet<Resource>();
+ private Set<RdfTerm> getAdditionalExpansionResources(Graph tc) {
+ final Set<Iri> subjectExpansionProperties = getSubjectExpansionProperties();
+ final Set<Iri> objectExpansionProperties = getObjectExpansionProperties();
+ final Set<RdfTerm> result = new HashSet<RdfTerm>();
if ((subjectExpansionProperties.size() > 0)
|| (objectExpansionProperties.size() > 0)) {
for (Triple triple : tc) {
- final UriRef predicate = triple.getPredicate();
+ final Iri predicate = triple.getPredicate();
if (subjectExpansionProperties.contains(predicate)) {
result.add(triple.getSubject());
}
@@ -135,28 +135,28 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
return result;
}
- private Set<UriRef> getSubjectExpansionProperties() {
+ private Set<Iri> getSubjectExpansionProperties() {
final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
final List<String> paramValues = queryParams.get(SUBJ_EXP_PARAM);
if (paramValues == null) {
- return new HashSet<UriRef>(0);
+ return new HashSet<Iri>(0);
}
- final Set<UriRef> result = new HashSet<UriRef>(paramValues.size());
+ final Set<Iri> result = new HashSet<Iri>(paramValues.size());
for (String uriString : paramValues) {
- result.add(new UriRef(uriString));
+ result.add(new Iri(uriString));
}
return result;
}
- private Set<UriRef> getObjectExpansionProperties() {
+ private Set<Iri> getObjectExpansionProperties() {
final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
final List<String> paramValues = queryParams.get(OBJ_EXP_PARAM);
if (paramValues == null) {
- return new HashSet<UriRef>(0);
+ return new HashSet<Iri>(0);
}
- final Set<UriRef> result = new HashSet<UriRef>(paramValues.size());
+ final Set<Iri> result = new HashSet<Iri>(paramValues.size());
for (String uriString : paramValues) {
- result.add(new UriRef(uriString));
+ result.add(new Iri(uriString));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
index a53fae3..b1c4922 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphReader.java
@@ -28,9 +28,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
+
+import org.apache.commons.rdf.Graph;
+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.apache.clerezza.rdf.core.Graph;
/**
* @scr.component
@@ -49,6 +51,7 @@ public class GraphReader implements MessageBodyReader<Graph> {
* @scr.reference
*/
private Parser parser;
+
@Override
public boolean isReadable(Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
@@ -56,11 +59,8 @@ public class GraphReader implements MessageBodyReader<Graph> {
}
@Override
- public Graph readFrom(Class<Graph> type, Type genericType,
- Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders,
- InputStream entityStream)
- throws IOException, WebApplicationException {
+ public Graph readFrom(Class<Graph> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
+ Graph result = new SimpleGraph();
return parser.parse(entityStream, mediaType.toString());
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
index 7d6ed0c..9bcc33a 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphWriter.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@@ -46,7 +46,7 @@ import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@Produces({SupportedFormat.N3, SupportedFormat.N_TRIPLE,
SupportedFormat.RDF_XML, SupportedFormat.TURTLE,
SupportedFormat.X_TURTLE, SupportedFormat.RDF_JSON})
-public class GraphWriter implements MessageBodyWriter<TripleCollection> {
+public class GraphWriter implements MessageBodyWriter<Graph> {
/**
* @scr.reference
@@ -56,17 +56,17 @@ public class GraphWriter implements MessageBodyWriter<TripleCollection> {
@Override
public boolean isWriteable(Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
- return TripleCollection.class.isAssignableFrom(type);
+ return Graph.class.isAssignableFrom(type);
}
@Override
- public long getSize(TripleCollection t, Class<?> type, Type genericType,
+ public long getSize(Graph t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
return -1;
}
@Override
- public void writeTo(TripleCollection t, Class<?> type, Type genericType,
+ public void writeTo(Graph t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException, WebApplicationException {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
new file mode 100644
index 0000000..c2af5a8
--- /dev/null
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/ImmutableGraphReader.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.jaxrs.rdf.providers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
+import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+import org.apache.commons.rdf.ImmutableGraph;
+
+/**
+ * @scr.component
+ * @scr.service interface="java.lang.Object"
+ * @scr.property name="javax.ws.rs" type="Boolean" value="true"
+ *
+ * @author reto
+ */
+@Provider
+@Consumes({SupportedFormat.N3, SupportedFormat.N_TRIPLE,
+ SupportedFormat.RDF_XML, SupportedFormat.TURTLE,
+ SupportedFormat.X_TURTLE, SupportedFormat.RDF_JSON})
+public class ImmutableGraphReader implements MessageBodyReader<ImmutableGraph> {
+
+ /**
+ * @scr.reference
+ */
+ private Parser parser;
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType) {
+ return type.isAssignableFrom(ImmutableGraph.class);
+ }
+
+ @Override
+ public ImmutableGraph readFrom(Class<ImmutableGraph> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders,
+ InputStream entityStream)
+ throws IOException, WebApplicationException {
+ return parser.parse(entityStream, mediaType.toString());
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/TripleCollectionReader.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/TripleCollectionReader.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/TripleCollectionReader.java
deleted file mode 100644
index 7be80fa..0000000
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/TripleCollectionReader.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.jaxrs.rdf.providers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.Provider;
-
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-
-/**
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- *
- * @author reto
- */
-@Provider
-@Consumes({SupportedFormat.N3, SupportedFormat.N_TRIPLE,
- SupportedFormat.RDF_XML, SupportedFormat.TURTLE,
- SupportedFormat.X_TURTLE, SupportedFormat.RDF_JSON})
-public class TripleCollectionReader implements MessageBodyReader<TripleCollection> {
-
- /**
- * @scr.reference
- */
- private Parser parser;
-
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return type.isAssignableFrom(TripleCollection.class);
- }
-
- @Override
- public TripleCollection readFrom(Class<TripleCollection> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
- TripleCollection result = new SimpleMGraph();
- return parser.parse(entityStream, mediaType.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
index 848ace0..a9b549e 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
@@ -32,13 +32,12 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
+import org.apache.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -180,7 +179,7 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
if( !first ) {
outputStream.write( separator );
}
- Resource resource = lineData.get( header );
+ RdfTerm resource = lineData.get( header );
if( resource != null ) {
writeEscaped( outputStream, getResourceValue( resource ) );
}
@@ -190,17 +189,15 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
/**
- * Helper to get the proper string representation for the given Resource.
+ * Helper to get the proper string representation for the given RdfTerm.
*/
- private String getResourceValue( Resource resource ) {
+ private String getResourceValue( RdfTerm resource ) {
StringBuilder value = new StringBuilder();
- if( resource instanceof UriRef ) {
- value.append( ((UriRef) resource).getUnicodeString() );
- } else if( resource instanceof TypedLiteral ) {
- value.append( ((TypedLiteral) resource).getLexicalForm() );
- } else if( resource instanceof PlainLiteral ) {
- value.append( ((PlainLiteral) resource).getLexicalForm() );
- } else if( resource instanceof BNode ) {
+ if( resource instanceof Iri ) {
+ value.append( ((Iri) resource).getUnicodeString() );
+ } else if( resource instanceof Literal ) {
+ value.append( ((Literal) resource).getLexicalForm() );
+ } else if( resource instanceof BlankNode ) {
value.append( "/" );
} else {
value.append( resource.toString() );
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
index 8a7f7cc..f80f4a8 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
@@ -32,15 +32,14 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Language;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.Language;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
+import org.apache.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -115,27 +114,27 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
}
/**
- * Helper: creates value element from {@link Resource} depending on its
+ * Helper: creates value element from {@link RdfTerm} depending on its
* class
*
*/
- private JSONObject createResultElement(Resource resource) {
+ private JSONObject createResultElement(RdfTerm resource) {
JSONObject element = new JSONObject();
- if (resource instanceof UriRef) {
+ if (resource instanceof Iri) {
element.put("type", "uri");
- element.put("value", UriRef.class.cast(resource).getUnicodeString());
- } else if (resource instanceof PlainLiteral) {
+ element.put("value", Iri.class.cast(resource).getUnicodeString());
+ } else if (resource instanceof Literal) {
element.put("type", "literal");
- element.put("value", PlainLiteral.class.cast(resource).getLexicalForm());
- Language lang = PlainLiteral.class.cast(resource).getLanguage();
+ element.put("value", Literal.class.cast(resource).getLexicalForm());
+ Language lang = Literal.class.cast(resource).getLanguage();
if (lang != null) {
element.put("xml:lang", lang.toString());
}
- } else if (resource instanceof TypedLiteral) {
+ } else if (resource instanceof Literal) {
element.put("type", "typed-literal");
- element.put("datatype", TypedLiteral.class.cast(resource).getDataType().getUnicodeString());
- element.put("value", TypedLiteral.class.cast(resource).getLexicalForm());
- } else if (resource instanceof BNode) {
+ element.put("datatype", Literal.class.cast(resource).getDataType().getUnicodeString());
+ element.put("value", Literal.class.cast(resource).getLexicalForm());
+ } else if (resource instanceof BlankNode) {
element.put("type", "bnode");
element.put("value", "/");
} else {
@@ -152,7 +151,7 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
JSONObject result = new JSONObject();
Set<Variable> keys = solutionMap.keySet();
for (Variable key : keys) {
- result.put(key.getName(), createResultElement((Resource) solutionMap.get(key)));
+ result.put(key.getName(), createResultElement((RdfTerm) solutionMap.get(key)));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
index bf9dcd4..22ebc7c 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
@@ -32,13 +32,12 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
+import org.apache.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -180,7 +179,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
if( !first ) {
outputStream.write( separator );
}
- Resource resource = lineData.get( header );
+ RdfTerm resource = lineData.get( header );
if( resource != null ) {
writeEscaped( outputStream, getResourceValue( resource ) );
}
@@ -190,21 +189,17 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
/**
- * Helper to get the proper string representation for the given Resource.
+ * Helper to get the proper string representation for the given RdfTerm.
*/
- private String getResourceValue( Resource resource ) {
+ private String getResourceValue( RdfTerm resource ) {
StringBuilder value = new StringBuilder();
- if( resource instanceof UriRef ) {
+ if( resource instanceof Iri ) {
value.append( resource.toString() );
- } else if( resource instanceof TypedLiteral ) {
+ } else if( resource instanceof Literal ) {
value.append( "\"" );
- value.append( escapedDQuotes(((TypedLiteral) resource).getLexicalForm()) );
+ value.append( escapedDQuotes(((Literal) resource).getLexicalForm()) );
value.append( "\"" );
- } else if( resource instanceof PlainLiteral ) {
- value.append( "\"" );
- value.append( escapedDQuotes(((PlainLiteral) resource).getLexicalForm()) );
- value.append( "\"" );
- } else if( resource instanceof BNode ) {
+ } else if( resource instanceof BlankNode ) {
value.append( "/" );
} else {
value.append( resource.toString() );
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
index 074b829..8d2657a 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
@@ -40,14 +40,13 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import org.apache.clerezza.rdf.core.Language;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Language;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
+import org.apache.commons.rdf.Literal;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -148,27 +147,23 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
/**
- * Helper: creates value element from {@link Resource} depending on its
+ * Helper: creates value element from {@link RdfTerm} depending on its
* class
*
*/
- private Element createValueElement(Resource resource, Document doc) {
+ private Element createValueElement(RdfTerm resource, Document doc) {
Element value = null;
- if (resource instanceof UriRef) {
+ if (resource instanceof Iri) {
value = doc.createElement("uri");
- value.appendChild(doc.createTextNode(((UriRef) resource)
+ value.appendChild(doc.createTextNode(((Iri) resource)
.getUnicodeString()));
- } else if (resource instanceof TypedLiteral) {
+ } else if (resource instanceof Literal) {
value = doc.createElement("literal");
- value.appendChild(doc.createTextNode(((TypedLiteral) resource)
+ value.appendChild(doc.createTextNode(((Literal) resource)
.getLexicalForm()));
- value.setAttribute("datatype", (((TypedLiteral) resource)
+ value.setAttribute("datatype", (((Literal) resource)
.getDataType().getUnicodeString()));
- } else if (resource instanceof PlainLiteral) {
- value = doc.createElement("literal");
- value.appendChild(doc.createTextNode(((PlainLiteral) resource)
- .getLexicalForm()));
- Language lang = ((PlainLiteral) resource).getLanguage();
+ Language lang = ((Literal) resource).getLanguage();
if (lang != null) {
value.setAttribute("xml:lang", (lang.toString()));
}
@@ -191,7 +186,7 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
Element bindingElement = doc.createElement("binding");
bindingElement.setAttribute("name", key.getName());
bindingElement.appendChild(createValueElement(
- (Resource) solutionMap.get(key), doc));
+ (RdfTerm) solutionMap.get(key), doc));
result.appendChild(bindingElement);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/config/pom.xml
----------------------------------------------------------------------
diff --git a/platform/config/pom.xml b/platform/config/pom.xml
index 7537a21..c726a0b 100644
--- a/platform/config/pom.xml
+++ b/platform/config/pom.xml
@@ -36,6 +36,20 @@
provides a service to access configuration default values, and a GUI to
edit such values.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!-- a problem with more recent versions and combined targets target="(&(foo=bar)(name=foo)" -->
+ <version>2.5.0</version>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/graphnodeprovider/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/pom.xml b/platform/graphnodeprovider/pom.xml
index fdd198f..cd5535d 100644
--- a/platform/graphnodeprovider/pom.xml
+++ b/platform/graphnodeprovider/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.usermanager</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -103,6 +103,10 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/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 e1b4630..8d12669 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
@@ -20,6 +20,7 @@ package org.apache.clerezza.platform.graphnodeprovider
*/
import java.net.{HttpURLConnection, URL}
+import org.apache.commons.rdf._
import org.slf4j.scala._
import org.apache.clerezza.rdf.core.access._
import org.apache.clerezza.rdf.core._
@@ -27,10 +28,12 @@ import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.Constants
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
import org.apache.clerezza.platform.users.WebIdGraphsService
-import org.apache.clerezza.rdf.utils.{UnionMGraph, UriMutatingTripleCollection, GraphNode}
import java.util.concurrent.locks.Lock
import org.apache.clerezza.platform.usermanager.UserManager
import java.security.{PrivilegedAction, AccessController}
+import org.apache.clerezza.rdf.utils.GraphNode
+import org.apache.clerezza.rdf.utils.UnionGraph
+import org.apache.clerezza.rdf.utils.UriMutatingGraph
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider
/**
@@ -44,7 +47,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
* Get a GraphNode for the specified resource, see class comments for details.
*/
- def get(uriRef: UriRef): GraphNode = {
+ def get(uriRef: Iri): GraphNode = {
val uriString = uriRef.getUnicodeString
val isLocal: Boolean = {
import scala.collection.JavaConversions._
@@ -56,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(UriRef) 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: UriRef): GraphNode = {
+ def getLocal(uriRef: Iri): GraphNode = {
get(uriRef, true)
}
@@ -67,17 +70,17 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
*return true iff getLocal(uriRef).getNodeContext.size > 0
*/
- def existsLocal(uriRef: UriRef): Boolean = {
+ def existsLocal(uriRef: Iri): Boolean = {
val cgGraph = cgProvider.getContentGraph
lazy val localInstanceUri = {
val uri = new java.net.URI(uriRef.getUnicodeString)
- new UriRef(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: UriRef, tc: LockableMGraph): Boolean = {
+ private[this] def existsInGraph(nodeUri: Iri, tc: Graph): Boolean = {
var readLock: Lock = tc.getLock.readLock
readLock.lock
try {
@@ -89,7 +92,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
- private def get(uriRef: UriRef, isLocal: Boolean): GraphNode = {
+ private def get(uriRef: Iri, isLocal: Boolean): GraphNode = {
val uriString = uriRef.getUnicodeString
@@ -103,17 +106,17 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
uri.getScheme+"://"+uri.getAuthority
}
- val anyHostUri = new UriRef(Constants.URN_LOCAL_INSTANCE + uriPath)
+ val anyHostUri = new Iri(Constants.URN_LOCAL_INSTANCE + uriPath)
- var mGraphs: List[TripleCollection] = Nil
+ var mGraphs: List[Graph] = Nil
- def addToUnion(mGraph: LockableMGraph) {
+ def addToUnion(mGraph: Graph) {
//adding uncondinionately if (existsInGraph(uriRef, mGraph)) {
mGraphs ::= mGraph
//}
if (isLocal) {
if (existsInGraph(anyHostUri, mGraph)) {
- mGraphs ::= new UriMutatingTripleCollection(mGraph, Constants.URN_LOCAL_INSTANCE, uriPrefix)
+ mGraphs ::= new UriMutatingGraph(mGraph, Constants.URN_LOCAL_INSTANCE, uriPrefix)
}
}
}
@@ -126,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[UriRef]]() {
- def run(): Option[UriRef] = {
+ 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: UriRef => Some(u)
+ case u: Iri => Some(u)
case _ => None
}
} else {
@@ -188,11 +191,11 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
}
- addToUnion(tcManager.getMGraph(new UriRef(graphUriString)))
+ addToUnion(tcManager.getGraph(new Iri(graphUriString)))
}
- val unionMGraph = new UnionMGraph(mGraphs:_*);
- new GraphNode(uriRef, unionMGraph)
+ val unionGraph = new UnionGraph(mGraphs:_*);
+ new GraphNode(uriRef, unionGraph)
}
private var tcManager: TcManager = null;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/graphprovider.content/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/pom.xml b/platform/graphprovider.content/pom.xml
index cecf185..437bdaf 100644
--- a/platform/graphprovider.content/pom.xml
+++ b/platform/graphprovider.content/pom.xml
@@ -35,6 +35,14 @@
<packaging>bundle</packaging>
<name>Clerezza - Platform Graph Provider Content</name>
<description>A service that provides the content-graph</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
index de3b483..8d6ace8 100644
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
+++ b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
@@ -30,6 +30,8 @@ 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.utils.UnionGraph;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
/**
* A service providing a method to retrieve a <code>UnionGraph</code> containing
@@ -41,11 +43,9 @@ import org.apache.clerezza.rdf.utils.UnionGraph;
* Temporarily means that after restarting the org.apache.clerezza.platform.graphprovider.content
* bundle, these graphs will no longer be returned in the <code>UnionGraph</code>.
*
- * @scr.component
- * @scr.service interface="org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider"
- *
- * @author rbn, mir
*/
+@Component
+@Service(ContentGraphProvider.class)
public class ContentGraphProvider {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typehandlerspace.jaxrs2/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/pom.xml b/platform/typehandlerspace.jaxrs2/pom.xml
index c7aed18..b82c6de 100644
--- a/platform/typehandlerspace.jaxrs2/pom.xml
+++ b/platform/typehandlerspace.jaxrs2/pom.xml
@@ -24,8 +24,8 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace.jaxrs</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphnodeprovider</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/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 75e91f8..84e3e85 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
@@ -31,8 +31,8 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
@@ -89,13 +89,13 @@ public class TypeHandlerSpace {
}
private Object getTypeHandler(String absoluteUriPath) {
- UriRef uri = new UriRef(absoluteUriPath);
+ Iri uri = new Iri(absoluteUriPath);
if (gnp.existsLocal(uri)) {
GraphNode node = gnp.getLocal(uri);
Lock lock =node.readLock();
lock.lock();
try {
- Set<UriRef> rdfTypes = getRdfTypesOfUriRef(node);
+ Set<Iri> rdfTypes = getRdfTypesOfIri(node);
return typeHandlerDiscovery.getTypeHandler(rdfTypes);
} finally {
lock.unlock();
@@ -105,17 +105,17 @@ public class TypeHandlerSpace {
return null;
}
- private Set<UriRef> getRdfTypesOfUriRef(GraphNode node) {
- Set<UriRef> rdfTypes = new HashSet<UriRef>();
- Iterator<Resource> types = node.getObjects(RDF.type);
+ private Set<Iri> getRdfTypesOfIri(GraphNode node) {
+ Set<Iri> rdfTypes = new HashSet<Iri>();
+ Iterator<RdfTerm> types = node.getObjects(RDF.type);
while (types.hasNext()) {
- Resource typeStmtObj = types.next();
- if (!(typeStmtObj instanceof UriRef)) {
+ RdfTerm typeStmtObj = types.next();
+ if (!(typeStmtObj instanceof Iri)) {
throw new RuntimeException(
"RDF type is expected to be a URI but is " + typeStmtObj
+ "(of " + node.getNode() + ")");
}
- UriRef rdfType = (UriRef) typeStmtObj;
+ Iri rdfType = (Iri) typeStmtObj;
rdfTypes.add(rdfType);
}
@@ -127,8 +127,8 @@ public class TypeHandlerSpace {
@GET
public Object getDescription(@Context UriInfo uriInfo){
String absoluteUriPath = uriInfo.getAbsolutePath().toString();
- //MGraph contentMGraph = cgp.getContentGraph();
- UriRef uri = new UriRef(absoluteUriPath.substring(0,
+ //Graph contentGraph = cgp.getContentGraph();
+ Iri uri = new Iri(absoluteUriPath.substring(0,
absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
GraphNode graphNode = gnp.getLocal(uri);
return graphNode.getNodeContext();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typehandlerspace/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/pom.xml b/platform/typehandlerspace/pom.xml
index 43756c3..1586dd7 100644
--- a/platform/typehandlerspace/pom.xml
+++ b/platform/typehandlerspace/pom.xml
@@ -24,8 +24,8 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
@@ -40,22 +40,22 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.12</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typepriority</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!--
<dependency>
@@ -73,6 +73,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.xsite</groupId>
<artifactId>xsite-maven-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
index 5b2c929..2db91ee 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.platform.typehandlerspace;
import java.util.Set;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Iri;
/**
* Implementations of this interface map RDF-types to type handlers. A type
@@ -41,6 +41,6 @@ public interface TypeHandlerDiscovery {
* be handled
* @return the type handler for most important rdf-type in the set
*/
- public Object getTypeHandler(Set<UriRef> rdfTypes);
+ public Object getTypeHandler(Set<Iri> rdfTypes);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
index 57b89f1..789cc4d 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
@@ -35,7 +35,7 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.typehandlerspace.SupportedTypes;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
import org.apache.clerezza.platform.typepriority.TypePrioritizer;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.felix.scr.annotations.ReferencePolicy;
@@ -56,8 +56,8 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
@Reference
private TypePrioritizer typePrioritizer;
- private final Map<UriRef, Object> typeHandlerMap = Collections.synchronizedMap(
- new HashMap<UriRef, Object>());
+ private final Map<Iri, Object> typeHandlerMap = Collections.synchronizedMap(
+ new HashMap<Iri, Object>());
protected void bindTypeHandler(Object typeHandler) {
SupportedTypes supportedTypes = typeHandler.getClass()
@@ -66,17 +66,17 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
return;
}
for (String typeUriString : supportedTypes.types()) {
- UriRef typeUri = new UriRef(typeUriString);
+ Iri typeUri = new Iri(typeUriString);
typeHandlerMap.put(typeUri, typeHandler);
}
}
protected void unbindTypeHandler(Object typeHandler) {
- Iterator<UriRef> keys = typeHandlerMap.keySet().iterator();
- Set<UriRef> toRemove = new HashSet<UriRef>(typeHandlerMap.size());
+ Iterator<Iri> keys = typeHandlerMap.keySet().iterator();
+ Set<Iri> toRemove = new HashSet<Iri>(typeHandlerMap.size());
synchronized(typeHandlerMap) {
while (keys.hasNext()) {
- UriRef uriRef = keys.next();
+ Iri uriRef = keys.next();
if(typeHandlerMap.get(uriRef) == typeHandler) {
toRemove.add(uriRef);
}
@@ -89,12 +89,12 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
}
@Override
- public Object getTypeHandler(final Set<UriRef> types) {
+ public Object getTypeHandler(final Set<Iri> types) {
return AccessController.doPrivileged(new PrivilegedAction<Object>() {
@Override
public Object run() {
- Iterator<UriRef> prioritizedTypes = typePrioritizer.iterate(types);
+ Iterator<Iri> prioritizedTypes = typePrioritizer.iterate(types);
while (prioritizedTypes.hasNext()) {
Object result = typeHandlerMap.get(prioritizedTypes.next());
if (result != null) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
index 4552132..31222a7 100644
--- a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
+++ b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/GraphWriterDummy.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.commons.rdf.Graph;
/**
*
@@ -40,26 +40,26 @@ import org.apache.clerezza.rdf.core.TripleCollection;
*/
@Provider
@Produces("application/rdf+xml")
-public class GraphWriterDummy implements MessageBodyWriter<TripleCollection> {
+public class GraphWriterDummy implements MessageBodyWriter<Graph> {
@Override
public boolean isWriteable(Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
- return TripleCollection.class.isAssignableFrom(type);
+ return Graph.class.isAssignableFrom(type);
}
@Override
- public long getSize(TripleCollection t, Class<?> type, Type genericType,
+ public long getSize(Graph t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType) {
return -1;
}
@Override
- public void writeTo(TripleCollection t, Class<?> type, Type genericType,
+ public void writeTo(Graph t, Class<?> type, Type genericType,
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException, WebApplicationException {
- entityStream.write("Graph writer".getBytes());
+ entityStream.write("ImmutableGraph writer".getBytes());
entityStream.close();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/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 645ba8a..1e89023 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
@@ -18,40 +18,8 @@
*/
package org.apache.clerezza.platform.typehandlerspace;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import java.util.concurrent.locks.ReadWriteLock;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-
-import org.junit.Assert;
import org.junit.Test;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.event.FilterTriple;
-import org.apache.clerezza.rdf.core.event.GraphListener;
-//import org.apache.clerezza.jaxrs.testutils.TestWebServer;
-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.clerezza.rdf.core.access.LockableMGraphWrapper;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.ontologies.RDF;
/**
* @author mir
@@ -64,9 +32,9 @@ public class TypeHandlerSpaceTest {
}
//
-// private static LockableMGraph mGraph = new LockableMGraphWrapper(new SimpleMGraph());
+// private static LockableGraph mGraph = new LockableGraphWrapper(new SimpleGraph());
//
-// UriRef myType = new UriRef("org.example/myType");
+// Iri myType = new Iri("org.example/myType");
//
// @Path("/myTypeHandler")
// public static class MyTypeHandler {
@@ -106,7 +74,7 @@ public class TypeHandlerSpaceTest {
//
// int port = createTestWebServer().getPort();
//
-// UriRef uri = new UriRef("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);
@@ -141,7 +109,7 @@ public class TypeHandlerSpaceTest {
// public void testGet() throws IOException {
//
// int port = createTestWebServer().getPort();
-// UriRef uri = new UriRef("http://localhost:" + port + "/test");
+// Iri uri = new Iri("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -170,7 +138,7 @@ public class TypeHandlerSpaceTest {
// public void testGetDescription() throws IOException {
//
// int port = createTestWebServer().getPort();
-// UriRef uri = new UriRef("http://localhost:" + port + "/test");
+// Iri uri = new Iri("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -188,7 +156,7 @@ public class TypeHandlerSpaceTest {
// for (int ch = requestInput.read(); ch != -1; ch = requestInput.read()) {
// baos.write(ch);
// }
-// Assert.assertEquals("Graph writer", baos.toString());
+// Assert.assertEquals("ImmutableGraph writer", baos.toString());
// }
//
// private TestWebServer createTestWebServer() {
@@ -209,8 +177,8 @@ public class TypeHandlerSpaceTest {
// TypeHandlerSpace typeHandlerSpace = new TypeHandlerSpace();
// typeHandlerSpace.tcManager = new TcManager(){
// @Override
-// public LockableMGraph getMGraph(UriRef name) {
-// return new LockableMGraph() {
+// public LockableGraph getGraph(Iri name) {
+// return new LockableGraph() {
//
// @Override
// public ReadWriteLock getLock() {
@@ -218,12 +186,12 @@ public class TypeHandlerSpaceTest {
// }
//
// @Override
-// public Graph getGraph() {
+// public ImmutableGraph getGraph() {
// return mGraph.getGraph();
// }
//
// @Override
-// public Iterator<Triple> filter(NonLiteral subject, UriRef predicate, Resource object) {
+// public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
// return mGraph.filter(subject, predicate, object);
// }
//
@@ -313,7 +281,7 @@ public class TypeHandlerSpaceTest {
// typeHandlerSpace.typeHandlerDiscovery = new TypeHandlerDiscovery() {
//
// @Override
-// public Object getTypeHandler(Set<UriRef> rdfTypes) {
+// public Object getTypeHandler(Set<Iri> rdfTypes) {
// if (rdfTypes.contains(myType)){
// return typeHandler;
// }
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typepriority/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typepriority/pom.xml b/platform/typepriority/pom.xml
index 519811a..1d0810c 100644
--- a/platform/typepriority/pom.xml
+++ b/platform/typepriority/pom.xml
@@ -80,6 +80,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.xsite</groupId>
<artifactId>xsite-maven-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/typerendering.scalaserverpages/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/pom.xml b/platform/typerendering.scalaserverpages/pom.xml
index 7d5cdc6..3a9d3e7 100644
--- a/platform/typerendering.scalaserverpages/pom.xml
+++ b/platform/typerendering.scalaserverpages/pom.xml
@@ -31,6 +31,14 @@
<version>1.0.0-SNAPSHOT</version>
<name>Clerezza - Platform ScalaServerPages Renderlet</name>
<description>Renderlet implementation wrapping org.apache.clerezza.scala</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/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 bc6f83f..2b14401 100644
--- a/platform/typerendering/platform.typerendering.core/pom.xml
+++ b/platform/typerendering/platform.typerendering.core/pom.xml
@@ -35,6 +35,14 @@
<description>
This project provides a JAX-RS MessageBodyWriter to render GraphNodes. Rendering requests are delegated to registered renderlets.
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/platform/usermanager/pom.xml
----------------------------------------------------------------------
diff --git a/platform/usermanager/pom.xml b/platform/usermanager/pom.xml
index ba579d7..e8d6151 100644
--- a/platform/usermanager/pom.xml
+++ b/platform/usermanager/pom.xml
@@ -80,6 +80,10 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.xsite</groupId>
<artifactId>xsite-maven-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/provisioning/launchers/linked-data-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/pom.xml b/provisioning/launchers/linked-data-launcher/pom.xml
index 5e0acb0..35eb3ab 100644
--- a/provisioning/launchers/linked-data-launcher/pom.xml
+++ b/provisioning/launchers/linked-data-launcher/pom.xml
@@ -19,8 +19,8 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../../../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>linked-data-launcher</artifactId>
@@ -205,7 +205,7 @@
<!-- The Apache Stanbol launchpad -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.launchpad</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0</version>
</dependency>
<dependency>
<!-- maven-launchpad-plugin builds on the launchpad.base app -->
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>felixosgi</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
@@ -230,21 +230,21 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>platform.graphnodeprovider</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
@@ -256,19 +256,19 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>typehandlerspace</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>typerendering</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.web</artifactId>
- <version>0.1</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/provisioning/rdf.web/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.web/pom.xml b/provisioning/rdf.web/pom.xml
index f503b5a..4254294 100644
--- a/provisioning/rdf.web/pom.xml
+++ b/provisioning/rdf.web/pom.xml
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>clerezza</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
@@ -47,17 +47,17 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.15</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.web.core</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.web.ontologies</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -65,6 +65,11 @@
<version>0.9</version>
</dependency>
<dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.json.simple</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.globalmenu.api</artifactId>
<version>0.3</version>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index 2d97a87..ce10945 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.file.storage</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/provisioning/security/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/security/pom.xml b/provisioning/security/pom.xml
index b5cf21f..f8202c0 100644
--- a/provisioning/security/pom.xml
+++ b/provisioning/security/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+?<xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/provisioning/typehandlerspace/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/typehandlerspace/pom.xml b/provisioning/typehandlerspace/pom.xml
index 459f4fc..7af1994 100644
--- a/provisioning/typehandlerspace/pom.xml
+++ b/provisioning/typehandlerspace/pom.xml
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>clerezza</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
@@ -44,19 +44,19 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typepriority</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace.jaxrs</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typehandlerspace</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/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 8c8ec54..3a03e3b 100644
--- a/rdf.storage.web/src/main/scala/WebProxy.scala
+++ b/rdf.storage.web/src/main/scala/WebProxy.scala
@@ -148,8 +148,8 @@ class WebProxy extends WeightedTcProvider with Logging {
def listGraphs: java.util.Set[Iri] = {
var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
- result.addAll(listGraphs)
- result.addAll(listGraphs)
+ result.addAll(listMGraphs)
+ result.addAll(listImmutableGraphs)
return result
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/rdf.web/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.web/pom.xml b/rdf.web/pom.xml
index 73ea91d..7dc74da 100644
--- a/rdf.web/pom.xml
+++ b/rdf.web/pom.xml
@@ -24,15 +24,15 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.web</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Clerezza - SCB Web Access</name>
- <description>Allows access to SCB graphs over HTTP with JAX-RS</description>
+ <name>Clerezza - RDF Web Access</name>
+ <description>Allows access to Clerezza graphs over HTTP with JAX-RS</description>
<modules>
<module>rdf.web.core</module>
<module>rdf.web.ontologies</module>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/rdf.web/rdf.web.core/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.web/rdf.web.core/pom.xml b/rdf.web/rdf.web.core/pom.xml
index 772fd5a..2cad597 100644
--- a/rdf.web/rdf.web.core/pom.xml
+++ b/rdf.web/rdf.web.core/pom.xml
@@ -18,20 +18,29 @@
specific language governing permissions and limitations
under the License.
--->
+ -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.web</artifactId>
- <version>0.10</version>
+ <artifactId>clerezza</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.web.core</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Clerezza - SCB Web Access Core</name>
- <description>The core part of SCB Web Access</description>
+ <name>Clerezza - RDF Web Access Core</name>
+ <description>The core part of Clerezza RDF Web Access</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -41,29 +50,29 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.core</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
<scope>test</scope>
- <version>0.11</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
<scope>test</scope>
- <version>0.12</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -82,12 +91,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.12</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.web.ontologies</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c8c34941/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
----------------------------------------------------------------------
diff --git a/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java b/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
index cfb0a64..440e877 100644
--- a/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
+++ b/rdf.web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
@@ -22,10 +22,10 @@ import org.apache.clerezza.platform.Constants;
import org.apache.clerezza.platform.globalmenu.GlobalMenuItem;
import org.apache.clerezza.platform.globalmenu.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesService;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.security.TcPermission;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.web.ontologies.BACKUP;
@@ -128,8 +128,8 @@ public class Backup implements GlobalMenuItemsProvider {
@GET
public GraphNode overviewPage() {
- MGraph resultGraph = new SimpleMGraph();
- GraphNode result = new GraphNode(new BNode(), resultGraph);
+ Graph resultGraph = new SimpleGraph();
+ GraphNode result = new GraphNode(new BlankNode(), resultGraph);
result.addProperty(RDF.type, BACKUP.BackupAdminPage);
result.addProperty(RDF.type, PLATFORM.HeadedPage);
return result;