svn commit: r1201496 - in /incubator/jena/Jena2/Fuseki/trunk/src: main/java/org/openjena/fuseki/http/ main/java/org/openjena/fuseki/servlets/ test/java/org/openjena/fuseki/http/

[an...@apache.org]

Author: andy
Date: Sun Nov 13 19:53:51 2011
New Revision: 1201496

URL: http://svn.apache.org/viewvc?rev=1201496&view=rev
Log:
Align to ARQ tidying up.

Modified:
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/DatasetGraphAccessorHTTP.java
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
    incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1201496&r1=1201495&r2=1201496&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/DatasetGraphAccessorHTTP.java Sun Nov 13 19:53:51 2011
@@ -18,54 +18,43 @@
 
 package org.openjena.fuseki.http;
 
-import java.io.ByteArrayInputStream ;
-import java.io.ByteArrayOutputStream ;
-import java.io.IOException ;
-import java.io.InputStream ;
-
-import org.apache.http.Header ;
-import org.apache.http.HttpEntity ;
-import org.apache.http.HttpResponse ;
-import org.apache.http.HttpVersion ;
-import org.apache.http.client.HttpClient ;
-import org.apache.http.client.methods.HttpDelete ;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase ;
-import org.apache.http.client.methods.HttpGet ;
-import org.apache.http.client.methods.HttpHead ;
-import org.apache.http.client.methods.HttpPost ;
-import org.apache.http.client.methods.HttpPut ;
-import org.apache.http.client.methods.HttpUriRequest ;
-import org.apache.http.entity.InputStreamEntity ;
-import org.apache.http.impl.client.DefaultHttpClient ;
-import org.apache.http.params.BasicHttpParams ;
-import org.apache.http.params.HttpConnectionParams ;
-import org.apache.http.params.HttpParams ;
-import org.apache.http.params.HttpProtocolParams ;
-import org.apache.http.protocol.HTTP ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.logging.Log ;
-import org.openjena.fuseki.Fuseki ;
-import org.openjena.fuseki.FusekiException ;
-import org.openjena.fuseki.FusekiLib ;
-import org.openjena.fuseki.FusekiNotFoundException ;
-import org.openjena.fuseki.FusekiRequestException ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.TypedInputStream ;
-import org.openjena.fuseki.migrate.UnmodifiableGraph ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.WebContent ;
-import org.openjena.riot.lang.LangRDFXML ;
-import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.lang.SinkTriplesToGraph ;
-
-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.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import java.io.ByteArrayInputStream ;
+import java.io.ByteArrayOutputStream ;
+import java.io.IOException ;
+import java.io.InputStream ;
+
+import org.apache.http.Header ;
+import org.apache.http.HttpEntity ;
+import org.apache.http.HttpResponse ;
+import org.apache.http.HttpVersion ;
+import org.apache.http.client.HttpClient ;
+import org.apache.http.client.methods.* ;
+import org.apache.http.entity.InputStreamEntity ;
+import org.apache.http.impl.client.DefaultHttpClient ;
+import org.apache.http.params.BasicHttpParams ;
+import org.apache.http.params.HttpConnectionParams ;
+import org.apache.http.params.HttpParams ;
+import org.apache.http.params.HttpProtocolParams ;
+import org.apache.http.protocol.HTTP ;
+import org.openjena.atlas.io.IO ;
+import org.openjena.atlas.lib.Sink ;
+import org.openjena.atlas.logging.Log ;
+import org.openjena.fuseki.* ;
+import org.openjena.fuseki.conneg.TypedInputStream ;
+import org.openjena.fuseki.migrate.UnmodifiableGraph ;
+import org.openjena.riot.Lang ;
+import org.openjena.riot.RiotReader ;
+import org.openjena.riot.WebContent ;
+import org.openjena.riot.lang.LangRDFXML ;
+import org.openjena.riot.lang.LangRIOT ;
+import org.openjena.riot.lang.SinkTriplesToGraph ;
+
+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.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 
 public class DatasetGraphAccessorHTTP implements DatasetGraphAccessor
 {

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java?rev=1201496&r1=1201495&r2=1201496&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java Sun Nov 13 19:53:51 2011
@@ -44,12 +44,7 @@ import org.openjena.fuseki.FusekiLib ;
 import org.openjena.fuseki.HttpNames ;
 import org.openjena.fuseki.conneg.ConNeg ;
 import org.openjena.fuseki.conneg.MediaType ;
-import org.openjena.riot.ContentType ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
+import org.openjena.riot.* ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
 import org.openjena.riot.system.IRIResolver ;
@@ -61,7 +56,7 @@ import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 import com.hp.hpl.jena.util.FileUtils ;
 
 public abstract class SPARQL_REST extends SPARQL_ServletBase

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java?rev=1201496&r1=1201495&r2=1201496&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java Sun Nov 13 19:53:51 2011
@@ -36,12 +36,7 @@ import org.openjena.fuseki.FusekiLib ;
 import org.openjena.fuseki.HttpNames ;
 import org.openjena.fuseki.http.HttpSC ;
 import org.openjena.fuseki.server.DatasetRegistry ;
-import org.openjena.riot.ContentType ;
-import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerFactory ;
-import org.openjena.riot.Lang ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
+import org.openjena.riot.* ;
 import org.openjena.riot.lang.LangRIOT ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
 import org.openjena.riot.system.IRIResolver ;
@@ -51,7 +46,7 @@ import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.iri.IRI ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 
 public class SPARQL_Upload extends SPARQL_ServletBase 
 {

Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java?rev=1201496&r1=1201495&r2=1201496&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java Sun Nov 13 19:53:51 2011
@@ -18,11 +18,11 @@
 
 package org.openjena.fuseki.http;
 
-import org.junit.Test ;
-import org.openjena.fuseki.BaseServerTest ;
-
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
+import org.junit.Test ;
+import org.openjena.fuseki.BaseServerTest ;
+
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 
 public abstract class TestDatasetGraphAccessorBase extends BaseServerTest
 {