jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1414287 [7/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...
Date Tue, 27 Nov 2012 17:53:23 GMT
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java Tue Nov 27 17:51:25 2012
@@ -43,10 +43,10 @@ import org.apache.http.entity.InputStrea
 import org.apache.http.entity.StringEntity ;
 import org.apache.http.impl.client.DefaultHttpClient ;
 import org.apache.http.message.BasicNameValuePair ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.web.HttpException ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.web.HttpException ;
+import org.apache.jena.atlas.web.MediaType ;
 import org.openjena.riot.WebContent ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpResponseLib.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpResponseLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpResponseLib.java Tue Nov 27 17:51:25 2012
@@ -25,9 +25,9 @@ import java.util.Map ;
 
 import org.apache.http.HttpEntity ;
 import org.apache.http.HttpResponse ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.MediaType ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.WebContent ;
 import org.openjena.riot.lang.LangRIOT ;

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Tue Nov 27 17:51:25 2012
@@ -26,12 +26,12 @@ import java.util.HashMap ;
 import java.util.Map ;
 import java.util.Properties ;
 
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.SinkCounting ;
+import org.apache.jena.atlas.lib.SinkNull ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.log4j.PropertyConfigurator ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.lib.SinkCounting ;
-import org.openjena.atlas.lib.SinkNull ;
-import org.openjena.atlas.lib.StrUtils ;
 import org.openjena.riot.* ;
 import org.openjena.riot.lang.LabelToNode ;
 import org.openjena.riot.lang.LangRDFXML ;
@@ -315,12 +315,8 @@ public abstract class CmdLangParse exten
             sink = sink2 ;
         }
         
