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/08/28 17:13:48 UTC
svn commit: r1378167 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/engine/http/HttpParams.java
com/hp/hpl/jena/sparql/engine/http/HttpQuery.java
com/hp/hpl/jena/sparql/engine/http/Service.java
org/openjena/riot/WebContent.java
Author: andy
Date: Tue Aug 28 15:13:47 2012
New Revision: 1378167
URL: http://svn.apache.org/viewvc?rev=1378167&view=rev
Log:
Use WebContents for constants.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpParams.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpParams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpParams.java?rev=1378167&r1=1378166&r2=1378167&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpParams.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpParams.java Tue Aug 28 15:13:47 2012
@@ -40,21 +40,4 @@ public class HttpParams
/** Parameter for query language URI */
public static final String pQueryLang = "lang" ;
-
- // -------- Constants
-
- public static final String contentTypeAppN3 = "application/n3" ;
- public static final String contentTypeTurtle = "application/turtle" ;
- public static final String contentTypeRDFXML = "application/rdf+xml" ;
- public static final String contentTypeNTriples = "application/n-triples" ;
- public static final String contentTypeXML = "application/xml" ;
- public static final String contentTypeResultsXML = "application/sparql-results+xml" ;
-
- public static final String contentTypeTextPlain = "text/plain" ;
- public static final String contentTypeTextN3 = "text/n3" ;
- public static final String contentTypeForText = contentTypeTextPlain ;
-
- public static final String charsetUTF8 = "utf-8" ;
-
-
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java?rev=1378167&r1=1378166&r2=1378167&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/HttpQuery.java Tue Aug 28 15:13:47 2012
@@ -33,6 +33,7 @@ import java.util.zip.GZIPInputStream ;
import org.apache.commons.codec.binary.Base64 ;
import org.openjena.atlas.lib.StrUtils ;
+import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -59,7 +60,7 @@ public class HttpQuery extends Params
String serviceURL ;
- String contentTypeResult = HttpParams.contentTypeResultsXML ;
+ String contentTypeResult = WebContent.contentTypeResultsXML ;
HttpURLConnection httpConnection = null ;
// An object indicate no value associated with parameter name
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java?rev=1378167&r1=1378166&r2=1378167&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/Service.java Tue Aug 28 15:13:47 2012
@@ -22,6 +22,7 @@ import java.io.InputStream ;
import java.util.Map ;
import org.openjena.atlas.io.IO ;
+import org.openjena.riot.WebContent ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryExecException ;
@@ -167,7 +168,7 @@ public class Service
// configure the query object.
httpQuery.merge(QueryEngineHTTP.getServiceParams(uri, context));
httpQuery.addParam(HttpParams.pQuery, query.toString());
- httpQuery.setAccept(HttpParams.contentTypeResultsXML);
+ httpQuery.setAccept(WebContent.contentTypeResultsXML);
httpQuery.setAllowGZip(context.isTrue(queryGzip));
httpQuery.setAllowDeflate(context.isTrue(queryDeflate));
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java?rev=1378167&r1=1378166&r2=1378167&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java Tue Aug 28 15:13:47 2012
@@ -38,7 +38,7 @@ public class WebContent
public static final String contentTypeTurtleAlt2 = "application/x-turtle" ;
public static final String contentTypeRDFXML = "application/rdf+xml" ;
- public static final String contentTypeRDFJSON = "application/rdf+json" ;
+ public static final String contentTypeRDFJSON = "application/rdf+json" ;
// MIME type for N-triple is text/plain (!!!)
public static final String contentTypeTextPlain = "text/plain" ;