Author: andy
Date: Sat Mar 24 19:41:42 2012
New Revision: 1304891
URL: http://svn.apache.org/viewvc?rev=1304891&view=rev
Log: (empty)
Added:
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/AbstractTestGraphOverDataset.java
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/DSGViewGraphs.java
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GLib.java
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphViewDataset.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphOverDataset.java
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TS_ViewGraphs.java
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestDSGViewGraphs.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/HttpOp2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/HttpOp2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/Lang2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Lang2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/Langs.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/RDFReaderFactoryRIOT.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderFactoryRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/RDFReaderRIOT.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/ReaderRIOT.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/ReaderRIOTBase.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOTBase.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/ReaderRIOTFactory.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOTFactory.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/Registry2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Registry2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/TestWebReader.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TestWebReader.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/TypedInputStream2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TypedInputStream2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/TypedInputStreamHttp.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TypedInputStreamHttp.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/WebReader2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/FileManager2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/FileManager2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/JenaIOEnvironment.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/JenaIOEnvironment.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/LocationMapper.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/LocationMapper.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/Locator.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/Locator.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/LocatorClassLoader.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/LocatorClassLoader.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/LocatorFile2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/LocatorFile2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/LocatorURL2.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/LocatorURL2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/LocatorZip.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/LocatorZip.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/StreamManager.java
- copied unchanged from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/StreamManager.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot/reader/fm2/test/
- copied from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/test/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TW2.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TW2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TriGWriter.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TriGWriter.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriter2.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriter2.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterBlocks.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterBlocks.java
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterFlat.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterFlat.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/LangSSE.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/lang/LangSSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/ParserSSE.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/ParserSSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TS_SSE.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TS_SSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Basic.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Basic.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Builder.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Builder.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Forms.java
- copied, changed from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Forms.java
Removed:
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphOverDataset.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/ParserSSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TS_SSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TW2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Basic.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Builder.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Forms.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TriGWriter.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriter2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterBlocks.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterFlat.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/lang/LangSSE.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/HttpOp2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Lang2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Langs.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderFactoryRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOT.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOTBase.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/ReaderRIOTFactory.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/Registry2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TestWebReader.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TypedInputStream2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/TypedInputStreamHttp.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/fm2/
Modified:
incubator/jena/Scratch/AFS/Dev/trunk/.classpath
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestGraphOverDataset.java
Modified: incubator/jena/Scratch/AFS/Dev/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/.classpath?rev=1304891&r1=1304890&r2=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/.classpath (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/.classpath Sat Mar 24 19:41:42 2012
@@ -6,6 +6,7 @@
<classpathentry excluding="**/.svn/" kind="src"
path="src-lib/test/java"/>
<classpathentry excluding="**/.svn/" kind="src" path="src-dev"/>
<classpathentry excluding="**/.svn/" kind="src" path="src-archive"/>
+ <classpathentry kind="src" path="src-projects"/>
<classpathentry kind="var"
path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar"
sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
<classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"
sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar"
sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
Added:
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/AbstractTestGraphOverDataset.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/AbstractTestGraphOverDataset.java?rev=1304891&view=auto
==============================================================================
---
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/AbstractTestGraphOverDataset.java
(added)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/AbstractTestGraphOverDataset.java
Sat Mar 24 19:41:42 2012
@@ -0,0 +1,103 @@
+/**
+ * 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 graph;
+
+import java.util.Iterator ;
+
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.junit.BaseTest ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.sse.SSE ;
+
+public abstract class AbstractTestGraphOverDataset extends BaseTest
+{
+ // See also: ARQ/GraphsTests, TestGraphsMem(enable tests?),
UnionTransformTests
+
+ protected static DatasetGraph dsg ;
+ private static Quad q0 = SSE.parseQuad("(_ <s> <p> 0)") ;
+ private static Quad q1 = SSE.parseQuad("(<g1> <s> <p> 1)") ;
+ private static Quad q2 = SSE.parseQuad("(<g2> <s> <p> 2)") ; // same
triple - different graph
+ private static Quad q3 = SSE.parseQuad("(<g3> <s> <p> 2)") ; // same
triple - different graph
+
+ // Or parameterize
+ protected abstract Graph makeNamedGraph(DatasetGraph dsg, Node gn) ;
+ protected abstract Graph makeDefaultGraph(DatasetGraph dsg) ;
+
+ @BeforeClass public static void beforeClass()
+ {
+ dsg = DatasetGraphFactory.createMem() ;
+ dsg.add(q0) ;
+ dsg.add(q1) ;
+ dsg.add(q2) ;
+ dsg.add(q3) ;
+ }
+
+ @AfterClass public static void afterClass()
+ {
+ dsg = null ;
+ }
+
+ @Test public void graphDSG_01()
+ {
+ Triple t = makeDefaultGraph(dsg).find(null, null, null).next() ;
+ assertEquals(SSE.parseTriple("(<s> <p> 0)"), t) ;
+ // Check exact iterator.
+ }
+
+ @Test public void graphDSG_02()
+ {
+ Node g = SSE.parseNode("<g1>") ;
+ Triple t = makeNamedGraph(dsg, g).find(null, null, null).next() ;
+ assertEquals(SSE.parseTriple("(<s> <p> 1)"), t) ;
+ // Check exact iterator.
+ }
+
+ @Test public void graphDSG_03()
+ {
+ Graph g = makeDefaultGraph(dsg) ;
+ g.add(SSE.parseTriple("(<s> <p> 99)")) ;
+ long x = Iter.count(dsg.find(Quad.defaultGraphNodeGenerated, null,
null, null)) ;
+ assertEquals(2, x) ;
+ // Check exact iterator.
+ }
+
+ @Test public void graphDSG_10()
+ {
+ Graph g = makeNamedGraph(dsg, Quad.unionGraph) ;
+// System.out.println(Iter.asString(g.find(null), "\n")) ;
+// System.out.println() ;
+// System.out.println(Iter.asString(g.find(null,null,null), "\n")) ;
+
+ Iterator<Triple> iter = g.find(null,null,null) ;
+ while(iter.hasNext())
+ iter.next() ;
+ assertEquals(2, g.size()) ;
+ }
+
+ // Find union graph tests and move here.
+}
Added: incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/DSGViewGraphs.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/DSGViewGraphs.java?rev=1304891&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/DSGViewGraphs.java
(added)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/DSGViewGraphs.java Sat
Mar 24 19:41:42 2012
@@ -0,0 +1,42 @@
+/**
+ * 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 graph;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphWrapper ;
+
+/** Directly call the view mechanism */
+public class DSGViewGraphs extends DatasetGraphWrapper
+{
+ public DSGViewGraphs(DatasetGraph dsg)
+ {
+ super(dsg) ;
+ }
+
+ @Override
+ public Graph getDefaultGraph()
+ { return GraphViewDataset.createDefaultGraph(getWrapped()) ; }
+
+ @Override
+ public Graph getGraph(Node graphNode)
+ { return GraphViewDataset.createNamedGraph(getWrapped(), graphNode) ; }
+}
+
Added: incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GLib.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GLib.java?rev=1304891&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GLib.java (added)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GLib.java Sat Mar 24
19:41:42 2012
@@ -0,0 +1,135 @@
+/**
+ * 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 graph;
+
+import java.util.Iterator ;
+
+import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.iterator.Transform ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+
+/** A collection of Graph/Triple/Node related functions */
+public class GLib
+{
+ // DatasetGraphSimpleMem, Triple and other places
+
+ /** Convert null to Node.ANY */
+ public static Node nullAsAny(Node x) { return nullAsDft(x, Node.ANY) ; }
+
+ /** Convert null to some default Node */
+ public static Node nullAsDft(Node x, Node dft) { return x==null ? dft : x
; }
+
+ // DISTINCT means these are space using.
+ // Make part of graph interface.
+ /** List the subjects in a graph (no duplicates) */
+ public static Iterator<Node> listSubjects(Graph graph)
+ {
+ ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY,
Node.ANY) ;
+ return Iter.iter(iter).map(projectTripeSubject).distinct() ;
+ }
+
+ /** List the predicates in a graph (no duplicates) */
+ public static Iterator<Node> listPredicates(Graph graph)
+ {
+ ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY,
Node.ANY) ;
+ return Iter.iter(iter).map(projectTripePredicate).distinct() ;
+ }
+
+ /** List the objects in a graph (no duplicates) */
+ public static Iterator<Node> listObjects(Graph graph)
+ {
+ ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY,
Node.ANY) ;
+ return Iter.iter(iter).map(projectTripeObject).distinct() ;
+ }
+
+ private static Transform<Quad, Triple> transformQuad2Triple = new
Transform<Quad, Triple> () {
+ @Override
+ public Triple convert(Quad quad) { return quad.asTriple() ; }
+ } ;
+
+ public static Iter<Triple> quads2triples(Iterator<Quad> iter)
+ {
+ return Iter.iter(iter).map(transformQuad2Triple) ;
+ }
+
+ // Tidy up in DatasetGraphQuad
+ // Tidy up in Path Engine
+
+ /** Transform quad to graphname */
+ public static Iterator<Node> quad2graphName(Iterator<Quad> iter)
+ { return Iter.map(iter, projectQuadGraphName) ; }
+
+ /** Transform quad to graphname */
+ public static Iterator<Node> quad2subject(Iterator<Quad> iter)
+ { return Iter.map(iter, projectQuadSubject) ; }
+
+ /** Transform quad to predicate */
+ public static Iterator<Node> quad2predicate(Iterator<Quad> iter)
+ { return Iter.map(iter, projectQuadPredicate) ; }
+
+ /** Transform quad to object */
+ public static Iterator<Node> quad2object(Iterator<Quad> iter)
+ { return Iter.map(iter, projectQuadObject) ; }
+
+ /** Transform triple to subject */
+ public static Iterator<Node> triple2subject(Iterator<Triple> iter)
+ { return Iter.map(iter, projectTripeSubject) ; }
+
+ /** Transform triple to predicate */
+ public static Iterator<Node> triple2predicate(Iterator<Triple> iter)
+ { return Iter.map(iter, projectTripePredicate) ; }
+
+ /** Transform quad to graphname */
+ public static Transform<Quad, Node> projectQuadGraphName = new
Transform<Quad, Node>() {
+ @Override public Node convert(Quad quad) { return quad.getGraph() ; }
+ } ;
+ /** Transform quad to subject */
+ public static Transform<Quad, Node> projectQuadSubject = new
Transform<Quad, Node>() {
+ @Override public Node convert(Quad quad) { return quad.getSubject() ;
}
+ } ;
+ /** Transform quad to predicate */
+ public static Transform<Quad, Node> projectQuadPredicate = new
Transform<Quad, Node>() {
+ @Override public Node convert(Quad quad) { return quad.getPredicate()
; }
+ } ;
+ /** Transform quad to object */
+ static Transform<Quad, Node> projectQuadObject = new Transform<Quad,
Node>() {
+ @Override public Node convert(Quad quad) { return quad.getObject() ; }
+ } ;
+ /** Transform triple to subject */
+ public static Transform<Triple, Node> projectTripeSubject = new
Transform<Triple, Node>() {
+ @Override public Node convert(Triple triple) { return
triple.getSubject() ; }
+ } ;
+ /** Transform triple to predicate */
+ public static Transform<Triple, Node> projectTripePredicate = new
Transform<Triple, Node>() {
+ @Override public Node convert(Triple triple) { return
triple.getPredicate() ; }
+ } ;
+ /** Transform triple to object */
+ public static Transform<Triple, Node> projectTripeObject = new
Transform<Triple, Node>() {
+ @Override public Node convert(Triple triple) { return
triple.getObject() ; }
+ } ;
+ /** Transform triple to object */
+ public static Iterator<Node> triple2object(Iterator<Triple> iter)
+ { return Iter.map(iter, projectTripeObject) ; }
+}
+
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphViewDataset.java (from
r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphOverDataset.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphViewDataset.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphViewDataset.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphOverDataset.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphOverDataset.java
(original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/GraphViewDataset.java
Sat Mar 24 19:41:42 2012
@@ -21,13 +21,14 @@ package graph;
import java.util.Iterator ;
import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.graph.TripleMatch ;
import com.hp.hpl.jena.graph.query.QueryHandler ;
+import com.hp.hpl.jena.graph.query.SimpleQueryHandler ;
+import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -37,74 +38,93 @@ import com.hp.hpl.jena.util.iterator.Wra
/** Graph over a DatasetGraph - does not use getDefaultGraph etc (but maybe an
implementation of) */
-public class GraphOverDataset extends GraphBase2
+public class GraphViewDataset extends GraphBase2
{
- // Or remove getDefaultGraph(), getGraph(Node graphNode) -- seems harsh
+ static class GraphViewException extends JenaException
+ {
+ public GraphViewException() {
super(); }
+ public GraphViewException(String message) {
super(message); }
+ public GraphViewException(Throwable cause) {
super(cause) ; }
+ public GraphViewException(String message, Throwable cause) {
super(message, cause) ; }
+ }
+
+ // TODO datasetGraph - performAdd - call after making union graph
+ // TODO Integrate with DatasetGraphTriplesQuads / DatasetGraphQuads
+ // TODO default union graphs
+ // TODO Consolidate iterator projections : quads -> triples
private final DatasetGraph dsg ;
- private final Node g ;
+ private final Node gn ;
- protected GraphOverDataset(DatasetGraph dsg, Node g) { this.dsg = dsg ;
this.g = g ; }
+ protected GraphViewDataset(DatasetGraph dsg, Node gn)
+ {
+ this.dsg = dsg ;
+ this.gn = gn ;
+ }
- static Graph createDefaultGraph(DatasetGraph dsg)
- { return new GraphOverDataset(dsg, Quad.defaultGraphNodeGenerated) ; }
+ public static Graph createDefaultGraph(DatasetGraph dsg)
+ { return new GraphViewDataset(dsg, Quad.defaultGraphNodeGenerated) ; }
- static Graph createNamedGraph(DatasetGraph dsg, Node graphIRI)
- { return new GraphOverDataset(dsg, graphIRI) ; }
+ public static Graph createNamedGraph(DatasetGraph dsg, Node graphIRI)
+ { return new GraphViewDataset(dsg, graphIRI) ; }
@Override
public QueryHandler queryHandler()
{
- return null ;
+ return new SimpleQueryHandler(this);
}
@Override
protected PrefixMapping createPrefixMapping()
{
+ // TODO
return null ;
}
@Override
protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
{
+ if ( m == null ) m = Triple.ANY ;
Node s = m.getMatchSubject() ;
Node p = m.getMatchPredicate() ;
Node o = m.getMatchObject() ;
- Iterator<Triple> iter = quads2triples(dsg.find(g, s, p, o)) ;
+ return graphBaseFind(s, p, o) ;
+ }
+
+ @Override
+ protected ExtendedIterator<Triple> graphBaseFind(Node s, Node p, Node o)
+ {
+ Node g = gn ;
+ // Assumes dataset understands default union graphs.
+ // The general purpose implementation does.
+ Iterator<Triple> iter = GLib.quads2triples(dsg.find(gn, s, p, o)) ;
+ if ( Quad.isUnionGraph(gn) )
+ // Suppress duplicates after projecting to triples.
+ // A graph is a set of triples.
+ iter = Iter.distinct(iter) ;
return WrappedIterator.createNoRemove(iter) ;
}
@Override
public void performAdd( Triple t )
{
+ if ( Quad.isUnionGraph(gn) )
+ throw new GraphViewException("Can't update the default union graph
of a dataset") ;
Node s = t.getSubject() ;
Node p = t.getPredicate() ;
Node o = t.getObject() ;
- dsg.add(g, s, p, o) ;
+ dsg.add(gn, s, p, o) ;
}
@Override
public void performDelete( Triple t )
{
+ if ( Quad.isUnionGraph(gn) )
+ throw new GraphViewException("Can't update the default union graph
of a dataset") ;
Node s = t.getSubject() ;
Node p = t.getPredicate() ;
Node o = t.getObject() ;
- dsg.delete(g, s, p, o) ;
+ dsg.delete(gn, s, p, o) ;
}
-
- // Share with GraphTDBBase ??
- protected static Iter<Triple> quads2triples(Iterator<Quad> iter)
- {
- Transform<Quad, Triple> transform = new Transform<Quad, Triple> () {
- @Override
- public Triple convert(Quad quad)
- {
- return quad.asTriple() ;
- }
- } ;
-
- return Iter.iter(iter).map(transform) ;
- }
-
}
Added: incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TS_ViewGraphs.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TS_ViewGraphs.java?rev=1304891&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TS_ViewGraphs.java
(added)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TS_ViewGraphs.java Sat
Mar 24 19:41:42 2012
@@ -0,0 +1,34 @@
+/**
+ * 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 graph;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestGraphOverDataset.class,
+ TestDSGViewGraphs.class
+})
+
+public class TS_ViewGraphs
+{ }
+
Added: incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestDSGViewGraphs.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestDSGViewGraphs.java?rev=1304891&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestDSGViewGraphs.java
(added)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestDSGViewGraphs.java
Sat Mar 24 19:41:42 2012
@@ -0,0 +1,40 @@
+/**
+ * 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 graph;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+
+/** Directly call the view mechanism */
+public class TestDSGViewGraphs extends AbstractTestGraphOverDataset
+{
+
+ @Override
+ protected Graph makeDefaultGraph(DatasetGraph dsg)
+ {
+ return GraphViewDataset.createDefaultGraph(dsg) ;
+ }
+
+ @Override
+ protected Graph makeNamedGraph(DatasetGraph dsg, Node gn)
+ {
+ return GraphViewDataset.createNamedGraph(dsg, gn) ;
+ }
+}
Modified:
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestGraphOverDataset.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestGraphOverDataset.java?rev=1304891&r1=1304890&r2=1304891&view=diff
==============================================================================
---
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestGraphOverDataset.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-dev/graph/TestGraphOverDataset.java
Sat Mar 24 19:41:42 2012
@@ -18,59 +18,30 @@
package graph;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
-import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
+import org.junit.After ;
+import org.junit.Before ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.sse.SSE ;
-public class TestGraphOverDataset extends BaseTest
+/** Test using a view-generating dataset */
+public class TestGraphOverDataset extends AbstractTestGraphOverDataset
{
- private static DatasetGraph dsg ;
- private static Quad q0 = SSE.parseQuad("(_ <s> <p> 0)") ;
- private static Quad q1 = SSE.parseQuad("(<g1> <s> <p> 1)") ;
- private static Quad q2 = SSE.parseQuad("(<g2> <s> <p> 2)") ;
+ DatasetGraph dsgv ;
- @BeforeClass public static void beforeClass()
- {
- dsg = DatasetGraphFactory.createMem() ;
- dsg.add(q0) ;
- dsg.add(q1) ;
- dsg.add(q2) ;
- }
-
- @AfterClass public static void afterClass()
- {
- dsg = null ;
- }
+ @Before public void before() { dsgv = new DSGViewGraphs(dsg) ; }
+ @After public void after() { dsgv = null ; }
- @Test public void graphDSG_01()
+ @Override
+ protected Graph makeDefaultGraph(DatasetGraph dsg)
{
- Triple t = GraphOverDataset.createDefaultGraph(dsg).find(null, null,
null).next() ;
- assertEquals(SSE.parseTriple("(<s> <p> 0)"), t) ;
+ return dsgv.getDefaultGraph() ;
}
-
- @Test public void graphDSG_02()
- {
- Node g = SSE.parseNode("<g1>") ;
- Triple t = GraphOverDataset.createNamedGraph(dsg, g).find(null, null,
null).next() ;
- assertEquals(SSE.parseTriple("(<s> <p> 1)"), t) ;
- }
-
- @Test public void graphDSG_03()
+
+ @Override
+ protected Graph makeNamedGraph(DatasetGraph dsg, Node gn)
{
- Graph g = GraphOverDataset.createDefaultGraph(dsg) ;
- g.add(SSE.parseTriple("(<s> <p> 99)")) ;
- long x = Iter.count(dsg.find(Quad.defaultGraphNodeGenerated, null,
null, null)) ;
- assertEquals(2, x) ;
+ return dsgv.getGraph(gn) ;
}
-
}
Copied: incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TW2.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TW2.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TW2.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TW2.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TW2.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TW2.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TW2.java Sat
Mar 24 19:41:42 2012
@@ -16,15 +16,12 @@
* limitations under the License.
*/
-package riot;
+package riot_writer;
import java.util.Collection ;
import java.util.HashSet ;
-import java.util.Iterator ;
import java.util.Set ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
import org.openjena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Graph ;
@@ -71,25 +68,6 @@ public class TW2
return Pair.create(bNodesObj1, triplesObj1) ;
}
- // CALCULATE FOR LISTS
-
- static Transform<Triple, Node> subjects = new Transform<Triple, Node>() {
-
- @Override
- public Node convert(Triple item)
- {
- return item.getSubject() ;
- }} ;
-
- // Combine into a single pass.
- // DISTINCT means it's space using.
- static Iterator<Node> subjects(Graph graph)
- {
- // Later:
- ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY,
Node.ANY) ;
- return Iter.iter(iter).map(subjects).distinct() ;
- }
-
static Node connectedOnce(Graph graph, Node obj)
{
ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY, obj) ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TriGWriter.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TriGWriter.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TriGWriter.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TriGWriter.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TriGWriter.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TriGWriter.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TriGWriter.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot_writer;
import java.io.FileInputStream ;
import java.io.FileNotFoundException ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriter2.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriter2.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriter2.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriter2.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriter2.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriter2.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriter2.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,9 @@
* limitations under the License.
*/
-package riot;
+package riot_writer;
+
+import graph.GLib ;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
@@ -156,7 +158,7 @@ public class TurtleWriter2
writePrefixes(out, prefixMap) ;
// Or - listSubjects and sort.
- Iterator<Node> subjects = TW2.subjects(graph) ;
+ Iterator<Node> subjects = GLib.listSubjects(graph) ;
writeBySubject(out, graph, subjects, bNodesObj1, triplesObj1, new
HashSet<Object>(), prefixMap) ;
out.flush() ;
}
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterBlocks.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterBlocks.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterBlocks.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterBlocks.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterBlocks.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
---
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterBlocks.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterBlocks.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot_writer;
import java.io.OutputStream ;
import java.util.* ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterFlat.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterFlat.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterFlat.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterFlat.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterFlat.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
---
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TurtleWriterFlat.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src-projects/riot_writer/TurtleWriterFlat.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot_writer;
import java.util.Iterator ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/LangSSE.java (from
r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/lang/LangSSE.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/LangSSE.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/LangSSE.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/lang/LangSSE.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/lang/LangSSE.java
(original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/LangSSE.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot.lang;
+package riot.sse;
import org.openjena.atlas.lib.SinkNull ;
import org.openjena.riot.Lang ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/ParserSSE.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/ParserSSE.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/ParserSSE.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/ParserSSE.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/ParserSSE.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/ParserSSE.java
(original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/ParserSSE.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot.sse;
import java.io.InputStream ;
import java.io.Reader ;
@@ -28,7 +28,6 @@ import org.openjena.riot.system.ParserPr
import org.openjena.riot.system.RiotLib ;
import org.openjena.riot.tokens.Tokenizer ;
import org.openjena.riot.tokens.TokenizerFactory ;
-import riot.lang.LangSSE ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
Copied: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TS_SSE.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TS_SSE.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TS_SSE.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TS_SSE.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TS_SSE.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TS_SSE.java
(original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TS_SSE.java Sat
Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot.sse;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Basic.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Basic.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Basic.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Basic.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Basic.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Basic.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Basic.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot.sse;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Builder.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Builder.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Builder.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Builder.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Builder.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
---
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Builder.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Builder.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot.sse;
import org.junit.Test ;
Copied:
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Forms.java
(from r1300658,
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Forms.java)
URL:
http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Forms.java?p2=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Forms.java&p1=incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Forms.java&r1=1300658&r2=1304891&rev=1304891&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/TestSSE_Forms.java
(original)
+++
incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/sse/TestSSE_Forms.java
Sat Mar 24 19:41:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package riot;
+package riot.sse;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
