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/03/23 22:19:23 UTC
[1/3] clerezza git commit: CLEREZZA-961: re-added accidentaly removed
methos
Repository: clerezza
Updated Branches:
refs/heads/rdf-commons 32abd37f5 -> 9677f50eb
CLEREZZA-961: re-added accidentaly removed methos
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f0f8dce1
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f0f8dce1
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f0f8dce1
Branch: refs/heads/rdf-commons
Commit: f0f8dce131f0f72de5ff765e6ea110d29f80ff96
Parents: 32abd37
Author: Reto Gmuer <re...@apache.org>
Authored: Mon Mar 23 20:43:38 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Mon Mar 23 20:44:52 2015 +0000
----------------------------------------------------------------------
.../clerezza/rdf/core/access/SecuredGraph.java | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f0f8dce1/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
index 8620563..add4c7d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
@@ -18,6 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
+import java.security.AccessControlException;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
@@ -27,6 +28,7 @@ import org.apache.commons.rdf.Triple;
import org.apache.commons.rdf.Graph;
import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
+import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
import org.apache.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
import org.apache.commons.rdf.ImmutableGraph;
import org.apache.commons.rdf.WatchableGraph;
@@ -173,4 +175,24 @@ public class SecuredGraph implements Graph {
public ReadWriteLock getLock() {
return wrapped.getLock();
}
+
+ /**
+ * Returns the wrapped Graph if the caller has all access rights.
+ * If the caller has only the read access right, then a write-blocked
+ * Graph is returned. If the caller has neither the read nor the write
+ * access right then an AccessControlException is thrown.
+ *
+ * @return the wrapped Graph or a write-block Graph depending
+ * on the access rights of the caller.
+ */
+ public Graph getUnsecuredGraph() {
+ try {
+ checkWrite();
+ return wrapped;
+ } catch (AccessControlException ex) {
+ checkRead();
+ return new WriteBlockedGraph(wrapped);
+ }
+
+ }
}
[3/3] clerezza git commit: CLEREZZA-975: All bundle dependencies in
typerendering laucnher satisfied,
however some exceptions probably because of scala-compiler version mismatch
Posted by re...@apache.org.
CLEREZZA-975: All bundle dependencies in typerendering laucnher satisfied, however some exceptions probably because of scala-compiler version mismatch
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/9677f50e
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/9677f50e
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/9677f50e
Branch: refs/heads/rdf-commons
Commit: 9677f50ebae542f934e0f13d981672251ad9a59c
Parents: f0f8dce
Author: Reto Gmuer <re...@apache.org>
Authored: Mon Mar 23 21:19:09 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Mon Mar 23 21:19:09 2015 +0000
----------------------------------------------------------------------
platform/config/pom.xml | 2 +-
.../clerezza/platform/config/SystemConfig.java | 6 +-
platform/graphnodeprovider/pom.xml | 14 +-
platform/graphprovider.content/pom.xml | 12 +-
.../content/ContentGraphProvider.java | 49 +++--
.../content/GraphNameTransitioner.java | 95 ---------
.../TcPermissionDescriptionsProvider.java | 4 +-
platform/style.default/pom.xml | 20 +-
.../src/main/scala/Activator.scala | 13 +-
.../src/main/scala/GlobalMenuRenderlet.scala | 10 +-
.../src/main/scala/HeadedPageRenderlet.scala | 4 +-
platform/typerendering.gui/pom.xml | 1 -
platform/typerendering.scalaserverpages/pom.xml | 10 +-
.../ScalaServerPagesService.java | 6 +-
.../scalaserverpages/SspTypeRenderlet.java | 10 +-
platform/typerendering.seedsnipe/pom.xml | 10 +-
.../seedsnipe/WebRenderingFunctions.java | 67 +++---
.../typerendering/seedsnipe/GenericTest.java | 8 +-
.../seedsnipe/WebRenderingFunctionsTest.java | 11 +-
platform/usermanager/pom.xml | 16 +-
.../platform/usermanager/UserComparator.java | 2 +-
.../platform/usermanager/UserManager.java | 32 +--
.../platform/usermanager/UserManagerImpl.java | 173 ++++++++--------
platform/users/core/pom.xml | 19 +-
.../UserGraphAcessPermissionProvider.scala | 4 +-
.../platform/users/WebIdGraphsService.scala | 39 ++--
.../clerezza/platform/users/WebIdInfo.scala | 13 +-
.../launchers/typerendering-launcher/pom.xml | 6 +-
provisioning/platform.graphnodeprovider/pom.xml | 14 +-
provisioning/rdf.tdb/pom.xml | 2 +-
provisioning/rdf/pom.xml | 6 +-
provisioning/typerendering/pom.xml | 35 ++--
rdf.file.storage/pom.xml | 14 +-
.../clerezza/rdf/file/storage/FileGraph.java | 205 ++++++++++++++++++
.../clerezza/rdf/file/storage/FileMGraph.java | 207 -------------------
.../rdf/file/storage/FileTcProvider.java | 69 +++----
.../rdf/file/storage/FileGraphTest.java | 132 ++++++++++++
.../rdf/file/storage/FileMGraphTest.java | 132 ------------
.../rdf/file/storage/FileTcProviderTest.java | 74 ++++---
.../clerezza/rdf/file/storage/FileUtil.java | 2 +-
rdf.storage.web/pom.xml | 12 +-
rdf.storage.web/src/main/scala/WebProxy.scala | 63 +++---
rdf/rdfa/pom.xml | 4 +
templating.seedsnipe/pom.xml | 12 +-
.../GraphNodeDataFieldResolver.java | 44 ++--
.../templating/seedsnipe/GraphNodeTest.java | 126 +++++------
templating/pom.xml | 4 +-
47 files changed, 859 insertions(+), 954 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/config/pom.xml
----------------------------------------------------------------------
diff --git a/platform/config/pom.xml b/platform/config/pom.xml
index e2251bc..7537a21 100644
--- a/platform/config/pom.xml
+++ b/platform/config/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.file.storage</artifactId>
- <version>0.4</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/9677f50e/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 537733f..cb07d36 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
@@ -34,14 +34,12 @@ 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.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;
import org.slf4j.LoggerFactory;
-import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.file.storage.FileMGraph;
+import org.apache.clerezza.rdf.file.storage.FileGraph;
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
@@ -94,7 +92,7 @@ public class SystemConfig implements WeightedTcProvider {
File systemGraphFile = bundleContext.getDataFile(DATA_FILE_SYSTEM_GRAPH);
boolean dataFileExisted = systemGraphFile.exists();
//yould be good to use IndexedGraph to be faster
- systemGraph = new FileMGraph(systemGraphFile, parser, serializer);
+ systemGraph = new FileGraph(systemGraphFile, parser, serializer);
if (!dataFileExisted) {
readConfigGraphFile(systemGraph);
logger.info("Add initial configuration to system graph");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/graphnodeprovider/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/pom.xml b/platform/graphnodeprovider/pom.xml
index 6bdc520..fdd198f 100644
--- a/platform/graphnodeprovider/pom.xml
+++ b/platform/graphnodeprovider/pom.xml
@@ -45,22 +45,22 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.7</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -70,17 +70,17 @@
<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.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</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/9677f50e/platform/graphprovider.content/pom.xml
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/pom.xml b/platform/graphprovider.content/pom.xml
index 75daca2..cecf185 100644
--- a/platform/graphprovider.content/pom.xml
+++ b/platform/graphprovider.content/pom.xml
@@ -25,15 +25,15 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Platform Content-Graph Provider</name>
+ <name>Clerezza - Platform Graph Provider Content</name>
<description>A service that provides the content-graph</description>
<dependencies>
<dependency>
@@ -43,17 +43,17 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.2</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.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/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 09c1d95..de3b483 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
@@ -25,13 +25,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.clerezza.platform.Constants;
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.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.commons.rdf.Graph;
+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.UnionMGraph;
+import org.apache.clerezza.rdf.utils.UnionGraph;
/**
* A service providing a method to retrieve a <code>UnionGraph</code> containing
@@ -53,11 +51,11 @@ public class ContentGraphProvider {
/**
* Service property header, which contains the URIs of additional
- * <code>TripleCollection</code>s that are united as read-only to the Graph
+ * <code>Graph</code>s that are united as read-only to the ImmutableGraph
* returned by <code>getContentGraph</code>
*
* @scr.property name="additions" values.name="" description="Contains
- * additional TripleCollections that are added to the content
+ * additional Graphs that are added to the content
* graph for reading"
*/
public static final String CONTENT_ADDITIONS = "additions";
@@ -70,62 +68,61 @@ public class ContentGraphProvider {
/**
- * The URIs of the read-only addition-<code>TripleCollection</code>s
+ * The URIs of the read-only addition-<code>Graph</code>s
*/
- private UriRef[] additions;
+ private Iri[] additions;
private ReentrantReadWriteLock configLock = new ReentrantReadWriteLock();
protected void activate(ComponentContext context) {
- GraphNameTransitioner.renameGraphsWithOldNames(tcManager);
try {
- tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
+ tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
} catch (NoSuchEntityException nsee) {
- tcManager.createMGraph(Constants.CONTENT_GRAPH_URI);
+ tcManager.createGraph(Constants.CONTENT_GRAPH_URI);
}
String[] additionUriStrings = (String[]) context.getProperties().get(
CONTENT_ADDITIONS);
- additions = new UriRef[additionUriStrings.length];
+ additions = new Iri[additionUriStrings.length];
for (int i = 0; i < additionUriStrings.length; i++) {
- additions[i] = new UriRef(additionUriStrings[i]);
+ additions[i] = new Iri(additionUriStrings[i]);
}
}
- public LockableMGraph getContentGraph() {
+ public Graph getContentGraph() {
configLock.readLock().lock();
try {
- TripleCollection[] united = new TripleCollection[additions.length + 1];
+ Graph[] united = new Graph[additions.length + 1];
int i = 0;
- united[i++] = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
- for (UriRef uriRef : additions) {
- united[i++] = tcManager.getTriples(uriRef);
+ united[i++] = tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
+ for (Iri uriRef : additions) {
+ united[i++] = tcManager.getGraph(uriRef);
}
- return new UnionMGraph(united);
+ return new UnionGraph(united);
} finally {
configLock.readLock().unlock();
}
}
- public void addTemporaryAdditionGraph(UriRef graphName) {
+ public void addTemporaryAdditionGraph(Iri graphName) {
configLock.writeLock().lock();
try {
- Set<UriRef> additionsSet = new HashSet<UriRef>(Arrays
+ Set<Iri> additionsSet = new HashSet<Iri>(Arrays
.asList(additions));
additionsSet.add(graphName);
- additions = additionsSet.toArray(new UriRef[additionsSet.size()]);
+ additions = additionsSet.toArray(new Iri[additionsSet.size()]);
} finally {
configLock.writeLock().unlock();
}
}
- public void removeTemporaryAdditionGraph(UriRef graphName) {
+ public void removeTemporaryAdditionGraph(Iri graphName) {
configLock.writeLock().lock();
try {
- Set<UriRef> additionsSet = new HashSet<UriRef>(Arrays
+ Set<Iri> additionsSet = new HashSet<Iri>(Arrays
.asList(additions));
additionsSet.remove(graphName);
- additions = additionsSet.toArray(new UriRef[additionsSet.size()]);
+ additions = additionsSet.toArray(new Iri[additionsSet.size()]);
} finally {
configLock.writeLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/GraphNameTransitioner.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/GraphNameTransitioner.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/GraphNameTransitioner.java
deleted file mode 100644
index 80b904c..0000000
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/GraphNameTransitioner.java
+++ /dev/null
@@ -1,95 +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.platform.graphprovider.content;
-
-import org.apache.clerezza.platform.Constants;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
-import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * A utility class to rename used in snapshot versions to the naming in the first released version
- *
- * @author reto
- */
-public class GraphNameTransitioner {
-
- private final static Logger logger = LoggerFactory.getLogger(GraphNameTransitioner.class);
-
- /**
- * a hack to prevent double execution on the same start up process
- */
- private static boolean alreadyExecuted = false;
-
- synchronized static public void renameGraphsWithOldNames(TcManager tcManager) {
- if (alreadyExecuted) {
- return;
- } else {
- alreadyExecuted = true;
- }
-
- /*try {
- //just to see that nothing bad happens
- Thread.sleep(20*1000);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }*/
-
- final String OLD_SYSTEM_GRAPH_URI_STRING =
- "http://tpf.localhost/system.graph";
- final UriRef OLD_SYSTEM_GRAPH_URI =
- new UriRef(OLD_SYSTEM_GRAPH_URI_STRING);
-
- final String OLD_CONFIG_GRAPH_URI_STRING =
- "http://tpf.localhost/config.graph";
- final UriRef OLD_CONFIG_GRAPH_URI =
- new UriRef(OLD_CONFIG_GRAPH_URI_STRING);
-
- final String OLD_CONTENT_GRAPH_URI_STRING =
- "http://tpf.localhost/content.graph";
- final UriRef OLD_CONTENT_GRAPH_URI =
- new UriRef(OLD_CONTENT_GRAPH_URI_STRING);
-
- renameGraphs(tcManager, OLD_SYSTEM_GRAPH_URI, Constants.SYSTEM_GRAPH_URI);
- renameGraphs(tcManager, OLD_CONFIG_GRAPH_URI, Constants.CONFIG_GRAPH_URI);
- renameGraphs(tcManager, OLD_CONTENT_GRAPH_URI, Constants.CONTENT_GRAPH_URI);
- renameGraphs(tcManager, new UriRef("http://zz.localhost/graph-access.graph"),
- new UriRef(Constants.URN_LOCAL_INSTANCE+"/graph-access.graph"));
-
- }
-
- private static void renameGraphs(TcManager tcManager, UriRef oldGraphUri, UriRef graphUri) {
- try {
- MGraph oldMGraph = tcManager.getMGraph(oldGraphUri);
- MGraph newMGraph = tcManager.createMGraph(graphUri);
- logger.info("renaming "+oldGraphUri+" to "+graphUri);
- newMGraph.addAll(oldMGraph);
- tcManager.deleteTripleCollection(oldGraphUri);
- } catch (NoSuchEntityException ex) {
- } catch (EntityAlreadyExistsException ex) {
- logger.warn("could not rename " + oldGraphUri + " to " +
- graphUri + " because target graph already exists", ex);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
index 9c6c85e..a7433b4 100644
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
+++ b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/TcPermissionDescriptionsProvider.java
@@ -41,11 +41,11 @@ public class TcPermissionDescriptionsProvider implements PermissionDescriptionsP
private static final Set<PermissionDescripton> GRAPH_ACCESS_PERMISSION_DESCRIPTIONS =
new HashSet<PermissionDescripton>();
static {
- GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content Graph Read Permission",
+ GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content ImmutableGraph Read Permission",
"Grants permission to the user to read the content graph", null, TcPermission.class,
"(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/content.graph\" \"read\")"));
- GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content Graph Read/Write Permission",
+ GRAPH_ACCESS_PERMISSION_DESCRIPTIONS.add(new PermissionDescripton("Content ImmutableGraph Read/Write Permission",
"Grants permission to the user to read and write the content graph", null, TcPermission.class,
"(org.apache.clerezza.rdf.core.access.security.TcPermission \"urn:x-localinstance:/content.graph\" \"readwrite\")"));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/style.default/pom.xml
----------------------------------------------------------------------
diff --git a/platform/style.default/pom.xml b/platform/style.default/pom.xml
index 66b53df..0f661f0 100644
--- a/platform/style.default/pom.xml
+++ b/platform/style.default/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>platform.style.default</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Default Style</name>
+ <name>Clerezza - Platform - Style Default</name>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -43,27 +43,27 @@
<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.scala</artifactId>
- <version>0.2</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>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -75,6 +75,10 @@
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/style.default/src/main/scala/Activator.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/Activator.scala b/platform/style.default/src/main/scala/Activator.scala
index a6a687b..2930ce4 100644
--- a/platform/style.default/src/main/scala/Activator.scala
+++ b/platform/style.default/src/main/scala/Activator.scala
@@ -21,21 +21,12 @@
package org.apache.clerezza.platform.style.default
-import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
-import scala.collection.JavaConversions.asJavaDictionary
-import org.apache.clerezza.platform.typerendering.{TypeRenderlet, RenderletManager}
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
-import org.apache.clerezza.rdf.core.access.TcManager
-import org.apache.clerezza.osgi.services.ActivationHelper
-import org.apache.clerezza.osgi.services.ServicesDsl
-import org.apache.clerezza.platform.Constants
-import org.apache.clerezza.rdf.core.event.{GraphEvent, FilterTriple, GraphListener}
-import org.apache.clerezza.rdf.core.serializedform.{Serializer, SupportedFormat, Parser}
-import java.io.{FileOutputStream, FileInputStream, File}
/**
* Activator for a bundle using Apache Clerezza.
*/
+import org.apache.clerezza.osgi.services.ActivationHelper
+
class Activator extends ActivationHelper {
registerRenderlet(new GlobalMenuRenderlet)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
index 26c5272..75cf1eb 100644
--- a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
@@ -50,10 +50,10 @@ class GlobalMenuRenderlet extends SRenderlet {
<a href={href}>{label}</a>
}
override def content = {
- def menu(s: Any) = new UriRef("http://clerezza.org/2009/11/global-menu#"+s)
-def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
-def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
-def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
+ def menu(s: Any) = new Iri("http://clerezza.org/2009/11/global-menu#"+s)
+def rdfs(s: Any) = new Iri("http://www.w3.org/2000/01/rdf-schema#"+s)
+def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
+def dct(s: Any) = new Iri("http://purl.org/dc/terms/"+s)
<div class="column nav">
<ul>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
index f5c0106..2ef6189 100644
--- a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
+++ b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
@@ -24,7 +24,6 @@ package org.apache.clerezza.platform.style.default
import java.net.URLEncoder
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.rdf.core.UriRef
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
@@ -33,6 +32,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import org.apache.clerezza.platform.typerendering.scala._
import org.apache.clerezza.rdf.ontologies.DC
+import org.apache.commons.rdf.Iri
/**
* A Renderlet for the menu
@@ -92,7 +92,7 @@ resultDocModifier.addScriptReference("/scripts/status-message.js");
<div class="zz-control">
<div class="login">
{
- def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
+ def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
val userName = context/platform("user")/platform("userName")*
val displayName = if ((context/platform("user")/FOAF.name).length == 0) {
userName
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.gui/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/pom.xml b/platform/typerendering.gui/pom.xml
index 1215a5d..fe51f01 100644
--- a/platform/typerendering.gui/pom.xml
+++ b/platform/typerendering.gui/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_2.11</artifactId>
- <version>1.0.3</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.scalaserverpages/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/pom.xml b/platform/typerendering.scalaserverpages/pom.xml
index bd1aada..7d5cdc6 100644
--- a/platform/typerendering.scalaserverpages/pom.xml
+++ b/platform/typerendering.scalaserverpages/pom.xml
@@ -22,8 +22,8 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
@@ -35,17 +35,17 @@
<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.typerendering.core</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.scala</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
index b180e9a..a14f640 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.platform.typerendering.scalaserverpages;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -66,7 +66,7 @@ public class ScalaServerPagesService {
* @param mediaType
* @return
*/
- public ServiceRegistration registerScalaServerPage(URL location, UriRef rdfType,
+ public ServiceRegistration registerScalaServerPage(URL location, Iri rdfType,
String modePattern, MediaType mediaType) {
return registerScalaServerPage(location, rdfType, modePattern, mediaType, bundleContext);
}
@@ -83,7 +83,7 @@ public class ScalaServerPagesService {
* @param callerBundleContext
* @return
*/
- public ServiceRegistration registerScalaServerPage(URL location, UriRef rdfType,
+ public ServiceRegistration registerScalaServerPage(URL location, Iri rdfType,
String modePattern, MediaType mediaType, BundleContext callerBundleContext) {
TypeRenderlet sspTypeRenderlet = new SspTypeRenderlet(location, rdfType,
modePattern, mediaType, scalaCompilerService);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
index 0d67262..6a328e3 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering.scalaserverpages;
import java.util.logging.Level;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.slf4j.Logger;
@@ -44,7 +44,7 @@ import java.util.Map;
public class SspTypeRenderlet implements TypeRenderlet {
- private static final Logger logger = LoggerFactory.getLogger(ScalaServerPagesRenderlet.class);
+ private static final Logger logger = LoggerFactory.getLogger(SspTypeRenderlet.class);
private static final Charset UTF8 = Charset.forName("UTF-8");
private static final char[] headerChars
= getChars(SspTypeRenderlet.class.getResource("typerenderlet-header.txt"));
@@ -53,7 +53,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
+ lineSeparator + "}" + lineSeparator + "}" + lineSeparator).toCharArray();
- private UriRef rdfType;
+ private Iri rdfType;
private String modePattern;
private MediaType mediaType;
private URL sspLocation;
@@ -61,7 +61,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
private TypeRenderlet lastCompiledSsp = null;
private CompilerService scalaCompilerService;
- SspTypeRenderlet(URL sspLocation, UriRef rdfType, String modePattern, MediaType mediaType,
+ SspTypeRenderlet(URL sspLocation, Iri rdfType, String modePattern, MediaType mediaType,
CompilerService scalaCompilerService) {
this.sspLocation = sspLocation;
this.rdfType = rdfType;
@@ -71,7 +71,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
}
@Override
- public UriRef getRdfType() {
+ public Iri getRdfType() {
return rdfType;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.seedsnipe/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/pom.xml b/platform/typerendering.seedsnipe/pom.xml
index 9d023f1..0591bf5 100644
--- a/platform/typerendering.seedsnipe/pom.xml
+++ b/platform/typerendering.seedsnipe/pom.xml
@@ -42,28 +42,28 @@
<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>templating.seedsnipe</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<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>rdf.jena.parser</artifactId>
<scope>test</scope>
- <version>0.12</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/9677f50e/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
index 5cdbdce..90e3cf4 100644
--- a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
+++ b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
@@ -27,18 +27,16 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Language;
-import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.TripleCollection;
-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.Literal;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.templating.RenderingFunction;
import org.apache.clerezza.templating.RenderingFunctions;
+import org.apache.commons.rdf.BlankNodeOrIri;
+import org.apache.commons.rdf.Graph;
/**
*
@@ -46,16 +44,16 @@ import org.apache.clerezza.templating.RenderingFunctions;
*/
class WebRenderingFunctions implements RenderingFunctions {
- private static final UriRef XML_DATE_LITERAL = new UriRef(
+ private static final Iri XML_DATE_LITERAL = new Iri(
"http://www.w3.org/2001/XMLSchema#dateTime");
- private final static UriRef RDF_XML_LITERAL = new UriRef(
+ private final static Iri RDF_XML_LITERAL = new Iri(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
- private TripleCollection graph;
+ private Graph graph;
private GraphNode context;
private CallbackRenderer callbackRenderer;
private String mode;
- WebRenderingFunctions(TripleCollection graph,
+ WebRenderingFunctions(Graph graph,
GraphNode context,
CallbackRenderer callbackRenderer, String mode) {
this.graph = graph;
@@ -78,16 +76,16 @@ class WebRenderingFunctions implements RenderingFunctions {
}
String stringValue;
if (value instanceof Literal) {
- if (value instanceof TypedLiteral) {
- TypedLiteral typedLiteral = (TypedLiteral) value;
+ if (value instanceof Literal) {
+ Literal typedLiteral = (Literal) value;
if (typedLiteral.getDataType().equals(RDF_XML_LITERAL)) {
return typedLiteral.getLexicalForm();
}
}
stringValue = ((Literal) value).getLexicalForm();
} else {
- if (value instanceof UriRef) {
- stringValue = ((UriRef) value).getUnicodeString();
+ if (value instanceof Iri) {
+ stringValue = ((Iri) value).getUnicodeString();
} else {
stringValue = value.toString();
}
@@ -140,7 +138,7 @@ class WebRenderingFunctions implements RenderingFunctions {
@Override
public String process(Object... values) throws IOException {
- NonLiteral resource = (NonLiteral) values[0];
+ BlankNodeOrIri resource = (BlankNodeOrIri) values[0];
GraphNode graphNode = new GraphNode(resource, graph);
String mode = null;
if (values.length > 1) {
@@ -176,24 +174,24 @@ class WebRenderingFunctions implements RenderingFunctions {
@Override
public Language process(Object... values) {
Object value = values[0];
- if (value instanceof PlainLiteral) {
- return ((PlainLiteral) value).getLanguage();
+ if (value instanceof Literal) {
+ return ((Literal) value).getLanguage();
}
return null;
}
};
/**
- * A function that returns the Datatype of a TypedLiteral or null if the
- * Literal has no language or if the object is not a TypedLiteral
+ * A function that returns the Datatype of a Literal or null if the
+ * Literal has no language or if the object is not a Literal
*/
- private static RenderingFunction datatypeFunction = new RenderingFunction<Object, UriRef>() {
+ private static RenderingFunction datatypeFunction = new RenderingFunction<Object, Iri>() {
@Override
- public UriRef process(Object... values) {
+ public Iri process(Object... values) {
Object value = values[0];
- if (value instanceof PlainLiteral) {
- return ((TypedLiteral) value).getDataType();
+ if (value instanceof Literal) {
+ return ((Literal) value).getDataType();
}
return null;
}
@@ -224,17 +222,14 @@ class WebRenderingFunctions implements RenderingFunctions {
@Override
public String process(Object... values) {
Object value = values[0];
- if (value instanceof PlainLiteral) {
- return "plainLiteral";
+ if (value instanceof Literal) {
+ return "literal";
}
- if (value instanceof TypedLiteral) {
- return "typedLiteral";
+ if (value instanceof Iri) {
+ return "iri";
}
- if (value instanceof UriRef) {
- return "uriRef";
- }
- if (value instanceof BNode) {
- return "bNode";
+ if (value instanceof BlankNode) {
+ return "blankNode";
}
return value.getClass().getSimpleName();
}
@@ -250,8 +245,8 @@ class WebRenderingFunctions implements RenderingFunctions {
@Override
public String process(Object... values) {
- TypedLiteral typedLiteral;
- if (values[0] instanceof TypedLiteral && (typedLiteral = (TypedLiteral) values[0]).getDataType().equals(XML_DATE_LITERAL)) {
+ Literal typedLiteral;
+ if (values[0] instanceof Literal && (typedLiteral = (Literal) values[0]).getDataType().equals(XML_DATE_LITERAL)) {
String dateString = typedLiteral.getLexicalForm();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
index b0ba432..6c01a8d 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
@@ -23,8 +23,8 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import org.junit.Assert;
import org.junit.Test;
-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.serializedform.Parser;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils.GraphNode;
*/
public class GenericTest {
- private final UriRef root = new UriRef("http://tests.clerezza.org/root#");
+ private final Iri root = new Iri("http://tests.clerezza.org/root#");
private final SeedsnipeRenderlet renderlet = new SeedsnipeRenderlet();
@Test
@@ -55,7 +55,7 @@ public class GenericTest {
private void testWithFiles(String triples, String template, String expected)
throws Exception {
- TripleCollection tc = Parser.getInstance().parse(
+ Graph tc = Parser.getInstance().parse(
getClass().getResourceAsStream(triples),
"text/turtle");
GraphNode res = new GraphNode(root, tc);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
index 1ecec91..3af878d 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
@@ -22,13 +22,12 @@ import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.clerezza.rdf.core.LiteralFactory;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.Literal;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.templating.RenderingFunction;
/**
@@ -42,7 +41,7 @@ public class WebRenderingFunctionsTest {
public void dateTest() throws IOException {
Date date = new Date();
- TypedLiteral dateLiteral = LiteralFactory.getInstance()
+ Literal dateLiteral = LiteralFactory.getInstance()
.createTypedLiteral(date);
WebRenderingFunctions webRenderingFunctions = new WebRenderingFunctions(
@@ -106,7 +105,7 @@ public class WebRenderingFunctionsTest {
null, null, null, null);
RenderingFunction<Object, Boolean> function = webRenderingFunctions
.getNamedFunctions().get("contains");
- UriRef testObject = new UriRef("http://example.org/bla#fooBar");
+ Iri testObject = new Iri("http://example.org/bla#fooBar");
Assert.assertTrue(function.process(testObject, "bla"));
Assert.assertFalse(function.process(testObject, "hello"));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/usermanager/pom.xml
----------------------------------------------------------------------
diff --git a/platform/usermanager/pom.xml b/platform/usermanager/pom.xml
index dc784f8..ba579d7 100644
--- a/platform/usermanager/pom.xml
+++ b/platform/usermanager/pom.xml
@@ -22,10 +22,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</groupId>
<artifactId>platform.usermanager</artifactId>
@@ -38,12 +38,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>org.osgi</groupId>
@@ -56,7 +56,7 @@
<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.felix</groupId>
@@ -65,12 +65,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.7</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
index f0086fc..2a8350d 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
@@ -22,7 +22,7 @@ import org.apache.clerezza.rdf.utils.GraphNode;
import java.util.Comparator;
import java.util.Iterator;
-import org.apache.clerezza.rdf.core.Literal;
+import org.apache.commons.rdf.Literal;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
public class UserComparator implements Comparator<GraphNode> {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
index 6776ac1..b2b514f 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.clerezza.rdf.core.NonLiteral;
+import org.apache.commons.rdf.BlankNodeOrIri;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
@@ -57,24 +57,24 @@ public interface UserManager {
/**
*
* @param title
- * @return NonLiteral which is either a BNode or a UriRef
+ * @return BlankNodeOrIri which is either a BlankNode or a Iri
*/
- public NonLiteral getRoleByTitle(String title);
+ public BlankNodeOrIri getRoleByTitle(String title);
/**
*
* @return Iterator defining all roles, except base roles
*/
- public Iterator<NonLiteral> getRoles();
+ public Iterator<BlankNodeOrIri> getRoles();
/**
*
* @param user
- * the user is either a BNode or a UriRef
+ * the user is either a BlankNode or a Iri
*
* @return Iterator defining all the Roles the specified user owns
*/
- public Iterator<NonLiteral> getRolesOfUser(NonLiteral user);
+ public Iterator<BlankNodeOrIri> getRolesOfUser(BlankNodeOrIri user);
/**
*
@@ -95,11 +95,11 @@ public interface UserManager {
/**
*
* @param role
- * the role is either a BNode or an UriRef
+ * the role is either a BlankNode or an Iri
*
* @return Iterator defining all permissions of a role
*/
- public Iterator<NonLiteral> getPermissionsOfRole(NonLiteral role);
+ public Iterator<BlankNodeOrIri> getPermissionsOfRole(BlankNodeOrIri role);
/**
* Deletes the defined permissions of the role
@@ -171,13 +171,13 @@ public interface UserManager {
/**
*
* @param name specifies the username of the user
- * @return NonLiteral representing the user in the system Graph
+ * @return BlankNodeOrIri representing the user in the system ImmutableGraph
*/
@Deprecated
- public NonLiteral getUserByName(String name);
+ public BlankNodeOrIri getUserByName(String name);
/**
- * Returns the user with the specified name in an (editable) MGraph
+ * Returns the user with the specified name in an (editable) Graph
* (i.e. a SimpleGraph but this is implementation specific) with the context
* of the user node, editing the graphnode('s Mgraph) doesn't cause any
* changes elsewhere. Returns null if the user does not exist.
@@ -185,7 +185,7 @@ public interface UserManager {
* otherwise a AccessControlException will be thrown.
*
* @param name The username of the user
- * @return GraphNode representing the user (WebID or blank node) with some context in a dedicated MGraph
+ * @return GraphNode representing the user (WebID or blank node) with some context in a dedicated Graph
*/
public GraphNode getUserGraphNode(String name);
@@ -214,9 +214,9 @@ public interface UserManager {
/**
* Returns all users.
*
- * @return Iterator of users in the system Graph.
+ * @return Iterator of users in the system ImmutableGraph.
*/
- public Iterator<NonLiteral> getUsers();
+ public Iterator<BlankNodeOrIri> getUsers();
/**
*
@@ -234,10 +234,10 @@ public interface UserManager {
/**
*
* @param user
- * the user is either a BNode or a UriRef
+ * the user is either a BlankNode or a Iri
* @return Iterator defining all permissions of the specified user
*/
- public Iterator<NonLiteral> getPermissionsOfUser(NonLiteral user);
+ public Iterator<BlankNodeOrIri> getPermissionsOfUser(BlankNodeOrIri user);
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
index f3e3281..a48362c 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
@@ -38,19 +38,17 @@ import org.apache.felix.scr.annotations.Service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-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.clerezza.rdf.core.access.SecuredMGraph;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.Graph;
+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.SecuredGraph;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.commons.rdf.impl.utils.PlainLiteralImpl;
+import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.DC;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.OSGI;
@@ -59,6 +57,7 @@ import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.SIOC;
import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.commons.rdf.Literal;
/**
* @author hasan, tio
@@ -76,10 +75,10 @@ public class UserManagerImpl implements UserManager {
private final Logger logger = LoggerFactory.getLogger(getClass());
@Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
- private MGraph securedSystemGraph;
+ private Graph securedSystemGraph;
- private LockableMGraph getSystemGraph() {
- return ((SecuredMGraph) securedSystemGraph).getUnsecuredMGraph();
+ private Graph getSystemGraph() {
+ return ((SecuredGraph) securedSystemGraph).getUnsecuredGraph();
}
@Override
@@ -90,8 +89,8 @@ public class UserManagerImpl implements UserManager {
if (getRoleByTitle(title) != null) {
return;
}
- BNode role = new BNode();
- LockableMGraph systemGraph = getSystemGraph();
+ BlankNode role = new BlankNode();
+ Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
@@ -104,14 +103,14 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public NonLiteral getRoleByTitle(String title) {
- LockableMGraph systemGraph = getSystemGraph();
+ public BlankNodeOrIri getRoleByTitle(String title) {
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
Iterator<Triple> triples = systemGraph.filter(null, DC.title,
new PlainLiteralImpl(title));
- NonLiteral role = null;
+ BlankNodeOrIri role = null;
while (triples.hasNext()) {
role = triples.next().getSubject();
if (systemGraph.filter(role, RDF.type, PERMISSION.Role).hasNext()) {
@@ -130,18 +129,18 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<NonLiteral> getRoles() {
- LockableMGraph systemGraph = getSystemGraph();
+ public Iterator<BlankNodeOrIri> getRoles() {
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
- final Iterator<NonLiteral> allRolesIter = getResourcesOfType(PERMISSION.Role);
- final Set<NonLiteral> allRolesSet = new HashSet<NonLiteral>();
+ final Iterator<BlankNodeOrIri> allRolesIter = getResourcesOfType(PERMISSION.Role);
+ final Set<BlankNodeOrIri> allRolesSet = new HashSet<BlankNodeOrIri>();
while (allRolesIter.hasNext()) {
allRolesSet.add(allRolesIter.next());
}
- final Set<NonLiteral> nonBaseRolesSet = new HashSet<NonLiteral>();
- for (NonLiteral role : allRolesSet) {
+ final Set<BlankNodeOrIri> nonBaseRolesSet = new HashSet<BlankNodeOrIri>();
+ for (BlankNodeOrIri role : allRolesSet) {
if (!systemGraph.filter(role, RDF.type, PERMISSION.BaseRole).hasNext()) {
nonBaseRolesSet.add(role);
}
@@ -153,15 +152,15 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<NonLiteral> getRolesOfUser(NonLiteral user){
- LockableMGraph systemGraph = getSystemGraph();
+ public Iterator<BlankNodeOrIri> getRolesOfUser(BlankNodeOrIri user){
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(user,SIOC.has_function, null);
- Set<NonLiteral> userRoles = new HashSet<NonLiteral>();
+ Set<BlankNodeOrIri> userRoles = new HashSet<BlankNodeOrIri>();
while (triples.hasNext()) {
- userRoles.add((NonLiteral) triples.next().getObject());
+ userRoles.add((BlankNodeOrIri) triples.next().getObject());
}
return userRoles.iterator();
} finally {
@@ -175,7 +174,7 @@ public class UserManagerImpl implements UserManager {
return;
}
- NonLiteral role = getRoleByTitle(title);
+ BlankNodeOrIri role = getRoleByTitle(title);
if (role == null) {
return;
}
@@ -185,8 +184,8 @@ public class UserManagerImpl implements UserManager {
deleteTriplesOfASubject(role);
}
- private boolean isBaseRole(NonLiteral role) {
- LockableMGraph systemGraph = getSystemGraph();
+ private boolean isBaseRole(BlankNodeOrIri role) {
+ Graph systemGraph = getSystemGraph();
GraphNode roleNode = new GraphNode(role, systemGraph);
Lock readLock = roleNode.readLock();
readLock.lock();
@@ -198,8 +197,8 @@ public class UserManagerImpl implements UserManager {
}
- private void deleteTriplesOfASubject(NonLiteral subject) {
- LockableMGraph systemGraph = getSystemGraph();
+ private void deleteTriplesOfASubject(BlankNodeOrIri subject) {
+ Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
@@ -226,7 +225,7 @@ public class UserManagerImpl implements UserManager {
permissionEntries);
}
- private void addPermissionEntriesForARole(NonLiteral role,
+ private void addPermissionEntriesForARole(BlankNodeOrIri role,
String id, List<String> permissionEntries) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
@@ -236,7 +235,7 @@ public class UserManagerImpl implements UserManager {
if (permissionEntries.isEmpty()) {
return;
}
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
@@ -262,10 +261,10 @@ public class UserManagerImpl implements UserManager {
* @param permissionString the specified java permission entry
* @return permission node
*/
- private NonLiteral getPermissionOfAJavaPermEntry(
+ private BlankNodeOrIri getPermissionOfAJavaPermEntry(
String permissionString) {
- LockableMGraph systemGraph = getSystemGraph();
- PlainLiteral javaPermEntry = new PlainLiteralImpl(permissionString);
+ Graph systemGraph = getSystemGraph();
+ Literal javaPermEntry = new PlainLiteralImpl(permissionString);
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
@@ -281,7 +280,7 @@ public class UserManagerImpl implements UserManager {
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
- BNode result = new BNode();
+ BlankNode result = new BlankNode();
systemGraph.add(new TripleImpl(result,
PERMISSION.javaPermissionEntry, javaPermEntry));
return result;
@@ -291,16 +290,16 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<NonLiteral> getPermissionsOfRole(NonLiteral role) {
- LockableMGraph systemGraph = getSystemGraph();
+ public Iterator<BlankNodeOrIri> getPermissionsOfRole(BlankNodeOrIri role) {
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(role,
PERMISSION.hasPermission, null);
- Set<NonLiteral> permissions = new HashSet<NonLiteral>();
+ Set<BlankNodeOrIri> permissions = new HashSet<BlankNodeOrIri>();
while (triples.hasNext()) {
- permissions.add((NonLiteral) triples.next().getObject());
+ permissions.add((BlankNodeOrIri) triples.next().getObject());
}
return permissions.iterator();
} finally {
@@ -321,7 +320,7 @@ public class UserManagerImpl implements UserManager {
permissionEntries);
}
- private void deletePermissionEntriesOfARole(NonLiteral role,
+ private void deletePermissionEntriesOfARole(BlankNodeOrIri role,
String id, List<String> permissionEntries) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
@@ -331,12 +330,12 @@ public class UserManagerImpl implements UserManager {
if (permissionEntries.isEmpty()) {
return;
}
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
for (String permissionEntry : permissionEntries) {
- NonLiteral permission = getPermissionOfAJavaPermEntry(permissionEntry);
+ BlankNodeOrIri permission = getPermissionOfAJavaPermEntry(permissionEntry);
systemGraph.remove(new TripleImpl(role, PERMISSION.hasPermission,
permission));
}
@@ -357,12 +356,12 @@ public class UserManagerImpl implements UserManager {
getRoleByTitle(title));
}
- private void deleteAllPermissionEntriesOfARole(NonLiteral role) {
+ private void deleteAllPermissionEntriesOfARole(BlankNodeOrIri role) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
return;
}
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
GraphNode graphNode = new GraphNode(role, systemGraph);
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
@@ -392,8 +391,8 @@ public class UserManagerImpl implements UserManager {
throw new EmailAlreadyAssignedException(email, storedName);
}
}
- BNode user = new BNode();
- LockableMGraph systemGraph = getSystemGraph();
+ BlankNode user = new BlankNode();
+ Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
try {
@@ -402,7 +401,7 @@ public class UserManagerImpl implements UserManager {
new PlainLiteralImpl(name)));
if (email != null) {
systemGraph.add(new TripleImpl(user, FOAF.mbox,
- new UriRef("mailto:" + email)));
+ new Iri("mailto:" + email)));
}
if (password != null) {
try {
@@ -442,22 +441,22 @@ public class UserManagerImpl implements UserManager {
if (email == null) {
return null;
}
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
Iterator<Triple> triples = systemGraph.filter(null, FOAF.mbox,
- new UriRef("mailto:" + email));
+ new Iri("mailto:" + email));
if (!triples.hasNext()) {
return null;
}
- NonLiteral user = triples.next().getSubject();
+ BlankNodeOrIri user = triples.next().getSubject();
triples = systemGraph.filter(user, PLATFORM.userName, null);
if (!triples.hasNext()) {
throw new UserHasNoNameException("User with email address" + email
+ " does not have a name");
}
- return ((PlainLiteral) triples.next().getObject()).getLexicalForm();
+ return ((Literal) triples.next().getObject()).getLexicalForm();
} finally {
readLock.unlock();
}
@@ -471,17 +470,17 @@ public class UserManagerImpl implements UserManager {
if (name == null) {
throw new IllegalArgumentException("userName may not be null");
}
- NonLiteral user = getUserByUserName(name);
+ BlankNodeOrIri user = getUserByUserName(name);
if (user == null) {
throw new UserNotExistsException(name);
}
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
GraphNode userGraphNode = new GraphNode(user, systemGraph);
Lock writeLock = userGraphNode.writeLock();
writeLock.lock();
try {
if (email != null) {
- updateProperty(userGraphNode, FOAF.mbox, new UriRef("mailto:" + email));
+ updateProperty(userGraphNode, FOAF.mbox, new Iri("mailto:" + email));
}
if (password != null) {
@@ -500,7 +499,7 @@ public class UserManagerImpl implements UserManager {
}
if (!assignedRoles.isEmpty()) {
userGraphNode.deleteProperties(SIOC.has_function);
- addRolesToUser(assignedRoles, (NonLiteral) userGraphNode.getNode());
+ addRolesToUser(assignedRoles, (BlankNodeOrIri) userGraphNode.getNode());
//refresh the policy so it will recheck the permissions
Policy.getPolicy().refresh();
}
@@ -509,14 +508,14 @@ public class UserManagerImpl implements UserManager {
}
}
- private void addRolesToUser(Collection<String> assignedRoles, NonLiteral user) throws RoleUnavailableException {
- LockableMGraph systemGraph = getSystemGraph();
+ private void addRolesToUser(Collection<String> assignedRoles, BlankNodeOrIri user) throws RoleUnavailableException {
+ Graph systemGraph = getSystemGraph();
for (String roleTitle : assignedRoles) {
// skip empty strings
if ((roleTitle == null) || (roleTitle.trim().length() == 0)) {
continue;
}
- NonLiteral role = getRoleByTitle(roleTitle);
+ BlankNodeOrIri role = getRoleByTitle(roleTitle);
if (role == null) {
throw new RoleUnavailableException(roleTitle);
}
@@ -524,14 +523,14 @@ public class UserManagerImpl implements UserManager {
}
}
- private void updateProperty(GraphNode node, UriRef predicate, Resource object) {
+ private void updateProperty(GraphNode node, Iri predicate, RdfTerm object) {
node.deleteProperties(predicate);
node.addProperty(predicate, object);
}
@Override
public boolean nameExists(String name) {
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
@@ -544,34 +543,34 @@ public class UserManagerImpl implements UserManager {
@Override
public boolean emailExists(String email) {
- LockableMGraph systemGraph = getSystemGraph();
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
return systemGraph.filter(null, FOAF.mbox,
- new UriRef("mailto:" + email)).hasNext();
+ new Iri("mailto:" + email)).hasNext();
} finally {
readLock.unlock();
}
}
@Override
- public NonLiteral getUserByName( String name) {
+ public BlankNodeOrIri getUserByName( String name) {
return getUserByUserName(name);
}
@Override
- public Iterator<NonLiteral> getUsers() {
+ public Iterator<BlankNodeOrIri> getUsers() {
return getResourcesOfType(FOAF.Agent);
}
- private Iterator<NonLiteral> getResourcesOfType(UriRef type) {
- LockableMGraph systemGraph = getSystemGraph();
+ private Iterator<BlankNodeOrIri> getResourcesOfType(Iri type) {
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(null, RDF.type, type);
- Set<NonLiteral> userRoles = new HashSet<NonLiteral>();
+ Set<BlankNodeOrIri> userRoles = new HashSet<BlankNodeOrIri>();
while (triples.hasNext()) {
userRoles.add(triples.next().getSubject());
}
@@ -587,7 +586,7 @@ public class UserManagerImpl implements UserManager {
return;
}
- NonLiteral user = getUserByUserName(name);
+ BlankNodeOrIri user = getUserByUserName(name);
if (user != null) {
deleteTriplesOfASubject(user);
}
@@ -607,7 +606,7 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<NonLiteral> getPermissionsOfUser(NonLiteral user) {
+ public Iterator<BlankNodeOrIri> getPermissionsOfUser(BlankNodeOrIri user) {
return getPermissionsOfRole(user);
}
@@ -653,8 +652,8 @@ public class UserManagerImpl implements UserManager {
@Override
public GraphNode getUserInSystemGraph(final String name) {
- LockableMGraph systemGraph = getSystemGraph();
- NonLiteral user = getUserByUserName(name);
+ Graph systemGraph = getSystemGraph();
+ BlankNodeOrIri user = getUserByUserName(name);
if (user != null) {
return new GraphNode(user, systemGraph);
} else {
@@ -664,7 +663,7 @@ public class UserManagerImpl implements UserManager {
@Override
public GraphNode getUserInContentGraph(final String name) {
- final LockableMGraph contentGraph = (LockableMGraph) cgProvider.getContentGraph();
+ final Graph contentGraph = cgProvider.getContentGraph();
Iterator<Triple> triples = contentGraph.filter(null, PLATFORM.userName,
new PlainLiteralImpl(name));
GraphNode resultNode = null;
@@ -677,11 +676,11 @@ public class UserManagerImpl implements UserManager {
readLock.unlock();
}
} else {
- NonLiteral user = AccessController.doPrivileged(
- new PrivilegedAction<NonLiteral>() {
+ BlankNodeOrIri user = AccessController.doPrivileged(
+ new PrivilegedAction<BlankNodeOrIri>() {
@Override
- public NonLiteral run() {
+ public BlankNodeOrIri run() {
return getUserByUserName(name);
}
});
@@ -689,7 +688,7 @@ public class UserManagerImpl implements UserManager {
Lock writeLock = contentGraph.getLock().writeLock();
writeLock.lock();
try {
- resultNode = new GraphNode(new BNode(), contentGraph);
+ resultNode = new GraphNode(new BlankNode(), contentGraph);
resultNode.addProperty(PLATFORM.userName,
new PlainLiteralImpl(name));
} finally {
@@ -703,12 +702,12 @@ public class UserManagerImpl implements UserManager {
@Override
public GraphNode getUserGraphNode(final String name) {
- LockableMGraph systemGraph = getSystemGraph();
- NonLiteral user = getUserByUserName(name);
+ Graph systemGraph = getSystemGraph();
+ BlankNodeOrIri user = getUserByUserName(name);
if (user != null) {
GraphNode userNodeInSystemGraph =
new GraphNode(getUserByUserName(name), systemGraph);
- MGraph copiedUserContext = new SimpleMGraph(userNodeInSystemGraph.getNodeContext());
+ Graph copiedUserContext = new SimpleGraph(userNodeInSystemGraph.getNodeContext());
return new GraphNode(userNodeInSystemGraph.getNode(),
copiedUserContext);
} else {
@@ -716,8 +715,8 @@ public class UserManagerImpl implements UserManager {
}
}
- private NonLiteral getUserByUserName(String name) {
- LockableMGraph systemGraph = getSystemGraph();
+ private BlankNodeOrIri getUserByUserName(String name) {
+ Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/users/core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/users/core/pom.xml b/platform/users/core/pom.xml
index eb1a1b6..cf61c99 100644
--- a/platform/users/core/pom.xml
+++ b/platform/users/core/pom.xml
@@ -23,8 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.users</artifactId>
- <version>0.2</version>
+ <artifactId>clerezza</artifactId>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
@@ -39,32 +40,32 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security.foafssl.ontologies</artifactId>
<version>0.2</version>
- </dependency>
+ </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.scala.utils</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.storage.web</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
index 72f2324..9758955 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
@@ -18,11 +18,11 @@
/*package org.apache.clerezza.platform.users
import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider
-import org.apache.clerezza.rdf.core.UriRef
+import org.apache.commons.rdf.Iri
class UserGraphAcessPermissionProvider extends WebIdBasedPermissionProvider {
- override def getPermissions(webId: UriRef) : java.util.Collection[String] = {
+ override def getPermissions(webId: Iri) : java.util.Collection[String] = {
import scala.collection.JavaConversions._
val uriString = webId.getUnicodeString
def uriStringWithoutFragment = {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
index 78eca2a..37d5c33 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
@@ -25,18 +25,17 @@ import java.security.PrivilegedAction
import org.apache.clerezza.platform.Constants
import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.config.SystemConfig
-import org.apache.clerezza.rdf.core.MGraph
-import org.apache.clerezza.rdf.core.TripleCollection
-import org.apache.clerezza.rdf.core.UriRef
-import org.apache.clerezza.rdf.core.access.LockableMGraph
+import org.apache.commons.rdf.Graph
+import org.apache.commons.rdf.Graph
+import org.apache.commons.rdf.Iri
import org.apache.clerezza.rdf.core.access.NoSuchEntityException
-import org.apache.clerezza.rdf.core.access.SecuredMGraph
+import org.apache.clerezza.rdf.core.access.SecuredGraph
import org.apache.clerezza.rdf.core.access.TcManager
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.PLATFORM
import org.apache.clerezza.rdf.storage.web.WebProxy
-import org.apache.clerezza.rdf.utils.UnionMGraph
+import org.apache.clerezza.rdf.utils.UnionGraph
import org.apache.clerezza.rdf.core.serializedform.{SupportedFormat, Parser}
/**
@@ -79,7 +78,7 @@ class WebIdGraphsService {
* @param uri the Web-Id
* @return a WebIdInfo allowing to access the graphs of the user
*/
- def getWebIdInfo(uri: UriRef): WebIdInfo = {
+ def getWebIdInfo(uri: Iri): WebIdInfo = {
return new WebIdInfo {
private val uriString = uri.getUnicodeString
@@ -104,7 +103,7 @@ class WebIdGraphsService {
private lazy val localGraphUri = {
if (isLocal) uri
else {
- new UriRef("urn:x-localinstance:/user/"+hashTruncatedUriString)
+ new Iri("urn:x-localinstance:/user/"+hashTruncatedUriString)
}
}
@@ -119,7 +118,7 @@ class WebIdGraphsService {
private lazy val profileDocumentUri = {
- new UriRef(profileDocumentUriString)
+ new Iri(profileDocumentUriString)
}
/**
@@ -158,11 +157,11 @@ class WebIdGraphsService {
private def systemTriples = {
- AccessController.doPrivileged(new PrivilegedAction[MGraph]() {
+ AccessController.doPrivileged(new PrivilegedAction[Graph]() {
def run() = {
- val systemGraph = tcManager.getMGraph(Constants.SYSTEM_GRAPH_URI)
+ val systemGraph = tcManager.getGraph(Constants.SYSTEM_GRAPH_URI)
val triples = systemGraph.filter(uri, PLATFORM.userName, null)
- val result = new SimpleMGraph
+ val result = new SimpleGraph
while (triples.hasNext) {
result.add(triples.next())
}
@@ -172,7 +171,7 @@ class WebIdGraphsService {
}
private lazy val localGraph = try {
- val g = tcManager.getMGraph(localGraphUri)
+ val g = tcManager.getGraph(localGraphUri)
g
} catch {
case e: NoSuchEntityException => {
@@ -180,19 +179,19 @@ class WebIdGraphsService {
tcManager.getTcAccessController.
setRequiredReadPermissionStrings(localGraphUri,
List(new TcPermission(Constants.CONTENT_GRAPH_URI_STRING, TcPermission.READ).toString))
- tcManager.createMGraph(localGraphUri)
+ tcManager.createGraph(localGraphUri)
}
}
//implementing exposed methods (from WebIdInfo trait)
- def publicProfile: TripleCollection = {
- tcManager.getMGraph(profileDocumentUri)
+ def publicProfile: Graph = {
+ tcManager.getGraph(profileDocumentUri)
}
- def localPublicUserData: LockableMGraph = {
+ def localPublicUserData: Graph = {
if (isLocal) {
- new UnionMGraph(tcManager.getMGraph(profileDocumentUri), systemTriples)
+ new UnionGraph(tcManager.getGraph(profileDocumentUri), systemTriples)
} else {
- new UnionMGraph(localGraph, systemTriples, publicProfile)
+ new UnionGraph(localGraph, systemTriples, publicProfile)
}
}
[2/3] clerezza git commit: CLEREZZA-975: All bundle dependencies in
typerendering laucnher satisfied,
however some exceptions probably because of scala-compiler version mismatch
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
index 228c327..648e0ba 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
@@ -19,8 +19,6 @@
package org.apache.clerezza.platform.users
-import org.apache.clerezza.rdf.core.{MGraph, TripleCollection, UriRef}
-import org.apache.clerezza.rdf.core.access.LockableMGraph
/*
@@ -29,24 +27,27 @@ import org.apache.clerezza.rdf.core.access.LockableMGraph
* many things are easier for user with URIs.
*
*/
+import org.apache.commons.rdf.Graph
+import org.apache.commons.rdf.Iri
+
trait WebIdInfo {
/**
* The WebID this instance is about
*/
- def webId: UriRef
+ def webId: Iri
/**
* The WebId profile graph, for remote users this is immutable
*/
- def publicProfile: TripleCollection
+ def publicProfile: Graph
/**
- * An MGraph used to store public information about the user. For local
+ * An Graph used to store public information about the user. For local
* users this is the same as publicProfile. In any case this contains the
* triples of the publicProfile.
*/
- def localPublicUserData: LockableMGraph
+ def localPublicUserData: Graph
/**
* indicates if this WebId is local.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/provisioning/launchers/typerendering-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/pom.xml b/provisioning/launchers/typerendering-launcher/pom.xml
index 88c7dd7..f2ce3ea 100644
--- a/provisioning/launchers/typerendering-launcher/pom.xml
+++ b/provisioning/launchers/typerendering-launcher/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
<version>7-SNAPSHOT</version>
- <relativePath>../../../parent</relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>typerendering-launcher</artifactId>
@@ -239,7 +239,7 @@
<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>
@@ -251,7 +251,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>typerendering</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/9677f50e/provisioning/platform.graphnodeprovider/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/platform.graphnodeprovider/pom.xml b/provisioning/platform.graphnodeprovider/pom.xml
index 4252f83..550eef0 100644
--- a/provisioning/platform.graphnodeprovider/pom.xml
+++ b/provisioning/platform.graphnodeprovider/pom.xml
@@ -61,43 +61,43 @@
<dependency> <!-- dependency of platform.user.core (implementation of WebIdInfo.forceCacheUpdate() ) -->
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.storage.web</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.7</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<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>
<artifactId>platform.graphnodeprovider</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/provisioning/rdf.tdb/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.tdb/pom.xml b/provisioning/rdf.tdb/pom.xml
index aa2ea8d..28787f5 100644
--- a/provisioning/rdf.tdb/pom.xml
+++ b/provisioning/rdf.tdb/pom.xml
@@ -26,7 +26,7 @@
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
<version>7-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index d5acc70..2d97a87 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -25,8 +25,8 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
@@ -130,11 +130,13 @@
<artifactId>rdf.jena.facade</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!-- requirws an older version jena-iri
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfa</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ -->
<!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/provisioning/typerendering/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/typerendering/pom.xml b/provisioning/typerendering/pom.xml
index 0d7c4a5..48a290d 100644
--- a/provisioning/typerendering/pom.xml
+++ b/provisioning/typerendering/pom.xml
@@ -25,8 +25,8 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
@@ -63,6 +63,11 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -73,7 +78,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typepriority</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- required by platform.config -->
@@ -86,62 +91,62 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- provides system graph as required by typepriority -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<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.ontologies</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.seedsnipe</artifactId>
- <version>0.7</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>templating</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>templating.seedsnipe</artifactId>
- <version>0.9</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>platform.typerendering.scala</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.gui</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -153,7 +158,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.style.default</artifactId>
- <version>0.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- needed by default style -->
@@ -167,7 +172,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</artifactId>
- <version>0.4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.file.storage/pom.xml b/rdf.file.storage/pom.xml
index 18e2214..4932a7c 100644
--- a/rdf.file.storage/pom.xml
+++ b/rdf.file.storage/pom.xml
@@ -24,14 +24,14 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.file.storage</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Clerezza - SCB File Storage Provider</name>
+ <name>Clerezza - RDF File Storage Provider</name>
<description>A file base storage provider</description>
<dependencies>
<dependency>
@@ -46,25 +46,25 @@
<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.core.test</artifactId>
<scope>test</scope>
- <version>0.15</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.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
<scope>test</scope>
- <version>0.11</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/9677f50e/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
new file mode 100644
index 0000000..e9143f9
--- /dev/null
+++ b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.rdf.file.storage;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.Collection;
+
+import java.util.Iterator;
+import org.apache.commons.rdf.ImmutableGraph;
+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.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+
+/**
+ *
+ * @author mir
+ */
+public class FileGraph extends SimpleGraph {
+
+ private Serializer serializer;
+ private File file;
+ private String fileType;
+
+ FileGraph(Iri uri, Parser parser,
+ Serializer serializer) {
+ this(new File(URI.create(uri.getUnicodeString())), parser, serializer);
+ }
+
+ public FileGraph(File file, Parser parser, Serializer serializer) {
+ this.file = file;
+ String fileEnding = extractFileEnding(file.getPath());
+ fileType = getMediaTypeForFileEnding(fileEnding);
+ this.serializer = serializer;
+ try {
+ if (file.exists() && file.length() != 0) {
+ InputStream fio = new FileInputStream(file);
+ ImmutableGraph graph = parser.parse(fio, fileType);
+ addAllNoFileAccess(graph);
+ } else {
+ file.createNewFile();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public boolean add(Triple e) {
+ boolean result = super.add(e);
+ writeToFile();
+ return result;
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends Triple> c) {
+ boolean modified = addAllNoFileAccess(c);
+ writeToFile();
+ return modified;
+ }
+
+ @Override
+ public boolean remove(Object o) {
+ Iterator<Triple> e = super.filter(null, null, null);
+ while (e.hasNext()) {
+ if (o.equals(e.next())) {
+ e.remove();
+ writeToFile();
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean removeAll(Collection<?> c) {
+ boolean modified = false;
+ Iterator<Triple> e = super.filter(null, null, null);
+ while (e.hasNext()) {
+ if (c.contains(e.next())) {
+ e.remove();
+ modified = true;
+ }
+ }
+ writeToFile();
+ return modified;
+ }
+
+ @Override
+ public boolean retainAll(Collection<?> c) {
+ boolean result = super.retainAll(c);
+ writeToFile();
+ return result;
+ }
+
+ @Override
+ public Iterator<Triple> filter(final BlankNodeOrIri subject,
+ final Iri predicate,
+ final RdfTerm object) {
+ final Iterator<Triple> baseIter = super.filter(subject, predicate, object);
+ Iterator<Triple> iterator = new Iterator<Triple>() {
+
+ @Override
+ public boolean hasNext() {
+ return baseIter.hasNext();
+ }
+
+ @Override
+ public Triple next() {
+ return baseIter.next();
+ }
+
+ @Override
+ public void remove() {
+ baseIter.remove();
+ writeToFile();
+ }
+
+ };
+ return iterator;
+ }
+
+ private boolean addAllNoFileAccess(Collection<? extends Triple> c) {
+ boolean modified = false;
+ Iterator<? extends Triple> e = c.iterator();
+ while (e.hasNext()) {
+ if (super.add(e.next())) {
+ modified = true;
+ }
+ }
+ return modified;
+ }
+
+ private String extractFileEnding(String uriString) {
+ String fileEnding = uriString.substring(uriString.lastIndexOf(".") + 1, uriString.length());
+ return fileEnding;
+ }
+
+ private String getMediaTypeForFileEnding(String fileEnding) {
+ if (fileEnding.equals("rdf")) {
+ return SupportedFormat.RDF_XML;
+ }
+ if (fileEnding.equals("nt")) {
+ return SupportedFormat.N_TRIPLE;
+ }
+ if (fileEnding.equals("ttl")) {
+ return SupportedFormat.TURTLE;
+ }
+ if (fileEnding.equals("n3")) {
+ return SupportedFormat.N3;
+ }
+ return null;
+ }
+
+ private void writeToFile() {
+ synchronized(this) {
+ OutputStream out;
+ try {
+ out = new FileOutputStream(file);
+ } catch (FileNotFoundException ex) {
+ throw new RuntimeException(ex);
+ }
+ try {
+ serializer.serialize(out, this, fileType);
+ } finally {
+ try {
+ out.close();
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+ }
+
+ public void delete() {
+ file.delete();
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileMGraph.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileMGraph.java b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileMGraph.java
deleted file mode 100644
index 46083a2..0000000
--- a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileMGraph.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.rdf.file.storage;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.Collection;
-
-import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-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.Triple;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-
-/**
- *
- * @author mir
- */
-public class FileMGraph extends SimpleMGraph {
-
- private Serializer serializer;
- private File file;
- private String fileType;
-
- FileMGraph(UriRef uri, Parser parser,
- Serializer serializer) {
- this(new File(URI.create(uri.getUnicodeString())), parser, serializer);
- }
-
- public FileMGraph(File file, Parser parser, Serializer serializer) {
- this.file = file;
- String fileEnding = extractFileEnding(file.getPath());
- fileType = getMediaTypeForFileEnding(fileEnding);
- this.serializer = serializer;
- try {
- if (file.exists() && file.length() != 0) {
- InputStream fio = new FileInputStream(file);
- Graph graph = parser.parse(fio, fileType);
- addAllNoFileAccess(graph);
- } else {
- file.createNewFile();
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public boolean add(Triple e) {
- boolean result = super.add(e);
- writeToFile();
- return result;
- }
-
- @Override
- public boolean addAll(Collection<? extends Triple> c) {
- boolean modified = addAllNoFileAccess(c);
- writeToFile();
- return modified;
- }
-
- @Override
- public boolean remove(Object o) {
- Iterator<Triple> e = super.filter(null, null, null);
- while (e.hasNext()) {
- if (o.equals(e.next())) {
- e.remove();
- writeToFile();
- return true;
- }
- }
- return false;
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- boolean modified = false;
- Iterator<Triple> e = super.filter(null, null, null);
- while (e.hasNext()) {
- if (c.contains(e.next())) {
- e.remove();
- modified = true;
- }
- }
- writeToFile();
- return modified;
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- boolean result = super.retainAll(c);
- writeToFile();
- return result;
- }
-
- @Override
- public Iterator<Triple> filter(final NonLiteral subject,
- final UriRef predicate,
- final Resource object) {
- final Iterator<Triple> baseIter = super.filter(subject, predicate, object);
- Iterator<Triple> iterator = new Iterator<Triple>() {
-
- @Override
- public boolean hasNext() {
- return baseIter.hasNext();
- }
-
- @Override
- public Triple next() {
- return baseIter.next();
- }
-
- @Override
- public void remove() {
- baseIter.remove();
- writeToFile();
- }
-
- };
- return iterator;
- }
-
- private boolean addAllNoFileAccess(Collection<? extends Triple> c) {
- boolean modified = false;
- Iterator<? extends Triple> e = c.iterator();
- while (e.hasNext()) {
- if (super.add(e.next())) {
- modified = true;
- }
- }
- return modified;
- }
-
- private String extractFileEnding(String uriString) {
- String fileEnding = uriString.substring(uriString.lastIndexOf(".") + 1, uriString.length());
- return fileEnding;
- }
-
- private String getMediaTypeForFileEnding(String fileEnding) {
- if (fileEnding.equals("rdf")) {
- return SupportedFormat.RDF_XML;
- }
- if (fileEnding.equals("nt")) {
- return SupportedFormat.N_TRIPLE;
- }
- if (fileEnding.equals("ttl")) {
- return SupportedFormat.TURTLE;
- }
- if (fileEnding.equals("n3")) {
- return SupportedFormat.N3;
- }
- return null;
- }
-
- private void writeToFile() {
- synchronized(this) {
- OutputStream out;
- try {
- out = new FileOutputStream(file);
- } catch (FileNotFoundException ex) {
- throw new RuntimeException(ex);
- }
- try {
- serializer.serialize(out, this, fileType);
- } finally {
- try {
- out.close();
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
- }
- }
- }
-
- public void delete() {
- file.delete();
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
index cfcb831..0b4fd33 100644
--- a/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
+++ b/rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
@@ -33,10 +33,9 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.osgi.service.component.ComponentContext;
-import org.apache.clerezza.rdf.core.Graph;
-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.ImmutableGraph;
+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;
@@ -46,9 +45,9 @@ import org.apache.clerezza.rdf.core.serializedform.Serializer;
/**
* The <code>FileTcProvider</code> is a <code>WeightedTcProvider</code> that
- * stores <code>MGraph</code>S in the file system. <code>Graph</code>S are not
+ * stores <code>Graph</code>S in the file system. <code>ImmutableGraph</code>S are not
* supported.
- * The <code>UriRef</code> of a MGraph is location of the file in the file system
+ * The <code>Iri</code> of a Graph is location of the file in the file system
* (e.g. "file:///home/user/myGraph.rdf"). The format of the rdf data in the file
* depends on the file ending, for example ".rdf" or ".ttl".
* <code>FileTcProvider</code> uses
@@ -75,8 +74,8 @@ public class FileTcProvider implements WeightedTcProvider {
*/
private Serializer serializer;
- private Map<UriRef, FileMGraph> uriRef2MGraphMap =
- new HashMap<UriRef, FileMGraph>();
+ private Map<Iri, FileGraph> uriRef2GraphMap =
+ new HashMap<Iri, FileGraph>();
protected static File dataFile = new File("data");
@@ -102,24 +101,24 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public Graph getGraph(UriRef name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
/**
- * Get an <code>MGraph</code> by its name. If the file at the specified
- * location already exists, then a MGraph is returned even though it was not
- * created with createMGraph().
+ * Get an <code>Graph</code> by its name. If the file at the specified
+ * location already exists, then a Graph is returned even though it was not
+ * created with createGraph().
*
- * @param the name of the <code>MGraph</code>
- * @return name the <code>MGraph</code> with the specified name
- * @throws NoSuchEntityException if there is no <code>MGraph</code>
+ * @param the name of the <code>Graph</code>
+ * @return name the <code>Graph</code> with the specified name
+ * @throws NoSuchEntityException if there is no <code>Graph</code>
* with the specified name or the file didn't exist.
*/
@Override
- public MGraph getMGraph(UriRef name) throws NoSuchEntityException {
+ public Graph getMGraph(Iri name) throws NoSuchEntityException {
initialize();
- MGraph mGraph = uriRef2MGraphMap.get(name);
+ Graph mGraph = uriRef2GraphMap.get(name);
if (mGraph == null) {
final String uriString = name.getUnicodeString();
if (!uriString.startsWith("file:")) {
@@ -127,7 +126,7 @@ public class FileTcProvider implements WeightedTcProvider {
}
File file = new File(URI.create(uriString));
if (file.exists()) {
- return createMGraph(name);
+ return createGraph(name);
} else {
throw new NoSuchEntityException(name);
}
@@ -136,58 +135,58 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public TripleCollection getTriples(UriRef name) throws NoSuchEntityException {
+ public Graph getGraph(Iri name) throws NoSuchEntityException {
return getMGraph(name);
}
@Override
- public Set<UriRef> listGraphs() {
+ public Set<Iri> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported.");
}
@Override
- public Set<UriRef> listMGraphs() {
+ public Set<Iri> listMGraphs() {
initialize();
- return uriRef2MGraphMap.keySet();
+ return uriRef2GraphMap.keySet();
}
@Override
- public Set<UriRef> listTripleCollections() {
+ public Set<Iri> listGraphs() {
return listMGraphs();
}
@Override
- public MGraph createMGraph(UriRef name) throws
+ public Graph createGraph(Iri name) throws
UnsupportedOperationException, EntityAlreadyExistsException {
initialize();
- if (uriRef2MGraphMap.containsKey(name)) {
+ if (uriRef2GraphMap.containsKey(name)) {
throw new EntityAlreadyExistsException(name);
}
- FileMGraph mGraph = new FileMGraph(name, parser, serializer);
- uriRef2MGraphMap.put(name, mGraph);
+ FileGraph mGraph = new FileGraph(name, parser, serializer);
+ uriRef2GraphMap.put(name, mGraph);
writeDataFile();
return mGraph;
}
@Override
- public Graph createGraph(UriRef name, TripleCollection triples) throws
+ public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws
UnsupportedOperationException, EntityAlreadyExistsException {
throw new UnsupportedOperationException("Not supported.");
}
@Override
- public void deleteTripleCollection(UriRef name) throws
+ public void deleteGraph(Iri name) throws
UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
initialize();
- FileMGraph mGraph = (FileMGraph)getMGraph(name);
+ FileGraph mGraph = (FileGraph)getGraph(name);
mGraph.delete();
- uriRef2MGraphMap.remove(name);
+ uriRef2GraphMap.remove(name);
writeDataFile();
}
@Override
- public Set<UriRef> getNames(Graph graph) {
+ public Set<Iri> getNames(ImmutableGraph graph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -206,8 +205,8 @@ public class FileTcProvider implements WeightedTcProvider {
BufferedReader br = new BufferedReader(new InputStreamReader(in));
String strLine;
while ((strLine = br.readLine()) != null) {
- UriRef uriRef = new UriRef(strLine);
- uriRef2MGraphMap.put(uriRef, new FileMGraph(uriRef, parser, serializer));
+ Iri uriRef = new Iri(strLine);
+ uriRef2GraphMap.put(uriRef, new FileGraph(uriRef, parser, serializer));
}
in.close();
} else {
@@ -222,7 +221,7 @@ public class FileTcProvider implements WeightedTcProvider {
FileOutputStream fout = null;
try {
fout = new FileOutputStream(dataFile);
- for (UriRef uri : uriRef2MGraphMap.keySet()) {
+ for (Iri uri : uriRef2GraphMap.keySet()) {
fout.write((uri.getUnicodeString() + "\n").getBytes());
}
} catch (FileNotFoundException ex) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
new file mode 100644
index 0000000..e24edb9
--- /dev/null
+++ b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.rdf.file.storage;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Iterator;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.apache.commons.rdf.Triple;
+import org.apache.commons.rdf.Iri;
+import org.apache.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author mir
+ */
+public class FileGraphTest {
+
+ private static String tempDir = System.getProperty("java.io.tmpdir");
+ private static final String FILE_PROTOCOL = "file://";
+
+ protected static final String NT_FILE_NAME = "test-04.nt";
+ protected static final String RDF_FILE_NAME = "test-04.rdf";
+ protected static final String TURTLE_FILE_NAME = "test-04.ttl";
+
+ private static final Iri uriA = new Iri("http://example.com/a");
+ private static final Iri uriB = new Iri("http://example.com/b");
+ private static final Iri uriC = new Iri("http://example.com/c");
+
+
+ @BeforeClass
+ public static void setup() throws Exception {
+ createTempFileFromRdfTerm(NT_FILE_NAME);
+ createTempFileFromRdfTerm(RDF_FILE_NAME);
+ createTempFileFromRdfTerm(TURTLE_FILE_NAME);
+ }
+
+ @AfterClass
+ public static void cleanUp() throws Exception {
+ deleteTempFile(NT_FILE_NAME);
+ deleteTempFile(RDF_FILE_NAME);
+ deleteTempFile(TURTLE_FILE_NAME);
+ }
+
+ private static void createTempFileFromRdfTerm(String resourceName)
+ throws FileNotFoundException, IOException {
+ InputStream in = FileTcProviderTest.class.getResourceAsStream(resourceName);
+ File file = new File(URI.create(getTempFileUri(resourceName)));
+ FileOutputStream fout = new FileOutputStream(file);
+ int inByte;
+ while ((inByte = in.read()) != -1) {
+ fout.write(inByte);
+ }
+ }
+
+ protected static String getTempFileUri(String name) {
+ String prefix = tempDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
+ return prefix + tempDir.replace(File.separatorChar, '/') + "/" + name;
+ }
+
+ private static void deleteTempFile(String name)
+ throws FileNotFoundException, IOException {
+ File file = new File(tempDir + "/" + name);
+ file.delete();
+ }
+
+ @Test
+ public void testReadingFromFile() {
+ FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(RDF_FILE_NAME)),
+ Parser.getInstance(), Serializer.getInstance());
+ assertEquals(2, mGraph.size());
+
+ mGraph = new FileGraph(new Iri(getTempFileUri(TURTLE_FILE_NAME)),
+ Parser.getInstance(), Serializer.getInstance());
+ assertEquals(2, mGraph.size());
+
+ mGraph = new FileGraph(new Iri(getTempFileUri(NT_FILE_NAME)),
+ Parser.getInstance(), Serializer.getInstance());
+ assertEquals(2, mGraph.size());
+ }
+
+ @Test
+ public void testFilter() throws IOException {
+ String fileName = "filter.rdf";
+ FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ Parser.getInstance(), Serializer.getInstance());
+
+ mGraph.add(new TripleImpl(uriA, uriB, uriC));
+ mGraph.add(new TripleImpl(uriC, uriB, uriA));
+
+ mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ Parser.getInstance(), Serializer.getInstance());
+
+
+ assertEquals(2, mGraph.size());
+ Iterator<Triple> iterator = mGraph.filter(null, null, null);
+
+ iterator.next();
+ iterator.remove();
+ assertEquals(1, mGraph.size());
+
+ mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ Parser.getInstance(), Serializer.getInstance());
+ assertEquals(1, mGraph.size());
+ deleteTempFile(fileName);
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileMGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileMGraphTest.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileMGraphTest.java
deleted file mode 100644
index b236025..0000000
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileMGraphTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.rdf.file.storage;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Iterator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author mir
- */
-public class FileMGraphTest {
-
- private static String tempDir = System.getProperty("java.io.tmpdir");
- private static final String FILE_PROTOCOL = "file://";
-
- protected static final String NT_FILE_NAME = "test-04.nt";
- protected static final String RDF_FILE_NAME = "test-04.rdf";
- protected static final String TURTLE_FILE_NAME = "test-04.ttl";
-
- private static final UriRef uriA = new UriRef("http://example.com/a");
- private static final UriRef uriB = new UriRef("http://example.com/b");
- private static final UriRef uriC = new UriRef("http://example.com/c");
-
-
- @BeforeClass
- public static void setup() throws Exception {
- createTempFileFromResource(NT_FILE_NAME);
- createTempFileFromResource(RDF_FILE_NAME);
- createTempFileFromResource(TURTLE_FILE_NAME);
- }
-
- @AfterClass
- public static void cleanUp() throws Exception {
- deleteTempFile(NT_FILE_NAME);
- deleteTempFile(RDF_FILE_NAME);
- deleteTempFile(TURTLE_FILE_NAME);
- }
-
- private static void createTempFileFromResource(String resourceName)
- throws FileNotFoundException, IOException {
- InputStream in = FileTcProviderTest.class.getResourceAsStream(resourceName);
- File file = new File(URI.create(getTempFileUri(resourceName)));
- FileOutputStream fout = new FileOutputStream(file);
- int inByte;
- while ((inByte = in.read()) != -1) {
- fout.write(inByte);
- }
- }
-
- protected static String getTempFileUri(String name) {
- String prefix = tempDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
- return prefix + tempDir.replace(File.separatorChar, '/') + "/" + name;
- }
-
- private static void deleteTempFile(String name)
- throws FileNotFoundException, IOException {
- File file = new File(tempDir + "/" + name);
- file.delete();
- }
-
- @Test
- public void testReadingFromFile() {
- FileMGraph mGraph = new FileMGraph(new UriRef(getTempFileUri(RDF_FILE_NAME)),
- Parser.getInstance(), Serializer.getInstance());
- assertEquals(2, mGraph.size());
-
- mGraph = new FileMGraph(new UriRef(getTempFileUri(TURTLE_FILE_NAME)),
- Parser.getInstance(), Serializer.getInstance());
- assertEquals(2, mGraph.size());
-
- mGraph = new FileMGraph(new UriRef(getTempFileUri(NT_FILE_NAME)),
- Parser.getInstance(), Serializer.getInstance());
- assertEquals(2, mGraph.size());
- }
-
- @Test
- public void testFilter() throws IOException {
- String fileName = "filter.rdf";
- FileMGraph mGraph = new FileMGraph(new UriRef(getTempFileUri(fileName)),
- Parser.getInstance(), Serializer.getInstance());
-
- mGraph.add(new TripleImpl(uriA, uriB, uriC));
- mGraph.add(new TripleImpl(uriC, uriB, uriA));
-
- mGraph = new FileMGraph(new UriRef(getTempFileUri(fileName)),
- Parser.getInstance(), Serializer.getInstance());
-
-
- assertEquals(2, mGraph.size());
- Iterator<Triple> iterator = mGraph.filter(null, null, null);
-
- iterator.next();
- iterator.remove();
- assertEquals(1, mGraph.size());
-
- mGraph = new FileMGraph(new UriRef(getTempFileUri(fileName)),
- Parser.getInstance(), Serializer.getInstance());
- assertEquals(1, mGraph.size());
- deleteTempFile(fileName);
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
index afbd46e..aeff78d 100644
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
+++ b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
@@ -31,15 +31,15 @@ import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.Triple;
-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.Triple;
+import org.apache.commons.rdf.Graph;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.TcProviderTest;
import static org.junit.Assert.*;
@@ -54,10 +54,10 @@ public class FileTcProviderTest extends TcProviderTest {
@Override
- protected UriRef generateUri(String name) {
+ protected Iri generateUri(String name) {
String prefix = testDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
String path = prefix + testDir.replace('\\', '/') + "/";
- return new UriRef(path + name + ".rdf");
+ return new Iri(path + name + ".rdf");
}
@Before
@@ -72,14 +72,20 @@ public class FileTcProviderTest extends TcProviderTest {
@Test(expected=UnsupportedOperationException.class)
@Override
- public void testCreateGraph() {
- super.testCreateGraph();
+ public void testCreateImmutableGraph() {
+ super.testCreateImmutableGraph();
+ }
+
+ @Test(expected=UnsupportedOperationException.class)
+ @Override
+ public void testCreateImmutableGraphExtended() throws Exception {
+ super.testCreateImmutableGraphExtended();
}
@Test(expected=UnsupportedOperationException.class)
@Override
- public void testGetGraph() {
- super.testGetGraph();
+ public void testGetImmutableGraph() {
+ super.testGetImmutableGraph();
}
@@ -88,15 +94,15 @@ public class FileTcProviderTest extends TcProviderTest {
public void testGetTriples() {
TcProvider fileTcProvider = getInstance();
// add Graphs
- MGraph mGraph = new SimpleMGraph();
- // add MGraphs
- mGraph = fileTcProvider.createMGraph(uriRefA1);
+ Graph mGraph = new SimpleGraph();
+ // add Graphs
+ mGraph = fileTcProvider.createGraph(uriRefA1);
mGraph.add(new TripleImpl(uriRefA1, uriRefA1, uriRefA1));
- mGraph = fileTcProvider.createMGraph(uriRefB1);
+ mGraph = fileTcProvider.createGraph(uriRefB1);
mGraph.add(new TripleImpl(uriRefB1, uriRefB1, uriRefB1));
- // get a MGraph
- TripleCollection tripleCollection2 = fileTcProvider.getTriples(uriRefB1);
+ // get a Graph
+ Graph tripleCollection2 = fileTcProvider.getGraph(uriRefB1);
Iterator<Triple> iterator = tripleCollection2.iterator();
assertEquals(new TripleImpl(uriRefB1, uriRefB1, uriRefB1), iterator.next());
@@ -107,18 +113,18 @@ public class FileTcProviderTest extends TcProviderTest {
@Override
public void testDeleteEntity() {
TcProvider fileTcProvider = getInstance();
- MGraph mGraph = fileTcProvider.createMGraph(uriRefA);
+ Graph mGraph = fileTcProvider.createGraph(uriRefA);
mGraph.add(new TripleImpl(uriRefA, uriRefA, uriRefA));
- fileTcProvider.deleteTripleCollection(uriRefA);
+ fileTcProvider.deleteGraph(uriRefA);
try {
- fileTcProvider.getMGraph(uriRefA);
+ fileTcProvider.getGraph(uriRefA);
assertTrue(false);
} catch (NoSuchEntityException e) {
assertTrue(true);
}
fileTcProvider = getInstance();
try {
- fileTcProvider.getMGraph(uriRefA);
+ fileTcProvider.getGraph(uriRefA);
assertTrue(false);
} catch (NoSuchEntityException e) {
assertTrue(true);
@@ -134,15 +140,15 @@ public class FileTcProviderTest extends TcProviderTest {
@Test(expected=UnsupportedOperationException.class)
public void testGetNames() {
//super.testGetNames();
- getInstance().getNames(new SimpleMGraph().getGraph());
+ getInstance().getNames(new SimpleGraph().getImmutableGraph());
}
- @Test(expected=UnsupportedOperationException.class)
+ /*@Test(expected=UnsupportedOperationException.class)
@Override
public void testCreateGraphExtended() throws Exception {
super.testCreateGraphExtended();
- }
+ }*/
@Test(expected=UnsupportedOperationException.class)
@Override
@@ -177,7 +183,7 @@ public class FileTcProviderTest extends TcProviderTest {
@Test
public void testDataFile() {
TcProvider provider = getInstance();
- provider.createMGraph(uriRefA);
+ provider.createGraph(uriRefA);
File dataFile = new File("data");
assertTrue(dataFile.exists());
@@ -185,27 +191,27 @@ public class FileTcProviderTest extends TcProviderTest {
expected.add(uriRefA.getUnicodeString());
assertTrue(expected.equals(getLinesFromFile(dataFile)));
- provider.createMGraph(uriRefB);
+ provider.createGraph(uriRefB);
expected.add(uriRefB.getUnicodeString());
assertTrue(expected.equals(getLinesFromFile(dataFile)));
- provider.deleteTripleCollection(uriRefA);
+ provider.deleteGraph(uriRefA);
expected.remove(uriRefA.getUnicodeString());
assertTrue(expected.equals(getLinesFromFile(dataFile)));
- provider.deleteTripleCollection(uriRefB);
+ provider.deleteGraph(uriRefB);
expected.remove(uriRefB.getUnicodeString());
assertTrue(expected.equals(getLinesFromFile(dataFile)));
}
@Test
- public void testAutoMGraphCreationFromExistingFile() throws Exception{
- FileMGraphTest.setup();
+ public void testAutoGraphCreationFromExistingFile() throws Exception{
+ FileGraphTest.setup();
TcProvider provider = getInstance();
- MGraph mGraph = provider.getMGraph(new UriRef(
- FileMGraphTest.getTempFileUri(FileMGraphTest.RDF_FILE_NAME)));
+ Graph mGraph = provider.getGraph(new Iri(
+ FileGraphTest.getTempFileUri(FileGraphTest.RDF_FILE_NAME)));
assertEquals(2 ,mGraph.size());
- FileMGraphTest.cleanUp();
+ FileGraphTest.cleanUp();
}
private Set<String> getLinesFromFile(File file) throws RuntimeException {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
----------------------------------------------------------------------
diff --git a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
index 6b2adf4..e163f8a 100644
--- a/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
+++ b/rdf.file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileUtil.java
@@ -27,7 +27,7 @@ import java.io.File;
public class FileUtil {
/**
- * Sets up a new <code>SesameMGraph</code>.
+ * Sets up a new <code>SesameGraph</code>.
* @param testName Name of the test to support.
* @throws RepositoryException If it failed to activate the graph.
*/
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf.storage.web/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.storage.web/pom.xml b/rdf.storage.web/pom.xml
index ab32443..4315683 100644
--- a/rdf.storage.web/pom.xml
+++ b/rdf.storage.web/pom.xml
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>clerezza</artifactId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<artifactId>rdf.storage.web</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - SCB Caching Web Storage Provider</name>
+ <name>Clerezza - RDF Storage Web (Caching Web Storage Provider)</name>
<description>A (currently read-only) storage provider retrieving graphs from the web. It
implements a caching proxy, relying on another provider for storing triples.</description>
<dependencies>
@@ -45,17 +45,17 @@
<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.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</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/9677f50e/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 c482dd2..8c8ec54 100644
--- a/rdf.storage.web/src/main/scala/WebProxy.scala
+++ b/rdf.storage.web/src/main/scala/WebProxy.scala
@@ -20,6 +20,10 @@
package org.apache.clerezza.rdf.storage.web
+import org.apache.commons.rdf.ImmutableGraph
+import org.apache.commons.rdf.Iri
+import org.apache.commons.rdf._
+import org.apache.commons.rdf.impl.utils.AbstractGraph
import org.osgi.service.component.ComponentContext
import java.io.IOException
import java.net.{HttpURLConnection, URL}
@@ -29,7 +33,6 @@ import java.security.{PrivilegedExceptionAction, PrivilegedActionException, Acce
import org.slf4j.scala._
import org.apache.clerezza.rdf.core.access._
-import org.apache.clerezza.rdf.core.impl.AbstractMGraph
import org.apache.clerezza.rdf.core._
import java.sql.Time
@@ -87,24 +90,24 @@ class WebProxy extends WeightedTcProvider with Logging {
}
/**
- * Any TripleCollection is available as Graph as well as immutable MGraph
+ * Any Graph is available as ImmutableGraph as well as immutable Graph
*
* @param name
* @return
* @throws NoSuchEntityException
*/
- def getMGraph(name: UriRef): MGraph = {
- val graph = getGraph(name)
- return new AbstractMGraph() {
- protected def performFilter(subject: NonLiteral, predicate: UriRef, `object` : Resource): java.util.Iterator[Triple] = {
+ def getMGraph(name: Iri): Graph = {
+ val graph = getImmutableGraph(name)
+ return new AbstractGraph() {
+ protected def performFilter(subject: BlankNodeOrIri, predicate: Iri, `object` : RdfTerm): java.util.Iterator[Triple] = {
graph.filter(subject, predicate, `object`)
}
- def size = graph.size
+ def performSize = graph.size
}
}
- def getGraph(name: UriRef): Graph = {
+ def getImmutableGraph(name: Iri): ImmutableGraph = {
try {
getGraph(name, Cache.Fetch)
} catch {
@@ -116,54 +119,54 @@ class WebProxy extends WeightedTcProvider with Logging {
}
}
- def getTriples(name: UriRef): TripleCollection = {
+ def getGraph(name: Iri): Graph = {
return getMGraph(name)
}
- def createMGraph(name: UriRef): MGraph = {
+ def createGraph(name: Iri): Graph = {
throw new UnsupportedOperationException
}
- def createGraph(name: UriRef, triples: TripleCollection): Graph = {
+ def createImmutableGraph(name: Iri, triples: Graph): ImmutableGraph = {
throw new UnsupportedOperationException
}
- def deleteTripleCollection(name: UriRef): Unit = {
+ def deleteGraph(name: Iri): Unit = {
throw new UnsupportedOperationException
}
- def getNames(graph: Graph): java.util.Set[UriRef] = {
- var result: java.util.Set[UriRef] = new java.util.HashSet[UriRef]
+ def getNames(graph: ImmutableGraph): java.util.Set[Iri] = {
+ var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
import collection.JavaConversions._
for (name <- listGraphs) {
- if (getGraph(name).equals(graph)) {
+ if (getImmutableGraph(name).equals(graph)) {
result.add(name)
}
}
return result
}
- def listTripleCollections: java.util.Set[UriRef] = {
- var result: java.util.Set[UriRef] = new java.util.HashSet[UriRef]
+ 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)
return result
}
- def listGraphs: java.util.Set[UriRef] = {
+ def listMGraphs: java.util.Set[Iri] = {
//or should we list graphs for which we have a cached version?
- return java.util.Collections.emptySet[UriRef]
+ return java.util.Collections.emptySet[Iri]
}
- def listMGraphs: java.util.Set[UriRef] = {
- return java.util.Collections.emptySet[UriRef]
+ def listImmutableGraphs: java.util.Set[Iri] = {
+ return java.util.Collections.emptySet[Iri]
}
/**
* The semantics of this resource
* @param update if a remote URI, update information on the resource first
*/
- def getGraph(name: UriRef, updatePolicy: Cache.Value): Graph = {
+ def getGraph(name: Iri, updatePolicy: Cache.Value): ImmutableGraph = {
logger.debug("getting graph " + name)
if (name.getUnicodeString.indexOf('#') != -1) {
logger.debug("not dereferencing URI with hash sign. Please see CLEREZZA-533 for debate.")
@@ -173,7 +176,7 @@ class WebProxy extends WeightedTcProvider with Logging {
//these are not dereferenceable
throw new NoSuchEntityException(name)
}
- val cacheGraphName = new UriRef("urn:x-localinstance:/cache/" + name.getUnicodeString)
+ val cacheGraphName = new Iri("urn:x-localinstance:/cache/" + name.getUnicodeString)
//todo: follow redirects and keep track of them
//todo: keep track of headers especially date and etag. test for etag similarity
//todo: for https connection allow user to specify his webid and send his key: ie allow web server to be an agent
@@ -195,23 +198,23 @@ class WebProxy extends WeightedTcProvider with Logging {
val remoteTriples = parser.parse(in, mediaType, name)
tcProvider.synchronized {
try {
- tcProvider.deleteTripleCollection(cacheGraphName)
+ tcProvider.deleteGraph(cacheGraphName)
} catch {
case e: NoSuchEntityException =>;
}
- tcProvider.createGraph(cacheGraphName, remoteTriples)
+ tcProvider.createImmutableGraph(cacheGraphName, remoteTriples)
}
}
try {
//the logic here is not quite right, as we don't look at time of previous fetch.
updatePolicy match {
case Cache.Fetch => try {
- tcProvider.getGraph(cacheGraphName)
+ tcProvider.getImmutableGraph(cacheGraphName)
} catch {
- case e: NoSuchEntityException => updateGraph(); tcProvider.getGraph(cacheGraphName)
+ case e: NoSuchEntityException => updateGraph(); tcProvider.getImmutableGraph(cacheGraphName)
}
- case Cache.ForceUpdate => updateGraph(); tcProvider.getGraph(cacheGraphName)
- case Cache.CacheOnly => tcProvider.getGraph(cacheGraphName)
+ case Cache.ForceUpdate => updateGraph(); tcProvider.getImmutableGraph(cacheGraphName)
+ case Cache.CacheOnly => tcProvider.getImmutableGraph(cacheGraphName)
}
} catch {
case ex: PrivilegedActionException => {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/rdf/rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/rdf/rdfa/pom.xml b/rdf/rdfa/pom.xml
index 0d1c185..68525f9 100644
--- a/rdf/rdfa/pom.xml
+++ b/rdf/rdfa/pom.xml
@@ -67,6 +67,10 @@
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
+ <exclusion>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>iri</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/templating.seedsnipe/pom.xml
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/pom.xml b/templating.seedsnipe/pom.xml
index 962a324..25bb3ff 100644
--- a/templating.seedsnipe/pom.xml
+++ b/templating.seedsnipe/pom.xml
@@ -24,8 +24,8 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
- <relativePath>../parent</relativePath>
+ <version>7-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>templating.seedsnipe</artifactId>
@@ -42,22 +42,22 @@
<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.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>templating</artifactId>
- <version>0.9</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
index 2366230..a40ecf2 100644
--- a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
+++ b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
@@ -26,10 +26,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.commons.rdf.BlankNodeOrIri;
+import org.apache.commons.rdf.RdfTerm;
+import org.apache.commons.rdf.Iri;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -41,6 +40,7 @@ import org.apache.clerezza.templating.seedsnipe.datastructure.FieldDoesNotHaveDi
import org.apache.clerezza.templating.seedsnipe.datastructure.FieldIndexOutOfBoundsException;
import org.apache.clerezza.templating.seedsnipe.datastructure.InvalidElementException;
import org.apache.clerezza.templating.seedsnipe.simpleparser.DefaultParser;
+import org.apache.commons.rdf.Graph;
/**
* Data Model for {@link GraphNode} to be used with {@link DefaultParser}.
@@ -61,10 +61,10 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
public static class PropertyKey {
- private UriRef property;
+ private Iri property;
private boolean reverse;
- public PropertyKey(UriRef property, boolean reverse) {
+ public PropertyKey(Iri property, boolean reverse) {
super();
this.property = property;
this.reverse = reverse;
@@ -101,7 +101,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
- private static final UriRef RDF_NIL = new UriRef(
+ private static final Iri RDF_NIL = new Iri(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
private RenderingFunctions renderingFunctions;
@@ -134,17 +134,17 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
private class ExpandedNode {
private GraphNode node;
- private Resource value;
+ private RdfTerm value;
private Map<PropertyKey, List<ExpandedNode>> children;
- private List<Resource> list = null;
+ private List<RdfTerm> list = null;
- private ExpandedNode(Resource value) {
+ private ExpandedNode(RdfTerm value) {
this.value = value;
- final TripleCollection tc = expandedNode.node.getGraph();
+ final Graph tc = expandedNode.node.getGraph();
doListInitialization(tc);
}
- private ExpandedNode(GraphNode node, Resource value) {
+ private ExpandedNode(GraphNode node, RdfTerm value) {
this.value = value;
this.node = node;
doListInitialization(node.getGraph());
@@ -153,12 +153,12 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
/** if value id an rdf:list in tc, initialize list
* @param tc
*/
- private void doListInitialization(TripleCollection tc) {
- if (value instanceof NonLiteral) {
- if ((tc.filter((NonLiteral) value, RDF.rest, null).hasNext())
+ private void doListInitialization(Graph tc) {
+ if (value instanceof BlankNodeOrIri) {
+ if ((tc.filter((BlankNodeOrIri) value, RDF.rest, null).hasNext())
|| (tc.filter(
- (NonLiteral) value, OWL.sameAs, RDF_NIL).hasNext())) {
- list = new RdfList((NonLiteral) value, tc);
+ (BlankNodeOrIri) value, OWL.sameAs, RDF_NIL).hasNext())) {
+ list = new RdfList((BlankNodeOrIri) value, tc);
}
}
}
@@ -207,7 +207,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
inverseResolve = false;
}
String uriString = getUriFromCuri(fieldName);
- UriRef property = new UriRef(uriString);
+ Iri property = new Iri(uriString);
List<ExpandedNode> childList = getChildList(property, inverseResolve);
if (arrayPos.length == 0) {
arrayPos = new int[1];
@@ -226,7 +226,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
- private List<ExpandedNode> getChildList(UriRef property, boolean inverseResolve) {
+ private List<ExpandedNode> getChildList(Iri property, boolean inverseResolve) {
PropertyKey propertyKey = new PropertyKey(property, inverseResolve);
List<ExpandedNode> result;
if (children == null) {
@@ -238,16 +238,16 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
if (result == null) {
result = new ArrayList<ExpandedNode>();
if (node == null) {
- node = new GraphNode((NonLiteral) value, expandedNode.node.getGraph());
+ node = new GraphNode((BlankNodeOrIri) value, expandedNode.node.getGraph());
}
if (inverseResolve) {
- Iterator<NonLiteral> subjects = node.getSubjects(property);
+ Iterator<BlankNodeOrIri> subjects = node.getSubjects(property);
while (subjects.hasNext()) {
ExpandedNode childNode = new ExpandedNode(subjects.next());
result.add(childNode);
}
} else {
- Iterator<Resource> objects = node.getObjects(property);
+ Iterator<RdfTerm> objects = node.getObjects(property);
while (objects.hasNext()) {
ExpandedNode childNode = new ExpandedNode(objects.next());
result.add(childNode);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
index 12adfbe..0a74afe 100644
--- a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
+++ b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
@@ -27,16 +27,14 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.TripleCollection;
-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.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.commons.rdf.BlankNode;
+import org.apache.commons.rdf.ImmutableGraph;
+import org.apache.commons.rdf.BlankNodeOrIri;
+import org.apache.commons.rdf.RdfTerm;
+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.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -48,6 +46,8 @@ import org.apache.clerezza.templating.RenderingFunctions;
import org.apache.clerezza.templating.seedsnipe.datastructure.DataFieldResolver;
import org.apache.clerezza.templating.seedsnipe.graphnodeadapter.GraphNodeDataFieldResolver;
import org.apache.clerezza.templating.seedsnipe.simpleparser.DefaultParser;
+import org.apache.commons.rdf.Graph;
+import org.apache.commons.rdf.Literal;
/**
* Unit Test for RDF Templating.
@@ -99,8 +99,8 @@ public class GraphNodeTest {
@Test
public void simple() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -116,9 +116,9 @@ public class GraphNodeTest {
@Test
public void inverse() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral subject = new UriRef("http://example.org/subject");
- UriRef object = new UriRef("http://example.org/object");
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri subject = new Iri("http://example.org/subject");
+ Iri object = new Iri("http://example.org/object");
mGraph.add(new TripleImpl(subject, RDFS.comment, object));
GraphNode node = new GraphNode(object, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -133,8 +133,8 @@ public class GraphNodeTest {
@Test
public void defaultFunction() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -166,9 +166,9 @@ public class GraphNodeTest {
}
@Test
- public void simpleUriRefRoot() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new UriRef("http://example.org/");
+ public void simpleIriRoot() throws IOException {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new Iri("http://example.org/");
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -183,8 +183,8 @@ public class GraphNodeTest {
@Test
public void simpleWithNoOp() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -200,8 +200,8 @@ public class GraphNodeTest {
@Test
public void simpleWithUppercase() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -217,8 +217,8 @@ public class GraphNodeTest {
@Test
public void simpleWithLiteralUppercase() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -234,8 +234,8 @@ public class GraphNodeTest {
@Test
public void simpleWithCombinedFunctions() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -251,8 +251,8 @@ public class GraphNodeTest {
@Test
public void multiple() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("another resource")));
@@ -269,8 +269,8 @@ public class GraphNodeTest {
@Test
public void fieldTest() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -286,8 +286,8 @@ public class GraphNodeTest {
@Test
public void fieldTest2() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -304,13 +304,13 @@ public class GraphNodeTest {
@Test
public void foaf() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
+ Graph mGraph = new SimpleGraph();
final Parser parser = Parser.getInstance();
try {
- Graph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
+ ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
mGraph.addAll(deserializedGraph);
- UriRef document = new UriRef("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+ Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
Assert.assertTrue((mGraph.size() > 0));
@@ -340,13 +340,13 @@ public class GraphNodeTest {
@Test
public void foafSorted() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
+ Graph mGraph = new SimpleGraph();
final Parser parser = Parser.getInstance();
try {
- Graph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
+ ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
mGraph.addAll(deserializedGraph);
- UriRef document = new UriRef("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+ Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
Assert.assertTrue((mGraph.size() > 0));
@@ -380,13 +380,13 @@ public class GraphNodeTest {
@Test
public void rdfListAsPropertyValue() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
- NonLiteral listNode = new BNode() {
+ BlankNodeOrIri listNode = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode));
- List<Resource> list = new RdfList(listNode, mGraph);
+ List<RdfTerm> list = new RdfList(listNode, mGraph);
list.add(new PlainLiteralImpl("first"));
list.add(new PlainLiteralImpl("second"));
list.add(new PlainLiteralImpl("third"));
@@ -404,10 +404,10 @@ public class GraphNodeTest {
@Test
public void rdfListAsRoot() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
- List<Resource> list = new RdfList(resource, mGraph);
+ List<RdfTerm> list = new RdfList(resource, mGraph);
list.add(new PlainLiteralImpl("first"));
list.add(new PlainLiteralImpl("second"));
list.add(new PlainLiteralImpl("third"));
@@ -424,10 +424,10 @@ public class GraphNodeTest {
@Test
public void rdfListAsRootElementProperties() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
- List<Resource> list = new RdfList(resource, mGraph);
+ List<RdfTerm> list = new RdfList(resource, mGraph);
list.add(createLabeledRes("first", mGraph));
list.add(createLabeledRes("second", mGraph));
list.add(createLabeledRes("third", mGraph));
@@ -445,10 +445,10 @@ public class GraphNodeTest {
@Test
public void rdfListAsRootElementPropertiesWithPresenceTest() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
- List<Resource> list = new RdfList(resource, mGraph);
+ List<RdfTerm> list = new RdfList(resource, mGraph);
list.add(createLabeledRes("first", mGraph));
list.add(createLabeledRes("second", mGraph));
list.add(createLabeledRes("third", mGraph));
@@ -466,8 +466,8 @@ public class GraphNodeTest {
@Test
public void compareFunctionResultInIf() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode();
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode();
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -483,19 +483,19 @@ public class GraphNodeTest {
@Test
public void loopWithEmptyList() throws IOException {
- TripleCollection mGraph = new SimpleMGraph();
- NonLiteral resource = new BNode() {
+ Graph mGraph = new SimpleGraph();
+ BlankNodeOrIri resource = new BlankNode() {
};
- NonLiteral listNode1 = new BNode() {
+ BlankNodeOrIri listNode1 = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode1));
- List<Resource> list1 = new RdfList(listNode1, mGraph);
+ List<RdfTerm> list1 = new RdfList(listNode1, mGraph);
list1.add(new PlainLiteralImpl("first"));
list1.add(new PlainLiteralImpl("second"));
list1.add(new PlainLiteralImpl("third"));
- NonLiteral listNode2 = new BNode() {
+ BlankNodeOrIri listNode2 = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode2));
RdfList.createEmptyList(listNode2, mGraph);
@@ -513,9 +513,9 @@ public class GraphNodeTest {
Assert.assertEquals("\"first\"\"second\"\"third\"", writer.toString());
}
- private NonLiteral createLabeledRes(String label, TripleCollection mGraph) {
- BNode bNode = new BNode();
- PlainLiteral lit = new PlainLiteralImpl(label);
+ private BlankNodeOrIri createLabeledRes(String label, Graph mGraph) {
+ BlankNode bNode = new BlankNode();
+ Literal lit = new PlainLiteralImpl(label);
mGraph.add(new TripleImpl(bNode, RDFS.label, lit));
return bNode;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9677f50e/templating/pom.xml
----------------------------------------------------------------------
diff --git a/templating/pom.xml b/templating/pom.xml
index 261c1b2..e224ddf 100644
--- a/templating/pom.xml
+++ b/templating/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.5</version>
+ <version>7-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.clerezza</groupId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file