Author: andy
Date: Wed Sep 18 19:07:17 2013
New Revision: 1524531
URL: http://svn.apache.org/r1524531
Log:
Use Locale.ROOT for lower/upper case when the operation is Locale independent.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_MD5.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeral.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFWriterRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.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/ResponseOps.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
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java
Wed Sep 18 19:07:17 2013
@@ -42,7 +42,7 @@ public class OpBGP extends Op0
public BasicPattern getPattern() { return pattern ; }
@Override
- public String getName() { return Tags.tagBGP
/*.toUpperCase(Locale.ENGLISH)*/ ; }
+ public String getName() { return Tags.tagBGP
/*.toUpperCase(Locale.ROOT)*/ ; }
@Override
public Op apply(Transform transform) { return transform.transform(this)
; }
@Override
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_MD5.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_MD5.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_MD5.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_MD5.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_MD5 extends ExprDigest
{
- private static final String symbol =
Tags.tagMD5.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol = Tags.tagMD5.toUpperCase(Locale.ROOT) ;
public E_MD5(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA1.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_SHA1 extends ExprDigest
{
- private static final String symbol =
Tags.tagSHA1.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol = Tags.tagSHA1.toUpperCase(Locale.ROOT)
;
public E_SHA1(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA224.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_SHA224 extends ExprDigest
{
- private static final String symbol =
Tags.tagSHA224.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol =
Tags.tagSHA224.toUpperCase(Locale.ROOT) ;
public E_SHA224(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA256.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_SHA256 extends ExprDigest
{
- private static final String symbol =
Tags.tagSHA256.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol =
Tags.tagSHA256.toUpperCase(Locale.ROOT) ;
public E_SHA256(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA384.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_SHA384 extends ExprDigest
{
- private static final String symbol =
Tags.tagSHA384.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol =
Tags.tagSHA384.toUpperCase(Locale.ROOT) ;
public E_SHA384(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_SHA512.java
Wed Sep 18 19:07:17 2013
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.sparql.sse.Tags ;
public class E_SHA512 extends ExprDigest
{
- private static final String symbol =
Tags.tagSHA512.toUpperCase(Locale.ENGLISH) ;
+ private static final String symbol =
Tags.tagSHA512.toUpperCase(Locale.ROOT) ;
public E_SHA512(Expr expr)
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
Wed Sep 18 19:07:17 2013
@@ -103,7 +103,7 @@ public class GraphMemPlain extends Graph
String lang = node.getLiteralLanguage() ;
if ( lang != null && ! lang.equals("") )
node = NodeFactory.createLiteral(node.getLiteralLexicalForm(),
- lang.toLowerCase(Locale.ENGLISH),
+ lang.toLowerCase(Locale.ROOT),
node.getLiteralDatatype()) ;
}
return node ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
Wed Sep 18 19:07:17 2013
@@ -562,7 +562,7 @@ public class FmtUtils
}
else
{
- String hexstr =
Integer.toHexString(c).toUpperCase(Locale.ENGLISH);
+ String hexstr =
Integer.toHexString(c).toUpperCase(Locale.ROOT);
int pad = 4 - hexstr.length();
sbuff.append("\\u");
for (; pad > 0; pad--)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeral.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeral.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeral.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeral.java
Wed Sep 18 19:07:17 2013
@@ -94,7 +94,7 @@ public class RomanNumeral
// It is easier working right to left!
public static int r2i(String lex)
{
- lex = lex.toUpperCase(Locale.ENGLISH) ;
+ lex = lex.toUpperCase(Locale.ROOT) ;
// This is overly permissive.
// 1 - allows multiple reducing values
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
Wed Sep 18 19:07:17 2013
@@ -331,7 +331,7 @@ public class RDFLanguages
return lang ;
}
- static String canonicalKey(String x) { return
x.toLowerCase(Locale.ENGLISH) ; }
+ static String canonicalKey(String x) { return x.toLowerCase(Locale.ROOT) ;
}
public static ContentType guessContentType(String resourceName)
{
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
Wed Sep 18 19:07:17 2013
@@ -49,7 +49,7 @@ public class RDFReaderRIOT implements RD
public RDFReaderRIOT(String lang)
{
- basename =
"org.apache.jena.riot.reader."+lang.toLowerCase(Locale.ENGLISH) ;
+ basename =
"org.apache.jena.riot.reader."+lang.toLowerCase(Locale.ROOT) ;
hintlang = lang ;
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFWriterRIOT.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFWriterRIOT.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFWriterRIOT.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFWriterRIOT.java
Wed Sep 18 19:07:17 2013
@@ -51,7 +51,7 @@ public class RDFWriterRIOT implements RD
public RDFWriterRIOT(String jenaName)
{
- this.basename =
"org.apache.jena.riot.writer."+jenaName.toLowerCase(Locale.ENGLISH) ;
+ this.basename =
"org.apache.jena.riot.writer."+jenaName.toLowerCase(Locale.ROOT) ;
this.jenaName = jenaName ;
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
Wed Sep 18 19:07:17 2013
@@ -145,9 +145,9 @@ public abstract class LangTurtleBase ext
protected final void directivePrefix() {
// Raw - unresolved prefix name.
if ( !lookingAt(PREFIXED_NAME) )
- exception(peekToken(), "@prefix requires a prefix (found '" +
peekToken() + "')") ;
+ exception(peekToken(), "@prefix or PREFIX requires a prefix (found
'" + peekToken() + "')") ;
if ( peekToken().getImage2().length() != 0 )
- exception(peekToken(), "@prefix requires a prefix and no suffix
(found '" + peekToken() + "')") ;
+ exception(peekToken(), "@prefix or PREFIX requires a prefix with
no suffix (found '" + peekToken() + "')") ;
String prefix = peekToken().getImage() ;
nextToken() ;
if ( !lookingAt(IRI) )
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
Wed Sep 18 19:07:17 2013
@@ -58,7 +58,7 @@ public class LocatorURL implements Locat
String uriSchemeName = FileUtils.getScheme(filenameOrURI) ;
if ( uriSchemeName == null )
return false ;
- uriSchemeName = uriSchemeName.toLowerCase(Locale.ENGLISH) ;
+ uriSchemeName = uriSchemeName.toLowerCase(Locale.ROOT) ;
for ( int i = 0 ; i < schemeNames.length ; i++ )
{
if ( uriSchemeName.equals(schemeNames[i]) )
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/LangTag.java Wed
Sep 18 19:07:17 2013
@@ -288,13 +288,13 @@ public class LangTag
private static String lowercase(String string)
{
if ( string == null ) return null ;
- return string.toLowerCase(Locale.ENGLISH) ;
+ return string.toLowerCase(Locale.ROOT) ;
}
private static String uppercase(String string)
{
if ( string == null ) return null ;
- return string.toUpperCase(Locale.ENGLISH) ;
+ return string.toUpperCase(Locale.ROOT) ;
}
private static String titlecase(String string)
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=1524531&r1=1524530&r2=1524531&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
Wed Sep 18 19:07:17 2013
@@ -100,7 +100,7 @@ public class ResponseModel
String forceAccept = ResponseOps.paramForceAccept(request) ;
if ( forceAccept != null )
{
- contentType = WebContent.contentTypeTextPlain ;
+ contentType = forceAccept ;
charset = WebContent.charsetUTF8 ;
}
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java?rev=1524531&r1=1524530&r2=1524531&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
Wed Sep 18 19:07:17 2013
@@ -31,7 +31,7 @@ public class ResponseOps
// Helpers
public static void put(Map<String, String> map, String key, String value)
{
- map.put(key.toLowerCase(Locale.US), value) ;
+ map.put(key.toLowerCase(Locale.ROOT), value) ;
}
public static boolean isEOFexception(IOException ioEx)
@@ -58,7 +58,8 @@ public class ResponseOps
String x = fetchParam(request, HttpNames.paramOutput1) ;
if ( x == null )
x = fetchParam(request, HttpNames.paramOutput2) ;
- return expandShortName(x, map) ;
+ String z = expandShortName(x, map) ;
+ return z.toLowerCase(Locale.ROOT) ;
}
// public static String paramAcceptField(HttpServletRequest request,
Map<String,String> map)
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=1524531&r1=1524530&r2=1524531&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
Wed Sep 18 19:07:17 2013
@@ -116,7 +116,7 @@ public abstract class SPARQL_Query exten
@Override
protected void validate(HttpAction action)
{
- String method = action.request.getMethod().toUpperCase(Locale.ENGLISH)
;
+ String method = action.request.getMethod().toUpperCase(Locale.ROOT) ;
if ( ! HttpNames.METHOD_POST.equals(method) && !
HttpNames.METHOD_GET.equals(method) )
errorMethodNotAllowed("Not a GET or POST request") ;
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=1524531&r1=1524530&r2=1524531&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
Wed Sep 18 19:07:17 2013
@@ -179,7 +179,7 @@ public abstract class SPARQL_REST extend
private void dispatch(HttpAction action) {
HttpServletRequest req = action.request ;
HttpServletResponse resp = action.response ;
- String method = req.getMethod().toUpperCase(Locale.ENGLISH) ;
+ String method = req.getMethod().toUpperCase(Locale.ROOT) ;
if (method.equals(METHOD_GET))
doGet$(action);
