svn commit: r1414287 [4/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...

[an...@apache.org]

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java Tue Nov 27 17:51:25 2012
@@ -20,12 +20,13 @@ package com.hp.hpl.jena.sparql.util;
 
 import java.util.regex.Pattern ;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Node_Literal ;
 import com.hp.hpl.jena.graph.Triple ;
+
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.logging.Log ;
 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/com/hp/hpl/jena/sparql/util/Loader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Loader.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Loader.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Loader.java Tue Nov 27 17:51:25 2012
@@ -18,7 +18,7 @@
 
 package com.hp.hpl.jena.sparql.util;
 
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.sparql.ARQConstants ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;

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

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java Tue Nov 27 17:51:25 2012
@@ -23,11 +23,12 @@ import java.util.HashSet ;
 import java.util.Iterator ;
 import java.util.Set ;
 
-import org.openjena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+
+import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.iri.IRI ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
 import com.hp.hpl.jena.sparql.expr.Expr ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializable.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializable.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializable.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.util;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.Printable ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.Printable ;
 
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.sparql.serializer.SerializationContext ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.sparql.util;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.PrintUtils ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.PrintUtils ;
 
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.sparql.engine.Plan ;

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

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

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/StringUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/StringUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/StringUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/StringUtils.java Tue Nov 27 17:51:25 2012
@@ -26,9 +26,9 @@ import java.util.Date ;
 import java.util.List ;
 import java.util.regex.Pattern ;
 
-import org.openjena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.Iter ;
 
-/** @see org.openjena.atlas.lib.StrUtils */
+/** @see org.apache.jena.atlas.lib.StrUtils */
 public class StringUtils
 {
     static NumberFormat integerFormat = NumberFormat.getNumberInstance() ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java Tue Nov 27 17:51:25 2012
@@ -23,7 +23,7 @@ import java.util.ArrayList ;
 import java.util.Iterator ;
 import java.util.List ;
 
-import org.openjena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedWriter ;
 
 /** Manage version information for subsystems */
 public class Version

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java Tue Nov 27 17:51:25 2012
@@ -28,7 +28,9 @@ import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.expr.Expr ;
-import org.openjena.atlas.logging.Log ;
+
+import org.apache.jena.atlas.logging.Log ;
+
 import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 import com.hp.hpl.jena.vocabulary.RDF ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java Tue Nov 27 17:51:25 2012
@@ -29,7 +29,9 @@ import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.BasicPattern ;
-import org.openjena.atlas.logging.Log ;
+
+import org.apache.jena.atlas.logging.Log ;
+
 import com.hp.hpl.jena.util.iterator.NiceIterator ;
 import com.hp.hpl.jena.vocabulary.RDF ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java Tue Nov 27 17:51:25 2012
@@ -24,7 +24,7 @@ import java.util.Iterator ;
 import java.util.List ;
 import java.util.Set ;
 
-import org.openjena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java Tue Nov 27 17:51:25 2012
@@ -18,8 +18,8 @@
 
 package com.hp.hpl.jena.update;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.PrintUtils ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.PrintUtils ;
 
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.sparql.modify.request.UpdateVisitor ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java Tue Nov 27 17:51:25 2012
@@ -24,7 +24,7 @@ import static com.hp.hpl.jena.query.Synt
 
 import java.io.InputStream ;
 
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
 
 import com.hp.hpl.jena.n3.IRIResolver ;
 import com.hp.hpl.jena.query.Syntax ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java?rev=1414287&r1=1414286&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java Tue Nov 27 17:51:25 2012
@@ -23,9 +23,9 @@ import java.util.Collections ;
 import java.util.Iterator ;
 import java.util.List ;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.PrintUtils ;
-import org.openjena.atlas.io.Printable ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.PrintUtils ;
+import org.apache.jena.atlas.io.Printable ;
 
 import com.hp.hpl.jena.sparql.core.Prologue ;
 import com.hp.hpl.jena.sparql.modify.request.UpdateWriter ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/AtlasException.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/AtlasException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/AtlasException.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/AtlasException.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/AtlasException.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/AtlasException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/AtlasException.java Tue Nov 27 17:51:25 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas;
+package org.apache.jena.atlas;
 
 public class AtlasException extends RuntimeException
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.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.BufferedInputStream ;
 import java.io.BufferedOutputStream ;
@@ -34,8 +34,8 @@ import java.util.Iterator ;
 import java.util.List ;
 import java.util.UUID ;
 
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.FileOps ;
 
 /**
  * Abstract implementation of DataBag.  Used as a parent for all three of the types of data bags.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.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.util.Comparator;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.util.Iterator;
 
-import org.openjena.atlas.lib.Closeable;
-import org.openjena.atlas.lib.Sink;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sink ;
 
 /**
  * A collection of Tuples.  A DataBag may or may not fit into memory.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.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.BufferedInputStream ;
 import java.io.File ;
@@ -27,11 +27,11 @@ import java.io.InputStream ;
 import java.io.OutputStream ;
 import java.util.Iterator ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.IteratorResourceClosing ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
+import org.apache.jena.atlas.lib.Sink ;
 
 /**
  * <p>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.util.Comparator ;
 import java.util.HashSet ;
 import java.util.Iterator ;
 
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.PeekIterator ;
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.PeekIterator ;
+import org.apache.jena.atlas.lib.Closeable ;
 
 /**
  * <p>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.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.io.FileNotFoundException ;
@@ -26,10 +26,10 @@ import java.util.Iterator ;
 import java.util.List ;
 import java.util.NoSuchElementException ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.FileOps ;
 
 
 /**
@@ -106,7 +106,7 @@ public class DistinctDataNet<E> extends 
      * Returns an iterator to all additional items that are distinct but were
      * not reported to be so at the time {@link #netAdd(Object)} was invoked.
      * <p/>
-     * If you do not exhaust the iterator, you should call {@link org.openjena.atlas.iterator.Iter#close(Iterator)}
+     * If you do not exhaust the iterator, you should call {@link org.apache.jena.atlas.iterator.Iter#close(Iterator)}
      * to be sure any open file handles are closed.
      */
     public Iterator<E> netIterator()

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SerializationFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SerializationFactory.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SerializationFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SerializationFactory.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.data;
+package org.apache.jena.atlas.data;
 
 import java.io.InputStream ;
 import java.io.OutputStream ;
 import java.util.Iterator ;
 
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.Sink ;
 
 public interface SerializationFactory<E>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.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.io.FileNotFoundException ;
@@ -31,11 +31,11 @@ import java.util.List ;
 import java.util.NoSuchElementException ;
 import java.util.PriorityQueue ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.IteratorResourceClosing ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sink ;
 
 /**
  * <p>
@@ -176,7 +176,7 @@ public class SortedDataBag<E> extends Ab
 
     /**
      * Returns an iterator over a set of elements of type E.  If you do not exhaust
-     * the iterator, you should call {@link org.openjena.atlas.iterator.Iter#close(Iterator)}
+     * the iterator, you should call {@link org.apache.jena.atlas.iterator.Iter#close(Iterator)}
      * to be sure any open file handles are closed.
      * 
      * @return an Iterator

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicy.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicy.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicy.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;
 
 public interface ThresholdPolicy<E>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyCount.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;
 
 /**
  * A threshold policy based on the number of tuples added.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.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 com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.sparql.util.Context ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyMemory.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;
 
 
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/Event.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/Event.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/Event.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/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;
 
 public class Event
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventListener.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventListener.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventListener.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventListener.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;
 
 /** Interface for receiving events */
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.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 java.util.ArrayList ;
 import java.util.HashMap ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventType.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventType.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 com.hp.hpl.jena.sparql.util.Symbol ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BlockUTF8.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io ;
+package org.apache.jena.atlas.io ;
 
 import java.io.IOException ;
 import java.nio.ByteBuffer ;
 import java.nio.CharBuffer ;
 
-import org.openjena.atlas.lib.NotImplemented ;
+import org.apache.jena.atlas.lib.NotImplemented ;
 
 /**
  * Convert between bytes and chars, UTF-8 only.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/BufferingWriter.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.IOException ;
 import java.io.OutputStream ;
@@ -26,14 +26,15 @@ import java.nio.CharBuffer ;
 import java.nio.channels.WritableByteChannel ;
 
 import java.nio.charset.CharsetEncoder;
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.lib.Chars;
-import org.openjena.atlas.lib.Sink ;
+
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.lib.Bytes ;
+import org.apache.jena.atlas.lib.Chars ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.logging.Log ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
-import org.openjena.atlas.logging.Log ;
 
 
 /** A buffering writer, send output to a channel (WriteableByteChannel)
@@ -118,10 +119,10 @@ public final class BufferingWriter exten
 //        return new BufferingWriter(new SinkOutputStream(out), size, size/2) ;
 //    }
 
-    /** Create a buffering output stream of charcaters to a {@link org.openjena.atlas.lib.Sink} */
+    /** Create a buffering output stream of charcaters to a {@link org.apache.jena.atlas.lib.Sink} */
     public BufferingWriter(Sink<ByteBuffer> sink) { this(sink, SIZE, BLOB_SIZE) ; }
     
-    /** Create a buffering output stream of charcaters to a {@link org.openjena.atlas.lib.Sink} */
+    /** Create a buffering output stream of charcaters to a {@link org.apache.jena.atlas.lib.Sink} */
     /*package*/ BufferingWriter(Sink<ByteBuffer> sink, int size, int blobSize)
     {
         this.out = sink ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStream.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStream.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;
 
 
 /** A simplifed reader interface without IOExceptions. 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBasic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBasic.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBasic.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBasic.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.IOException ;
 import java.io.Reader ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
-import static org.openjena.atlas.io.IO.EOF ;
+import static org.apache.jena.atlas.io.IO.EOF ;
 
 import java.io.IOException ;
 import java.io.Reader ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamReader.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.IOException ;
 import java.io.Reader ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamSequence.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamSequence.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamSequence.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamSequence.java Tue Nov 27 17:51:25 2012
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
-import static org.openjena.atlas.io.IO.EOF ;
+package org.apache.jena.atlas.io;
+import static org.apache.jena.atlas.io.IO.EOF ;
 
 public final class CharStreamSequence implements CharStream
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java Tue Nov 27 17:51:25 2012
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.* ;
 import java.nio.charset.Charset ;
 import java.util.zip.GZIPInputStream ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.lib.IRILib ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.atlas.logging.Log ;
 
 import com.hp.hpl.jena.util.FileUtils ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.Reader ;
 
-import org.openjena.atlas.AtlasException ;
+import org.apache.jena.atlas.AtlasException ;
 
 /** Fast and streaming.
  */

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java Tue Nov 27 17:51:25 2012
@@ -16,14 +16,14 @@
  * 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 java.io.Reader ;
 
-import org.openjena.atlas.AtlasException ;
+import org.apache.jena.atlas.AtlasException ;
 
 /** Fast and streaming UTF-8 */
 public final class InStreamUTF8 extends Reader implements CharStream

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedLineBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedLineBuffer.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedLineBuffer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedLineBuffer.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.StringWriter ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java Tue Nov 27 17:51:25 2012
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 import static java.lang.String.format ;
 
 import java.io.IOException ;
 import java.io.OutputStream ;
 import java.io.Writer ;
 
-import org.openjena.atlas.AtlasException ;
+import org.apache.jena.atlas.AtlasException ;
 
 /** A writer that records what the current indentation level is, and
  *  uses that to insert a prefix at each line. 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
-import static org.openjena.atlas.io.IO.EOF ;
+import static org.apache.jena.atlas.io.IO.EOF ;
 
 import java.io.IOException ;
 import java.io.InputStream ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutStreamUTF8.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.IOException ;
 import java.io.OutputStream ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutputUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutputUtils.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutputUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/OutputUtils.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.IOException ;
 import java.io.Writer ;
 
-import org.openjena.atlas.lib.BitsInt ;
-import org.openjena.atlas.lib.Chars ;
+import org.apache.jena.atlas.lib.BitsInt ;
+import org.apache.jena.atlas.lib.Chars ;
 
 
 public class OutputUtils

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java Tue Nov 27 17:51:25 2012
@@ -16,17 +16,17 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
-import static org.openjena.atlas.io.IO.EOF ;
-import static org.openjena.atlas.io.IO.UNSET ;
+import static org.apache.jena.atlas.io.IO.EOF ;
+import static org.apache.jena.atlas.io.IO.UNSET ;
 
 import java.io.FileInputStream ;
 import java.io.FileNotFoundException ;
 import java.io.IOException ;
 import java.io.InputStream ;
 
-import org.openjena.atlas.AtlasException ;
+import org.apache.jena.atlas.AtlasException ;
 
 import com.hp.hpl.jena.shared.JenaException ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
-import static org.openjena.atlas.io.IO.EOF ;
-import static org.openjena.atlas.io.IO.UNSET ;
+import static org.apache.jena.atlas.io.IO.EOF ;
+import static org.apache.jena.atlas.io.IO.UNSET ;
 
 import java.io.FileInputStream ;
 import java.io.FileNotFoundException ;
@@ -27,8 +27,8 @@ import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.Reader ;
 
-import org.openjena.atlas.AtlasException ;
-import org.openjena.atlas.lib.Chars ;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.lib.Chars ;
 
 import com.hp.hpl.jena.shared.JenaException ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintUtils.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintUtils.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;
 
 
 public class PrintUtils

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Printable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Printable.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Printable.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Printable.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;
 
 public interface Printable
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintableBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintableBase.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintableBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PrintableBase.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;
 
 // Hmm - hardly worth it!
 public abstract class PrintableBase implements Printable

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Writer2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Writer2.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Writer2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/Writer2.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.io;
+package org.apache.jena.atlas.io;
 
 import java.io.IOException ;
 import java.io.Writer ;
 
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
 
 /** A Writer, without the checked exceptions. */
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/AccString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/AccString.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/AccString.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/AccString.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;
 
 public class AccString<T> implements Accumulate<T, String>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Accumulate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Accumulate.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Accumulate.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Accumulate.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;
 
 public interface Accumulate <T, R>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Action.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Action.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Action.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Action.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;
 
 public interface Action<T>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionCount.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionCount.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionCount.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionCount.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;
 
 
 public class ActionCount<T> implements Action<T>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionNothing.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionNothing.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionNothing.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionNothing.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;
 
 
 public class ActionNothing<T> implements Action<T>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionPrint.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionPrint.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionPrint.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/ActionPrint.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.Printable ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.Printable ;
 
 public class ActionPrint <T extends Printable> implements Action<T> 
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Filter.java Tue Nov 27 17:51:25 2012
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 public interface Filter <T> { boolean accept(T item) ; }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterDistinctAdjacent.java Tue Nov 27 17:51:25 2012
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
-import org.openjena.atlas.lib.Lib ;
+import org.apache.jena.atlas.lib.Lib ;
 
 public class FilterDistinctAdjacent<T> implements Filter<T>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterOutNulls.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterOutNulls.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterOutNulls.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterOutNulls.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;
 
 
 public class FilterOutNulls<T> implements Filter<T>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.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;
 
 /**
  * Add a filter to a chain - the original filter is called after this new sub-filter.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.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 java.util.HashSet ;
 import java.util.Set ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.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.io.PrintStream ;
 import java.util.* ;
 
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sink ;
 
 
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java Tue Nov 27 17:51:25 2012
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Iterator ;
 import java.util.List ;
 import java.util.NoSuchElementException ;
 
-import org.openjena.atlas.lib.DS ;
+import org.apache.jena.atlas.lib.DS ;
 
 /** Iterator of Iterators */
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorDelayedInitialization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorDelayedInitialization.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorDelayedInitialization.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorDelayedInitialization.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 java.util.Iterator ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.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 java.util.Iterator ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorResourceClosing.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorResourceClosing.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorResourceClosing.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorResourceClosing.java Tue Nov 27 17:51:25 2012
@@ -16,16 +16,16 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Iterator;
 
-import org.openjena.atlas.AtlasException;
-import org.openjena.atlas.io.IO;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Closeable ;
 
 /**
- * This iterator will automatically close a {@link org.openjena.atlas.lib.Closeable} or {@link java.io.Closeable}
+ * This iterator will automatically close a {@link org.apache.jena.atlas.lib.Closeable} or {@link java.io.Closeable}
  * resource when the iterator is exhausted.  Alternatively, the resource will be closed when {@link #close()} is
  * called.  An {@link AtlasException} will be thrown if access is attempted after {@link #close()} has been called.
  */

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorTruncate.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.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 java.util.ArrayList ;
 import java.util.Iterator ;
@@ -27,8 +27,8 @@ import java.util.NoSuchElementException 
  * See also PeekIterator (which predates this code).
  * See also IteratorWithHistory for an iterator that remembers what it has yielded.
  * 
- * @see org.openjena.atlas.iterator.PeekIterator
- * @see org.openjena.atlas.iterator.PushbackIterator
+ * @see org.apache.jena.atlas.iterator.PeekIterator
+ * @see org.apache.jena.atlas.iterator.PushbackIterator
  * @see IteratorWithHistory
  */
 public class IteratorWithBuffer<T> implements Iterator<T>

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.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 java.util.ArrayList ;
 import java.util.Iterator ;
@@ -26,8 +26,8 @@ import java.util.NoSuchElementException 
 /** Remembers the last N yields.
  * See also IteratorWithBuffer, for an iterator that looks ahead to what it wil yield.
  * @see IteratorWithBuffer
- * @see org.openjena.atlas.iterator.PeekIterator
- * @see org.openjena.atlas.iterator.PushbackIterator
+ * @see org.apache.jena.atlas.iterator.PeekIterator
+ * @see org.apache.jena.atlas.iterator.PushbackIterator
  */
 public class IteratorWithHistory<T> implements Iterator<T>
 {

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWrapper.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWrapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWrapper.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 java.util.Iterator ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/MapUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/MapUtils.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/MapUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/MapUtils.java Tue Nov 27 17:51:25 2012
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 import java.util.Map ;
 
-import org.openjena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
 
 
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/NullIterator.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.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 java.util.ArrayDeque ;
 import java.util.Deque ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,12 @@
  * 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.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
 
 import com.hp.hpl.jena.sparql.util.Utils ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.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 java.util.Iterator ;
 import java.util.NoSuchElementException ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Transform.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Transform.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Transform.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Transform.java Tue Nov 27 17:51:25 2012
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.iterator;
+package org.apache.jena.atlas.iterator;
 
 public interface Transform <T, R> { R convert(T item) ; }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/WrapperIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/WrapperIterator.java?rev=1414287&r1=1411387&r2=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/WrapperIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/WrapperIterator.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 java.util.Iterator ;
 

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JSON.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JSON.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/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 java.io.FileNotFoundException ;
 import java.io.IOException ;
@@ -25,13 +25,13 @@ import java.io.OutputStream ;
 import java.io.Reader ;
 import java.io.StringReader ;
 
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.atlas.json.io.JSONMaker ;
-import org.openjena.atlas.json.io.JsonWriter ;
-import org.openjena.atlas.json.io.parser.JSONParser ;
-import org.openjena.atlas.json.io.parserjavacc.JSONParserJavaCC ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.json.io.JSONMaker ;
+import org.apache.jena.atlas.json.io.JsonWriter ;
+import org.apache.jena.atlas.json.io.parser.JSONParser ;
+import org.apache.jena.atlas.json.io.parserjavacc.JSONParserJavaCC ;
 
 /** A class that is the front door to the JSON subsystem */
 public class JSON

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonAccess.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonAccess.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonAccess.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java Tue Nov 27 17:51:25 2012
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.json.io.JSWriter ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.json.io.JSWriter ;
 
 public class JsonAccess
 {

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonArray.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonArray.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonArray.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.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 java.util.ArrayList ;
 import java.util.Collection ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBoolean.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonBoolean.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBoolean.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBoolean.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonBoolean.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonBoolean.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBoolean.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;
 
 public class JsonBoolean extends JsonPrimitive
 {

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonException.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonException.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonException.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonException.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonException.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;
 
 
 public class JsonException extends RuntimeException

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNull.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNull.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNull.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNull.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNull.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNull.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNull.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;
 
 public class JsonNull extends JsonPrimitive
 {

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNumber.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNumber.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNumber.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNumber.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNumber.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonNumber.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonNumber.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 java.math.BigDecimal ;
 

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonObject.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonObject.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonObject.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.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 java.util.Collection ;
 import java.util.HashMap ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonParseException.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonParseException.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonParseException.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonParseException.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonParseException.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonParseException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonParseException.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;
 
 
 public class JsonParseException extends JsonException

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonPrimitive.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonPrimitive.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonPrimitive.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonPrimitive.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonPrimitive.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonPrimitive.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonPrimitive.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;
 
 public abstract class JsonPrimitive extends JsonValue
 {

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonString.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonString.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonString.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonString.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonString.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonString.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonString.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;
 
 public class JsonString extends JsonPrimitive
 {

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonValue.java (from r1411387, jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonValue.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonValue.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonValue.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonValue.java&r1=1411387&r2=1414287&rev=1414287&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/atlas/json/JsonValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonValue.java Tue Nov 27 17:51:25 2012
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package org.openjena.atlas.json;
+package org.apache.jena.atlas.json;
 
-import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.Printable ;
-import org.openjena.atlas.json.io.JsonWriter ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.Printable ;
+import org.apache.jena.atlas.json.io.JsonWriter ;
 
 public abstract class JsonValue implements Printable
 {