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 2016/01/13 18:13:11 UTC
[1/2] jena git commit: Remove dead code.
Repository: jena
Updated Branches:
refs/heads/master 7ea0c9c91 -> dd7b6ecc9
Remove dead code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08cd3703
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08cd3703
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08cd3703
Branch: refs/heads/master
Commit: 08cd3703854175e30d5199dd2aca7fbaeabef0be
Parents: 7ea0c9c
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jan 13 17:12:02 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jan 13 17:12:02 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/tdb/sys/SetupTDB.java | 66 --------------------
1 file changed, 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/08cd3703/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SetupTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SetupTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SetupTDB.java
index 166a3f5..29ff118 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SetupTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SetupTDB.java
@@ -53,72 +53,6 @@ public class SetupTDB
private static StoreParams params = StoreParams.getDftStoreParams() ;
-// // And here we make datasets ...
-// public static DatasetGraphTDB buildDataset(Location location)
-// {
-// return DatasetBuilderStd.build(location) ;
-// }
-//
-// //protected static DatasetControl createConcurrencyPolicy() { return new DatasetControlMRSW() ; }
-//
-// public static TripleTable makeTripleTable(Location location, NodeTable nodeTable, String dftPrimary, String[] dftIndexes, DatasetControl policy)
-// {
-// String primary = Names.primaryIndexTriples ;
-// String indexes[] = Names.tripleIndexes ;
-//
-// if ( indexes.length != 3 )
-// error(log, "Wrong number of triple table indexes: "+StrUtils.strjoin(",", indexes)) ;
-// log.debug("Triple table: "+primary+" :: "+StrUtils.strjoin(",", indexes)) ;
-//
-// TupleIndex tripleIndexes[] = makeTupleIndexes(location, primary, indexes, indexes) ;
-// if ( tripleIndexes.length != indexes.length )
-// error(log, "Wrong number of triple table tuples indexes: "+tripleIndexes.length) ;
-// TripleTable tripleTable = new TripleTable(tripleIndexes, nodeTable, policy) ;
-// return tripleTable ;
-// }
-//
-// public static QuadTable makeQuadTable(Location location, NodeTable nodeTable, String dftPrimary, String[] dftIndexes, DatasetControl policy)
-// {
-// String primary = Names.primaryIndexQuads ;
-// String indexes[] = Names.quadIndexes ;
-//
-// if ( indexes.length != 6 )
-// error(log, "Wrong number of quad table indexes: "+StrUtils.strjoin(",", indexes)) ;
-// log.debug("Quad table: "+primary+" :: "+StrUtils.strjoin(",", indexes)) ;
-//
-// TupleIndex quadIndexes[] = makeTupleIndexes(location, primary, indexes, indexes) ;
-// if ( quadIndexes.length != indexes.length )
-// error(log, "Wrong number of quad table tuples indexes: "+quadIndexes.length) ;
-// QuadTable quadTable = new QuadTable(quadIndexes, nodeTable, policy) ;
-// return quadTable ;
-// }
-//
-//
-// public static DatasetPrefixesTDB makePrefixes(Location location, DatasetControl policy)
-// {
-// // The index using for Graph+Prefix => URI
-// String indexPrefixes = params.getIndexPrefix() ;
-// String primary = params.getPrimaryIndexPrefix() ;
-// String indexes[] = params.getPrefixIndexes() ;
-//
-// TupleIndex prefixIndexes[] = makeTupleIndexes(location, primary, indexes, new String[]{indexPrefixes}) ;
-// if ( prefixIndexes.length != indexes.length )
-// error(log, "Wrong number of triple table tuples indexes: "+prefixIndexes.length) ;
-//
-// // The nodetable.
-// String pnNode2Id = params.getPrefixNode2Id() ;
-// String pnId2Node = params.getPrefixId2Node() ;
-//
-// // No cache - the prefix mapping is a cache
-// NodeTable prefixNodes = makeNodeTable(location, pnNode2Id, -1, pnId2Node, -1, -1) ;
-// NodeTupleTable prefixTable = new NodeTupleTableConcrete(primary.length(),
-// prefixIndexes,
-// prefixNodes, policy) ;
-// DatasetPrefixesTDB prefixes = new DatasetPrefixesTDB(prefixTable) ;
-// log.debug("Prefixes: "+StrUtils.strjoin(", ", indexes)) ;
-// return prefixes ;
-// }
-
public static TupleIndex[] makeTupleIndexes(Location location, String primary, String[] descs, String[] filenames)
{
if ( primary.length() != 3 && primary.length() != 4 )
[2/2] jena git commit: Use file extension to determine syntax is not
on the command line.
Posted by an...@apache.org.
Use file extension to determine syntax is not on the command line.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dd7b6ecc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dd7b6ecc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dd7b6ecc
Branch: refs/heads/master
Commit: dd7b6ecc94b91205c063b9685e2201b1093add13
Parents: 08cd370
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jan 13 17:12:50 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jan 13 17:12:50 2016 +0000
----------------------------------------------------------------------
jena-cmds/src/main/java/jena/rdfcompare.java | 63 ++++++++++++-----------
1 file changed, 32 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dd7b6ecc/jena-cmds/src/main/java/jena/rdfcompare.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/jena/rdfcompare.java b/jena-cmds/src/main/java/jena/rdfcompare.java
index 95cc602..a5ccc33 100644
--- a/jena-cmds/src/main/java/jena/rdfcompare.java
+++ b/jena-cmds/src/main/java/jena/rdfcompare.java
@@ -20,10 +20,12 @@ package jena;
import static org.apache.jena.atlas.logging.LogCtl.setCmdLogging;
-import java.net.URL;
-import java.io.FileInputStream;
-
-import org.apache.jena.rdf.model.* ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.ModelFactory ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.system.JenaSystem ;
/** A program which read two RDF models and determines if they are the same.
*
@@ -41,12 +43,17 @@ import org.apache.jena.rdf.model.* ;
* lang1 and lang2 specify the language of the input and can be:
* RDF/XML
* N-TRIPLE
- * N3
+ * TURTLE
+ * JSON-LD
+ * The language defaults to what can be inferred from the file name or URL.
* </pre>
*/
public class rdfcompare extends java.lang.Object {
- static { setCmdLogging(); }
+ static {
+ JenaSystem.init();
+ setCmdLogging();
+ }
/**
* @param args the command line arguments
@@ -59,28 +66,27 @@ public class rdfcompare extends java.lang.Object {
String in1 = args[0];
String in2 = args[1];
- String lang1 = "RDF/XML";
- if (args.length >= 3) {
+ String lang1 = null ;
+ if (args.length >= 3)
lang1 = args[2];
- }
- String lang2 = "N-TRIPLE";
- if (args.length >= 4) {
+
+ String lang2 = null ;
+ if (args.length >= 4)
lang2 = args[3];
- }
+
String base1 = null;
- if (args.length >= 5) {
+ if (args.length >= 5)
base1 = args[4];
- }
+
String base2 = base1;
- if (args.length >= 6) {
+ if (args.length >= 6)
base2 = args[5];
- }
- System.out.println(in1 + " " + in2 + " " + lang1 + " " + lang2 + " " + base1 + " " + base2);
+ //System.out.println(in1 + " " + in2 + " " + lang1 + " " + lang2 + " " + base1 + " " + base2);
try {
Model m1 = ModelFactory.createDefaultModel();
Model m2 = ModelFactory.createDefaultModel();
-
+
read(m1, in1, lang1, base1);
read(m2, in2, lang2, base2);
@@ -107,25 +113,20 @@ public class rdfcompare extends java.lang.Object {
System.err.println();
System.err.println(" source1 and source2 can be URL's or filenames");
System.err.println(" lang1 and lang2 can take values:");
- System.err.println(" RDF/XML");
- System.err.println(" N-TRIPLE");
- System.err.println(" N3");
- System.err.println(" lang1 defaults to RDF/XML, lang2 to N-TRIPLE");
+ System.err.println(" RDF/XML, N-TRIPLE, TURTLE, JSON-LD");
System.err.println(" base1 and base2 are URIs");
System.err.println(" base1 defaults to null");
System.err.println(" base2 defaults to base1");
- System.err.println(" If no base URIs are specified Jena determines the base URI based on the input source");
+ System.err.println("If no base URIs are specified Jena determines the base URI based on the input source");
System.err.println();
}
- protected static void read(Model model, String in, String lang, String base)
- throws java.io.FileNotFoundException {
- try {
- URL url = new URL(in);
- model.read(in, base, lang);
- } catch (java.net.MalformedURLException e) {
- model.read(new FileInputStream(in), base, lang);
- }
+ protected static void read(Model model, String in, String langStr, String base)
+ {
+ Lang lang = null ;
+ if ( langStr != null )
+ lang = RDFLanguages.nameToLang(langStr) ;
+ RDFDataMgr.read(model, in, base, lang) ;
}
}