You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/11/27 19:17:49 UTC
svn commit: r1414301 - in /jena/Scratch/AFS/Dev/trunk:
src-archive/riot/comms/ src-archive/riot/comms/client/
src-archive/riot/io/section/ src-dev/dev/ src-dev/dev/g2/
src-lib/main/java/hash/ src-lib/main/java/libmisc/ src/main/java/algebra2/
src/main/...
Author: andy
Date: Tue Nov 27 18:17:38 2012
New Revision: 1414301
URL: http://svn.apache.org/viewvc?rev=1414301&view=rev
Log:
Changes following move of org.openjena.atlas to org.apache.jena.atlas
Modified:
jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/Comms.java
jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TupleSender.java
jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/Client.java
jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/IsoMatcher.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/LogMain.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/PathMain.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/Graph2.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/IndexImpl.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunch.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunchSimple.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleDex.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleIndex.java
jena/Scratch/AFS/Dev/trunk/src-lib/main/java/hash/FnvHashFunction.java
jena/Scratch/AFS/Dev/trunk/src-lib/main/java/libmisc/CodecUTF8.java
jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/JoinEngine.java
jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/Table.java
jena/Scratch/AFS/Dev/trunk/src/main/java/jenaplus/TestMRSW.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMap.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMapOfMap.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorage.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Builder.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TW2.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterBlocks.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterFlat.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java
jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java
jena/Scratch/AFS/Dev/trunk/src/main/java/search/SearchBase.java
Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/Comms.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/Comms.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/Comms.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/Comms.java Tue Nov 27 18:17:38 2012
@@ -23,7 +23,7 @@ import java.util.List ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
public class Comms
{
Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java Tue Nov 27 18:17:38 2012
@@ -26,7 +26,7 @@ import java.io.Writer ;
import java.net.Socket ;
import java.nio.channels.SocketChannel ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
import org.openjena.riot.tokens.Tokenizer ;
import org.openjena.riot.tokens.TokenizerFactory ;
import riot.comms.client.DirectChannel ;
Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TupleSender.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TupleSender.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TupleSender.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TupleSender.java Tue Nov 27 18:17:38 2012
@@ -22,7 +22,7 @@ import riot.io.TokenOutputStream ;
import com.hp.hpl.jena.graph.Node;
-import org.openjena.atlas.lib.Tuple;
+import org.apache.jena.atlas.lib.Tuple ;
/** Send tuples of tokens over a TokenOutputStream */
public class TupleSender
Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/Client.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/Client.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/Client.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/Client.java Tue Nov 27 18:17:38 2012
@@ -22,9 +22,9 @@ import java.net.InetSocketAddress ;
import java.net.Socket ;
import riot.comms.TokenStreamEndpoint ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheFactory ;
-import org.openjena.atlas.lib.cache.Getter ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.cache.Getter ;
/** An client endpoint that caches connections to a server */
public class Client
Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java Tue Nov 27 18:17:38 2012
@@ -22,7 +22,7 @@ import java.util.Iterator ;
import java.util.List ;
import java.util.NoSuchElementException ;
-import org.openjena.atlas.lib.Pool ;
+import org.apache.jena.atlas.lib.Pool ;
import org.openjena.riot.tokens.Token ;
import riot.comms.End ;
import riot.comms.TokenStreamEndpoint ;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/IsoMatcher.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/IsoMatcher.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/IsoMatcher.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/IsoMatcher.java Tue Nov 27 18:17:38 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
import java.util.Collection ;
import java.util.List ;
-import org.openjena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Iter ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/LogMain.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/LogMain.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/LogMain.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/LogMain.java Tue Nov 27 18:17:38 2012
@@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream ;
import java.io.IOException ;
import java.io.UnsupportedEncodingException ;
-import org.openjena.atlas.lib.StrUtils ;
-import org.openjena.atlas.logging.Log ;
-import org.openjena.atlas.logging.java.ConsoleHandlerStdout ;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.java.ConsoleHandlerStdout ;
import org.slf4j.LoggerFactory ;
public class LogMain
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/PathMain.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/PathMain.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/PathMain.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/PathMain.java Tue Nov 27 18:17:38 2012
@@ -18,8 +18,8 @@
package dev;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/RunAFS.java Tue Nov 27 18:17:38 2012
@@ -20,11 +20,11 @@ package dev;
import java.util.Iterator ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
import org.apache.jena.iri.ViolationCodes ;
-import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/Graph2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/Graph2.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/Graph2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/Graph2.java Tue Nov 27 18:17:38 2012
@@ -20,10 +20,10 @@ package dev.g2;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
-import org.openjena.atlas.lib.ColumnMap ;
-import org.openjena.atlas.lib.Tuple ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.lib.ColumnMap ;
+import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/IndexImpl.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/IndexImpl.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/IndexImpl.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/IndexImpl.java Tue Nov 27 18:17:38 2012
@@ -21,7 +21,7 @@ package dev.g2;
import java.util.Iterator;
import java.util.Map;
-import org.openjena.atlas.lib.DS;
+import org.apache.jena.atlas.lib.DS ;
/** Simplified map */
public class IndexImpl<K, V> implements Index<K, V>
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunch.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunch.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunch.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunch.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package dev.g2;
import java.util.Iterator;
-import org.openjena.atlas.lib.Pair;
+import org.apache.jena.atlas.lib.Pair ;
/** A storage of (K, Collection<V>) - i.e. a multivalued map; only one occurence of each distinct V per K */
public interface MultiBunch<K,V>
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunchSimple.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunchSimple.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunchSimple.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/MultiBunchSimple.java Tue Nov 27 18:17:38 2012
@@ -18,16 +18,16 @@
package dev.g2;
-import org.openjena.atlas.iterator.Iter;
-import org.openjena.atlas.iterator.IteratorConcat;
-import org.openjena.atlas.iterator.NullIterator;
-import org.openjena.atlas.iterator.Transform;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorConcat ;
+import org.apache.jena.atlas.iterator.NullIterator ;
+import org.apache.jena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.lib.Pair ;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import org.openjena.atlas.lib.Pair;
/** TEMPORARY implementation */
public class MultiBunchSimple<K, V> implements MultiBunch<K, V>
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleDex.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleDex.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleDex.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleDex.java Tue Nov 27 18:17:38 2012
@@ -18,12 +18,12 @@
package dev.g2;
-import org.openjena.atlas.iterator.*;
+import org.apache.jena.atlas.iterator.* ;
+import org.apache.jena.atlas.lib.ColumnMap ;
+import org.apache.jena.atlas.lib.Tuple ;
import java.util.Iterator;
-import org.openjena.atlas.lib.ColumnMap;
-import org.openjena.atlas.lib.Tuple;
import com.hp.hpl.jena.graph.Node;
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleIndex.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleIndex.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleIndex.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/g2/TupleIndex.java Tue Nov 27 18:17:38 2012
@@ -18,13 +18,13 @@
package dev.g2;
-import org.openjena.atlas.iterator.IteratorConcat;
+import org.apache.jena.atlas.iterator.IteratorConcat ;
+import org.apache.jena.atlas.lib.DS ;
import java.util.Collection;
import java.util.Iterator;
-import org.openjena.atlas.lib.DS;
public class TupleIndex<T> //extends Index<T, Index<T, Collection<T>>>
{
Modified: jena/Scratch/AFS/Dev/trunk/src-lib/main/java/hash/FnvHashFunction.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-lib/main/java/hash/FnvHashFunction.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-lib/main/java/hash/FnvHashFunction.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-lib/main/java/hash/FnvHashFunction.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package hash;
import com.hp.hpl.jena.tdb.store.Hash ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
/** From Project Voldemort / Apache License / Thanks!
* who in turn got it from
Modified: jena/Scratch/AFS/Dev/trunk/src-lib/main/java/libmisc/CodecUTF8.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-lib/main/java/libmisc/CodecUTF8.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-lib/main/java/libmisc/CodecUTF8.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-lib/main/java/libmisc/CodecUTF8.java Tue Nov 27 18:17:38 2012
@@ -18,12 +18,12 @@
package libmisc;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.BlockUTF8 ;
+import org.apache.jena.atlas.io.InStreamUTF8 ;
+import org.apache.jena.atlas.io.OutStreamUTF8 ;
import org.junit.Assert ;
import org.junit.Test ;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.io.InStreamUTF8 ;
-import org.openjena.atlas.io.BlockUTF8;
-import org.openjena.atlas.io.OutStreamUTF8 ;
/** Encode chars as UTF-8 - this code exists to remember the process and requirements.
* Normally, done in a stream and is much more improtant.
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/JoinEngine.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/JoinEngine.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/JoinEngine.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/JoinEngine.java Tue Nov 27 18:17:38 2012
@@ -21,7 +21,7 @@ package algebra2;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.atlas.lib.Tuple ;
+import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.tdb.store.NodeId ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/Table.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/Table.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/Table.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/algebra2/Table.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package algebra2;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Tuple;
+import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/jenaplus/TestMRSW.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/jenaplus/TestMRSW.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/jenaplus/TestMRSW.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/jenaplus/TestMRSW.java Tue Nov 27 18:17:38 2012
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import org.openjena.atlas.logging.Log;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.shared.LockMRSW;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMap.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMap.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMap.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMap.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package projects.atlas;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
/** Simpler Map interface
* -- typed get()
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMapOfMap.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMapOfMap.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMapOfMap.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/atlas/SimpleMapOfMap.java Tue Nov 27 18:17:38 2012
@@ -22,9 +22,9 @@ import java.util.Iterator ;
import java.util.Map ;
import java.util.Map.Entry ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.lib.Pair ;
/** Adapter */
public class SimpleMapOfMap<K,V> implements SimpleMap<K, V>
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixes.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package projects.prefixes;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/DatasetPrefixesMem.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package projects.prefixes;
import java.util.* ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapBase.java Tue Nov 27 18:17:38 2012
@@ -22,9 +22,9 @@ import java.util.HashMap ;
import java.util.Map ;
import java.util.Map.Entry ;
+import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
-import org.openjena.atlas.lib.Pair ;
public class PrefixMapBase implements PrefixMapI {
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapI.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package projects.prefixes ;
import java.util.Map ;
+import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.lib.Pair ;
public interface PrefixMapI
{
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorage.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorage.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorage.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorage.java Tue Nov 27 18:17:38 2012
@@ -20,9 +20,9 @@ package projects.prefixes;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Sync ;
import projects.atlas.SimpleMap ;
public interface PrefixMapStorage extends SimpleMap<String, String>, Sync, Closeable {
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMapStorageView.java Tue Nov 27 18:17:38 2012
@@ -21,9 +21,9 @@ package projects.prefixes;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixMappingOverPrefixMapI.java Tue Nov 27 18:17:38 2012
@@ -21,10 +21,10 @@ package projects.prefixes;
import java.util.HashMap ;
import java.util.Map ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Pair ;
import com.hp.hpl.jena.shared.PrefixMapping ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/PrefixesFactory.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package projects.prefixes;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.shared.PrefixMapping ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java Tue Nov 27 18:17:38 2012
@@ -21,10 +21,10 @@ package projects.prefixes.test;
import java.util.List ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Pair ;
import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Pair ;
import projects.prefixes.DatasetPrefixes ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/LangSSE.java Tue Nov 27 18:17:38 2012
@@ -18,7 +18,7 @@
package projects.riot_sse;
-import org.openjena.atlas.lib.SinkNull ;
+import org.apache.jena.atlas.lib.SinkNull ;
import org.openjena.riot.Lang ;
import org.openjena.riot.lang.LangBase ;
import org.openjena.riot.system.ParserProfile ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java Tue Nov 27 18:17:38 2012
@@ -18,10 +18,10 @@
package projects.riot_sse;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Builder.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Builder.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Builder.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Builder.java Tue Nov 27 18:17:38 2012
@@ -19,8 +19,8 @@
package projects.riot_sse;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.op.OpLabel ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java Tue Nov 27 18:17:38 2012
@@ -18,8 +18,8 @@
package projects.riot_sse;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TW2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TW2.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TW2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TW2.java Tue Nov 27 18:17:38 2012
@@ -22,7 +22,7 @@ import java.util.Collection ;
import java.util.HashSet ;
import java.util.Set ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java Tue Nov 27 18:17:38 2012
@@ -24,8 +24,8 @@ import java.io.OutputStream ;
import java.util.Iterator ;
import java.util.Map ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.lang.SinkQuadsToDataset ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriter2.java Tue Nov 27 18:17:38 2012
@@ -25,9 +25,9 @@ import java.io.OutputStream ;
import java.util.* ;
import java.util.Map.Entry ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.StrUtils ;
import org.openjena.riot.SysRIOT ;
import projects.viewgraph.GLib ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterBlocks.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterBlocks.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterBlocks.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterBlocks.java Tue Nov 27 18:17:38 2012
@@ -21,8 +21,8 @@ package projects.riot_writer;
import java.io.OutputStream ;
import java.util.* ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.iterator.PeekIterator ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.iterator.PeekIterator ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterFlat.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterFlat.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterFlat.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TurtleWriterFlat.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package projects.riot_writer;
import java.util.Iterator ;
-import org.openjena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedWriter ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/validate/ValidatorStage.java Tue Nov 27 18:17:38 2012
@@ -18,8 +18,8 @@
package projects.validate;
+import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.lib.Sink ;
import org.openjena.riot.checker.* ;
import org.openjena.riot.system.Checker ;
import org.openjena.riot.system.IRIResolver ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package projects.viewgraph;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java Tue Nov 27 18:17:38 2012
@@ -20,7 +20,7 @@ package projects.viewgraph;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Iter ;
import projects.prefixes.* ;
import com.hp.hpl.jena.graph.Graph ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/AbstractTestGraphOverDataset.java Tue Nov 27 18:17:38 2012
@@ -20,10 +20,10 @@ package projects.viewgraph.test;
import java.util.Iterator ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Before ;
import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
import projects.viewgraph.DSGViewGraphs ;
import com.hp.hpl.jena.graph.Graph ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetPrefixes.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/test/TestDatasetPrefixes.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package projects.viewgraph.test;
import java.util.Set ;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
import projects.prefixes2.DatasetPrefixStorageMem ;
import com.hp.hpl.jena.shared.PrefixMapping ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TestTokenIO.java Tue Nov 27 18:17:38 2012
@@ -28,15 +28,15 @@ import java.io.Writer ;
import java.nio.ByteBuffer ;
import java.util.List ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Chars ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.logging.Log ;
import org.junit.AfterClass ;
import org.junit.Before ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Chars ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.logging.Log ;
import org.openjena.riot.tokens.Token ;
import org.openjena.riot.tokens.TokenType ;
import org.openjena.riot.tokens.Tokenizer ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStream.java Tue Nov 27 18:17:38 2012
@@ -21,7 +21,7 @@ package riot.io;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
import org.openjena.riot.tokens.Token ;
/** A stream of tokens */
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamWrapper.java Tue Nov 27 18:17:38 2012
@@ -21,7 +21,7 @@ package riot.io;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
import org.openjena.riot.tokens.Token ;
public class TokenInputStreamWrapper implements Iterator<List<Token>>, Iterable<List<Token>>, Closeable
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStream.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package riot.io;
import java.io.Writer ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
import org.openjena.riot.tokens.Token ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java Tue Nov 27 18:17:38 2012
@@ -23,7 +23,7 @@ import java.io.Writer ;
import java.util.ArrayList ;
import java.util.List ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.tokens.Token ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java Tue Nov 27 18:17:38 2012
@@ -20,8 +20,8 @@ package search;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.Transform ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.QueryExecException ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/search/SearchBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/search/SearchBase.java?rev=1414301&r1=1414300&r2=1414301&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/search/SearchBase.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/search/SearchBase.java Tue Nov 27 18:17:38 2012
@@ -25,8 +25,8 @@ import java.io.Reader ;
import java.net.HttpURLConnection ;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.NullIterator ;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.iterator.NullIterator ;
+import org.apache.jena.atlas.lib.StrUtils ;
import com.hp.hpl.jena.sparql.util.Convert ;