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 2012/01/27 20:19:28 UTC
svn commit: r1236848 - in /incubator/jena/Jena2/Fuseki/trunk/src:
main/java/org/apache/jena/fuseki/ main/java/org/apache/jena/fuseki/conneg/
main/java/org/apache/jena/fuseki/http/
main/java/org/apache/jena/fuseki/servlets/ test/java/org/apache/jena/fus...
Author: andy
Date: Fri Jan 27 19:19:27 2012
New Revision: 1236848
URL: http://svn.apache.org/viewvc?rev=1236848&view=rev
Log:
Tidying up. Use code that has been migrated to ARQ already.
Removed:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java Fri Jan 27 19:19:27 2012
@@ -19,7 +19,7 @@
package org.apache.jena.fuseki;
import org.apache.jena.fuseki.conneg.AcceptList ;
-import org.apache.jena.fuseki.conneg.MediaType ;
+import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
public class DEF
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java Fri Jan 27 19:19:27 2012
@@ -18,13 +18,11 @@
package org.apache.jena.fuseki.conneg;
-import java.util.ArrayList ;
-import java.util.Arrays ;
-import java.util.Collections ;
-import java.util.Comparator ;
-import java.util.List ;
+import java.util.* ;
import org.openjena.atlas.logging.Log ;
+import org.openjena.atlas.web.MediaRange ;
+import org.openjena.atlas.web.MediaType ;
public class AcceptList
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java Fri Jan 27 19:19:27 2012
@@ -23,6 +23,8 @@ import static org.apache.jena.fuseki.Htt
import javax.servlet.http.HttpServletRequest ;
+import org.openjena.atlas.web.MediaRange ;
+import org.openjena.atlas.web.MediaType ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java Fri Jan 27 19:19:27 2012
@@ -37,11 +37,11 @@ import org.apache.http.params.HttpParams
import org.apache.http.params.HttpProtocolParams ;
import org.apache.http.protocol.HTTP ;
import org.apache.jena.fuseki.* ;
-import org.apache.jena.fuseki.conneg.TypedInputStream ;
import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.lib.Sink ;
import org.openjena.atlas.logging.Log ;
+import org.openjena.atlas.web.TypedInputStream ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Fri Jan 27 19:19:27 2012
@@ -25,10 +25,10 @@ import org.apache.jena.fuseki.DEF ;
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.MediaType ;
-import org.apache.jena.fuseki.conneg.TypedInputStream ;
import org.apache.jena.fuseki.conneg.WebLib ;
import org.apache.jena.fuseki.http.HttpSC ;
+import org.openjena.atlas.web.MediaType ;
+import org.openjena.atlas.web.TypedInputStream ;
import org.openjena.riot.Lang ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Fri Jan 27 19:19:27 2012
@@ -28,8 +28,8 @@ import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.conneg.AcceptList ;
import org.apache.jena.fuseki.conneg.ConNeg ;
-import org.apache.jena.fuseki.conneg.MediaType ;
import org.apache.jena.fuseki.http.HttpSC ;
+import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Fri Jan 27 19:19:27 2012
@@ -42,8 +42,8 @@ import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.conneg.ConNeg ;
-import org.apache.jena.fuseki.conneg.MediaType ;
import org.openjena.atlas.lib.Sink ;
+import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Fri Jan 27 19:19:27 2012
@@ -26,8 +26,8 @@ import javax.servlet.ServletOutputStream
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.fuseki.conneg.MediaType ;
-import org.apache.jena.fuseki.conneg.TypedOutputStream ;
+import org.openjena.atlas.web.MediaType ;
+import org.openjena.atlas.web.TypedOutputStream ;
import org.openjena.riot.Lang ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java?rev=1236848&r1=1236847&r2=1236848&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java Fri Jan 27 19:19:27 2012
@@ -19,10 +19,10 @@
package org.apache.jena.fuseki;
import org.apache.jena.fuseki.conneg.AcceptList ;
-import org.apache.jena.fuseki.conneg.MediaType ;
import org.junit.Test ;
+import org.openjena.atlas.web.MediaType ;
-
+// Moved to ARQ 2.9.1
public class TestContentNegotiation extends BaseTest
{
static final String ctFirefox = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5" ;