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 18:53:23 UTC
svn commit: r1414287 [6/8] - in /jena/trunk/jena-arq:
src-examples/arq/examples/ src-examples/arq/examples/bgpmatching/
src-examples/arq/examples/propertyfunction/ src-examples/arq/examples/riot/
src-examples/arq/examples/update/ src/main/java/arq/ src...
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
import java.util.concurrent.atomic.AtomicLong ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheStats ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheStats ;
/** Capture statisics for a cache - this class is thread safe (you can read the stats while the cache is active) */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheStats ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheStats ;
/** Collect statistics for a cache - this class is not thread safe (@see{CacheStatsAtomic}) */
public class CacheStatsSimple<Key,Value> extends CacheWrapper<Key,Value> implements CacheStats<Key, Value>
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheSync.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheSync.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheSync.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheSync.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
import java.util.Iterator ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
public class CacheSync<Key, T> implements Cache<Key, T>
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheUnbounded.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheUnbounded.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheUnbounded.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheUnbounded.java Tue Nov 27 17:51:25 2012
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
import java.util.HashMap ;
import java.util.Iterator ;
import java.util.Map ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
public class CacheUnbounded<K,V> implements Cache<K,V>
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWithGetter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWithGetter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWithGetter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWithGetter.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
-import org.openjena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.Cache ;
/** Cache that takes a {@link Getter} to automatically fill cache misses. */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheWrapper.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
import java.util.Iterator ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/Getter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/Getter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/Getter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/Getter.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.lib.cache;
+package org.apache.jena.atlas.lib.cache;
/** A get interface */
public interface Getter<K, V>
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/Log.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/Log.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/Log.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.logging;
+package org.apache.jena.atlas.logging;
import java.io.ByteArrayInputStream ;
import java.io.File ;
@@ -25,10 +25,10 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.util.Properties ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.log4j.PropertyConfigurator ;
import org.apache.log4j.xml.DOMConfigurator ;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.lib.StrUtils ;
import org.openjena.riot.SysRIOT ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/ProgressLogger.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/ProgressLogger.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/logging/ProgressLogger.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.logging;
+package org.apache.jena.atlas.logging;
import static com.hp.hpl.jena.sparql.util.Utils.nowAsString ;
import org.slf4j.Logger ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStdout.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStdout.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStdout.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStdout.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.logging.java;
+package org.apache.jena.atlas.logging.java;
import java.util.logging.Formatter ;
import java.util.logging.Handler ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.logging.java;
+package org.apache.jena.atlas.logging.java;
import java.text.MessageFormat ;
import java.util.Date ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/ExecGenerator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/ExecGenerator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/ExecGenerator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/ExecGenerator.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.test;
+package org.apache.jena.atlas.test;
public interface ExecGenerator
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.atlas.test;
+package org.apache.jena.atlas.test;
-import static org.openjena.atlas.lib.RandomLib.random ;
+import static org.apache.jena.atlas.lib.RandomLib.random ;
import java.util.Arrays ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/RepeatExecution.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/RepeatExecution.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/RepeatExecution.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/test/RepeatExecution.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.test;
+package org.apache.jena.atlas.test;
public class RepeatExecution
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/AcceptList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/AcceptList.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/AcceptList.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/AcceptList.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
import java.util.* ;
-import org.openjena.atlas.logging.Log ;
-import org.openjena.atlas.web.MediaRange ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.web.MediaRange ;
+import org.apache.jena.atlas.web.MediaType ;
public class AcceptList
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
/** A restricted MediaType */
public class ContentType
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
public class HttpException extends RuntimeException
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaRange.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaRange.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaRange.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaRange.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
/** A media range is a media type used in content negotiation.
* It has a q parameter (others are possible but we don't need them ... yet */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/MediaType.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
-import static org.openjena.atlas.lib.Lib.equal ;
-import static org.openjena.atlas.lib.Lib.hashCodeObject ;
+import static org.apache.jena.atlas.lib.Lib.equal ;
+import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
import java.util.Iterator ;
import java.util.LinkedHashMap ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ParsedMediaType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ParsedMediaType.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ParsedMediaType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ParsedMediaType.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
import java.util.LinkedHashMap ;
import java.util.Map ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
import java.io.FilterInputStream ;
import java.io.IOException ;
import java.io.InputStream;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
public class TypedInputStream extends FilterInputStream
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedOutputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedOutputStream.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedOutputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedOutputStream.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
import java.io.FilterOutputStream ;
import java.io.IOException ;
import java.io.OutputStream ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
public class TypedOutputStream extends FilterOutputStream
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/WebLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/WebLib.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/WebLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/WebLib.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.atlas.web;
+package org.apache.jena.atlas.web;
public class WebLib
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java Tue Nov 27 17:51:25 2012
@@ -29,9 +29,9 @@ import org.apache.http.StatusLine ;
import org.apache.http.client.HttpClient ;
import org.apache.http.client.methods.HttpGet ;
import org.apache.http.impl.client.DefaultHttpClient ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.web.HttpException ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.web.HttpException ;
+import org.apache.jena.atlas.web.MediaType ;
import org.openjena.riot.web.HttpNames ;
public class HttpOp2
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Dataset.java Tue Nov 27 17:51:25 2012
@@ -25,8 +25,8 @@ import java.io.InputStream ;
import java.io.Reader ;
import java.io.StringReader ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.RiotNotFoundException ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
package org.apache.jena.riot;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.stream.StreamManager ;
-import org.openjena.atlas.web.ContentType ;
import org.openjena.riot.RiotNotFoundException ;
import org.openjena.riot.SysRIOT ;
import org.openjena.riot.WebContent ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Model.java Tue Nov 27 17:51:25 2012
@@ -25,8 +25,8 @@ import java.io.InputStream ;
import java.io.Reader ;
import java.io.StringReader ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRDFXML ;
import org.openjena.riot.lang.LangRIOT ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java Tue Nov 27 17:51:25 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList ;
import java.util.Collections ;
import java.util.List ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.web.ContentType ;
/** A "language" (syntax).
* A language has a name, some alternative names,
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java Tue Nov 27 17:51:25 2012
@@ -25,12 +25,12 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.util.Context ;
+import org.apache.jena.atlas.lib.DS ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang2 ;
import org.apache.jena.riot.ReaderRIOT ;
import org.apache.jena.riot.ReaderRIOTFactory ;
-import org.openjena.atlas.lib.DS ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.lang.LangRIOT ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Tue Nov 27 17:51:25 2012
@@ -35,8 +35,8 @@ import static org.openjena.riot.WebConte
import java.util.Locale ;
import java.util.Map ;
-import org.openjena.atlas.lib.DS ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.lib.DS ;
+import org.apache.jena.atlas.web.ContentType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOT.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOT.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package org.apache.jena.riot;
import java.io.InputStream ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import com.hp.hpl.jena.sparql.util.Context ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ReaderRIOTBase.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package org.apache.jena.riot;
import java.io.InputStream ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import com.hp.hpl.jena.sparql.util.Context ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStream2.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package org.apache.jena.riot;
import java.io.InputStream;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.web.ContentType ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.web.ContentType ;
public class TypedInputStream2
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/TypedInputStreamHttp.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.apache.jena.riot;
import java.io.InputStream ;
import org.apache.http.conn.ClientConnectionManager ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.MediaType ;
/** Type streams for HTTP connections - includes Apache HTTP client specific cleanup */
public class TypedInputStreamHttp extends TypedInputStream2
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java Tue Nov 27 17:51:25 2012
@@ -22,9 +22,9 @@ import java.io.InputStream ;
import java.io.Reader ;
import java.io.StringReader ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.stream.StreamManager ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRDFXML ;
import org.openjena.riot.lang.LangRIOT ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Tue Nov 27 17:51:25 2012
@@ -22,9 +22,9 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.util.Iterator ;
+import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.riot.TypedInputStream2 ;
import org.apache.jena.riot.stream.* ;
-import org.openjena.atlas.lib.IRILib ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package org.apache.jena.riot.stream;
import java.io.InputStream ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.TypedInputStream2 ;
-import org.openjena.atlas.web.ContentType ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java Tue Nov 27 17:51:25 2012
@@ -23,11 +23,11 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.security.AccessControlException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.TypedInputStream2 ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.IRILib ;
-import org.openjena.atlas.web.ContentType ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorZip.java Tue Nov 27 17:51:25 2012
@@ -23,9 +23,9 @@ import java.io.InputStream ;
import java.util.zip.ZipEntry ;
import java.util.zip.ZipFile ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.TypedInputStream2 ;
-import org.openjena.atlas.web.ContentType ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/LangTag.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.openjena.riot;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
-import org.openjena.atlas.lib.Chars ;
+import org.apache.jena.atlas.lib.Chars ;
import org.openjena.riot.system.RiotChars ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package org.openjena.riot;
import java.io.InputStream ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.IRILib ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkQuadsToDataset ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotParsePuller.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotParsePuller.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotParsePuller.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotParsePuller.java Tue Nov 27 17:51:25 2012
@@ -27,10 +27,10 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.CancellationException ;
import java.util.concurrent.TimeUnit ;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.lib.SinkToQueue ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.SinkToQueue ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.system.ParserProfile ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotQuadParsePuller.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotQuadParsePuller.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotQuadParsePuller.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotQuadParsePuller.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package org.openjena.riot;
import java.io.InputStream ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.lang.LangRIOT ;
import com.hp.hpl.jena.sparql.core.Quad ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Tue Nov 27 17:51:25 2012
@@ -26,12 +26,12 @@ import static org.openjena.riot.Lang.RDF
import java.io.InputStream ;
import java.util.Iterator;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.atlas.iterator.IteratorResourceClosing;
-import org.openjena.atlas.json.io.parser.TokenizerJSON ;
-import org.openjena.atlas.lib.IRILib ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
+import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.lang.* ;
import org.openjena.riot.system.IRIResolver ;
import org.openjena.riot.system.RiotLib ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotTripleParsePuller.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotTripleParsePuller.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotTripleParsePuller.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotTripleParsePuller.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package org.openjena.riot;
import java.io.InputStream ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.lang.LangRIOT ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/SerializationFactoryFinder.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.io.InputStream ;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.openjena.atlas.data.SerializationFactory ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.data.SerializationFactory ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.lang.LabelToNode ;
import org.openjena.riot.lang.LangNQuads ;
import org.openjena.riot.lang.LangNTriples ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot;
-import org.openjena.atlas.event.EventType ;
+import org.apache.jena.atlas.event.EventType ;
import org.openjena.riot.system.JenaReaderNTriples2 ;
import org.openjena.riot.system.JenaReaderRdfJson ;
import org.openjena.riot.system.JenaReaderTurtle2 ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.openjena.riot;
import java.util.HashMap ;
import java.util.Map ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.MediaType ;
public class WebContent
{
@@ -29,6 +29,9 @@ public class WebContent
// contentType => ctStr
+ // Rename as:
+ // TEXT_TURTLE etc etc.
+
public static final String contentTypeN3 = "text/rdf+n3" ;
public static final String contentTypeN3Alt1 = "application/n3" ;
public static final String contentTypeN3Alt2 = "text/n3" ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java Tue Nov 27 17:51:25 2012
@@ -40,9 +40,9 @@ import java.io.InputStream ;
import java.util.HashMap ;
import java.util.Map ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.TypedInputStream ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java Tue Nov 27 17:51:25 2012
@@ -20,13 +20,14 @@ package org.openjena.riot.checker;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheFactory ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Node ;
+
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangBase.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
package org.openjena.riot.lang;
-import org.openjena.atlas.event.Event ;
-import org.openjena.atlas.event.EventManager ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.event.Event ;
+import org.apache.jena.atlas.event.EventManager ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.SysRIOT ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Tokenizer ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangEngine.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package org.openjena.riot.lang;
import static org.openjena.riot.tokens.TokenType.EOF ;
import static org.openjena.riot.tokens.TokenType.NODE ;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.iterator.PeekIterator ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.iterator.PeekIterator ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.RiotParseException ;
import org.openjena.riot.system.ParserProfile ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNQuads.java Tue Nov 27 17:51:25 2012
@@ -17,7 +17,7 @@
*/
package org.openjena.riot.lang;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Token ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTriples.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.lang;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Token ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package org.openjena.riot.lang;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Token ;
import org.openjena.riot.tokens.TokenType ;
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.graph.Node ;
*
* <ul>
* <li>The {@link #parse} method processes the whole stream of tokens,
- * sending each to a {@link org.openjena.atlas.lib.Sink} object.</li>
+ * sending each to a {@link org.apache.jena.atlas.lib.Sink} object.</li>
* <li>The <tt>Iterator<X></tt> interface yields triples one-by-one.</li>
* </ul>
*
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFJSON.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import com.hp.hpl.jena.datatypes.TypeMap
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple ;
-import org.openjena.atlas.json.io.parser.TokenizerJSON;
-import org.openjena.atlas.lib.*;
+import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
+import org.apache.jena.atlas.lib.* ;
import org.openjena.riot.Lang;
import org.openjena.riot.tokens.Token;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.io.Reader ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.Lang ;
import org.openjena.riot.checker.CheckerLiterals ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTriG.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package org.openjena.riot.lang;
import static org.openjena.riot.tokens.TokenType.DOT ;
import static org.openjena.riot.tokens.TokenType.RBRACE ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Token ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java Tue Nov 27 17:51:25 2012
@@ -19,7 +19,7 @@
package org.openjena.riot.lang;
import static org.openjena.riot.tokens.TokenType.DOT ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Tokenizer ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java Tue Nov 27 17:51:25 2012
@@ -19,13 +19,14 @@
package org.openjena.riot.lang;
import static org.openjena.riot.tokens.TokenType.* ;
-import org.openjena.atlas.lib.Sink ;
import org.openjena.riot.system.ParserProfile ;
import org.openjena.riot.tokens.Token ;
import org.openjena.riot.tokens.TokenType ;
import org.openjena.riot.tokens.Tokenizer ;
import com.hp.hpl.jena.graph.Node ;
+
+import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.vocabulary.OWL ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/PrintingSink.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/PrintingSink.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/PrintingSink.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/PrintingSink.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.lang;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.out.NodeFmtLib ;
import org.slf4j.Logger ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.lang;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java Tue Nov 27 17:51:25 2012
@@ -18,11 +18,11 @@
package org.openjena.riot.lang;
-import org.openjena.atlas.event.Event ;
-import org.openjena.atlas.event.EventListener ;
-import org.openjena.atlas.event.EventManager ;
-import org.openjena.atlas.event.EventType ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.event.Event ;
+import org.apache.jena.atlas.event.EventListener ;
+import org.apache.jena.atlas.event.EventManager ;
+import org.apache.jena.atlas.event.EventType ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.GraphEvents ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/EscapeStr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/EscapeStr.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/EscapeStr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/EscapeStr.java Tue Nov 27 17:51:25 2012
@@ -24,8 +24,8 @@ import java.io.Writer ;
import com.hp.hpl.jena.sparql.lang.ParserBase ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.OutputUtils ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.OutputUtils ;
public class EscapeStr
{
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java Tue Nov 27 17:51:25 2012
@@ -21,8 +21,8 @@ package org.openjena.riot.out;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NTriplesWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NTriplesWriter.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NTriplesWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NTriplesWriter.java Tue Nov 27 17:51:25 2012
@@ -21,8 +21,8 @@ package org.openjena.riot.out;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFmtLib.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFmtLib.java Tue Nov 27 17:51:25 2012
@@ -23,14 +23,15 @@ import java.io.Writer ;
import java.net.MalformedURLException ;
import java.util.Map ;
-import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.lib.Chars ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.RiotChars ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+
+import org.apache.jena.atlas.lib.Bytes ;
+import org.apache.jena.atlas.lib.Chars ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterBase.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.openjena.riot.out;
import java.io.IOException ;
import java.io.Writer ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterNT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterNT.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterNT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterNT.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.openjena.riot.out;
import java.io.IOException ;
import java.io.Writer ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
public class NodeFormatterNT extends NodeFormatterBase
{
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterTTL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterTTL.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterTTL.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NodeFormatterTTL.java Tue Nov 27 17:51:25 2012
@@ -22,12 +22,13 @@ import java.io.IOException ;
import java.io.Writer ;
import java.net.MalformedURLException ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Pair ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.system.RiotChars ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/OutputLangUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/OutputLangUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/OutputLangUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/OutputLangUtils.java Tue Nov 27 17:51:25 2012
@@ -22,13 +22,14 @@ import java.io.IOException ;
import java.io.Writer ;
import java.net.MalformedURLException ;
-import org.openjena.atlas.io.OutputUtils ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+
+import org.apache.jena.atlas.io.OutputUtils ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/RDFJSONWriter.java Tue Nov 27 17:51:25 2012
@@ -25,8 +25,8 @@ import java.util.HashSet ;
import java.util.Map ;
import java.util.Set ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkEntityOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkEntityOutput.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkEntityOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkEntityOutput.java Tue Nov 27 17:51:25 2012
@@ -23,10 +23,10 @@ import java.io.Writer ;
import java.util.Map ;
import java.util.Set ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.json.io.JSWriter ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.json.io.JSWriter ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadBracedOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadBracedOutput.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadBracedOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadBracedOutput.java Tue Nov 27 17:51:25 2012
@@ -20,10 +20,10 @@ package org.openjena.riot.out;
import java.io.OutputStream;
-import org.openjena.atlas.io.IndentedWriter;
-import org.openjena.atlas.lib.Closeable;
-import org.openjena.atlas.lib.Lib;
-import org.openjena.atlas.lib.Sink;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Lib ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.graph.Triple;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadOutput.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkQuadOutput.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.io.IOException ;
import java.io.OutputStream ;
import java.io.Writer ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkTripleOutput.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkTripleOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/SinkTripleOutput.java Tue Nov 27 17:51:25 2012
@@ -23,8 +23,8 @@ import java.io.OutputStream ;
import java.io.Writer ;
import java.nio.charset.CharsetEncoder ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.system.Prologue ;
import org.openjena.riot.system.SyntaxLabels ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.process.inf;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.process.inf;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.process.inf;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java Tue Nov 27 17:51:25 2012
@@ -23,7 +23,7 @@ import java.util.HashMap ;
import java.util.List ;
import java.util.Map ;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Query ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
package org.openjena.riot.process.normalize;
-import static org.openjena.atlas.lib.Chars.CH_DOT ;
-import static org.openjena.atlas.lib.Chars.CH_MINUS ;
-import static org.openjena.atlas.lib.Chars.CH_PLUS ;
+import static org.apache.jena.atlas.lib.Chars.CH_DOT ;
+import static org.apache.jena.atlas.lib.Chars.CH_MINUS ;
+import static org.apache.jena.atlas.lib.Chars.CH_PLUS ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.graph.Node ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ContentNeg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ContentNeg.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ContentNeg.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ContentNeg.java Tue Nov 27 17:51:25 2012
@@ -29,9 +29,9 @@ import java.util.Map ;
import java.util.zip.GZIPInputStream ;
import java.util.zip.InflaterInputStream ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.StrUtils ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.Log ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/IRIResolver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/IRIResolver.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/IRIResolver.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/IRIResolver.java Tue Nov 27 17:51:25 2012
@@ -18,13 +18,13 @@
package org.openjena.riot.system;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIException ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.ViolationCodes ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheFactory ;
-import org.openjena.atlas.lib.IRILib ;
import org.openjena.riot.RiotException ;
/** Package up IRI reolver functionality. */
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderNTriples2.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.system;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.RiotLoader ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.lang.LangRIOT ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderRdfJson.java Tue Nov 27 17:51:25 2012
@@ -21,9 +21,9 @@ package org.openjena.riot.system;
import java.io.InputStream;
import java.io.Reader;
-import org.openjena.atlas.io.PeekReader;
-import org.openjena.atlas.json.io.parser.TokenizerJSON;
-import org.openjena.atlas.lib.Sink;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
+import org.apache.jena.atlas.lib.Sink ;
import org.openjena.riot.RiotLoader;
import org.openjena.riot.RiotReader;
import org.openjena.riot.lang.LangRIOT;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaReaderTurtle2.java Tue Nov 27 17:51:25 2012
@@ -20,13 +20,14 @@ package org.openjena.riot.system;
import java.util.Map ;
-import org.openjena.atlas.lib.Sink ;
import org.openjena.riot.RiotLoader ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.lang.LangTurtle ;
import org.openjena.riot.tokens.Tokenizer ;
import com.hp.hpl.jena.graph.Triple ;
+
+import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.iri.IRI ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaWriterBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaWriterBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaWriterBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/JenaWriterBase.java Tue Nov 27 17:51:25 2012
@@ -25,8 +25,8 @@ import java.io.Writer ;
import java.util.HashMap ;
import java.util.Map ;
-import org.openjena.atlas.lib.Chars ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.lib.Chars ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/LangTag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/LangTag.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/LangTag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/LangTag.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package org.openjena.riot.system;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
-import org.openjena.atlas.lib.Chars ;
+import org.apache.jena.atlas.lib.Chars ;
/**
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap.java Tue Nov 27 17:51:25 2012
@@ -23,11 +23,11 @@ import java.util.HashMap ;
import java.util.Map ;
import java.util.Map.Entry ;
+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.apache.jena.iri.IRIFactory ;
-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/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/PrefixMap2.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
package org.openjena.riot.system;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.iri.IRI ;
// UNUSED
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.system;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.Lang ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
package org.openjena.riot.system;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Token.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Token.java Tue Nov 27 17:51:25 2012
@@ -18,17 +18,17 @@
package org.openjena.riot.tokens;
-import static org.openjena.atlas.lib.Chars.CH_COMMA ;
-import static org.openjena.atlas.lib.Chars.CH_DOT ;
-import static org.openjena.atlas.lib.Chars.CH_LBRACE ;
-import static org.openjena.atlas.lib.Chars.CH_LBRACKET ;
-import static org.openjena.atlas.lib.Chars.CH_LPAREN ;
-import static org.openjena.atlas.lib.Chars.CH_RBRACE ;
-import static org.openjena.atlas.lib.Chars.CH_RBRACKET ;
-import static org.openjena.atlas.lib.Chars.CH_RPAREN ;
-import static org.openjena.atlas.lib.Chars.CH_SEMICOLON ;
-import static org.openjena.atlas.lib.Lib.equal ;
-import static org.openjena.atlas.lib.Lib.hashCodeObject ;
+import static org.apache.jena.atlas.lib.Chars.CH_COMMA ;
+import static org.apache.jena.atlas.lib.Chars.CH_DOT ;
+import static org.apache.jena.atlas.lib.Chars.CH_LBRACE ;
+import static org.apache.jena.atlas.lib.Chars.CH_LBRACKET ;
+import static org.apache.jena.atlas.lib.Chars.CH_LPAREN ;
+import static org.apache.jena.atlas.lib.Chars.CH_RBRACE ;
+import static org.apache.jena.atlas.lib.Chars.CH_RBRACKET ;
+import static org.apache.jena.atlas.lib.Chars.CH_RPAREN ;
+import static org.apache.jena.atlas.lib.Chars.CH_SEMICOLON ;
+import static org.apache.jena.atlas.lib.Lib.equal ;
+import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
import static org.openjena.riot.tokens.TokenType.BNODE ;
import static org.openjena.riot.tokens.TokenType.DECIMAL ;
import static org.openjena.riot.tokens.TokenType.DOUBLE ;
@@ -42,9 +42,9 @@ import static org.openjena.riot.tokens.T
import java.util.ArrayList ;
import java.util.List ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Pair ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.system.Prologue ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Tokenizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Tokenizer.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Tokenizer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/Tokenizer.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package org.openjena.riot.tokens;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
public interface Tokenizer extends Iterator<Token>, Closeable
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerFactory.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerFactory.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream ;
import java.io.InputStream ;
import java.io.Reader ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.lib.StrUtils ;
public class TokenizerFactory
{
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerText.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerText.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerText.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/tokens/TokenizerText.java Tue Nov 27 17:51:25 2012
@@ -18,31 +18,7 @@
package org.openjena.riot.tokens;
-import static org.openjena.atlas.lib.Chars.* ;
-import static org.openjena.atlas.lib.Chars.CH_COLON ;
-import static org.openjena.atlas.lib.Chars.CH_COMMA ;
-import static org.openjena.atlas.lib.Chars.CH_DOT ;
-import static org.openjena.atlas.lib.Chars.CH_EQUALS ;
-import static org.openjena.atlas.lib.Chars.CH_GT ;
-import static org.openjena.atlas.lib.Chars.CH_HASH ;
-import static org.openjena.atlas.lib.Chars.CH_LBRACE ;
-import static org.openjena.atlas.lib.Chars.CH_LBRACKET ;
-import static org.openjena.atlas.lib.Chars.CH_LPAREN ;
-import static org.openjena.atlas.lib.Chars.CH_LT ;
-import static org.openjena.atlas.lib.Chars.CH_MINUS ;
-import static org.openjena.atlas.lib.Chars.CH_PLUS ;
-import static org.openjena.atlas.lib.Chars.CH_QMARK ;
-import static org.openjena.atlas.lib.Chars.CH_QUOTE1 ;
-import static org.openjena.atlas.lib.Chars.CH_QUOTE2 ;
-import static org.openjena.atlas.lib.Chars.CH_RBRACE ;
-import static org.openjena.atlas.lib.Chars.CH_RBRACKET ;
-import static org.openjena.atlas.lib.Chars.CH_RPAREN ;
-import static org.openjena.atlas.lib.Chars.CH_SEMICOLON ;
-import static org.openjena.atlas.lib.Chars.CH_STAR ;
-import static org.openjena.atlas.lib.Chars.CH_UNDERSCORE ;
-import static org.openjena.atlas.lib.Chars.CR ;
-import static org.openjena.atlas.lib.Chars.EOF ;
-import static org.openjena.atlas.lib.Chars.NL ;
+import static org.apache.jena.atlas.lib.Chars.* ;
import static org.openjena.riot.system.RiotChars.charInArray ;
import static org.openjena.riot.system.RiotChars.isA2Z ;
import static org.openjena.riot.system.RiotChars.isA2ZN ;
@@ -58,9 +34,9 @@ import java.util.NoSuchElementException
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.PeekReader ;
import org.openjena.riot.RiotParseException ;
import org.openjena.riot.system.RiotChars ;