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 2011/08/18 12:51:37 UTC
svn commit: r1159155 - in /incubator/jena/Jena2/ARQ/trunk/src/org/openjena:
atlas/lib/SystemUtils.java riot/web/HttpOp.java riot/web/HttpResponseLib.java
Author: andy
Date: Thu Aug 18 10:51:36 2011
New Revision: 1159155
URL: http://svn.apache.org/viewvc?rev=1159155&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/lib/SystemUtils.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpOp.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpResponseLib.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/lib/SystemUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/lib/SystemUtils.java?rev=1159155&r1=1159154&r2=1159155&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/lib/SystemUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/lib/SystemUtils.java Thu Aug 18 10:51:36 2011
@@ -13,12 +13,14 @@ import org.slf4j.LoggerFactory ;
public class SystemUtils
{
private static Logger log = LoggerFactory.getLogger(SystemUtils.class.getName());
+ // Unfortunately, this tends to cause confusing logging.
+ private static boolean logging = false ;
static public ClassLoader chooseClassLoader()
{
ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); ;
- if ( classLoader != null )
+ if ( logging && classLoader != null )
log.trace("Using thread classloader") ;
// if (classLoader == null)
@@ -31,7 +33,7 @@ public class SystemUtils
if ( classLoader == null )
{
classLoader = ClassLoader.getSystemClassLoader() ;
- if ( classLoader != null )
+ if ( logging && classLoader != null )
log.trace("Using system classloader") ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpOp.java?rev=1159155&r1=1159154&r2=1159155&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpOp.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpOp.java Thu Aug 18 10:51:36 2011
@@ -64,21 +64,22 @@ public class HttpOp
static private AtomicLong counter = new AtomicLong(0) ;
- /** GET with unencoded query string.
- * See {@link #execHttpGet(String, String, Map)} for additional details.
- * <p>The query string wil be encoded as needed and appended to the URL, inserting a "?".
- */
- public static void execHttpGet(String url, String queryString, String acceptHeader, Map<String, HttpResponseHandler> handlers)
- {
- try {
- String requestURL = url+"?"+URLEncoder.encode(queryString, "UTF-8") ;
- execHttpGet(requestURL, acceptHeader, handlers) ;
- } catch (UnsupportedEncodingException ex)
- {
- // UTF-8 required of all Java platforms.
- throw new ARQInternalErrorException("No UTF-8 charset") ;
- }
- }
+// /** GET with unencoded query string.
+// * See {@link #execHttpGet(String, String, Map)} for additional details.
+// * <p>The query string will be encoded as needed and appended to the URL, inserting a "?".
+// */
+// public static void execHttpGet(String url, String queryString, String acceptHeader, Map<String, HttpResponseHandler> handlers)
+// {
+// try {
+// System.err.println("BROKEN - encodes the queyr string structure") ;
+// String requestURL = url+"?"+URLEncoder.encode(queryString, "UTF-8") ;
+// execHttpGet(requestURL, acceptHeader, handlers) ;
+// } catch (UnsupportedEncodingException ex)
+// {
+// // UTF-8 required of all Java platforms.
+// throw new ARQInternalErrorException("No UTF-8 charset") ;
+// }
+// }
/** GET
* <p>The acceptHeader string is any legal value for HTTP Accept: field.
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpResponseLib.java?rev=1159155&r1=1159154&r2=1159155&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpResponseLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/riot/web/HttpResponseLib.java Thu Aug 18 10:51:36 2011
@@ -41,8 +41,9 @@ import com.hp.hpl.jena.sparql.resultset.
import com.hp.hpl.jena.sparql.util.graph.GraphFactory ;
/** A collection of handlers for response handling.
- * @See {@link HttpOp#execHttpGet(String, String, String, java.util.Map)}
- * @See {@link HttpOp#execHttpPost(String, String, ContentProducer, String, java.util.Map)}
+ * @see HttpOp#execHttpGet(String, String, java.util.Map)
+ * @see HttpOp#execHttpPost(String, String, ContentProducer, String, java.util.Map)
+ *
*/
public class HttpResponseLib
{
@@ -122,6 +123,7 @@ public class HttpResponseLib
public static ResultsFormat contentTypeToResultSet(String contentType) { return mapContentTypeToResultSet.get(contentType) ; }
private static final Map<String, ResultsFormat> mapContentTypeToResultSet = new HashMap<String, ResultsFormat>() ;
+ static
{
mapContentTypeToResultSet.put(WebContent.contentTypeResultsXML, ResultsFormat.FMT_RS_XML) ;
mapContentTypeToResultSet.put(WebContent.contentTypeResultsJSON, ResultsFormat.FMT_RS_JSON) ;