-        // Pending log message having he filename in them.
-        // output(filename) ;
         try
         {
-            // Default behaviour is "check":
-            
             if ( checking )
             {
                 if ( parser.getLang() == Lang.NTRIPLES ||  parser.getLang() == Lang.NQUADS )
@@ -347,7 +343,7 @@ public abstract class CmdLangParse exten
         }
         finally {
             IO.close(in) ;
-            // Not close - we may write again to the underlying ouytptu stream in another call to parse a file.  
+            // Not close - we may write again to the underlying output stream in another call to parse a file.  
             sink.flush() ;
         }
         long x = modTime.endTimer() ;

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdTokens.java Tue Nov 27 17:51:25 2012
@@ -20,7 +20,7 @@ package riotcmd;
 
 import java.io.InputStream ;
 
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
 import org.openjena.riot.tokens.Token ;
 import org.openjena.riot.tokens.Tokenizer ;
 import org.openjena.riot.tokens.TokenizerFactory ;

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/infer.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/infer.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/infer.java Tue Nov 27 17:51:25 2012
@@ -21,9 +21,9 @@ package riotcmd;
 import java.io.InputStream ;
 import java.util.List ;
 
-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 ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.lang.LangRIOT ;

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/json.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/json.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/json.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/json.java Tue Nov 27 17:51:25 2012
@@ -18,10 +18,10 @@
 
 package riotcmd;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.json.JSON ;
-import org.openjena.atlas.json.JsonParseException ;
-import org.openjena.atlas.json.JsonValue ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.json.JSON ;
+import org.apache.jena.atlas.json.JsonParseException ;
+import org.apache.jena.atlas.json.JsonValue ;
 
 /** Command to read and print JSON */
 public class json

Modified: jena/trunk/jena-arq/src/main/java/riotcmd/utf8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/utf8.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/utf8.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/utf8.java Tue Nov 27 17:51:25 2012
@@ -21,10 +21,10 @@ package riotcmd;
 import java.io.IOException ;
 import java.io.InputStream ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.InputStreamBuffered ;
-import org.openjena.atlas.io.InStreamUTF8 ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.InStreamUTF8 ;
+import org.apache.jena.atlas.io.InputStreamBuffered ;
 
 public class utf8
 {

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.sparql;
 
 import junit.framework.JUnit4TestAdapter ;
 import junit.framework.TestSuite ;
+import org.apache.jena.atlas.TC_Atlas ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.riot.TC_Riot ;
-import org.openjena.atlas.TC_Atlas ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestAlgebraTranslate.java Tue Nov 27 17:51:25 2012
@@ -24,9 +24,9 @@ import com.hp.hpl.jena.query.Syntax ;
 import com.hp.hpl.jena.sparql.algebra.Op ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 /** Test translation of syntax to algebra - no otpimization */ 
 public class TestAlgebraTranslate extends BaseTest 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestPattern2Join.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestPattern2Join.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestPattern2Join.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestPattern2Join.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.sparql.algebra;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryFactory ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestTransformQuads.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.sparql.algebra;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryFactory ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestVarFinder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestVarFinder.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestVarFinder.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TestVarFinder.java Tue Nov 27 17:51:25 2012
@@ -24,8 +24,8 @@ import java.util.List ;
 import java.util.Set ;
 
 import junit.framework.JUnit4TestAdapter ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.main.VarFinder ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestFilterTransform.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.sparql.algebra.o
 
 import junit.framework.Assert ;
 import junit.framework.JUnit4TestAdapter ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.sparql.algebra.Op ;
 import com.hp.hpl.jena.sparql.algebra.Transform ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestOptimizer.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.sparql.algebra.optimize;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.query.Query ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformMergeBGPs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformMergeBGPs.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformMergeBGPs.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestTransformMergeBGPs.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.algebra.optimize;
 
+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.Transformer ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestVarRename.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestVarRename.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestVarRename.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/optimize/TestVarRename.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.util.HashSet ;
 import java.util.Set ;
 
 import junit.framework.JUnit4TestAdapter ;
+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.core.Var ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/AbstractTestUnionTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/AbstractTestUnionTransform.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/AbstractTestUnionTransform.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/AbstractTestUnionTransform.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.sparql.algebra.u
 
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.sparql.algebra.Algebra ;
 import com.hp.hpl.jena.sparql.algebra.Op ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/TestUnionGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/TestUnionGraph.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/TestUnionGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/uniongraph/TestUnionGraph.java Tue Nov 27 17:51:25 2012
@@ -20,10 +20,10 @@ package com.hp.hpl.jena.sparql.algebra.u
 
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.sparql.algebra.Algebra ;
 import com.hp.hpl.jena.sparql.algebra.Op ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestAPI.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.sparql.api;
 
 import java.util.Iterator;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Triple;
 import com.hp.hpl.jena.query.Query ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionCancel.java Tue Nov 27 17:51:25 2012
@@ -18,10 +18,10 @@
 
 package com.hp.hpl.jena.sparql.api;
 
+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 com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryCancelledException ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/api/TestQueryExecutionTimeout.java Tue Nov 27 17:51:25 2012
@@ -18,14 +18,14 @@
 
 package com.hp.hpl.jena.sparql.api ;
 
-import static org.openjena.atlas.lib.Lib.sleep ;
+import static org.apache.jena.atlas.lib.Lib.sleep ;
 
 import java.util.concurrent.TimeUnit ;
 
+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 com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.query.ARQ ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java Tue Nov 27 17:51:25 2012
@@ -26,8 +26,8 @@ import java.util.Iterator ;
 import java.util.List ;
 import java.util.Set ;
 
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDataset.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.sparql.core;
 
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.rdf.model.Model ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractTestDynamicDataset.java Tue Nov 27 17:51:25 2012
@@ -18,10 +18,10 @@
 
 package com.hp.hpl.jena.sparql.core;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.After ;
 import org.junit.Before ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.query.* ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Tue Nov 27 17:51:25 2012
@@ -24,10 +24,10 @@ import java.util.ArrayList ;
 import java.util.List ;
 
 import junit.framework.JUnit4TestAdapter ;
+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 org.openjena.riot.system.PrefixMap ;
 import org.openjena.riot.tokens.Tokenizer ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java Tue Nov 27 17:51:25 2012
@@ -27,10 +27,10 @@ import java.util.Iterator ;
 import java.util.List ;
 import java.util.Random ;
 
+import org.apache.jena.atlas.data.DataBagExaminer ;
+import org.apache.jena.atlas.io.IndentedWriter ;
 import org.junit.Before ;
 import org.junit.Test ;
-import org.openjena.atlas.data.DataBagExaminer ;
-import org.openjena.atlas.io.IndentedWriter ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Graph ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprTransform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprTransform.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprTransform.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExprTransform.java Tue Nov 27 17:51:25 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.sparql.expr;
 
 import com.hp.hpl.jena.sparql.sse.SSE ;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestExprTransform extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java Tue Nov 27 17:51:25 2012
@@ -28,10 +28,10 @@ import com.hp.hpl.jena.sparql.function.F
 import com.hp.hpl.jena.sparql.util.ExprUtils ;
 import com.hp.hpl.jena.sparql.util.NodeFactory ;
 
+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 ;
 
 public class TestFunctions2 extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValueOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValueOps.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValueOps.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValueOps.java Tue Nov 27 17:51:25 2012
@@ -18,9 +18,9 @@
 
 package com.hp.hpl.jena.sparql.expr;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.logging.Log ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.graph;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestPrefixMapping2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestPrefixMapping2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestPrefixMapping2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestPrefixMapping2.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.graph;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.shared.PrefixMapping ;
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/GraphsTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/GraphsTests.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/GraphsTests.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/GraphsTests.java Tue Nov 27 17:51:25 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.sparql.graph;
 
 import java.util.Iterator ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java Tue Nov 27 17:51:25 2012
@@ -21,10 +21,10 @@ package com.hp.hpl.jena.sparql.graph;
 import java.util.Arrays ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsDataBag.java Tue Nov 27 17:51:25 2012
@@ -18,12 +18,12 @@
 
 package com.hp.hpl.jena.sparql.graph;
 
+import org.apache.jena.atlas.data.ThresholdPolicy ;
+import org.apache.jena.atlas.data.ThresholdPolicyFactory ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.After ;
 import org.junit.Before ;
 import org.junit.Test ;
-import org.openjena.atlas.data.ThresholdPolicy ;
-import org.openjena.atlas.data.ThresholdPolicyFactory ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Tue Nov 27 17:51:25 2012
@@ -23,7 +23,7 @@ import java.io.PrintStream ;
 import java.io.PrintWriter ;
 import java.util.* ;
 
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
 import org.openjena.riot.checker.CheckerLiterals ;
 
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.sparql.junit;
 import junit.framework.Test ;
 import junit.framework.TestCase ;
 import junit.framework.TestSuite ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.query.Syntax ;
 import com.hp.hpl.jena.rdf.model.Resource ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestSerialization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestSerialization.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestSerialization.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestSerialization.java Tue Nov 27 17:51:25 2012
@@ -19,7 +19,7 @@
 package com.hp.hpl.jena.sparql.junit;
 
 
-import org.openjena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
 
 import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.Syntax ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java Tue Nov 27 17:51:25 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.sparql.junit;
 import java.util.ArrayList ;
 import java.util.List ;
 
-import org.openjena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Iter ;
 import org.openjena.riot.checker.CheckerLiterals ;
 
 import com.hp.hpl.jena.query.Dataset ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestVarScope.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestVarScope.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestVarScope.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/lang/TestVarScope.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.lang;
 
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.query.Query ;
 import com.hp.hpl.jena.query.QueryException ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
-import org.openjena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java Tue Nov 27 17:51:25 2012
@@ -19,8 +19,8 @@
 package com.hp.hpl.jena.sparql.modify;
 
 
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 
 import com.hp.hpl.jena.graph.Factory ;
 import com.hp.hpl.jena.graph.Graph ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java Tue Nov 27 17:51:25 2012
@@ -26,10 +26,10 @@ import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Assert ;
 import org.junit.Ignore ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java Tue Nov 27 17:51:25 2012
@@ -21,12 +21,12 @@ package com.hp.hpl.jena.sparql.path;
 import java.util.ArrayList ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java Tue Nov 27 17:51:25 2012
@@ -23,9 +23,9 @@ import java.io.ByteArrayOutputStream ;
 import java.util.ArrayList ;
 import java.util.List ;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.query.ResultSet ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat1.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat1.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat1.java Tue Nov 27 17:51:25 2012
@@ -23,12 +23,12 @@ import java.io.ByteArrayOutputStream ;
 import java.util.Arrays ;
 import java.util.Collection ;
 
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Assert;
 import org.junit.Test ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Parameterized ;
 import org.junit.runners.Parameterized.Parameters ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.query.ResultSetFactory ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSetFormat2.java Tue Nov 27 17:51:25 2012
@@ -22,8 +22,8 @@ import java.io.ByteArrayInputStream ;
 
 import junit.framework.Assert;
 
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.junit.Test ;
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.query.ResultSetFactory ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestReorder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestReorder.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestReorder.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestReorder.java Tue Nov 27 17:51:25 2012
@@ -21,8 +21,8 @@ package com.hp.hpl.jena.sparql.solver;
 import static com.hp.hpl.jena.sparql.solver.TestSolverLib.bgp ;
 import static com.hp.hpl.jena.sparql.solver.TestSolverLib.matcher ;
 import static com.hp.hpl.jena.sparql.solver.TestSolverLib.triple ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.BasicPattern ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestSolverLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestSolverLib.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestSolverLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/solver/TestSolverLib.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
 
 package com.hp.hpl.jena.sparql.solver;
 
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.BasicPattern ;

Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/TC_Atlas.java (from r1411592, jena/trunk/jena-arq/src/test/java/org/openjena/atlas/TC_Atlas.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/TC_Atlas.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/TC_Atlas.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/atlas/TC_Atlas.java&r1=1411592&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/atlas/TC_Atlas.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/TC_Atlas.java Tue Nov 27 17:51:25 2012
@@ -16,17 +16,17 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas;
+package org.apache.jena.atlas;
 
+import org.apache.jena.atlas.data.TS_Data ;
+import org.apache.jena.atlas.event.TS_Event ;
+import org.apache.jena.atlas.io.TS_IO ;
+import org.apache.jena.atlas.iterator.TS_Iterator ;
+import org.apache.jena.atlas.json.TS_JSON ;
+import org.apache.jena.atlas.lib.TS_Lib ;
+import org.apache.jena.atlas.web.TS_Web ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
-import org.openjena.atlas.data.TS_Data ;
-import org.openjena.atlas.event.TS_Event ;
-import org.openjena.atlas.io.TS_IO ;
-import org.openjena.atlas.iterator.TS_Iterator ;
-import org.openjena.atlas.json.TS_JSON ;
-import org.openjena.atlas.lib.TS_Lib ;
-import org.openjena.atlas.web.TS_Web ;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/DataBagExaminer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/DataBagExaminer.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/DataBagExaminer.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/DataBagExaminer.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.io.File ;
 
+import org.apache.jena.atlas.data.AbstractDataBag ;
+
 /**
  * This class exists so that we can examine the internals of a DataBag during testing (which we can do here since it is in the same package).
  */

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TS_Data.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TS_Data.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TS_Data.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TS_Data.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import junit.framework.JUnit4TestAdapter ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.io.File ;
 import java.util.ArrayList ;
@@ -26,8 +26,10 @@ import java.util.Random ;
 
 import junit.framework.TestCase ;
 
+import org.apache.jena.atlas.data.DistinctDataBag ;
+import org.apache.jena.atlas.data.ThresholdPolicyCount ;
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 import org.openjena.riot.SerializationFactoryFinder ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.io.File ;
 import java.util.ArrayList ;
@@ -27,8 +27,10 @@ import java.util.Random ;
 
 import junit.framework.TestCase ;
 
+import org.apache.jena.atlas.data.DistinctDataNet ;
+import org.apache.jena.atlas.data.ThresholdPolicyCount ;
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 import org.openjena.riot.SerializationFactoryFinder ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.io.File ;
 import java.util.ArrayList ;
@@ -27,8 +27,10 @@ import java.util.Random ;
 
 import junit.framework.TestCase ;
 
+import org.apache.jena.atlas.data.SortedDataBag ;
+import org.apache.jena.atlas.data.ThresholdPolicyCount ;
+import org.apache.jena.atlas.iterator.Iter ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.Iter ;
 import org.openjena.riot.SerializationFactoryFinder ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
+import org.apache.jena.atlas.data.ThresholdPolicyCount ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.data.ThresholdPolicyCount;
-import org.openjena.atlas.junit.BaseTest ;
 
 
 public class TestThresholdPolicyCount extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TS_Event.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TS_Event.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TS_Event.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TS_Event.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.event;
+package org.apache.jena.atlas.event;
 
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TestEvent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TestEvent.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TestEvent.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/event/TestEvent.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.event;
+package org.apache.jena.atlas.event;
 
+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.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 
 public class TestEvent extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
+import org.apache.jena.atlas.io.PeekInputStream ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public abstract class AbstractTestPeekInputStream extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public abstract class AbstractTestPeekReader extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TS_IO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TS_IO.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TS_IO.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TS_IO.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.ByteArrayOutputStream ;
 import java.io.IOException ;
@@ -29,10 +29,10 @@ import java.nio.charset.Charset ;
 import java.nio.charset.CharsetDecoder ;
 import java.nio.charset.CharsetEncoder ;
 
+import org.apache.jena.atlas.io.BlockUTF8 ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Chars ;
 import org.junit.Test ;
-import org.openjena.atlas.io.BlockUTF8 ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Chars ;
 
 public class TestBlockUTF8 extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestBufferingWriter.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,16 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 
 import java.nio.ByteBuffer ;
 
+import org.apache.jena.atlas.io.BufferingWriter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Bytes ;
+import org.apache.jena.atlas.lib.Sink ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.lib.Sink ;
 
 public class TestBufferingWriter extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIndentedWriter extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestInputStreamBuffered.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,16 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.ByteArrayInputStream ;
 import java.io.IOException ;
 import java.io.InputStream ;
 
+import org.apache.jena.atlas.io.InputStreamBuffered ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Bytes ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Bytes ;
 
 public class TestInputStreamBuffered extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekInputStreamSource.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekInputStreamSource.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekInputStreamSource.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekInputStreamSource.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.ByteArrayInputStream ;
 import java.io.UnsupportedEncodingException ;
 
+import org.apache.jena.atlas.io.PeekInputStream ;
+
 public class TestPeekInputStreamSource extends AbstractTestPeekInputStream
 {
     @Override

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderCharSequence.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderCharSequence.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderCharSequence.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderCharSequence.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
+
+import org.apache.jena.atlas.io.PeekReader ;
 
 
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderSource.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderSource.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderSource.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPeekReaderSource.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.StringReader ;
 
+import org.apache.jena.atlas.io.PeekReader ;
+
 public class TestPeekReaderSource extends AbstractTestPeekReader
 {
     @Override

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestPrintUtils.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,16 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.ByteArrayOutputStream ;
 import java.io.IOException ;
 import java.io.OutputStreamWriter ;
 import java.io.Writer ;
 
+import org.apache.jena.atlas.io.OutputUtils ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestPrintUtils extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestStreamUTF8.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.ByteArrayInputStream ;
 import java.io.ByteArrayOutputStream ;
@@ -27,9 +27,11 @@ import java.nio.charset.Charset ;
 import java.nio.charset.CharsetDecoder ;
 import java.nio.charset.CharsetEncoder ;
 
+import org.apache.jena.atlas.io.InStreamUTF8 ;
+import org.apache.jena.atlas.io.OutStreamUTF8 ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Chars ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.Chars ;
 
 public class TestStreamUTF8 extends BaseTest
     {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TS_Iterator.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import static org.junit.Assert.assertEquals ;
 import static org.junit.Assert.assertFalse ;
@@ -27,6 +27,9 @@ import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Filter ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Transform ;
 import org.junit.Test ;
 
 public class TestIter

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Iterator ;
 import java.util.NoSuchElementException ;
 
+import org.apache.jena.atlas.iterator.IteratorArray ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorArray extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,16 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.ArrayList ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorArray ;
+import org.apache.jena.atlas.iterator.PeekIterator ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorPeek extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.ArrayList ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.PushbackIterator ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorPushback extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorSlotted.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.IteratorSlotted ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.iterator.IteratorSlotted ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorSlotted extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Arrays ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.IteratorWithBuffer ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorWithBuffer extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Arrays ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.IteratorWithHistory ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestIteratorWithHistory extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/LibJsonTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/LibJsonTest.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/LibJsonTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/LibJsonTest.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
 
 import static org.junit.Assert.assertEquals ;
+import org.apache.jena.atlas.json.JSON ;
+import org.apache.jena.atlas.json.JsonValue ;
 
 public class LibJsonTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TS_JSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TS_JSON.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TS_JSON.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TS_JSON.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJson.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
-import static org.openjena.atlas.json.LibJsonTest.read ;
+import static org.apache.jena.atlas.json.LibJsonTest.read ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestJson extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonExt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonExt.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonExt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonExt.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
-import static org.openjena.atlas.json.LibJsonTest.read ;
-import static org.openjena.atlas.json.LibJsonTest.writeRead ;
+import static org.apache.jena.atlas.json.LibJsonTest.read ;
+import static org.apache.jena.atlas.json.LibJsonTest.writeRead ;
+import org.apache.jena.atlas.json.JsonNumber ;
+import org.apache.jena.atlas.json.JsonObject ;
+import org.apache.jena.atlas.json.JsonString ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 /** Test that are of extension of JSON */ 
 public class TestJsonExt extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonWriter.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonWriter.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/json/TestJsonWriter.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
-import static org.openjena.atlas.json.LibJsonTest.writeRead ;
+import static org.apache.jena.atlas.json.LibJsonTest.writeRead ;
+import org.apache.jena.atlas.json.JsonString ;
+import org.apache.jena.atlas.json.JsonValue ;
+import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestJsonWriter extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.junit;
+package org.apache.jena.atlas.junit;
 
 import java.util.ArrayDeque ;
 import java.util.Deque ;
 
+import org.apache.jena.atlas.logging.Log ;
 import org.junit.Assert ;
-import org.openjena.atlas.logging.Log ;
 import org.openjena.riot.ErrorHandler ;
 import org.openjena.riot.ErrorHandlerFactory ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/TextListener2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/TextListener2.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/TextListener2.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/TextListener2.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.junit;
+package org.apache.jena.atlas.junit;
 
 import java.io.PrintStream ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TS_Lib.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
 
 import org.junit.runner.RunWith ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
-import static org.openjena.atlas.lib.Lib.sleep; 
+import static org.apache.jena.atlas.lib.Lib.sleep ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.AlarmClock ;
+import org.apache.jena.atlas.lib.Callback ;
+import org.apache.jena.atlas.lib.Pingback ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestAlarmClock extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlg.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlg.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestAlg.java Tue Nov 27 17:51:25 2012
@@ -16,14 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
 import java.nio.ByteBuffer ;
 import java.nio.ByteOrder ;
 import java.nio.IntBuffer ;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Alg ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestAlg extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.BitsInt ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 
 public class TestBitsInt extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.BitsLong ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 
 public class TestBitsLong extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBytes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBytes.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBytes.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestBytes.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
 import java.nio.ByteBuffer ;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Bytes ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
 
 public class TestBytes extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java Tue Nov 27 17:51:25 2012
@@ -16,21 +16,23 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
 import java.util.Arrays ;
 import java.util.Collection ;
 import java.util.List ;
 
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.cache.CacheStatsAtomic ;
+import org.apache.jena.atlas.lib.cache.CacheStatsSimple ;
 import org.junit.Before ;
 import org.junit.Test ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Parameterized ;
 import org.junit.runners.Parameterized.Parameters ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.cache.CacheStatsAtomic ;
-import org.openjena.atlas.lib.cache.CacheStatsSimple ;
 
 @RunWith(Parameterized.class)
 public class TestCache extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.cache.Cache1 ;
+import org.apache.jena.atlas.lib.cache.Getter ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.cache.Cache1 ;
-import org.openjena.atlas.lib.cache.Getter ;
 
 // Non-parameterized tests
 public class TestCache2 extends BaseTest

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java?rev=1414287&r1=1411592&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.lib;
+package org.apache.jena.atlas.lib;
 
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.CacheStats ;
+import org.apache.jena.atlas.lib.cache.CacheStatsAtomic ;
 import org.junit.Before ;
 import org.junit.Test ;
-import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.atlas.lib.cache.CacheStatsAtomic ;
 
 public class TestCacheStats extends BaseTest
 {



Mime
View raw message