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 2010/08/23 18:06:28 UTC

svn commit: r988168 - in /incubator/clerezza/trunk/org.apache.clerezza.parent: ./ org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/ org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/pars...

Author: reto
Date: Mon Aug 23 16:06:28 2010
New Revision: 988168

URL: http://svn.apache.org/viewvc?rev=988168&view=rev
Log:
CLEREZZA-269: updated jena and tdb

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java?rev=988168&r1=988167&r2=988168&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java Mon Aug 23 16:06:28 2010
@@ -62,7 +62,7 @@ public class JenaParserProvider implemen
 		Model model = ModelFactory.createModelForGraph(graph);
 		String base;
 		if (baseUri == null) {
-			base = "urn:x-relative:";
+			base = "http://relative-uri.fake/";
 		} else {
 			base = baseUri.getUnicodeString();
 		}

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java?rev=988168&r1=988167&r2=988168&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java Mon Aug 23 16:06:28 2010
@@ -54,6 +54,15 @@ public class JenaParserProviderTest {
 		Assert.assertTrue(jenaGraphFromNTriples.isIsomorphicWith(jenaGraphFromTurtle));
 	}
 
+	@Test
+	public void testTurtleParser2() {
+		ParsingProvider provider = new JenaParserProvider();
+
+		InputStream turtleIn = getClass().getResourceAsStream("image-13-08-2010_14-46-13.0001.txt");
+		Graph graphFromTurtle = provider.parse(turtleIn, "text/turtle", null);
+
+	}
+
 	/*
 	 * comparing result from nt and rdf/xml parsing,
 	 */

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java?rev=988168&r1=988167&r2=988168&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java Mon Aug 23 16:06:28 2010
@@ -23,6 +23,7 @@ import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Node_URI;
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.sparql.core.DatasetGraph;
+import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.sparql.util.Context;
 import java.util.Iterator;
 import org.apache.clerezza.rdf.core.TripleCollection;
@@ -102,7 +103,7 @@ class TcDatasetGraph implements DatasetG
 	}
 
 	@Override
-	public int size() {
+	public long size() {
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
@@ -115,4 +116,61 @@ class TcDatasetGraph implements DatasetG
 		return null;
 	}
 
+	@Override
+	public boolean isEmpty() {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void add(Quad quad) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void addGraph(Node graphName, Graph graph) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(Node g, Node s, Node p, Node o) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public boolean contains(Quad quad) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void delete(Quad quad) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void deleteAny(Node g, Node s, Node p, Node o) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Iterator<Quad> find(Quad quad) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public Iterator<Quad> find(Node g, Node s, Node p, Node o) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void removeGraph(Node graphName) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public void setDefaultGraph(Graph g) {
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+
+
 }

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=988168&r1=988167&r2=988168&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Mon Aug 23 16:06:28 2010
@@ -420,17 +420,17 @@
 			<dependency>
 				<groupId>com.hp.hpl.jena</groupId>
 				<artifactId>jena</artifactId>
-				<version>2.6.2</version>
+				<version>2.6.3</version>
 			</dependency>
 			<dependency>
 				<groupId>com.hp.hpl.jena</groupId>
 				<artifactId>tdb</artifactId>
-				<version>0.8.5</version>
+				<version>0.8.7</version>
 			</dependency>
 			<dependency>
 				<groupId>com.hp.hpl.jena</groupId>
 				<artifactId>arq</artifactId>
-				<version>2.8.3</version>
+				<version>2.8.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.easymock</groupId>
@@ -867,7 +867,7 @@
 			<dependency>
 				<groupId>org.wymiwyg</groupId>
 				<artifactId>wrhapi-osgi</artifactId>
-				<version>0.4</version>
+				<version>0.4.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.wymiwyg</groupId>