jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sal...@apache.org
Subject svn commit: r1440101 [3/16] - in /jena/branches/streaming-update: ./ apache-jena-libs/ apache-jena/ apache-jena/bat/ apache-jena/bin/ jena-arq/ jena-arq/src-examples/arq/examples/riot/ jena-arq/src/main/java/arq/ jena-arq/src/main/java/arq/cmdline/ jen...
Date Tue, 29 Jan 2013 20:27:39 GMT
Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java Tue Jan 29 20:27:24 2013
@@ -18,26 +18,29 @@
 
 package com.hp.hpl.jena.sparql.path;
 
-import static org.junit.Assert.assertEquals ;
-import static org.junit.Assert.fail ;
-
 import java.util.ArrayList ;
 import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Assert ;
-import org.junit.Ignore ;
 import org.junit.Test ;
 
 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.query.ARQ ;
 import com.hp.hpl.jena.query.QueryParseException ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
 import com.hp.hpl.jena.sparql.core.Prologue ;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
+import com.hp.hpl.jena.sparql.engine.QueryIterator ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
 import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 import com.hp.hpl.jena.sparql.path.eval.PathEval ;
 import com.hp.hpl.jena.sparql.sse.Item ;
@@ -45,13 +48,15 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
 import com.hp.hpl.jena.sparql.sse.builders.BuilderPath ;
 import com.hp.hpl.jena.sparql.sse.writers.WriterPath ;
 
-public class TestPath
+public class TestPath extends BaseTest
 {
     static Graph graph1 = GraphFactory.createDefaultGraph() ;
     static Graph graph2 = GraphFactory.createDefaultGraph() ;
     static Graph graph3 = GraphFactory.createDefaultGraph() ;
     static Graph graph4 = GraphFactory.createDefaultGraph() ;
     static Graph graph5 = GraphFactory.createDefaultGraph() ;
+    static Graph graph6 = GraphFactory.createDefaultGraph() ;
+    static Graph graph7 = GraphFactory.createDefaultGraph() ;
     
     static Node n1 = Node.createURI("n1") ;
     static Node n2 = Node.createURI("n2") ;
@@ -96,6 +101,15 @@ public class TestPath
         graph5.add(new Triple(n1, p, n3)) ;
         graph5.add(new Triple(n2, q, n4)) ;
         graph5.add(new Triple(n3, q, n5)) ;
+        
+        // Loop
+        graph6.add(new Triple(n1, p, n2)) ;
+        graph6.add(new Triple(n2, p, n1)) ;
+        
+        // Loop + tail
+        graph7.add(new Triple(n1, p, n2)) ;
+        graph7.add(new Triple(n2, p, n1)) ;
+        graph7.add(new Triple(n2, p, n3)) ;
     }
     
     // ----
@@ -235,15 +249,72 @@ public class TestPath
     @Test public void path_32()   { test(graph3, n1,   ":p{*}",     n1,n2,n3,n4,n4) ; }
     @Test public void path_33()   { test(graph3, n1,   ":p*",       n1,n2,n3,n4) ; }
     @Test public void path_34()   { test(graph3, n1,   ":p+",       n2,n3,n4) ; }
+
+    
+    private static List<Binding> eval(Graph graph, String start$, String pathStr, String finish$)
+    {
+        return eval(graph, SSE.parseNode(start$, pmap), pathStr, SSE.parseNode(finish$, pmap)) ;
+    }
+    
+    private static List<Binding> eval(Graph graph, Node start, String pathStr, Node finish)
+    {
+        Path path = SSE.parsePath(pathStr, pmap) ;
+        QueryIterator qIter = PathLib.execTriplePath(BindingFactory.root(), start, path, finish, new ExecutionContext(ARQ.getContext(), graph, null, null)) ;
+        return Iter.toList(qIter) ;
+    }
+    
+    @Test public void path_35()
+    { 
+        List<Binding> x = eval(graph6, "?x", "(path+ :p)", "?y" ) ;
+        assertEquals(4, x.size()) ;
+    }
     
+    @Test public void path_36()
+    { 
+        // Same end points.
+        List<Binding> x = eval(graph6, "?x", "(path+ :p)", "?x" ) ;
+        assertEquals(2, x.size()) ;
+    }
+
+    @Test public void path_37()
+    { 
+        List<Binding> x = eval(graph6, "?x", "(path* :p)", "?x" ) ;
+        assertEquals(2, x.size()) ;
+        Node node1 = x.get(0).get(Var.alloc("x")) ;
+        Node node2 = x.get(1).get(Var.alloc("x")) ;
+        assertFalse(node1.equals(node2)) ;
+        assertTrue(node1.equals(n1) || node1.equals(n2)) ;
+        assertTrue(node2.equals(n1) || node2.equals(n2)) ;
+    }
+
+    @Test public void path_38()
+    { 
+        // Same end points.
+        List<Binding> x = eval(graph6, "?x", "(pathN+ :p)", "?x" ) ;
+        
+        assertEquals(2, x.size()) ;
+        Node node1 = x.get(0).get(Var.alloc("x")) ;
+        Node node2 = x.get(1).get(Var.alloc("x")) ;
+        assertFalse(node1.equals(node2)) ;
+        assertTrue(node1.equals(n1) || node1.equals(n2)) ;
+        assertTrue(node2.equals(n1) || node2.equals(n2)) ;
+    }
+
+    @Test public void path_39()
+    { 
+        List<Binding> x = eval(graph6, "?x", "(pathN* :p)", "?x" ) ;
+        assertEquals(2, x.size()) ;
+    }
+
     // TODO Shortest path is not implemented yet.  These also need to be verified that they are correct.
