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/12/03 15:26:49 UTC
svn commit: r1416542 - in /jena/trunk: jena-arq/pom.xml
jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java jena-fuseki/pom.xml
Author: andy
Date: Mon Dec 3 14:26:48 2012
New Revision: 1416542
URL: http://svn.apache.org/viewvc?rev=1416542&view=rev
Log:
JENA-358
Upgrade hhtpclient/httpcore
Use SystemDefaultHttpClient, which respects system settings.
Modified:
jena/trunk/jena-arq/pom.xml
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java
jena/trunk/jena-fuseki/pom.xml
Modified: jena/trunk/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/pom.xml?rev=1416542&r1=1416541&r2=1416542&view=diff
==============================================================================
--- jena/trunk/jena-arq/pom.xml (original)
+++ jena/trunk/jena-arq/pom.xml Mon Dec 3 14:26:48 2012
@@ -53,8 +53,8 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.httpclient>4.1.2</ver.httpclient>
- <ver.httpcore>4.1.3</ver.httpcore>
+ <ver.httpclient>4.2.2</ver.httpclient>
+ <ver.httpcore>4.2.3</ver.httpcore>
<ver.commons-codec>1.5</ver.commons-codec>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<build.time.xsd>${maven.build.timestamp}</build.time.xsd>
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java?rev=1416542&r1=1416541&r2=1416542&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/HttpOp2.java Mon Dec 3 14:26:48 2012
@@ -28,7 +28,7 @@ import org.apache.http.HttpResponse ;
import org.apache.http.StatusLine ;
import org.apache.http.client.HttpClient ;
import org.apache.http.client.methods.HttpGet ;
-import org.apache.http.impl.client.DefaultHttpClient ;
+import org.apache.http.impl.client.SystemDefaultHttpClient;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.web.HttpException ;
import org.apache.jena.atlas.web.MediaType ;
@@ -54,7 +54,7 @@ public class HttpOp2
httpget.addHeader(HttpNames.hAccept, acceptHeader) ;
// Execute
- HttpClient httpclient = new DefaultHttpClient(); // Pool?
+ HttpClient httpclient = new SystemDefaultHttpClient(); // Pool?
HttpResponse response = httpclient.execute(httpget) ;
// Response
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java?rev=1416542&r1=1416541&r2=1416542&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java Mon Dec 3 14:26:48 2012
@@ -41,7 +41,6 @@ import org.apache.http.client.methods.Ht
import org.apache.http.entity.EntityTemplate ;
import org.apache.http.entity.InputStreamEntity ;
import org.apache.http.entity.StringEntity ;
-import org.apache.http.impl.client.DefaultHttpClient ;
import org.apache.http.message.BasicNameValuePair ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Pair ;
@@ -52,6 +51,7 @@ import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
+import org.apache.http.impl.client.SystemDefaultHttpClient;
/** Simplified HTTP operations; simplification means only supporting certain uses of HTTP.
* The expectation is that the simplified operations in this class can be used by other code to
@@ -107,7 +107,7 @@ public class HttpOp
httpget.addHeader(HttpNames.hAccept, acceptHeader) ;
// Execute
- HttpClient httpclient = new DefaultHttpClient();
+ HttpClient httpclient = new SystemDefaultHttpClient();
HttpResponse response = httpclient.execute(httpget) ;
// Handle response
httpResponse(id, response, baseIRI, handlers) ;
@@ -201,7 +201,7 @@ public class HttpOp
log.debug(format("[%d] No content type")) ;
// Execute
- HttpClient httpclient = new DefaultHttpClient();
+ HttpClient httpclient = new SystemDefaultHttpClient();
httppost.setEntity(provider) ;
HttpResponse response = httpclient.execute(httppost) ;
httpResponse(id, response, baseIRI, handlers) ;
@@ -224,7 +224,7 @@ public class HttpOp
if ( log.isDebugEnabled() )
log.debug(format("[%d] %s %s",id ,httppost.getMethod(),httppost.getURI().toString())) ;
- HttpClient httpclient = new DefaultHttpClient();
+ HttpClient httpclient = new SystemDefaultHttpClient();
HttpResponse response = httpclient.execute(httppost) ;
httpResponse(id, response, baseIRI, handlers) ;
httpclient.getConnectionManager().shutdown();
@@ -267,7 +267,7 @@ public class HttpOp
log.debug(format("[%d] %s %s",id , httpput.getMethod(), httpput.getURI().toString())) ;
httpput.setEntity(entity) ;
- HttpClient httpclient = new DefaultHttpClient();
+ HttpClient httpclient = new SystemDefaultHttpClient();
HttpResponse response = httpclient.execute(httpput) ;
httpResponse(id, response, baseIRI, null) ;
httpclient.getConnectionManager().shutdown();
Modified: jena/trunk/jena-fuseki/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/pom.xml?rev=1416542&r1=1416541&r2=1416542&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/pom.xml (original)
+++ jena/trunk/jena-fuseki/pom.xml Mon Dec 3 14:26:48 2012
@@ -80,8 +80,8 @@
<ver.jetty>7.6.5.v20120716</ver.jetty>
<ver.velocity>1.7</ver.velocity>
- <ver.httpclient>4.1.3</ver.httpclient>
- <ver.httpcore>4.1.3</ver.httpcore>
+ <ver.httpclient>4.2.2</ver.httpclient>
+ <ver.httpcore>4.2.3</ver.httpcore>
<ver.commons-fileupload>1.2.2</ver.commons-fileupload>
<ver.commons-codec>1.5</ver.commons-codec>