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 2015/12/23 18:39:04 UTC
[1/4] jena git commit: JENA-1103: Skip editor backup files in
configuration directory
Repository: jena
Updated Branches:
refs/heads/master d624c70b0 -> c61c7e237
JENA-1103: Skip editor backup files in configuration directory
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/55d1fb3e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/55d1fb3e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/55d1fb3e
Branch: refs/heads/master
Commit: 55d1fb3e7f61a8891f8b0646f8d941a378dc1866
Parents: d624c70
Author: ajs6f <aj...@virginia.edu>
Authored: Wed Dec 23 10:54:15 2015 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Wed Dec 23 10:56:25 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/build/FusekiConfig.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/55d1fb3e/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index 3b8923e..09942d1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -18,6 +18,9 @@
package org.apache.jena.fuseki.build ;
+import static org.apache.jena.riot.RDFLanguages.filenameToLang;
+import static org.apache.jena.riot.RDFParserRegistry.getFactory;
+
import java.io.File ;
import java.io.FilenameFilter ;
import java.io.IOException ;
@@ -46,6 +49,7 @@ import org.apache.jena.query.QuerySolution ;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.rdf.model.* ;
+import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.update.UpdateAction ;
@@ -211,7 +215,8 @@ public class FusekiConfig {
// Files that are not hidden.
DirectoryStream.Filter<Path> filter = (entry)-> {
File f = entry.toFile() ;
- return ! f.isHidden() && f.isFile() ;
+ final Lang lang = filenameToLang(f.getName());
+ return ! f.isHidden() && f.isFile() && lang != null && getFactory(lang) != null;
} ;
List<DataAccessPoint> dataServiceRef = new ArrayList<>() ;
[4/4] jena git commit: Add and use RDFParserRegistry.isRegistered
Posted by an...@apache.org.
Add and use RDFParserRegistry.isRegistered
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c61c7e23
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c61c7e23
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c61c7e23
Branch: refs/heads/master
Commit: c61c7e2375ae12a04c092d74d979b13b633b6b39
Parents: a0e0f89
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 23 17:38:42 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 23 17:38:42 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/RDFParserRegistry.java | 3 +++
.../src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c61c7e23/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
index 220108c..68b3924 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
@@ -138,6 +138,9 @@ public class RDFParserRegistry
return langToParserFactory.get(language) ;
}
+ /** return true if the language has a registered parser. */
+ public static boolean isRegistered(Lang lang) { return langToParserFactory.containsKey(lang) ; }
+
/** return true if the language is registered with the triples parser factories */
public static boolean isTriples(Lang lang) { return langTriples.contains(lang) ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/c61c7e23/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index 09942d1..9100688 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -19,7 +19,7 @@
package org.apache.jena.fuseki.build ;
import static org.apache.jena.riot.RDFLanguages.filenameToLang;
-import static org.apache.jena.riot.RDFParserRegistry.getFactory;
+import static org.apache.jena.riot.RDFParserRegistry.isRegistered;
import java.io.File ;
import java.io.FilenameFilter ;
@@ -216,7 +216,7 @@ public class FusekiConfig {
DirectoryStream.Filter<Path> filter = (entry)-> {
File f = entry.toFile() ;
final Lang lang = filenameToLang(f.getName());
- return ! f.isHidden() && f.isFile() && lang != null && getFactory(lang) != null;
+ return ! f.isHidden() && f.isFile() && lang != null && isRegistered(lang) ;
} ;
List<DataAccessPoint> dataServiceRef = new ArrayList<>() ;
[3/4] jena git commit: Delete deprecated.
Posted by an...@apache.org.
Delete deprecated.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a0e0f895
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a0e0f895
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a0e0f895
Branch: refs/heads/master
Commit: a0e0f895c1c06fa98ac42b9e3388316ef3e59179
Parents: 0b8f36b
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 23 17:28:24 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 23 17:30:31 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RiotWriter.java | 129 -------------------
1 file changed, 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a0e0f895/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
deleted file mode 100644
index 0e5cde0..0000000
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.riot;
-
-import java.io.OutputStream ;
-import java.util.Iterator ;
-
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.riot.writer.* ;
-import org.apache.jena.sparql.core.Quad ;
-
-/** Direct call to create writers for specific formats.
- * The normal way to write is {@link RDFDataMgr}
- */
-@Deprecated
-public class RiotWriter
-{
- public static void writeNQuads(OutputStream out, Iterator<Quad> it) {
- NQuadsWriter.write(out, it) ;
- }
-
- public static void writeTriples(OutputStream out, Iterator<Triple> it) {
- NTriplesWriter.write(out, it) ;
- }
-
- // ---- Create writers
-
- /** Create a Turtle writer
- @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)}
- */
- @Deprecated
- public static WriterGraphRIOT createTurtle() { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE) ; }
-
- /** Create a streaming Turtle writer
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_BLOCKS</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createTurtleStreaming() { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_BLOCKS) ; }
-
- /** Create a streaming Turtle writer
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.TURTLE_FLAT</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createTurtleFlat() { return RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_FLAT) ; }
-
- /** Create am N-Triples writer
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)}
- */
- @Deprecated
- public static WriterGraphRIOT createNTriples() { return RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES) ; }
-
- /** Create an N-Triples writer, restricted to ASCII characters in the output.
- * Other chars escaped in \ u sequences.
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NTRIPLES_ASCII</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createNTriplesASCII() { return RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES_ASCII) ; }
-
- /** Create an RDF/XML writer which pretty-prints
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_ABBREV</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createRDFXMLAbbrev() { return RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_ABBREV) ; }
-
- /** Create an RDF/XML writer which pretty-prints
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.RDFXML_PLAIN</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createRDFXMLPlain() { return RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_PLAIN) ; }
-
- /** Create an RDF/JSON writer
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(Lang)} and <tt>Lang.RDFJSON</tt>
- */
- @Deprecated
- public static WriterGraphRIOT createRDFJSON() { return RDFDataMgr.createGraphWriter(RDFFormat.RDFJSON) ; }
- /** Create a TriG writer
- * @deprecated Use {@link RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.TRIG</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createTrig() { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG) ; }
-
- /** Create a streaming TriG writer
- * @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_BLOCKS</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createTrigStreaming() { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_BLOCKS) ; }
-
- /** Create a streaming TriG writer with one quad per line.
- * @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.TRIG_FLAT</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createTrigFlat() { return RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_FLAT) ; }
-
- /** Create an N-Quads writer
- * @deprecated Use {@link RDFDataMgr#createDatasetWriter(Lang)} and <tt>Lang.NQUADS</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createNQuads() { return RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS) ; }
-
- /** Create an N-Quads writer, restricted to ASCII characters in the output.
- * Other chars escaped in \ u sequences.
- * @deprecated Use {@link RDFDataMgr#createGraphWriter(RDFFormat)} and <tt>RDFFormat.NQUADS_ASCII</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createNQuadsASCII() { return RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS_ASCII) ; }
-
- /** Create a sink writer
- * @deprecated Use {@link RDFDataMgr#createDatasetWriter(RDFFormat)} and <tt>RDFFormat.RDFNULL</tt>
- */
- @Deprecated
- public static WriterDatasetRIOT createRDFNULL() { return RDFDataMgr.createDatasetWriter(RDFFormat.RDFNULL) ; }
-}
-
[2/4] jena git commit: Remove debug code.
Posted by an...@apache.org.
Remove debug code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0b8f36b5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0b8f36b5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0b8f36b5
Branch: refs/heads/master
Commit: 0b8f36b5e8de458095b7c121d5d44510cc9f9086
Parents: 55d1fb3
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 23 09:54:52 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 23 17:30:31 2015 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/cmdline/ModContext.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0b8f36b5/jena-arq/src/main/java/arq/cmdline/ModContext.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModContext.java b/jena-arq/src/main/java/arq/cmdline/ModContext.java
index 28c999a..2d20f87 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModContext.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModContext.java
@@ -67,7 +67,6 @@ public class ModContext extends ModBase
symbolName = MappingRegistry.mapPrefixName(symbolName);
Symbol symbol = Symbol.create(symbolName);
context.set(symbol, value);
- System.err.println(symbol+"="+value);
}
ARQ.getContext().putAll(context);