Author: sallen
Date: Thu Jan 31 04:37:19 2013
New Revision: 1440844
URL: http://svn.apache.org/viewvc?rev=1440844&view=rev
Log:
jena-client - update to the latest Jena snapshot
Modified:
jena/Experimental/jena-client/pom.xml
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ConnectionBase.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/SparqlStatement.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleterWrapper.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserterWrapper.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Updater.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdater.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java
Modified: jena/Experimental/jena-client/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/pom.xml?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
--- jena/Experimental/jena-client/pom.xml (original)
+++ jena/Experimental/jena-client/pom.xml Thu Jan 31 04:37:19 2013
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-client</artifactId>
- <version>0.0.8-SNAPSHOT</version>
+ <version>0.0.9-SNAPSHOT</version>
<name>Apache Jena - Client (SPARQL 1.1 Client API)</name>
<description>Client is a library that provides an API for querying and
updating local or remote SPARQL 1.1 endpoints.</description>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
- <version>2.9.4</version>
+ <version>2.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -57,6 +57,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots/</url>
+ </repository>
+ </distributionManagement>
<build>
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
Thu Jan 31 04:37:19 2013
@@ -18,7 +18,7 @@
package org.apache.jena.client;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.lib.Closeable;
import com.hp.hpl.jena.query.ParameterizedSparqlString;
import com.hp.hpl.jena.query.Query;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ConnectionBase.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ConnectionBase.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ConnectionBase.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/ConnectionBase.java
Thu Jan 31 04:37:19 2013
@@ -4,7 +4,7 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.lib.Closeable;
import com.hp.hpl.jena.query.ParameterizedSparqlString;
import com.hp.hpl.jena.query.Query;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/SparqlStatement.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/SparqlStatement.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/SparqlStatement.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/SparqlStatement.java
Thu Jan 31 04:37:19 2013
@@ -2,7 +2,7 @@ package org.apache.jena.client;
import java.util.concurrent.TimeUnit;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.lib.Closeable;
public interface SparqlStatement extends Closeable
{
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
Thu Jan 31 04:37:19 2013
@@ -21,8 +21,8 @@ package org.apache.jena.client;
import java.io.InputStream;
import java.util.Iterator;
-import org.openjena.atlas.lib.Closeable;
-import org.openjena.riot.Lang;
+import org.apache.jena.atlas.lib.Closeable;
+import org.apache.jena.riot.Lang;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleterWrapper.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleterWrapper.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleterWrapper.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleterWrapper.java
Thu Jan 31 04:37:19 2013
@@ -3,7 +3,7 @@ package org.apache.jena.client;
import java.io.InputStream;
import java.util.Iterator;
-import org.openjena.riot.Lang;
+import org.apache.jena.riot.Lang;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java
Thu Jan 31 04:37:19 2013
@@ -21,8 +21,8 @@ package org.apache.jena.client;
import java.io.InputStream;
import java.util.Iterator;
-import org.openjena.atlas.lib.Closeable;
-import org.openjena.riot.Lang;
+import org.apache.jena.atlas.lib.Closeable;
+import org.apache.jena.riot.Lang;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserterWrapper.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserterWrapper.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserterWrapper.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserterWrapper.java
Thu Jan 31 04:37:19 2013
@@ -3,7 +3,7 @@ package org.apache.jena.client;
import java.io.InputStream;
import java.util.Iterator;
-import org.openjena.riot.Lang;
+import org.apache.jena.riot.Lang;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
Thu Jan 31 04:37:19 2013
@@ -2,7 +2,7 @@ package org.apache.jena.client;
import java.util.Iterator;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.lib.Closeable;
import com.hp.hpl.jena.query.ParameterizedSparqlString;
import com.hp.hpl.jena.update.Update;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Updater.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Updater.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Updater.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Updater.java
Thu Jan 31 04:37:19 2013
@@ -18,7 +18,7 @@
package org.apache.jena.client;
-import org.openjena.atlas.lib.Closeable;
+import org.apache.jena.atlas.lib.Closeable;
public interface Updater extends UpdateInserter, UpdateDeleter, UpdateQuerier,
Closeable
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
Thu Jan 31 04:37:19 2013
@@ -22,10 +22,11 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.Iterator;
-import org.openjena.atlas.iterator.Iter;
-import org.openjena.atlas.iterator.Transform;
-import org.openjena.riot.Lang;
-import org.openjena.riot.RiotReader;
+import org.apache.jena.atlas.iterator.Iter;
+import org.apache.jena.atlas.iterator.Transform;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotReader;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
@@ -170,7 +171,7 @@ public abstract class UpdaterBase implem
@Override
public void insert(InputStream in, Lang lang, String base)
{
- if (!lang.isQuads())
+ if (!RDFLanguages.isQuads(lang))
{
throw new IllegalArgumentException("lang must be a Quad language,
or you must call the insert() method with a graph name for Triple languages");
}
@@ -196,7 +197,7 @@ public abstract class UpdaterBase implem
public void insert(final Node graphName, InputStream in, Lang lang, String
base)
{
Iterator<Quad> it;
- if (lang.isTriples())
+ if (RDFLanguages.isTriples(lang))
{
Iterator<Triple> parser = RiotReader.createIteratorTriples(in,
lang, base);
@@ -312,7 +313,7 @@ public abstract class UpdaterBase implem
@Override
public void delete(InputStream in, Lang lang, String base)
{
- if (!lang.isQuads())
+ if (!RDFLanguages.isQuads(lang))
{
throw new IllegalArgumentException("lang must be a Quad language,
or you must call the delete() method with a graph name for Triple languages");
}
@@ -338,7 +339,7 @@ public abstract class UpdaterBase implem
public void delete(final Node graphName, InputStream in, Lang lang, String
base)
{
Iterator<Quad> it;
- if (lang.isTriples())
+ if (RDFLanguages.isTriples(lang))
{
Iterator<Triple> parser = RiotReader.createIteratorTriples(in,
lang, base);
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
Thu Jan 31 04:37:19 2013
@@ -3,7 +3,7 @@ package org.apache.jena.client;
import java.io.InputStream;
import java.util.Iterator;
-import org.openjena.riot.Lang;
+import org.apache.jena.riot.Lang;
import com.hp.hpl.jena.graph.Graph;
import com.hp.hpl.jena.graph.Node;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdater.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdater.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdater.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdater.java
Thu Jan 31 04:37:19 2013
@@ -15,8 +15,8 @@ import java.net.URLEncoder;
import java.util.Iterator;
import org.apache.jena.client.UpdaterBase;
-import org.openjena.atlas.io.IndentedWriter;
-import org.openjena.riot.WebContent;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.riot.WebContent;
import com.hp.hpl.jena.sparql.core.Quad;
import com.hp.hpl.jena.sparql.modify.request.UpdateWriter;
@@ -116,7 +116,7 @@ public class HttpUpdater extends Updater
{
if (!opened)
{
- throw new IllegalStateException("SparqlHttpUpdater is not opened.
Call open() first.");
+ throw new IllegalStateException("HttpUpdater is not opened. Call
open() first.");
}
}
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
Thu Jan 31 04:37:19 2013
@@ -6,9 +6,9 @@ import java.io.OutputStream ;
import java.util.Iterator ;
import org.apache.http.entity.AbstractHttpEntity ;
-import org.openjena.atlas.io.IndentedWriter;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.NotImplemented ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.NotImplemented ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
Thu Jan 31 04:37:19 2013
@@ -6,8 +6,8 @@ import java.io.OutputStream ;
import java.util.Iterator ;
import org.apache.http.entity.AbstractHttpEntity ;
-import org.openjena.atlas.io.IndentedWriter;
-import org.openjena.atlas.lib.NotImplemented ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.NotImplemented ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java?rev=1440844&r1=1440843&r2=1440844&view=diff
==============================================================================
---
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java
(original)
+++
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateRemote.java
Thu Jan 31 04:37:19 2013
@@ -30,9 +30,9 @@ import org.apache.http.entity.AbstractHt
import org.apache.http.entity.ByteArrayEntity ;
import org.apache.http.impl.client.DefaultHttpClient ;
import org.apache.http.protocol.HTTP ;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.WebContent ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.WebContent ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
