You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/02/14 13:05:19 UTC
svn commit: r1446136 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/
jena-arq/src/main/java/org/apache/jena/riot/
jena-arq/src/main/java/org/apache/jena/riot/web/
jena-arq/src/main/java/org/apache/jena/web/ jena-arq/src/main/java...
Author: andy
Date: Thu Feb 14 12:05:18 2013
New Revision: 1446136
URL: http://svn.apache.org/r1446136
Log:
Migrate DatasetAccessor to ARQ.
Put the tests in the relevant modules.
Migrate/eliminate other code marked for migration.
Added:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/UnmodifiableGraph.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessor.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessorFactory.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpException.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpNotFoundException.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetAdapter.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessor.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorBasic.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorHTTP.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/HttpSC.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/HttpSC.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TextListenerOneLine.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java
- copied, changed from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java
Removed:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/SimpleTestRunner.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TestHttpBase.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
jena/trunk/jena-fuseki/pom.xml
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TS_Graph.java
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/UnmodifiableGraph.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/UnmodifiableGraph.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/UnmodifiableGraph.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/UnmodifiableGraph.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.migrate;
+package com.hp.hpl.jena.sparql.graph;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java Thu Feb 14 12:05:18 2013
@@ -640,6 +640,8 @@ public class RDFDataMgr
*/
public static void parse(StreamRDF sink, String uri, String base, Lang hintLang, Context context)
{
+ if ( uri == null )
+ throw new IllegalArgumentException("URI to read from is null") ;
if ( base == null )
base = IRIResolver.resolveFileURL(uri) ;
if ( hintLang == null )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java Thu Feb 14 12:05:18 2013
@@ -135,7 +135,12 @@ public class WebContent
return mapLangToContentType.get(lang) ;
}
- public static Lang contentTypeToLang(String contentType) { return mapContentTypeToLang.get(contentType) ; }
+ public static Lang contentTypeToLang(String contentType)
+ {
+ if ( contentType == null )
+ return null ;
+ return mapContentTypeToLang.get(contentType) ;
+ }
/** Canonical names */
private static Map<Lang, String> mapLangToContentType = new HashMap<Lang, String>() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java Thu Feb 14 12:05:18 2013
@@ -38,17 +38,19 @@ import org.apache.http.client.entity.Url
import org.apache.http.client.methods.HttpGet ;
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.EntityTemplate ;
import org.apache.http.entity.InputStreamEntity ;
import org.apache.http.entity.StringEntity ;
import org.apache.http.impl.client.SystemDefaultHttpClient ;
import org.apache.http.message.BasicNameValuePair ;
-import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpContext ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.web.HttpException ;
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.web.JenaHttpException ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -116,6 +118,9 @@ public class HttpOp
} catch (IOException ex) { IO.exception(ex) ; }
}
+ /** GET
+ * <p>The acceptHeader string is any legal value for HTTP Accept: field.
+ */
public static TypedInputStreamHttp execHttpGet(String url, String acceptHeader)
{
try {
@@ -166,6 +171,24 @@ public class HttpOp
catch (IOException ex) { IO.exception(ex) ; return null ; }
}
+ /** Simple GET - no content negotiation */
+ public static String execHttpGet(String url)
+ {
+ HttpUriRequest httpGet = new HttpGet(url) ;
+ HttpClient httpclient = new SystemDefaultHttpClient() ;
+ try {
+ HttpResponse response = httpclient.execute(httpGet) ;
+ int responseCode = response.getStatusLine().getStatusCode() ;
+ String responseMessage = response.getStatusLine().getReasonPhrase() ;
+ if ( 200 != responseCode )
+ throw JenaHttpException.create(responseCode, responseMessage) ;
+ HttpEntity entity = response.getEntity() ;
+ InputStream instream = entity.getContent() ;
+ String string = IO.readWholeFileAsUTF8(instream) ;
+ instream.close() ;
+ return string ;
+ } catch (IOException ex) { IO.exception(ex) ; return null ; }
+ }
/** POST a string without response body.
* <p>Execute an HTTP POST, with the string as content.
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessor.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessor.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessor.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessor.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki;
+package org.apache.jena.web;
import com.hp.hpl.jena.rdf.model.Model ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessorFactory.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessorFactory.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessorFactory.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAccessorFactory.java Thu Feb 14 12:05:18 2013
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki;
+package org.apache.jena.web;
-import org.apache.jena.fuseki.http.DatasetAdapter ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessorBasic ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessorHTTP ;
+import org.apache.jena.web.impl.DatasetAdapter ;
+import org.apache.jena.web.impl.DatasetGraphAccessor ;
+import org.apache.jena.web.impl.DatasetGraphAccessorBasic ;
+import org.apache.jena.web.impl.DatasetGraphAccessorHTTP ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpException.java?rev=1446136&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpException.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpException.java Thu Feb 14 12:05:18 2013
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.web;
+
+import org.apache.jena.web.impl.HttpSC ;
+
+import com.hp.hpl.jena.shared.JenaException ;
+
+public class JenaHttpException extends JenaException
+{
+ public static JenaHttpException create(int code, String msg)
+ {
+ if ( code == HttpSC.NOT_FOUND_404 )
+ return new JenaHttpNotFoundException(msg) ;
+ return new JenaHttpException(code, msg) ;
+ }
+
+ private final int statusCode ;
+ private final String responseMessage ;
+ protected JenaHttpException(int code, String msg)
+ {
+ super(msg) ;
+ this.statusCode = code ;
+ responseMessage = msg ;
+ }
+
+ public int getStatusCode()
+ {
+ return statusCode ;
+ }
+
+ public String getResponseMessage()
+ {
+ return responseMessage ;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "HTTP: "+statusCode+" "+getMessage() ;
+ }
+
+}
+
Added: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpNotFoundException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpNotFoundException.java?rev=1446136&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpNotFoundException.java (added)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/JenaHttpNotFoundException.java Thu Feb 14 12:05:18 2013
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.web;
+
+import org.apache.jena.web.impl.HttpSC ;
+
+public class JenaHttpNotFoundException extends JenaHttpException
+{
+ public JenaHttpNotFoundException(String msg) { super(HttpSC.NOT_FOUND_404, msg) ; }
+}
+
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetAdapter.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetAdapter.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetAdapter.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetAdapter.java Thu Feb 14 12:05:18 2013
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web.impl;
-import org.apache.jena.fuseki.DatasetAccessor ;
+import org.apache.jena.web.DatasetAccessor ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessor.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessor.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessor.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessor.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web.impl;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorBasic.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorBasic.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorBasic.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorBasic.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web.impl;
import com.hp.hpl.jena.graph.Graph ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorHTTP.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorHTTP.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorHTTP.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/DatasetGraphAccessorHTTP.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web.impl;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
@@ -35,24 +35,25 @@ import org.apache.http.params.BasicHttpP
import org.apache.http.params.HttpConnectionParams ;
import org.apache.http.params.HttpParams ;
import org.apache.http.params.HttpProtocolParams ;
-import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.fuseki.* ;
-import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.WebContent ;
-import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.riot.system.StreamRDFLib ;
+import org.apache.jena.riot.web.HttpNames ;
+import org.apache.jena.web.JenaHttpException ;
+import org.apache.jena.web.JenaHttpNotFoundException ;
+import com.hp.hpl.jena.Jena ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.shared.JenaException ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.UnmodifiableGraph ;
public class DatasetGraphAccessorHTTP implements DatasetGraphAccessor
{
@@ -75,7 +76,7 @@ public class DatasetGraphAccessorHTTP im
HttpUriRequest httpGet = new HttpGet(url) ;
try {
return exec(url, null, httpGet, true) ;
- } catch (FusekiNotFoundException ex)
+ } catch (JenaHttpNotFoundException ex)
{
return null ;
}
@@ -99,7 +100,7 @@ public class DatasetGraphAccessorHTTP im
try {
exec(url, null, httpHead, false) ;
return true ;
- } catch (FusekiRequestException ex)
+ } catch (JenaHttpException ex)
{
if ( ex.getStatusCode() == HttpSC.NOT_FOUND_404 )
return false ;
@@ -131,7 +132,7 @@ public class DatasetGraphAccessorHTTP im
HttpUriRequest httpDelete = new HttpDelete(url) ;
exec(url, null, httpDelete, false) ;
return true ;
- } catch (FusekiNotFoundException ex) { return false ; }
+ } catch (JenaHttpNotFoundException ex) { return false ; }
}
@Override
@@ -160,7 +161,7 @@ public class DatasetGraphAccessorHTTP im
private String target(Node name)
{
if ( ! name.isURI() )
- throw new FusekiException("Not a URI: "+name) ;
+ throw new JenaException("Not a URI: "+name) ;
String guri = name.getURI() ;
// Encode
guri = IRILib.encodeUriComponent(guri) ;
@@ -178,7 +179,7 @@ public class DatasetGraphAccessorHTTP im
HttpProtocolParams.setUseExpectContinue(httpParams$, true);
HttpConnectionParams.setTcpNoDelay(httpParams$, true);
HttpConnectionParams.setSocketBufferSize(httpParams$, 32*1024);
- HttpProtocolParams.setUserAgent(httpParams$, Fuseki.NAME+"/"+Fuseki.VERSION);
+ HttpProtocolParams.setUserAgent(httpParams$, Jena.NAME+"/"+Jena.VERSION);
return httpParams$;
}
@@ -219,12 +220,12 @@ public class DatasetGraphAccessorHTTP im
if ( HttpSC.isRedirection(responseCode) )
// Not implemented yet.
- throw FusekiRequestException.create(responseCode, responseMessage) ;
+ throw JenaHttpException.create(responseCode, responseMessage) ;
// Other 400 and 500 - errors
if ( HttpSC.isClientError(responseCode) || HttpSC.isServerError(responseCode) )
- throw FusekiRequestException.create(responseCode, responseMessage) ;
+ throw JenaHttpException.create(responseCode, responseMessage) ;
if ( responseCode == HttpSC.NO_CONTENT_204) return null ;
if ( responseCode == HttpSC.CREATED_201 ) return null ;
@@ -232,7 +233,7 @@ public class DatasetGraphAccessorHTTP im
if ( responseCode != HttpSC.OK_200 )
{
Log.warn(this, "Unexpected status code") ;
- throw FusekiRequestException.create(responseCode, responseMessage) ;
+ throw JenaHttpException.create(responseCode, responseMessage) ;
}
// May not have a body.
@@ -284,20 +285,15 @@ public class DatasetGraphAccessorHTTP im
}
}
- private void readGraph(Graph graph, TypedInputStream ts, String base)
- {
- // DRY - code in SPARQL_REST.parseBody
-
- // Yes - we ignore the charset.
- // Either it's XML and so the XML parser deals with it, or the
- // language determines the charset and the parsers offer InputStreams.
-
- Lang lang = FusekiLib.langFromContentType(ts.getContentType()) ;
- if ( lang == null )
- throw new FusekiException("Unknown lang for "+ts.getMediaType()) ;
- StreamRDF dest = StreamRDFLib.graph(graph) ;
- LangRIOT parser = RiotReader.createParser(ts, lang, base, dest) ;
- parser.parse() ;
- IO.close(ts) ;
- }
+ private void readGraph(Graph graph, TypedInputStream ts, String base)
+ {
+ // Yes - we ignore the charset.
+ // Either it's XML and so the XML parser deals with it, or the
+ // language determines the charset and the parsers offer InputStreams.
+
+ Lang lang = WebContent.contentTypeToLang(ts.getContentType()) ;
+ if ( lang == null )
+ throw new RiotException("Unknown lang for "+ts.getMediaType()) ;
+ RDFDataMgr.read(graph, ts, lang) ;
+ }
}
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/HttpSC.java (from r1446066, jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/HttpSC.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/HttpSC.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/HttpSC.java&p1=jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/HttpSC.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/HttpSC.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/impl/HttpSC.java Thu Feb 14 12:05:18 2013
@@ -34,7 +34,7 @@
* I found the naming which includes the number, more useful than the standard constants.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web.impl;
/**
* <p>
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TextListenerOneLine.java (from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TextListenerOneLine.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TextListenerOneLine.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TextListenerOneLine.java Thu Feb 14 12:05:18 2013
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.migrate;
+package com.hp.hpl.jena.sparql.junit;
import java.io.PrintStream ;
import java.text.NumberFormat ;
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java (from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java Thu Feb 14 12:05:18 2013
@@ -16,18 +16,36 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web;
-import org.apache.jena.fuseki.BaseServerTest ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.web.impl.DatasetGraphAccessor ;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.GraphUtil ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.sse.SSE ;
-public abstract class TestDatasetGraphAccessorBase extends BaseServerTest
-{
+public abstract class TestDatasetGraphAccessorBase extends BaseTest
+{
+ protected static final String gn1 = "http://graph/1" ;
+ protected static final String gn2 = "http://graph/2" ;
+ protected static final String gn99 = "http://graph/99" ;
+
+ protected static final Node n1 = Node.createURI("http://graph/1") ;
+ protected static final Node n2 = Node.createURI("http://graph/2") ;
+ protected static final Node n99 = Node.createURI("http://graph/99") ;
+
+ protected static final Graph graph1 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 1)))") ;
+ protected static final Graph graph2 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 2)))") ;
+
+ protected static final Model model1 = ModelFactory.createModelForGraph(graph1) ;
+ protected static final Model model2 = ModelFactory.createModelForGraph(graph2) ;
+
// return a DatasetGraphAccessor backed by an empty dataset
protected abstract DatasetGraphAccessor getDatasetUpdater() ;
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java (from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java Thu Feb 14 12:05:18 2013
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package org.apache.jena.web;
-import org.apache.jena.fuseki.DatasetAccessorFactory ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
+import org.apache.jena.web.DatasetAccessorFactory ;
+import org.apache.jena.web.impl.DatasetGraphAccessor ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
Modified: jena/trunk/jena-fuseki/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/pom.xml?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/pom.xml (original)
+++ jena/trunk/jena-fuseki/pom.xml Thu Feb 14 12:05:18 2013
@@ -93,6 +93,14 @@
<dependency>
<groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.10.0-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>2.10.0-SNAPSHOT</version>
</dependency>
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java Thu Feb 14 12:05:18 2013
@@ -18,40 +18,11 @@
package org.apache.jena.fuseki;
-import com.hp.hpl.jena.rdf.model.Model ;
-/** Accessor to a dataset a collection of graphs. */
-public interface DatasetAccessor
+/** Accessor to a dataset a collection of graphs.
+ * @deprecated Use {@link org.apache.jena.web.DatasetAccessor}
+ */
+@Deprecated
+public interface DatasetAccessor extends org.apache.jena.web.DatasetAccessor
{
- /** Get the default model of a Dataset */
- public Model getModel() ;
-
- /** Get a named model of a Dataset */
- public Model getModel(String graphUri) ;
-
-// /** Does the Dataset contain a default graph? */
-// public boolean containsDefault() ;
-
- /** Does the Dataset contain a named graph? */
- public boolean containsModel(String graphURI) ;
-
- /** Put (replace) the default model of a Dataset */
- public void putModel(Model data) ;
-
- /** Put (create/replace) a named model of a Dataset */
- public void putModel(String graphUri, Model data) ;
-
- /** Delete (which means clear) the default model of a Dataset */
- public void deleteDefault() ;
-
- /** Delete a named model of a Dataset */
- public void deleteModel(String graphUri) ;
-
-// /** Clear the default graph, delete all the named models */
-// public void reset() ;
-
- /** Add statements to the default model of a Dataset */
- public void add(Model data) ;
- /** Add statements to a named model of a Dataset */
- public void add(String graphUri, Model data) ;
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java Thu Feb 14 12:05:18 2013
@@ -26,6 +26,11 @@ import org.apache.jena.fuseki.http.Datas
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+/** Accessor to a dataset a collection of graphs.
+ * @deprecated Use {@link org.apache.jena.web.DatasetAccessorFactory}
+ *
+ */
+@Deprecated
public class DatasetAccessorFactory
{
public static DatasetAccessor createHTTP(String serviceURI)
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Thu Feb 14 12:05:18 2013
@@ -38,17 +38,6 @@ import com.hp.hpl.jena.sparql.util.Conve
public class FusekiLib
{
- // See also HttpUtils.
-
- // Much of this ought to be elsewhere but while we develop it, it's useful to have close to first use.
- // ---- To riot.WebContent
- public static Lang langFromContentType(String mimeType)
- {
- if ( mimeType == null )
- return null ;
- return WebContent.contentTypeToLang(mimeType.toLowerCase()) ;
- }
-
public static MediaType contentType(HttpServletRequest request)
{
String x = request.getHeader(HttpNames.hContentType) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java Thu Feb 14 12:05:18 2013
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki;
-import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.web.impl.HttpSC ;
public class FusekiNotFoundException extends FusekiRequestException
{
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java Thu Feb 14 12:05:18 2013
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki;
-import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.web.impl.HttpSC ;
public class FusekiRequestException extends FusekiException
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java Thu Feb 14 12:05:18 2013
@@ -26,6 +26,7 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
/** Adapter between Dataset/Model level and DatasetGraph/Graph level */
+@SuppressWarnings("deprecation")
public class DatasetAdapter implements DatasetAccessor
{
private final DatasetGraphAccessor updater ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java Thu Feb 14 12:05:18 2013
@@ -35,24 +35,20 @@ import org.apache.http.params.BasicHttpP
import org.apache.http.params.HttpConnectionParams ;
import org.apache.http.params.HttpParams ;
import org.apache.http.params.HttpProtocolParams ;
-import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.fuseki.* ;
-import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.WebContent ;
-import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.riot.system.StreamRDFLib ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
+import com.hp.hpl.jena.sparql.graph.UnmodifiableGraph ;
public class DatasetGraphAccessorHTTP implements DatasetGraphAccessor
{
@@ -286,18 +282,13 @@ public class DatasetGraphAccessorHTTP im
private void readGraph(Graph graph, TypedInputStream ts, String base)
{
- // DRY - code in SPARQL_REST.parseBody
-
// Yes - we ignore the charset.
// Either it's XML and so the XML parser deals with it, or the
// language determines the charset and the parsers offer InputStreams.
- Lang lang = FusekiLib.langFromContentType(ts.getContentType()) ;
+ Lang lang = WebContent.contentTypeToLang(ts.getContentType()) ;
if ( lang == null )
throw new FusekiException("Unknown lang for "+ts.getMediaType()) ;
- StreamRDF dest = StreamRDFLib.graph(graph) ;
- LangRIOT parser = RiotReader.createParser(ts, lang, base, dest) ;
- parser.parse() ;
- IO.close(ts) ;
+ RDFDataMgr.read(graph, base, lang) ;
}
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Thu Feb 14 12:05:18 2013
@@ -34,12 +34,12 @@ import org.apache.jena.atlas.lib.FileOps
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
import org.apache.jena.fuseki.servlets.HttpAction ;
import org.apache.jena.fuseki.servlets.ServletBase ;
import org.apache.jena.riot.out.NQuadsWriter ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.util.Utils ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java Thu Feb 14 12:05:18 2013
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpSession ;
import org.apache.commons.codec.binary.Base64 ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
+import org.apache.jena.web.impl.HttpSC ;
/** Log-in and choose dataset */
public class ActionDataset extends HttpServlet
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java Thu Feb 14 12:05:18 2013
@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.SPARQLServer ;
+import org.apache.jena.web.impl.HttpSC ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.Jena ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java Thu Feb 14 12:05:18 2013
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.web.impl.HttpSC ;
import org.eclipse.jetty.http.HttpHeaders ;
import org.eclipse.jetty.http.HttpMethods ;
import org.eclipse.jetty.http.MimeTypes ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Thu Feb 14 12:05:18 2013
@@ -28,12 +28,8 @@ import javax.servlet.http.HttpServletReq
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.atlas.web.TypedOutputStream ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.RiotWriter ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
@@ -66,7 +62,7 @@ public class REST_Quads extends SPARQL_R
catch (IOException ex) { errorOccurred(ex) ; output = null ; }
TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
- Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
+ Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
if ( lang == null )
lang = RDFLanguages.TRIG ;
@@ -128,7 +124,7 @@ public class REST_Quads extends SPARQL_R
errorBadRequest("Content-type required for data format") ;
MediaType mediaType = MediaType.create(x) ;
- Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
+ Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
if ( lang == null )
lang = RDFLanguages.TRIG ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Thu Feb 14 12:05:18 2013
@@ -31,9 +31,9 @@ import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.conneg.WebLib ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFWriter ;
@@ -97,7 +97,7 @@ public class ResponseModel
charset = WebContent.charsetUTF8 ;
}
- Lang lang = FusekiLib.langFromContentType(contentType) ;
+ Lang lang = WebContent.contentTypeToLang(contentType) ;
RDFWriter rdfw = FusekiLib.chooseWriter(lang) ;
if ( rdfw instanceof RDFXMLWriterI )
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Thu Feb 14 12:05:18 2013
@@ -32,8 +32,8 @@ import org.apache.jena.atlas.web.MediaTy
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.conneg.ConNeg ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.web.impl.HttpSC ;
import static org.apache.jena.atlas.lib.Lib.equal ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Thu Feb 14 12:05:18 2013
@@ -44,10 +44,10 @@ import org.apache.jena.atlas.web.MediaTy
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
-import org.apache.jena.fuseki.migrate.WebIO ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -363,7 +363,7 @@ public abstract class SPARQL_Query exten
private String getRemoteString(String queryURI)
{
- return WebIO.exec_get(queryURI) ;
+ return HttpOp.execHttpGet(queryURI) ;
}
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Thu Feb 14 12:05:18 2013
@@ -39,9 +39,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.atlas.web.ContentType ;
-import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RiotException ;
@@ -49,6 +47,7 @@ import org.apache.jena.riot.RiotReader ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.* ;
+import org.apache.jena.web.impl.HttpSC ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -312,7 +311,7 @@ public abstract class SPARQL_REST extend
}
int len = action.request.getContentLength() ;
- Lang lang = FusekiLib.langFromContentType(ct.getContentType()) ;
+ Lang lang = WebContent.contentTypeToLang(ct.getContentType()) ;
if ( lang == null )
{
errorBadRequest("Unknown content type for triples: "+contentTypeHeader) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Thu Feb 14 12:05:18 2013
@@ -92,7 +92,7 @@ public class SPARQL_REST_R extends SPARQ
catch (IOException ex) { errorOccurred(ex) ; output = null ; }
TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
- Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
+ Lang lang = WebContent.contentTypeToLang(mediaType.getContentType()) ;
if ( action.verbose )
log.info(format("[%d] Get: Content-Type=%s, Charset=%s => %s",
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Thu Feb 14 12:05:18 2013
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.QueryCancelledException ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java Thu Feb 14 12:05:18 2013
@@ -32,10 +32,10 @@ import org.apache.jena.atlas.web.MediaTy
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.conneg.ConNeg ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.web.impl.HttpSC ;
/** This servlet can be attached to a dataset location
* and acts as a falserouter for all SPARQL operations
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Thu Feb 14 12:05:18 2013
@@ -41,11 +41,11 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.system.IRIResolver ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.QueryParseException ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Thu Feb 14 12:05:18 2013
@@ -32,17 +32,13 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.servlet.ServletFileUpload ;
import org.apache.commons.fileupload.util.Streams ;
import org.apache.jena.atlas.web.ContentType ;
-import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.RiotReader ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.system.* ;
+import org.apache.jena.web.impl.HttpSC ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.GraphUtil ;
@@ -195,7 +191,7 @@ public class SPARQL_Upload extends SPARQ
String contentTypeHeader = item.getContentType() ;
ct = ContentType.parse(contentTypeHeader) ;
- lang = FusekiLib.langFromContentType(ct.getContentType()) ;
+ lang = WebContent.contentTypeToLang(ct.getContentType()) ;
if ( lang == null )
lang = RDFLanguages.filenameToLang(name) ;
if ( lang == null )
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Thu Feb 14 12:05:18 2013
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.web.impl.HttpSC ;
import org.slf4j.Logger ;
public abstract class ServletBase extends HttpServlet
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java Thu Feb 14 12:05:18 2013
@@ -19,11 +19,9 @@
package org.apache.jena.fuseki;
import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ;
import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ;
-import org.apache.jena.fuseki.http.TestDatasetGraphAccessorMem ;
-import org.apache.jena.fuseki.http.TestDatasetGraphAccessorTDB ;
+import org.apache.jena.web.TestDatasetGraphAccessorMem ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
@@ -34,7 +32,6 @@ import org.junit.runners.Suite ;
@Suite.SuiteClasses( {
TestProtocol.class
, TestDatasetGraphAccessorMem.class
- , TestDatasetGraphAccessorTDB.class
, TestDatasetGraphAccessorHTTP.class
, TestDatasetAccessorHTTP.class
, TestUpdate.class
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java Thu Feb 14 12:05:18 2013
@@ -18,8 +18,8 @@
package org.apache.jena.fuseki;
-import org.apache.jena.fuseki.DatasetAccessor ;
-import org.apache.jena.fuseki.DatasetAccessorFactory ;
+import org.apache.jena.web.DatasetAccessor ;
+import org.apache.jena.web.DatasetAccessorFactory ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java Thu Feb 14 12:05:18 2013
@@ -23,6 +23,8 @@ import java.net.HttpURLConnection ;
import java.net.URL ;
import junit.framework.Assert ;
+import org.apache.jena.web.DatasetAccessor ;
+import org.apache.jena.web.DatasetAccessorFactory ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
Copied: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java (from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java?p2=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java Thu Feb 14 12:05:18 2013
@@ -18,7 +18,11 @@
package org.apache.jena.fuseki.http;
-import org.apache.jena.fuseki.* ;
+import org.apache.jena.fuseki.BaseServerTest ;
+import org.apache.jena.fuseki.ServerTest ;
+import org.apache.jena.fuseki.WebTest ;
+import org.apache.jena.web.DatasetAccessor ;
+import org.apache.jena.web.DatasetAccessorFactory ;
import org.junit.AfterClass ;
import org.junit.Before ;
import org.junit.BeforeClass ;
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java Thu Feb 14 12:05:18 2013
@@ -20,8 +20,9 @@ package org.apache.jena.fuseki.http;
import org.apache.jena.fuseki.BaseServerTest ;
import org.apache.jena.fuseki.ServerTest ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessorHTTP ;
+import org.apache.jena.web.TestDatasetGraphAccessorBase ;
+import org.apache.jena.web.impl.DatasetGraphAccessor ;
+import org.apache.jena.web.impl.DatasetGraphAccessorHTTP ;
import org.junit.AfterClass ;
import org.junit.Before ;
import org.junit.BeforeClass ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TS_Graph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TS_Graph.java?rev=1446136&r1=1446135&r2=1446136&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TS_Graph.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TS_Graph.java Thu Feb 14 12:05:18 2013
@@ -28,6 +28,7 @@ import org.junit.runners.Suite ;
, TestDatasetGraphTDB.class
, TestGraphsTDB1.class
, TestGraphsTDB2.class
+ , TestDatasetGraphAccessorTDB.class
})
public class TS_Graph
{
Copied: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java (from r1446066, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java?p2=jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java&r1=1446066&r2=1446136&rev=1446136&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java Thu Feb 14 12:05:18 2013
@@ -16,10 +16,11 @@
* limitations under the License.
*/
-package org.apache.jena.fuseki.http;
+package com.hp.hpl.jena.tdb.graph;
-import org.apache.jena.fuseki.DatasetAccessorFactory ;
-import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
+import org.apache.jena.web.DatasetAccessorFactory ;
+import org.apache.jena.web.TestDatasetGraphAccessorBase ;
+import org.apache.jena.web.impl.DatasetGraphAccessor ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.tdb.TDBFactory ;