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/11/21 09:45:10 UTC
svn commit: r1412015 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/
jena-arq/src/main/java/org/openjena/riot/
jena-arq/src/test/java/org/openjena/riot/
jena-fuseki/src/main/java/org/apache/jena/fuseki/
Author: andy
Date: Wed Nov 21 08:45:08 2012
New Revision: 1412015
URL: http://svn.apache.org/viewvc?rev=1412015&view=rev
Log:
Add probable RDF 1.1 content type names for N-Quads and TriG.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Langs.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Langs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Langs.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Langs.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Langs.java Wed Nov 21 08:45:08 2012
@@ -216,11 +216,13 @@ public class Langs
// TriG
addQuadSyntax$(langTriG, WebContent.contentTypeTriG, pfQuads, "trig") ;
- addContentTypeLang$(WebContent.contentTypeTriGAlt, langTriG) ;
+ addContentTypeLang$(WebContent.contentTypeTriGAlt1, langTriG) ;
+ addContentTypeLang$(WebContent.contentTypeTriGAlt2, langTriG) ;
// N-Quads
addQuadSyntax$(langNQuads, WebContent.contentTypeNQuads, pfQuads, "nq") ;
- addContentTypeLang$(WebContent.contentTypeNQuadsAlt, langNQuads) ;
+ addContentTypeLang$(WebContent.contentTypeNQuadsAlt1, langNQuads) ;
+ addContentTypeLang$(WebContent.contentTypeNQuadsAlt2, langNQuads) ;
// Reader name and variations to lang - must include Jena old-name.
registerShortNameForLang("RDF/XML", langRDFXML) ;
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=1412015&r1=1412014&r2=1412015&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 Wed Nov 21 08:45:08 2012
@@ -48,10 +48,13 @@ public class WebContent
public static final String contentTypeXML = "application/xml" ;
public static final String contentTypeXMLAlt = "text/xml" ;
- public static final String contentTypeTriG = "application/trig" ;
- public static final String contentTypeNQuads = "text/nquads" ;
- public static final String contentTypeTriGAlt = "application/x-trig" ;
- public static final String contentTypeNQuadsAlt = "text/x-nquads" ;
+ public static final String contentTypeTriG = "text/trig" ;
+ public static final String contentTypeNQuads = "application/n-quads" ;
+
+ public static final String contentTypeTriGAlt1 = "application/x-trig" ;
+ public static final String contentTypeTriGAlt2 = "application/trig" ;
+ public static final String contentTypeNQuadsAlt1 = "text/n-quads" ;
+ public static final String contentTypeNQuadsAlt2 = "text/nquads" ;
public static final String contentTypeTriX = "application/trix+xml" ;
public static final String contentTypeOctets = "application/octet-stream" ;
@@ -110,9 +113,11 @@ public class WebContent
mapContentTypeToLang.put(contentTypeRdfJson, Lang.RDFJSON) ;
mapContentTypeToLang.put(contentTypeNQuads, Lang.NQUADS) ;
- mapContentTypeToLang.put(contentTypeNQuadsAlt, Lang.NQUADS) ;
+ mapContentTypeToLang.put(contentTypeNQuadsAlt1, Lang.NQUADS) ;
+ mapContentTypeToLang.put(contentTypeNQuadsAlt2, Lang.NQUADS) ;
mapContentTypeToLang.put(contentTypeTriG, Lang.TRIG) ;
- mapContentTypeToLang.put(contentTypeTriGAlt, Lang.TRIG) ;
+ mapContentTypeToLang.put(contentTypeTriGAlt1, Lang.TRIG) ;
+ mapContentTypeToLang.put(contentTypeTriGAlt2, Lang.TRIG) ;
}
@@ -150,10 +155,11 @@ public class WebContent
return ct.getCharset() ;
String mt = ct.getContentType() ;
- if ( contentTypeNTriples.equals(mt) ) return charsetASCII ;
+ if ( contentTypeNTriples.equals(mt) ) return charsetUTF8 ;
if ( contentTypeNTriplesAlt.equals(mt) ) return charsetASCII ;
- if ( contentTypeNQuads.equals(mt) ) return charsetASCII ;
- if ( contentTypeNQuadsAlt.equals(mt) ) return charsetASCII ;
+ if ( contentTypeNQuads.equals(mt) ) return charsetUTF8 ;
+ if ( contentTypeNQuadsAlt1.equals(mt) ) return charsetASCII ;
+ if ( contentTypeNQuadsAlt2.equals(mt) ) return charsetASCII ;
return charsetUTF8 ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebReader.java Wed Nov 21 08:45:08 2012
@@ -22,12 +22,14 @@ import static org.openjena.riot.WebConte
import static org.openjena.riot.WebContent.contentTypeN3Alt1 ;
import static org.openjena.riot.WebContent.contentTypeN3Alt2 ;
import static org.openjena.riot.WebContent.contentTypeNQuads ;
-import static org.openjena.riot.WebContent.contentTypeNQuadsAlt ;
+import static org.openjena.riot.WebContent.contentTypeNQuadsAlt1 ;
+import static org.openjena.riot.WebContent.contentTypeNQuadsAlt2 ;
import static org.openjena.riot.WebContent.contentTypeNTriples ;
import static org.openjena.riot.WebContent.contentTypeNTriplesAlt ;
import static org.openjena.riot.WebContent.contentTypeRDFXML ;
import static org.openjena.riot.WebContent.contentTypeTriG ;
-import static org.openjena.riot.WebContent.contentTypeTriGAlt ;
+import static org.openjena.riot.WebContent.contentTypeTriGAlt1 ;
+import static org.openjena.riot.WebContent.contentTypeTriGAlt2 ;
import static org.openjena.riot.WebContent.contentTypeTurtle ;
import static org.openjena.riot.WebContent.contentTypeTurtleAlt1 ;
import static org.openjena.riot.WebContent.contentTypeTurtleAlt2 ;
@@ -145,9 +147,11 @@ public class WebReader
contentTypeToLang.put(contentTypeRDFXML.toLowerCase(), Lang.RDFXML) ;
contentTypeToLang.put(contentTypeTriG.toLowerCase(), Lang.TRIG) ;
- contentTypeToLang.put(contentTypeTriGAlt.toLowerCase(), Lang.TRIG) ;
+ contentTypeToLang.put(contentTypeTriGAlt1.toLowerCase(), Lang.TRIG) ;
+ contentTypeToLang.put(contentTypeTriGAlt2.toLowerCase(), Lang.TRIG) ;
contentTypeToLang.put(contentTypeNQuads.toLowerCase(), Lang.NQUADS) ;
- contentTypeToLang.put(contentTypeNQuadsAlt.toLowerCase(), Lang.NQUADS) ;
+ contentTypeToLang.put(contentTypeNQuadsAlt1.toLowerCase(), Lang.NQUADS) ;
+ contentTypeToLang.put(contentTypeNQuadsAlt2.toLowerCase(), Lang.NQUADS) ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java Wed Nov 21 08:45:08 2012
@@ -31,7 +31,9 @@ import org.openjena.riot.tokens.TestToke
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestTokenizer.class
+ TestWebContent.class
+
+ , TestTokenizer.class
, TestTokenForNode.class
, TestPrefixMap.class
, TestIRI.class
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestWebContent.java Wed Nov 21 08:45:08 2012
@@ -51,14 +51,16 @@ public class TestWebContent {
public void testCanonicaliseMimeTypes4()
{
testCanonicalise(WebContent.contentTypeNQuads, WebContent.contentTypeNQuads);
- testCanonicalise(WebContent.contentTypeNQuadsAlt, WebContent.contentTypeNQuads);
+ testCanonicalise(WebContent.contentTypeNQuadsAlt1, WebContent.contentTypeNQuads);
+ testCanonicalise(WebContent.contentTypeNQuadsAlt2, WebContent.contentTypeNQuads);
}
@Test
public void testCanonicaliseMimeTypes5()
{
testCanonicalise(WebContent.contentTypeTriG, WebContent.contentTypeTriG);
- testCanonicalise(WebContent.contentTypeTriGAlt, WebContent.contentTypeTriG);
+ testCanonicalise(WebContent.contentTypeTriGAlt1, WebContent.contentTypeTriG);
+ testCanonicalise(WebContent.contentTypeTriGAlt2, WebContent.contentTypeTriG);
}
private void testCanonicalise(String input, String expected)
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java Wed Nov 21 08:45:08 2012
@@ -31,15 +31,17 @@ public class DEF
public static final MediaType acceptNTriples = MediaType.create(WebContent.contentTypeNTriples) ;
public static final MediaType acceptNTriplesAlt = MediaType.create(WebContent.contentTypeNTriplesAlt) ;
public static final MediaType acceptTriG = MediaType.create(WebContent.contentTypeTriG) ;
- public static final MediaType acceptTriGAlt = MediaType.create(WebContent.contentTypeTriGAlt) ;
+ public static final MediaType acceptTriGAlt1 = MediaType.create(WebContent.contentTypeTriGAlt1) ;
+ public static final MediaType acceptTriGAlt2 = MediaType.create(WebContent.contentTypeTriGAlt2) ;
public static final MediaType acceptNQuads = MediaType.create(WebContent.contentTypeNQuads) ;
- public static final MediaType acceptNQuadsAlt = MediaType.create(WebContent.contentTypeNQuadsAlt) ;
+ public static final MediaType acceptNQuadsAlt1 = MediaType.create(WebContent.contentTypeNQuadsAlt1) ;
+ public static final MediaType acceptNQuadsAlt2 = MediaType.create(WebContent.contentTypeNQuadsAlt2) ;
public static final MediaType charsetUTF8 = MediaType.create(WebContent.charsetUTF8) ;
public static final MediaType acceptRSXML = MediaType.create(WebContent.contentTypeResultsXML) ;
public static final AcceptList rdfOffer = AcceptList.create(acceptRDFXML, acceptTurtle1, acceptTurtle2, acceptTurtle3, acceptNTriples, acceptNTriplesAlt) ;
- public static final AcceptList quadsOffer = AcceptList.create(acceptNQuads, acceptNQuadsAlt, acceptTriG, acceptTriGAlt) ;
+ public static final AcceptList quadsOffer = AcceptList.create(acceptNQuads, acceptNQuadsAlt1, acceptNQuadsAlt2, acceptTriG, acceptTriGAlt1, acceptTriGAlt2) ;
public static final AcceptList charsetOffer = AcceptList.create(charsetUTF8) ;
public static final AcceptList rsOffer = AcceptList.create(WebContent.contentTypeResultsXML,
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1412015&r1=1412014&r2=1412015&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Wed Nov 21 08:45:08 2012
@@ -62,10 +62,11 @@ public class FusekiLib
mapContentTypeToLang.put(WebContent.contentTypeTriG, Lang.TRIG) ;
- mapContentTypeToLang.put(WebContent.contentTypeTriGAlt, Lang.TRIG) ;
+ mapContentTypeToLang.put(WebContent.contentTypeTriGAlt1, Lang.TRIG) ;
+ mapContentTypeToLang.put(WebContent.contentTypeTriGAlt2, Lang.TRIG) ;
mapContentTypeToLang.put(WebContent.contentTypeNQuads, Lang.NQUADS) ;
- mapContentTypeToLang.put(WebContent.contentTypeNQuadsAlt, Lang.NQUADS) ;
-
+ mapContentTypeToLang.put(WebContent.contentTypeNQuadsAlt1, Lang.NQUADS) ;
+ mapContentTypeToLang.put(WebContent.contentTypeNQuadsAlt2, Lang.NQUADS) ;
}
// ----