-    @Ignore @Test public void path_40()   { test(graph1, n1,   "shortest(:p*)",       n1) ; }
-    @Ignore @Test public void path_41()   { test(graph1, n1,   "shortest(:p+)",       n2) ; }
-    @Ignore @Test public void path_42()   { test(graph2, n1,   "shortest(:p*/:q)",    n4) ; }
-    @Ignore @Test public void path_43()   { test(graph2, n1,   "shortest(:p{*}/:q)",  n4, n4) ; }
-    @Ignore @Test public void path_44()   { test(graph4, n1,   "shortest(:p*/:q)",    n5) ; }
-    @Ignore @Test public void path_45()   { test(graph4, n1,   "shortest(:p{2,}/:q)", n6) ; }
-    @Ignore @Test public void path_46()   { test(graph5, n1,   "shortest(:p*/:q)",    n4, n5) ; }
+//    @Ignore @Test public void path_40()   { test(graph1, n1,   "shortest(:p*)",       n1) ; }
+//    @Ignore @Test public void path_41()   { test(graph1, n1,   "shortest(:p+)",       n2) ; }
+//    @Ignore @Test public void path_42()   { test(graph2, n1,   "shortest(:p*/:q)",    n4) ; }
+//    @Ignore @Test public void path_43()   { test(graph2, n1,   "shortest(:p{*}/:q)",  n4, n4) ; }
+//    @Ignore @Test public void path_44()   { test(graph4, n1,   "shortest(:p*/:q)",    n5) ; }
+//    @Ignore @Test public void path_45()   { test(graph4, n1,   "shortest(:p{2,}/:q)", n6) ; }
+//    @Ignore @Test public void path_46()   { test(graph5, n1,   "shortest(:p*/:q)",    n4, n5) ; }
+    
     
 
     // ----

Modified: jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java Tue Jan 29 20:27:24 2013
@@ -103,7 +103,7 @@ public class TestPath2 extends BaseTest
     @Test public void path_35() { test(x, "(pathN+ :r)",          ":y2", ":z", ":a2", ":b", ":a1", ":b", ":y1", ":z", ":a2", ":b", ":a1", ":b") ; } 
 	@Test public void path_36() { test(x, "(path* :r)",           ":x", ":y2", ":z", ":a2", ":b", ":a1", ":y1") ; } 
 	@Test public void path_37() { test(x, "(pathN* :r)",          ":x", ":y2", ":z", ":a2", ":b", ":a1", ":b", ":y1", ":z", ":a2", ":b", ":a1", ":b") ; } 
-	
+
 //	static int i = 0 ;
 	
 	private void test(Node start, String pathStr, String ... results)

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java Tue Jan 29 20:27:24 2013
@@ -22,6 +22,10 @@ package org.apache.jena.atlas.lib;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
 
+/**
+ * Tests for the Atlas lib package
+ *
+ */
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
     TestAlg.class
@@ -41,6 +45,7 @@ import org.junit.runners.Suite ;
     , TestAlarmClock.class
     , TestRefLong.class
     , TestReverseComparator.class
+    , TestTrie.class
 } )
 
 public class TS_Lib

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TS_ReaderRIOT.java Tue Jan 29 20:27:24 2013
@@ -31,6 +31,7 @@ import org.junit.runners.Suite.SuiteClas
     , TestStreamManager.class 
     , TestJenaReaderRIOT.class
     , TestReadData.class
+    , TestRiotReader.class
 })
 
 public class TS_ReaderRIOT

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Tue Jan 29 20:27:24 2013
@@ -170,9 +170,7 @@ public class TestJenaReaderRIOT extends 
         m2.read(new StringReader(x), "http://example/base4", lang) ;
     }
 
-    // Web.
-    // TriG
-    // NQ
+    // See also TestDataRead
     
     private static void jenaread(String dataurl)
     {

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java Tue Jan 29 20:27:24 2013
@@ -21,14 +21,19 @@ package org.apache.jena.riot;
 import java.io.FileInputStream ;
 import java.io.IOException ;
 
+import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 
+import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.DatasetFactory ;
 import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.util.Context ;
 
 /* Tests of RDFDataMgr.
@@ -91,6 +96,35 @@ public class TestReadData extends BaseTe
     @Test public void load_15() { RDFDataMgr.loadDatasetGraph(filename("D.nq"), RDFLanguages.NQUADS)  ; }
     @Test public void load_16() { RDFDataMgr.loadDatasetGraph(filename("D-nq"), RDFLanguages.NQUADS)  ; }
     
+    // Load triples into DSG 
+    @Test public void load_17() { 
+        DatasetGraph dsg = RDFDataMgr.loadDatasetGraph(filename("D.ttl")) ;
+        assertFalse(dsg.getDefaultGraph().isEmpty()) ;
+        assertEquals(0, Iter.count(dsg.listGraphNodes())) ;
+    }
+    
+    // Load quads into graph - warning on named graphs
+    @Test
+    public void load_18()
+    {
+        ErrorHandler err = ErrorHandlerFactory.getDefaultErrorHandler() ;
+        try
+        {
+            ErrorHandlerFactory.setDefaultErrorHandler(new ErrorHandlerTestLib.ErrorHandlerEx()) ;
+            try {
+                Graph g = RDFDataMgr.loadGraph(filename("D.trig")) ;
+                fail("No expection generated") ;
+            } catch (ErrorHandlerTestLib.ExWarning e) { }
+            ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerNoLogging) ;
+            Graph g = RDFDataMgr.loadGraph(filename("D.trig")) ;
+            assertFalse(g.isEmpty()) ;
+            assertEquals(1, g.size()) ;
+        } finally
+        {
+            ErrorHandlerFactory.setDefaultErrorHandler(err) ;
+        }
+    }
+
     private static String filename(String filename) { return directory+"/"+filename ; }
 
     // Base.

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java Tue Jan 29 20:27:24 2013
@@ -23,7 +23,7 @@ import org.junit.runners.Suite ;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
-      TestIRI.class
+     TestIRI.class
     , TestLang.class
     , TestNodeAllocator.class
     
@@ -34,6 +34,8 @@ import org.junit.runners.Suite ;
     , TestLangTrig.class
     , TestLangRdfJson.class
     , TestParserFactory.class
+
+    , TestPipedRDFIterators.class
 })
 
 

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java Tue Jan 29 20:27:24 2013
@@ -20,7 +20,6 @@ package org.apache.jena.riot.lang;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.lang.LangTurtle ;
 import org.apache.jena.riot.system.PrefixMap ;
 import org.apache.jena.riot.system.StreamRDF ;
 import org.apache.jena.riot.system.StreamRDFLib ;

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Tue Jan 29 20:27:24 2013
@@ -69,7 +69,12 @@ public class UnitTestEval extends LangTe
             Model results = ModelFactory.createDefaultModel() ;
             // Directly get an N-triples reader
             InputStream in = StreamManager.get().open(output) ;
-            RDFDataMgr.read(results, in, null, RDFLanguages.NTRIPLES) ;
+            
+            try {
+                RDFDataMgr.read(results, in, null, RDFLanguages.NTRIPLES) ;
+            } catch (RiotException ex) {
+                fail("Failed to read results: "+ex.getMessage()) ;
+            }
 
             boolean b = model.isIsomorphicWith(results) ;
             if ( !b )

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java Tue Jan 29 20:27:24 2013
@@ -21,10 +21,8 @@ package org.apache.jena.riot.out;
 import java.io.StringWriter ;
 
 import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.out.NodeFormatter ;
-import org.apache.jena.riot.out.NodeFormatterNT ;
-import org.apache.jena.riot.out.NodeFormatterTTL ;
 import org.apache.jena.riot.system.PrefixMap ;
+import org.apache.jena.riot.system.PrefixMapFactory ;
 import org.junit.Test ;
 
 import com.hp.hpl.jena.graph.Node ;
@@ -34,7 +32,7 @@ import com.hp.hpl.jena.sparql.util.NodeF
 public class TestNodeFmt extends BaseTest
 {
     private static String base = "http://example.org/base" ;
-    private static PrefixMap prefixMap = new PrefixMap() ;
+    private static PrefixMap prefixMap = PrefixMapFactory.createForOutput() ;
     static {
         prefixMap.add(":", "http://example/p") ;
         prefixMap.add("ex", "http://example/ex/") ;

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TS_RiotSystem.java Tue Jan 29 20:27:24 2013
@@ -22,10 +22,22 @@ import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
 import org.junit.runners.Suite.SuiteClasses ;
 
+/**
+ * Test suite for RIOT system
+ *
+ */
 @RunWith(Suite.class)
 @SuiteClasses({ 
     TestChecker.class
+    
+    // Prefix Map implementations
     , TestPrefixMap.class
+    , TestFastAbbreviatingPrefixMap.class
+    , TestPrefixMapExtended1.class
+    , TestPrefixMapExtended2.class
+    // May be subject to performance vagaries, with the improvements made
+    // to the fast implementation this should be fairly safe
+    //, TestAbbreviationPerformance.class
 })
 
 public class TS_RiotSystem

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/system/TestPrefixMap.java Tue Jan 29 20:27:24 2013
@@ -18,46 +18,14 @@
 
 package org.apache.jena.riot.system;
 
-import org.junit.Test ;
-
-import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.iri.IRIFactory ;
-import org.apache.jena.riot.system.PrefixMap ;
-
-public class TestPrefixMap extends BaseTest
-{
-    static IRIFactory factory = IRIFactory.iriImplementation() ; 
-    
-    @Test public void prefixMap1()
-    {
-        PrefixMap pmap = new PrefixMap() ;
-        add(pmap, "", "http://example/") ;
-        String x = pmap.expand("", "x") ;
-        assertEquals("http://example/x", x) ;
-    }
-
-    @Test public void prefixMap2()
-    {
-        PrefixMap pmap = new PrefixMap() ;
-        add(pmap, "ex", "http://example/") ;
-        String x = pmap.expand("", "x") ;
-        assertNull(x) ;
-    }
-    
-    @Test public void prefixMap3()
-    {
-        PrefixMap pmap = new PrefixMap() ;
-        add(pmap, "ex", "http://example/") ;
-        add(pmap, "ex", "http://elsewhere/ns#") ;
-        String x = pmap.expand("ex", "x") ;
-        assertEquals("http://elsewhere/ns#x", x) ;
-    }
-
-    // PrefixMap2
-    
-    static void add(PrefixMap pmap, String prefix, String uri)
-    {
-        pmap.add(prefix, factory.create(uri)) ; 
+/**
+ * Test the standard {@link PrefixMapStd} implementation
+ *
+ */
+public class TestPrefixMap extends AbstractTestPrefixMap {
+
+    @Override
+    protected PrefixMap getPrefixMap() {
+        return new PrefixMapStd();
     }
-    
 }

Modified: jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java (original)
+++ jena/branches/streaming-update/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java Tue Jan 29 20:27:24 2013
@@ -20,8 +20,7 @@ package org.apache.jena.riot.tokens;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.tokens.Token ;
-import org.apache.jena.riot.tokens.TokenType ;
+import org.apache.jena.riot.system.PrefixMapFactory ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 
@@ -32,7 +31,7 @@ import com.hp.hpl.jena.sparql.util.NodeF
 public class TestTokenForNode extends BaseTest 
 {
     static String base = "http://localhost/" ;
-    static PrefixMap prefixMap = new PrefixMap() ;
+    static PrefixMap prefixMap = PrefixMapFactory.create() ;
     
     @BeforeClass static public void beforeClass()
     {

Modified: jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/data-3.ttl
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/data-3.ttl?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/data-3.ttl (original)
+++ jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/data-3.ttl Tue Jan 29 20:27:24 2013
@@ -18,8 +18,7 @@
 :y4 :q "abc"^^xsd:string .
 :y5 :q "abc"^^xsd:integer .
 :y6 :q "abc"^^:unknown .
-:y7 :q _:abc .
-:y8 :q :abc .
+:y7 :q :abc .
 
 :z1 :r 1 .
 :z2 :r 01 .

Modified: jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-2.ttl?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-2.ttl (original)
+++ jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-2.ttl Tue Jan 29 20:27:24 2013
@@ -12,7 +12,7 @@
                       rs:binding    [ rs:value      :y2 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      10
+                      rs:index      9
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz"^^xsd:string ;
                                       rs:variable   "v"
@@ -20,7 +20,7 @@
                       rs:binding    [ rs:value      :x6 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      21
+                      rs:index      20
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :x3 ;
                                       rs:variable   "x"
@@ -28,7 +28,7 @@
                       rs:binding    [ rs:value      "xyz"@FR ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      17
+                      rs:index      16
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz"^^xsd:integer ;
                                       rs:variable   "v"
@@ -36,7 +36,7 @@
                       rs:binding    [ rs:value      :x7 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      20
+                      rs:index      19
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :z3 ;
                                       rs:variable   "x"
@@ -44,7 +44,7 @@
                       rs:binding    [ rs:value      "1"^^xsd:decimal ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      6
+                      rs:index      5
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz"@en ;
                                       rs:variable   "v"
@@ -52,7 +52,7 @@
                       rs:binding    [ rs:value      :x2 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      16
+                      rs:index      15
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz"^^:unknown ;
                                       rs:variable   "v"
@@ -60,7 +60,7 @@
                       rs:binding    [ rs:value      :x8 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      19
+                      rs:index      18
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :x4 ;
                                       rs:variable   "x"
@@ -68,24 +68,15 @@
                       rs:binding    [ rs:value      "xyz"@fr ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      18
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      [ 
-                                                    ] ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :y7 ;
-                                      rs:variable   "x"
-                                    ] ;
-                      rs:index      1
+                      rs:index      17
                     ] ;
-      rs:solution   [ rs:binding    [ rs:value      :y8 ;
+      rs:solution   [ rs:binding    [ rs:value      :y7 ;
                                       rs:variable   "x"
                                     ] ;
                       rs:binding    [ rs:value      :abc ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      3
+                      rs:index      2
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :x9 ;
                                       rs:variable   "x"
@@ -94,7 +85,7 @@
                                                     ] ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      2
+                      rs:index      1
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "abc"@EN ;
                                       rs:variable   "v"
@@ -102,7 +93,7 @@
                       rs:binding    [ rs:value      :y3 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      9
+                      rs:index      8
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "abc" ;
                                       rs:variable   "v"
@@ -110,7 +101,7 @@
                       rs:binding    [ rs:value      :y1 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      8
+                      rs:index      7
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "abc"^^xsd:string ;
                                       rs:variable   "v"
@@ -118,7 +109,7 @@
                       rs:binding    [ rs:value      :y4 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      13
+                      rs:index      12
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :z2 ;
                                       rs:variable   "x"
@@ -126,7 +117,7 @@
                       rs:binding    [ rs:value      01 ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:index      5
+                      rs:index      4
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz"@EN ;
                                       rs:variable   "v"
@@ -134,7 +125,7 @@
                       rs:binding    [ rs:value      :x5 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      15
+                      rs:index      14
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      1 ;
                                       rs:variable   "v"
@@ -142,7 +133,7 @@
                       rs:binding    [ rs:value      :z1 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      7
+                      rs:index      6
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      :xyz ;
                                       rs:variable   "v"
@@ -150,7 +141,7 @@
                       rs:binding    [ rs:value      :x10 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      4
+                      rs:index      3
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "abc"^^:unknown ;
                                       rs:variable   "v"
@@ -158,7 +149,7 @@
                       rs:binding    [ rs:value      :y6 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      11
+                      rs:index      10
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "xyz" ;
                                       rs:variable   "v"
@@ -166,7 +157,7 @@
                       rs:binding    [ rs:value      :x1 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      14
+                      rs:index      13
                     ] ;
       rs:solution   [ rs:binding    [ rs:value      "abc"^^xsd:integer ;
                                       rs:variable   "v"
@@ -174,5 +165,5 @@
                       rs:binding    [ rs:value      :y5 ;
                                       rs:variable   "x"
                                     ] ;
-                      rs:index      12
+                      rs:index      11
                     ] .

Modified: jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-3.ttl?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-3.ttl (original)
+++ jena/branches/streaming-update/jena-arq/testing/ARQ/Sort/sort-result-3.ttl Tue Jan 29 20:27:24 2013
@@ -14,15 +14,6 @@
                                     ] ;
                       rs:index      2
                     ] ;
-      rs:solution   [ rs:binding    [ rs:value      [ 
-                                                    ] ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :y7 ;
-                                      rs:variable   "x"
-                                    ] ;
-                      rs:index      21
-                    ] ;
       rs:solution   [ rs:binding    [ rs:value      :x9 ;
                                       rs:variable   "x"
                                     ] ;
@@ -139,7 +130,7 @@
       rs:solution   [ rs:binding    [ rs:value      :abc ;
                                       rs:variable   "v"
                                     ] ;
-                      rs:binding    [ rs:value      :y8 ;
+                      rs:binding    [ rs:value      :y7 ;
                                       rs:variable   "x"
                                     ] ;
                       rs:index      19

Modified: jena/branches/streaming-update/jena-arq/testing/RIOT/Reader/D.trig
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/testing/RIOT/Reader/D.trig?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/testing/RIOT/Reader/D.trig (original)
+++ jena/branches/streaming-update/jena-arq/testing/RIOT/Reader/D.trig Tue Jan 29 20:27:24 2013
@@ -1,4 +1,5 @@
 @base <http://example/> .
 
+{ <s1> <p1> <o1> }
 <g> { <s> <p> <o> }
 

Propchange: jena/branches/streaming-update/jena-core/
------------------------------------------------------------------------------
  Merged /jena/trunk/jena-core:r1430447-1440093

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/ClassHierarchy.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/ClassHierarchy.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/ClassHierarchy.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/ClassHierarchy.java Tue Jan 29 20:27:24 2013
@@ -38,10 +38,6 @@ import java.util.*;
  * is not a complete solution to the problem (sub-classes of restrictions, for example,
  * are not shown).  It is intended only to be illustrative of the general approach.
  * </p>
- *
- * @author Ian Dickinson, HP Labs
- *         (<a  href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: ClassHierarchy.java,v 1.5 2009-10-06 13:04:43 ian_dickinson Exp $
  */
 public class ClassHierarchy {
     // Constants

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/Main.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/Main.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/Main.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/classHierarchy/Main.java Tue Jan 29 20:27:24 2013
@@ -31,10 +31,6 @@ import com.hp.hpl.jena.rdf.model.ModelFa
  * <p>
  * Execution wrapper for class hierarchy example
  * </p>
- *
- * @author Ian Dickinson, HP Labs
- *         (<a  href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: Main.java,v 1.3 2009-10-06 13:04:43 ian_dickinson Exp $
  */
 public class Main {
     // Constants

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/DescribeClass.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/DescribeClass.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/DescribeClass.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/DescribeClass.java Tue Jan 29 20:27:24 2013
@@ -39,10 +39,6 @@ import com.hp.hpl.jena.shared.PrefixMapp
  * be adapted as necessary to provide a given application with the means to render
  * a class description in a readable form.
  * </p>
- *
- * @author Ian Dickinson, HP Labs
- *         (<a  href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: DescribeClass.java,v 1.4 2009-10-06 13:04:44 ian_dickinson Exp $
  */
 public class DescribeClass {
     // Constants

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/Main.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/Main.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/Main.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/ontology/describeClass/Main.java Tue Jan 29 20:27:24 2013
@@ -33,10 +33,6 @@ import com.hp.hpl.jena.rdf.model.ModelFa
  * <p>
  * Execution wrapper for describe-class example
  * </p>
- *
- * @author Ian Dickinson, HP Labs
- *         (<a  href="mailto:ian_dickinson@users.sourceforge.net" >email</a>)
- * @version CVS $Id: Main.java,v 1.3 2009-10-06 13:04:44 ian_dickinson Exp $
  */
 public class Main {
     // Constants

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial02.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial02.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial02.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial02.java Tue Jan 29 20:27:24 2013
@@ -22,9 +22,6 @@ import com.hp.hpl.jena.rdf.model.*;
 import com.hp.hpl.jena.vocabulary.*;
 
 /** Tutorial 2 resources as property values
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.3 $' Date='$Date: 2005-10-06 17:49:05 $'
  */
 public class Tutorial02 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial03.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial03.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial03.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial03.java Tue Jan 29 20:27:24 2013
@@ -23,9 +23,6 @@ import com.hp.hpl.jena.vocabulary.*;
 
 
 /** Tutorial 3 Statement attribute accessor methods
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.3 $' Date='$Date: 2005-10-06 17:49:05 $'
  */
 public class Tutorial03 extends Object {
     public static void main (String args[]) {

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial04.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial04.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial04.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial04.java Tue Jan 29 20:27:24 2013
@@ -22,9 +22,6 @@ import com.hp.hpl.jena.rdf.model.*;
 import com.hp.hpl.jena.vocabulary.*;
 
 /** Tutorial 4 - create a model and write it in XML form to standard out
- *
- * @author  bwm - updated by Kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.3 $' Date='$Date: 2005-10-06 17:49:05 $'
  */
 public class Tutorial04 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial05.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial05.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial05.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial05.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.util.FileManager;
 import java.io.*;
 
 /** Tutorial 5 - read RDF XML from a file and write it to standard out
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.4 $' Date='$Date: 2006-04-27 09:30:07 $'
  */
 public class Tutorial05 extends Object {
 

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial06.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial06.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial06.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial06.java Tue Jan 29 20:27:24 2013
@@ -25,9 +25,6 @@ import com.hp.hpl.jena.vocabulary.*;
 import java.io.*;
 
 /** Tutorial navigating a model
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.3 $' Date='$Date: 2005-10-06 17:49:05 $'
  */
 public class Tutorial06 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial07.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial07.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial07.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial07.java Tue Jan 29 20:27:24 2013
@@ -25,9 +25,6 @@ import com.hp.hpl.jena.vocabulary.*;
 import java.io.*;
 
 /** Tutorial 7 - selecting the VCARD resources
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.4 $' Date='$Date: 2007-11-14 15:30:32 $'
  */
 public class Tutorial07 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial08.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial08.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial08.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial08.java Tue Jan 29 20:27:24 2013
@@ -26,9 +26,6 @@ import java.io.*;
 
 
 /** Tutorial 8 - demonstrate Selector methods
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.4 $' Date='$Date: 2009-01-16 17:23:58 $'
  */
 public class Tutorial08 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial09.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial09.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial09.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial09.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.util.FileManager;
 import java.io.*;
 
 /** Tutorial 9 - demonstrate graph operations
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.3 $' Date='$Date: 2005-10-06 17:49:05 $'
  */
 public class Tutorial09 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial10.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial10.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial10.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial10.java Tue Jan 29 20:27:24 2013
@@ -27,9 +27,6 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 
 /** Tutorial 10 - demonstrate a container
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.4 $' Date='$Date: 2009-01-16 17:23:58 $'
  */
 public class Tutorial10 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial11.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial11.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial11.java (original)
+++ jena/branches/streaming-update/jena-core/src-examples/jena/examples/rdf/Tutorial11.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.vocabulary.*;
 import java.io.PrintWriter;
 
 /** Tutorial 11 - more on literals
- *
- * @author  bwm - updated by kers/Daniel
- * @version Release='$Name: not supported by cvs2svn $' Revision='$Revision: 1.5 $' Date='$Date: 2007-11-14 09:51:57 $'
  */
 public class Tutorial11 extends Object {
     

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Assembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Assembler.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Assembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Assembler.java Tue Jan 29 20:27:24 2013
@@ -25,8 +25,6 @@ import com.hp.hpl.jena.rdf.model.*;
     An Assembler creates objects from their RDF descriptions. The root motivation
     is to create Models, but other objects are required as sub-components of
     those Models, so a general mechanism is available.
-    
-    @author kers
 */
 public interface Assembler
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/AssemblerHelp.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/AssemblerHelp.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/AssemblerHelp.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/AssemblerHelp.java Tue Jan 29 20:27:24 2013
@@ -33,8 +33,6 @@ import com.hp.hpl.jena.vocabulary.*;
     the Assembler code, including the methods that expand a model to include the
     required inferences and to find the most specific type of a root in an
     assembler specification.
-    
-    @author kers
 */
 public class AssemblerHelp
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/BadObjectException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/BadObjectException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/BadObjectException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/BadObjectException.java Tue Jan 29 20:27:24 2013
@@ -25,8 +25,6 @@ import com.hp.hpl.jena.rdf.model.*;
     Exception used to report that the object of a statement is not a Resource.
     The subject of the exception is treated as the root object. The nature of the
     unsuitability is (currently) not described.
-    
-    @author kers
 */
 public class BadObjectException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Content.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Content.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Content.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Content.java Tue Jan 29 20:27:24 2013
@@ -25,7 +25,6 @@ import com.hp.hpl.jena.rdf.model.Model;
 /**
     A Content object records content to be used to fill models. This Content
     class contains other Content objects. 
-    @author kers
 */
 public class Content
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Mode.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Mode.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Mode.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/Mode.java Tue Jan 29 20:27:24 2013
@@ -29,8 +29,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 <p>The default behaviour of the methods is dictated by booleans bound into
     the mode object. Subclasses of mode may exploit the ability to inspect the
     name of the object or its other RDF properties.
-    
-    @author kers
 */
 public class Mode
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/ModelExpansion.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/ModelExpansion.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/ModelExpansion.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/ModelExpansion.java Tue Jan 29 20:27:24 2013
@@ -41,8 +41,6 @@ import com.hp.hpl.jena.vocabulary.*;
     This is sufficient to allow the subjects in <code>M</code> which have
     properties from <code>S</code> to have enough type information for
     AssemblerGroup dispatch.
-    
-    @author kers
  */
 public class ModelExpansion
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/RuleSet.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/RuleSet.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/RuleSet.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/RuleSet.java Tue Jan 29 20:27:24 2013
@@ -24,8 +24,6 @@ import com.hp.hpl.jena.reasoner.rulesys.
 
 /**
     A RuleSet wraps a list of rules.
-    
-    @author kers
  */
 public class RuleSet
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileManagerAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileManagerAssembler.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileManagerAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/FileManagerAssembler.java Tue Jan 29 20:27:24 2013
@@ -26,8 +26,6 @@ import com.hp.hpl.jena.util.*;
     A FileManagerAssembler creates a FileManager object which may be
     initialised with a LocationMapper specified by the object of a ja:locationMapper
     property.
-    
-    @author kers
 */
 public class FileManagerAssembler extends AssemblerBase
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/LocationMapperAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/LocationMapperAssembler.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/LocationMapperAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/LocationMapperAssembler.java Tue Jan 29 20:27:24 2013
@@ -25,8 +25,6 @@ import com.hp.hpl.jena.util.*;
 /**
     An assembler to create location mappings: all the work is done by the
     LocationMapper constructor (which has its own vocabulary).
-    
-    @author kers
 */
 public class LocationMapperAssembler extends AssemblerBase
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ReasonerFactoryAssembler.java Tue Jan 29 20:27:24 2013
@@ -40,8 +40,6 @@ import com.hp.hpl.jena.reasoner.rulesys.
 <p>
     Thanks to Adam Cimarosti for provoking this code and providing an
     example implementation.
-
-    @author kers
 */
 public class ReasonerFactoryAssembler extends AssemblerBase implements Assembler
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AmbiguousSpecificTypeException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AmbiguousSpecificTypeException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AmbiguousSpecificTypeException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AmbiguousSpecificTypeException.java Tue Jan 29 20:27:24 2013
@@ -25,8 +25,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 /**
     Exception to throw when an AssemblerGroup has a choice of types
     from which to try and find an implementation.
-    
- 	@author kers
 */
 public class AmbiguousSpecificTypeException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AssemblerException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AssemblerException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AssemblerException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/AssemblerException.java Tue Jan 29 20:27:24 2013
@@ -29,8 +29,6 @@ import com.hp.hpl.jena.vocabulary.RDFS;
 /**
     Assembler Exception class: contains code shared by all the Assembler
     exceptions.
-    
-    @author kers
 */
 public class AssemblerException extends JenaException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotConstructException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotConstructException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotConstructException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotConstructException.java Tue Jan 29 20:27:24 2013
@@ -25,7 +25,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
     Exception used to report a failure of a group assembler to construct an
     object because there is no component assembler associated with the
     object's most specific type.
-    @author kers
 */
 public class CannotConstructException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotLoadClassException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotLoadClassException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotLoadClassException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/CannotLoadClassException.java Tue Jan 29 20:27:24 2013
@@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 
 /**
     Exception used to report a faulire to load a class.
-    @author kers
 */
 public class CannotLoadClassException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/NotExpectedTypeException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/NotExpectedTypeException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/NotExpectedTypeException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/NotExpectedTypeException.java Tue Jan 29 20:27:24 2013
@@ -23,8 +23,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 /**
     Exception to throw when some (dynamically loaded) class isn't of the
     required type.
-    
-    @author kers
 */
 public class NotExpectedTypeException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/PropertyRequiredException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/PropertyRequiredException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/PropertyRequiredException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/PropertyRequiredException.java Tue Jan 29 20:27:24 2013
@@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.*;
 
 /**
     Exception used to report that a required property is missing.
-    @author kers
 */
 public class PropertyRequiredException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/ReasonerClashException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/ReasonerClashException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/ReasonerClashException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/ReasonerClashException.java Tue Jan 29 20:27:24 2013
@@ -23,8 +23,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 /**
     Exception to throw when a reasoner [or factory] has multiple clashing
     descriptions.
-    
-    @author kers
 */
 public class ReasonerClashException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/TransactionAbortedException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/TransactionAbortedException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/TransactionAbortedException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/TransactionAbortedException.java Tue Jan 29 20:27:24 2013
@@ -23,8 +23,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 /**
     Exception used to report that a transaction was aborted when loading
     content into a model.
-    
-    @author kers
 */
 public class TransactionAbortedException extends AssemblerException
     {    

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownEncodingException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownEncodingException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownEncodingException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownEncodingException.java Tue Jan 29 20:27:24 2013
@@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 
 /**
     Exception used to report an unknown language encoding.
-    @author kers
 */
 public class UnknownEncodingException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownReasonerException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownReasonerException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownReasonerException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownReasonerException.java Tue Jan 29 20:27:24 2013
@@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
 
 /**
     Exception used to report an unknown reasoner factory name.
-    @author kers
 */
 public class UnknownReasonerException extends AssemblerException
     {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java Tue Jan 29 20:27:24 2013
@@ -23,9 +23,6 @@ import com.hp.hpl.jena.graph.impl.Litera
 /**
  * Base level implementation of datatype from which real implementations
  * can inherit.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:50 $
  */
 public class BaseDatatype implements RDFDatatype {
     

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/DatatypeFormatException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/DatatypeFormatException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/DatatypeFormatException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/DatatypeFormatException.java Tue Jan 29 20:27:24 2013
@@ -23,9 +23,6 @@ import com.hp.hpl.jena.shared.*;
 /**
  * Exception thrown when a lexical form does not match the stated
  * datatype.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:50 $
  */
 public class DatatypeFormatException extends JenaException 
 {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/RDFDatatype.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/RDFDatatype.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/RDFDatatype.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/RDFDatatype.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.graph.impl.Litera
  * Interface on a datatype representation. An instance of this
  * interface is needed to convert typed literals between lexical
  * and value forms. 
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:50 $
  */
 public interface RDFDatatype {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/TypeMapper.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/TypeMapper.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/TypeMapper.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/TypeMapper.java Tue Jan 29 20:27:24 2013
@@ -31,9 +31,6 @@ import com.hp.hpl.jena.shared.impl.JenaP
  * The TypeMapper provides a global registry of known datatypes.
  * The datatypes can be retrieved by their URI or from the java class
  * that is used to represent them.
- *
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.2 $ on $Date: 2009-08-21 15:42:01 $
  */
 
 // Added extended set of class mappings and getTypeByClass

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/AbstractDateTime.java Tue Jan 29 20:27:24 2013
@@ -25,13 +25,10 @@ package com.hp.hpl.jena.datatypes.xsd;
  * using an int array. These wrapper classes just provide more
  * convenient access to the date values.
  * <p>
- * This class includees code derived from Xerces 2.6.0 
+ * This class includes code derived from Xerces 2.6.0 
  * Copyright (c) 1999-2002 The Apache Software Foundation.
  * All rights reserved.
  * </p>
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.3 $ on $Date: 2009-09-01 08:24:41 $
  */
 public class AbstractDateTime implements Comparable<AbstractDateTime> {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/IllegalDateTimeFieldException.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/IllegalDateTimeFieldException.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/IllegalDateTimeFieldException.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/IllegalDateTimeFieldException.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.shared.*;
  * Exception thrown when attempting to access a field of an XSDDateTime 
  * object that is not legal for the current date/time type. For example,
  * accessing the day from a gYearMonth object.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:56:03 $
  */
 public class IllegalDateTimeFieldException extends JenaException {
     

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java Tue Jan 29 20:27:24 2013
@@ -50,9 +50,6 @@ import com.hp.hpl.jena.graph.impl.Litera
 /**
  * Representation of an XSD datatype based on the Xerces-2
  * XSD implementation.
- *
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:56:03 $
  */
 public class XSDDatatype extends BaseDatatype {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDateTime.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDateTime.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDateTime.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDateTime.java Tue Jan 29 20:27:24 2013
@@ -27,9 +27,6 @@ import com.hp.hpl.jena.datatypes.xsd.imp
  * Represent an XSD date/time value. Rather than have a separate type for each
  * legal date/time value combination this is a combination type than does runtime
  * checks whether a given field is legal in the current circumstances.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.2 $ on $Date: 2009-09-25 09:58:14 $
  */
 public class XSDDateTime extends AbstractDateTime {
     /** Mask to indicate whether year is present */

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDuration.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDuration.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDuration.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDuration.java Tue Jan 29 20:27:24 2013
@@ -27,9 +27,6 @@ import com.hp.hpl.jena.datatypes.xsd.imp
  * with years, months, days, hours, minutes, seconds and fractional seconds.
  * This deviates from the spec which allows arbitrary position 
  * decimals for seconds.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.2 $ on $Date: 2010-05-09 10:22:07 $
  */
 
 public class XSDDuration extends AbstractDateTime {

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XMLLiteralType.java Tue Jan 29 20:27:24 2013
@@ -30,9 +30,6 @@ import java.io.*;
 /**
  * Builtin data type to represent XMLLiteral (i.e. items created
  * by use of <code>rdf:parsetype='literal'</code>.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XMLLiteralType extends BaseDatatype implements RDFDatatype {
     /** Singleton instance */

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDAbstractDateTimeType.java Tue Jan 29 20:27:24 2013
@@ -26,9 +26,6 @@ import com.hp.hpl.jena.graph.impl.Litera
 /**
  * Base class for all date/time/duration type representations.
  * Includes support functions for parsing and comparing dates.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDAbstractDateTimeType extends XSDDatatype {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseNumericType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseNumericType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseNumericType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseNumericType.java Tue Jan 29 20:27:24 2013
@@ -31,9 +31,6 @@ import com.hp.hpl.jena.shared.impl.JenaP
  * xsd:decimal. The only purpose of this place holder is
  * to support the isValidLiteral tests across numeric types. Note
  * that float and double are not included in this set.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDBaseNumericType extends XSDDatatype {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java Tue Jan 29 20:27:24 2013
@@ -26,9 +26,6 @@ import com.hp.hpl.jena.shared.impl.JenaP
  * Base implementation for all string datatypes derinved from
  * xsd:string. The only purpose of this place holder is
  * to support the isValidLiteral tests across string types.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDBaseStringType extends XSDDatatype {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDByteType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDByteType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDByteType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDByteType.java Tue Jan 29 20:27:24 2013
@@ -20,9 +20,6 @@ package com.hp.hpl.jena.datatypes.xsd.im
 
 /**
  * Datatype template used to define XSD int types
- *
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDByteType extends XSDBaseNumericType {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateTimeType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateTimeType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateTimeType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateTimeType.java Tue Jan 29 20:27:24 2013
@@ -23,9 +23,6 @@ import com.hp.hpl.jena.datatypes.xsd.*;
 /**
  * Type processor for dateTime, most of the machinery is in the
  * base XSDAbstractDateTimeType class.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDDateTimeType extends XSDAbstractDateTimeType {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDateType.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.datatypes.xsd.XSD
 /**
  * Type processor for date, most of the machinery is in the
  * base XSDAbstractDateTimeType class.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDDateType extends XSDAbstractDateTimeType {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDayType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDayType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDayType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDayType.java Tue Jan 29 20:27:24 2013
@@ -24,9 +24,6 @@ import com.hp.hpl.jena.datatypes.xsd.XSD
 /**
  * Type processor for gDay, most of the machinery is in the
  * base XSDAbstractDateTimeType class.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDDayType extends XSDAbstractDateTimeType {
 

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDouble.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDouble.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDouble.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDouble.java Tue Jan 29 20:27:24 2013
@@ -27,9 +27,6 @@ import com.hp.hpl.jena.shared.impl.JenaP
  * Datatype representation for xsd:float. Can't just use XSDBaseNumericType
  * because float, double and decimal are all disjoint in XSD. Can use plain
  * XSDDatatype because the equality function needs overriding.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDDouble extends XSDDatatype {
     /**

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDDurationType.java Tue Jan 29 20:27:24 2013
@@ -31,9 +31,6 @@ import com.hp.hpl.jena.datatypes.xsd.*;
  * Copyright (c) 1999-2002 The Apache Software Foundation.
  * All rights reserved.
  * </p>
- *            
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDDurationType extends XSDAbstractDateTimeType {
     

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDFloat.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDFloat.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDFloat.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDFloat.java Tue Jan 29 20:27:24 2013
@@ -27,9 +27,6 @@ import com.hp.hpl.jena.shared.impl.JenaP
  * Datatype representation for xsd:float. Can't just use XSDBaseNumericType
  * because float, double and decimal are all disjoint in XSD. Can use plain
  * XSDDatatype because the equality function needs overriding.
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDFloat extends XSDDatatype {
     /**

Modified: jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDGenericType.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDGenericType.java?rev=1440101&r1=1440100&r2=1440101&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDGenericType.java (original)
+++ jena/branches/streaming-update/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDGenericType.java Tue Jan 29 20:27:24 2013
@@ -31,9 +31,6 @@ import com.hp.hpl.jena.datatypes.xsd.*;
  * run time conversion of union results. Left in for now during restructuring and
  * in case any existing user code expects this type - very unlikely.
  * </p>
- * 
- * @author <a href="mailto:der@hplb.hpl.hp.com">Dave Reynolds</a>
- * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:58 $
  */
 public class XSDGenericType extends XSDDatatype {
 



Mime
View raw message