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/05 13:46:13 UTC
[19/20] jena git commit: JENA-1108 : jena-cmds module
JENA-1108 : jena-cmds module
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/498b2264
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/498b2264
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/498b2264
Branch: refs/heads/master
Commit: 498b2264143f67024085a32c354f7920a74802ae
Parents: eb9eec0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jan 2 21:28:04 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 5 12:31:35 2016 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/arq.java | 37 -
jena-arq/src/main/java/arq/bindings.java | 42 -
jena-arq/src/main/java/arq/cmdline/CmdARQ.java | 65 -
.../src/main/java/arq/cmdline/CmdARQ_SSE.java | 45 -
.../src/main/java/arq/cmdline/CmdUpdate.java | 63 -
.../src/main/java/arq/cmdline/ModAlgebra.java | 82 -
.../src/main/java/arq/cmdline/ModAssembler.java | 84 -
.../src/main/java/arq/cmdline/ModContext.java | 91 -
.../src/main/java/arq/cmdline/ModDataset.java | 49 -
.../java/arq/cmdline/ModDatasetAssembler.java | 70 -
.../java/arq/cmdline/ModDatasetGeneral.java | 119 -
.../arq/cmdline/ModDatasetGeneralAssembler.java | 56 -
.../src/main/java/arq/cmdline/ModEngine.java | 110 -
.../src/main/java/arq/cmdline/ModFormat.java | 91 -
jena-arq/src/main/java/arq/cmdline/ModItem.java | 80 -
.../main/java/arq/cmdline/ModLangOutput.java | 150 --
.../src/main/java/arq/cmdline/ModLangParse.java | 180 --
.../src/main/java/arq/cmdline/ModQueryIn.java | 156 --
.../src/main/java/arq/cmdline/ModQueryOut.java | 92 -
.../src/main/java/arq/cmdline/ModRemote.java | 75 -
.../src/main/java/arq/cmdline/ModResultsIn.java | 138 --
.../main/java/arq/cmdline/ModResultsOut.java | 70 -
.../src/main/java/arq/cmdline/ModSymbol.java | 26 -
jena-arq/src/main/java/arq/cmdline/ModTime.java | 73 -
jena-arq/src/main/java/arq/iri.java | 57 -
jena-arq/src/main/java/arq/juuid.java | 173 --
jena-arq/src/main/java/arq/load.java | 120 -
jena-arq/src/main/java/arq/qexpr.java | 223 --
jena-arq/src/main/java/arq/qparse.java | 269 ---
jena-arq/src/main/java/arq/query.java | 257 ---
jena-arq/src/main/java/arq/rdfdiff.java | 312 ---
jena-arq/src/main/java/arq/rset.java | 73 -
jena-arq/src/main/java/arq/rsparql.java | 95 -
jena-arq/src/main/java/arq/rupdate.java | 98 -
jena-arq/src/main/java/arq/sparql.java | 37 -
jena-arq/src/main/java/arq/sse.java | 108 -
jena-arq/src/main/java/arq/sse_exec.java | 50 -
jena-arq/src/main/java/arq/sse_expr.java | 24 -
jena-arq/src/main/java/arq/sse_query.java | 162 --
jena-arq/src/main/java/arq/tokens.java | 24 -
jena-arq/src/main/java/arq/uparse.java | 187 --
jena-arq/src/main/java/arq/update.java | 128 --
jena-arq/src/main/java/arq/utf8.java | 29 -
jena-arq/src/main/java/arq/version.java | 29 -
jena-arq/src/main/java/arq/wwwdec.java | 36 -
jena-arq/src/main/java/arq/wwwenc.java | 61 -
.../src/main/java/riotcmd/CmdLangParse.java | 361 ---
jena-arq/src/main/java/riotcmd/CmdTokens.java | 75 -
jena-arq/src/main/java/riotcmd/dumpthrift.java | 51 -
jena-arq/src/main/java/riotcmd/infer.java | 154 --
jena-arq/src/main/java/riotcmd/json.java | 52 -
jena-arq/src/main/java/riotcmd/nquads.java | 48 -
jena-arq/src/main/java/riotcmd/ntriples.java | 48 -
jena-arq/src/main/java/riotcmd/perftokens.java | 28 -
jena-arq/src/main/java/riotcmd/printtokens.java | 28 -
jena-arq/src/main/java/riotcmd/rdfxml.java | 48 -
jena-arq/src/main/java/riotcmd/riot.java | 62 -
jena-arq/src/main/java/riotcmd/trig.java | 48 -
jena-arq/src/main/java/riotcmd/turtle.java | 48 -
jena-arq/src/main/java/riotcmd/utf8.java | 75 -
jena-arq/src/test/java/arq/TS_Cmd.java | 31 -
jena-arq/src/test/java/arq/TestCmdLine.java | 104 -
jena-arq/src/test/java/arq/qtest.java | 274 ---
.../org/apache/jena/sparql/ARQTestSuite.java | 2 -
jena-arq/src/test/java/riotcmd/rdflangtest.java | 213 --
jena-base/src/main/java/jena/cmd/Arg.java | 69 -
jena-base/src/main/java/jena/cmd/ArgDecl.java | 93 -
jena-base/src/main/java/jena/cmd/ArgModule.java | 26 -
.../main/java/jena/cmd/ArgModuleGeneral.java | 25 -
jena-base/src/main/java/jena/cmd/ArgProc.java | 27 -
.../src/main/java/jena/cmd/CmdArgModule.java | 70 -
.../src/main/java/jena/cmd/CmdException.java | 30 -
.../src/main/java/jena/cmd/CmdGeneral.java | 92 -
.../src/main/java/jena/cmd/CmdLineArgs.java | 413 ----
jena-base/src/main/java/jena/cmd/CmdMain.java | 108 -
.../src/main/java/jena/cmd/CommandLineBase.java | 136 --
jena-base/src/main/java/jena/cmd/ModBase.java | 23 -
.../src/main/java/jena/cmd/ModGeneral.java | 57 -
.../src/main/java/jena/cmd/ModVersion.java | 67 -
.../java/jena/cmd/TerminationException.java | 31 -
jena-base/src/main/java/jena/cmd/Usage.java | 102 -
.../src/main/java/jena/cmd/package-info.java | 6 -
jena-cmds/pom.xml | 117 +
jena-cmds/src/main/java/arq/arq.java | 37 +
jena-cmds/src/main/java/arq/bindings.java | 42 +
jena-cmds/src/main/java/arq/cmdline/CmdARQ.java | 65 +
.../src/main/java/arq/cmdline/CmdARQ_SSE.java | 45 +
.../src/main/java/arq/cmdline/CmdUpdate.java | 63 +
.../src/main/java/arq/cmdline/ModAlgebra.java | 82 +
.../src/main/java/arq/cmdline/ModAssembler.java | 84 +
.../src/main/java/arq/cmdline/ModContext.java | 91 +
.../src/main/java/arq/cmdline/ModDataset.java | 49 +
.../java/arq/cmdline/ModDatasetAssembler.java | 70 +
.../java/arq/cmdline/ModDatasetGeneral.java | 119 +
.../arq/cmdline/ModDatasetGeneralAssembler.java | 56 +
.../src/main/java/arq/cmdline/ModEngine.java | 110 +
.../src/main/java/arq/cmdline/ModFormat.java | 91 +
.../src/main/java/arq/cmdline/ModItem.java | 80 +
.../main/java/arq/cmdline/ModLangOutput.java | 150 ++
.../src/main/java/arq/cmdline/ModLangParse.java | 180 ++
.../src/main/java/arq/cmdline/ModQueryIn.java | 156 ++
.../src/main/java/arq/cmdline/ModQueryOut.java | 92 +
.../src/main/java/arq/cmdline/ModRemote.java | 75 +
.../src/main/java/arq/cmdline/ModResultsIn.java | 138 ++
.../main/java/arq/cmdline/ModResultsOut.java | 70 +
.../src/main/java/arq/cmdline/ModSymbol.java | 26 +
.../src/main/java/arq/cmdline/ModTime.java | 73 +
jena-cmds/src/main/java/arq/iri.java | 57 +
jena-cmds/src/main/java/arq/juuid.java | 173 ++
jena-cmds/src/main/java/arq/load.java | 120 +
jena-cmds/src/main/java/arq/qexpr.java | 223 ++
jena-cmds/src/main/java/arq/qparse.java | 269 +++
jena-cmds/src/main/java/arq/query.java | 257 +++
jena-cmds/src/main/java/arq/rdfdiff.java | 312 +++
jena-cmds/src/main/java/arq/rset.java | 73 +
jena-cmds/src/main/java/arq/rsparql.java | 95 +
jena-cmds/src/main/java/arq/rupdate.java | 98 +
jena-cmds/src/main/java/arq/sparql.java | 37 +
jena-cmds/src/main/java/arq/sse.java | 108 +
jena-cmds/src/main/java/arq/sse_exec.java | 50 +
jena-cmds/src/main/java/arq/sse_expr.java | 24 +
jena-cmds/src/main/java/arq/sse_query.java | 162 ++
jena-cmds/src/main/java/arq/tokens.java | 24 +
jena-cmds/src/main/java/arq/uparse.java | 187 ++
jena-cmds/src/main/java/arq/update.java | 128 ++
jena-cmds/src/main/java/arq/utf8.java | 29 +
jena-cmds/src/main/java/arq/version.java | 29 +
jena-cmds/src/main/java/arq/wwwdec.java | 36 +
jena-cmds/src/main/java/arq/wwwenc.java | 61 +
jena-cmds/src/main/java/jena/RuleMap.java | 196 ++
jena-cmds/src/main/java/jena/cmd/Arg.java | 69 +
jena-cmds/src/main/java/jena/cmd/ArgDecl.java | 93 +
jena-cmds/src/main/java/jena/cmd/ArgModule.java | 26 +
.../main/java/jena/cmd/ArgModuleGeneral.java | 25 +
jena-cmds/src/main/java/jena/cmd/ArgProc.java | 27 +
.../src/main/java/jena/cmd/CmdArgModule.java | 70 +
.../src/main/java/jena/cmd/CmdException.java | 30 +
.../src/main/java/jena/cmd/CmdGeneral.java | 92 +
.../src/main/java/jena/cmd/CmdLineArgs.java | 413 ++++
jena-cmds/src/main/java/jena/cmd/CmdMain.java | 108 +
.../src/main/java/jena/cmd/CommandLineBase.java | 136 ++
jena-cmds/src/main/java/jena/cmd/ModBase.java | 23 +
.../src/main/java/jena/cmd/ModGeneral.java | 57 +
.../src/main/java/jena/cmd/ModVersion.java | 67 +
.../java/jena/cmd/TerminationException.java | 31 +
jena-cmds/src/main/java/jena/cmd/Usage.java | 102 +
.../src/main/java/jena/cmd/package-info.java | 6 +
jena-cmds/src/main/java/jena/package.html | 34 +
jena-cmds/src/main/java/jena/query.java | 26 +
jena-cmds/src/main/java/jena/rdfcat.java | 1150 ++++++++++
jena-cmds/src/main/java/jena/rdfcompare.java | 131 ++
jena-cmds/src/main/java/jena/rdfcopy.java | 158 ++
jena-cmds/src/main/java/jena/rdfparse.java | 103 +
jena-cmds/src/main/java/jena/rset.java | 25 +
jena-cmds/src/main/java/jena/schemagen.java | 2117 ++++++++++++++++++
jena-cmds/src/main/java/jena/sparql.java | 25 +
jena-cmds/src/main/java/jena/turtle.java | 25 +
jena-cmds/src/main/java/jena/version.java | 49 +
.../src/main/java/riotcmd/CmdLangParse.java | 361 +++
jena-cmds/src/main/java/riotcmd/CmdTokens.java | 75 +
jena-cmds/src/main/java/riotcmd/dumpthrift.java | 51 +
jena-cmds/src/main/java/riotcmd/infer.java | 154 ++
jena-cmds/src/main/java/riotcmd/json.java | 52 +
jena-cmds/src/main/java/riotcmd/nquads.java | 48 +
jena-cmds/src/main/java/riotcmd/ntriples.java | 48 +
jena-cmds/src/main/java/riotcmd/perftokens.java | 28 +
.../src/main/java/riotcmd/printtokens.java | 28 +
jena-cmds/src/main/java/riotcmd/rdfxml.java | 48 +
jena-cmds/src/main/java/riotcmd/riot.java | 62 +
jena-cmds/src/main/java/riotcmd/trig.java | 48 +
jena-cmds/src/main/java/riotcmd/turtle.java | 48 +
jena-cmds/src/main/java/riotcmd/utf8.java | 75 +
.../src/main/java/tdb/CmdNodeTableBuilder.java | 132 ++
.../src/main/java/tdb/CmdRewriteIndex.java | 147 ++
jena-cmds/src/main/java/tdb/cmdline/CmdSub.java | 77 +
jena-cmds/src/main/java/tdb/cmdline/CmdTDB.java | 87 +
.../src/main/java/tdb/cmdline/CmdTDBGraph.java | 81 +
.../src/main/java/tdb/cmdline/ModLocation.java | 56 +
.../src/main/java/tdb/cmdline/ModModel.java | 66 +
.../main/java/tdb/cmdline/ModTDBAssembler.java | 90 +
.../main/java/tdb/cmdline/ModTDBDataset.java | 139 ++
jena-cmds/src/main/java/tdb/tdbbackup.java | 49 +
jena-cmds/src/main/java/tdb/tdbconfig.java | 250 +++
jena-cmds/src/main/java/tdb/tdbdump.java | 51 +
jena-cmds/src/main/java/tdb/tdbloader.java | 138 ++
jena-cmds/src/main/java/tdb/tdbnode.java | 84 +
jena-cmds/src/main/java/tdb/tdbquery.java | 60 +
jena-cmds/src/main/java/tdb/tdbrecovery.java | 54 +
jena-cmds/src/main/java/tdb/tdbreorder.java | 124 +
jena-cmds/src/main/java/tdb/tdbstats.java | 103 +
jena-cmds/src/main/java/tdb/tdbupdate.java | 61 +
jena-cmds/src/main/java/tdb/tools/dumpbpt.java | 178 ++
.../src/main/java/tdb/tools/dumpnodetable.java | 182 ++
.../src/main/java/tdb/tools/tdbgenindex.java | 86 +
jena-cmds/src/test/java/jena/cmd/TS_Cmd.java | 36 +
.../src/test/java/jena/cmd/TestCmdLine.java | 104 +
.../src/test/java/jena/cmd/Test_rdfcat.java | 291 +++
.../src/test/java/jena/cmd/Test_schemagen.java | 848 +++++++
jena-cmds/src/test/java/jena/cmd/qtest.java | 274 +++
.../src/test/java/riotcmd/rdflangtest.java | 213 ++
jena-cmds/testing/cmd/README_LICENSE | 16 +
jena-cmds/testing/cmd/rdfcat.n3 | 18 +
jena-cmds/testing/cmd/rdfcat.nt | 11 +
jena-cmds/testing/cmd/rdfcat.xml | 20 +
jena-cmds/testing/cmd/rdfcat_1.xml | 10 +
jena-cmds/testing/cmd/rdfcat_1_n3 | 17 +
jena-cmds/testing/cmd/rdfcat_2.xml | 16 +
jena-cmds/testing/cmd/rdfcat_2_n3 | 20 +
jena-cmds/testing/cmd/sg-test-config.rdf | 23 +
jena-core/src/main/java/jena/InvokingUtil.java | 66 -
jena-core/src/main/java/jena/RuleMap.java | 196 --
jena-core/src/main/java/jena/package.html | 34 -
jena-core/src/main/java/jena/qtest.java | 29 -
jena-core/src/main/java/jena/query.java | 33 -
jena-core/src/main/java/jena/rdfcat.java | 1150 ----------
jena-core/src/main/java/jena/rdfcompare.java | 131 --
jena-core/src/main/java/jena/rdfcopy.java | 158 --
jena-core/src/main/java/jena/rdfparse.java | 103 -
jena-core/src/main/java/jena/rset.java | 29 -
jena-core/src/main/java/jena/schemagen.java | 2117 ------------------
jena-core/src/main/java/jena/sparql.java | 29 -
jena-core/src/main/java/jena/turtle.java | 29 -
jena-core/src/main/java/jena/version.java | 49 -
.../src/test/java/jena/test/TestPackage.java | 50 -
.../src/test/java/jena/test/Test_rdfcat.java | 269 ---
.../src/test/java/jena/test/Test_schemagen.java | 798 -------
.../java/org/apache/jena/test/TestPackage.java | 1 -
jena-core/testing/cmd/README_LICENSE | 16 -
jena-core/testing/cmd/rdfcat.n3 | 18 -
jena-core/testing/cmd/rdfcat.nt | 11 -
jena-core/testing/cmd/rdfcat.xml | 20 -
jena-core/testing/cmd/rdfcat_1.xml | 10 -
jena-core/testing/cmd/rdfcat_1_n3 | 17 -
jena-core/testing/cmd/rdfcat_2.xml | 16 -
jena-core/testing/cmd/rdfcat_2_n3 | 20 -
jena-core/testing/cmd/sg-test-config.rdf | 23 -
jena-csv/pom.xml | 6 +
jena-sdb/pom.xml | 6 +
jena-spatial/pom.xml | 6 +
.../java/org/apache/jena/tdb/lib/DumpOps.java | 7 +-
.../tdb/store/bulkloader2/CmdIndexBuild.java | 87 +-
.../tdb/store/bulkloader2/CmdIndexCopy.java | 66 +-
.../store/bulkloader2/CmdNodeTableBuilder.java | 305 ---
.../store/bulkloader2/ProcNodeTableBuilder.java | 211 ++
jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 147 --
jena-tdb/src/main/java/tdb/cmdline/CmdSub.java | 77 -
jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java | 87 -
.../src/main/java/tdb/cmdline/CmdTDBGraph.java | 81 -
.../src/main/java/tdb/cmdline/ModLocation.java | 56 -
.../src/main/java/tdb/cmdline/ModModel.java | 66 -
.../main/java/tdb/cmdline/ModTDBAssembler.java | 90 -
.../main/java/tdb/cmdline/ModTDBDataset.java | 139 --
jena-tdb/src/main/java/tdb/tdbbackup.java | 49 -
jena-tdb/src/main/java/tdb/tdbconfig.java | 250 ---
jena-tdb/src/main/java/tdb/tdbdump.java | 51 -
jena-tdb/src/main/java/tdb/tdbloader.java | 138 --
jena-tdb/src/main/java/tdb/tdbnode.java | 84 -
jena-tdb/src/main/java/tdb/tdbquery.java | 60 -
jena-tdb/src/main/java/tdb/tdbrecovery.java | 54 -
jena-tdb/src/main/java/tdb/tdbreorder.java | 124 -
jena-tdb/src/main/java/tdb/tdbstats.java | 103 -
jena-tdb/src/main/java/tdb/tdbupdate.java | 61 -
jena-tdb/src/main/java/tdb/tools/dumpbpt.java | 178 --
.../src/main/java/tdb/tools/dumpnodetable.java | 182 --
.../src/main/java/tdb/tools/tdbgenindex.java | 86 -
jena-text/pom.xml | 6 +
266 files changed, 15770 insertions(+), 15701 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/arq.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/arq.java b/jena-arq/src/main/java/arq/arq.java
deleted file mode 100644
index 5fc9c6c..0000000
--- a/jena-arq/src/main/java/arq/arq.java
+++ /dev/null
@@ -1,37 +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 arq;
-
-import org.apache.jena.query.Syntax ;
-
-/** A program to execute queries from the command line in ARQ mode. */
-
-public class arq extends query
-{
- public static void main (String... argv) {
- new arq(argv).mainRun() ;
- }
-
- public arq(String[] argv) {
- super(argv) ;
- }
-
- @Override
- protected Syntax getDefaultSyntax() { return Syntax.syntaxARQ ; }
- }
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/bindings.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/bindings.java b/jena-arq/src/main/java/arq/bindings.java
deleted file mode 100644
index f9d3b2c..0000000
--- a/jena-arq/src/main/java/arq/bindings.java
+++ /dev/null
@@ -1,42 +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 arq;
-
-import java.io.InputStream ;
-import java.io.OutputStream ;
-
-import org.apache.jena.sparql.engine.binding.BindingInputStream ;
-import org.apache.jena.sparql.engine.binding.BindingOutputStream ;
-
-/** Simple command for testing bindings */
-public class bindings
-{
- public static void main(String[] args)
- {
- InputStream in = System.in ;
- OutputStream out = System.out ;
-
- BindingInputStream input = new BindingInputStream(in) ;
- BindingOutputStream output = new BindingOutputStream(out) ;
-
- for ( ; input.hasNext() ; )
- output.send(input.next()) ;
- output.flush() ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdARQ.java b/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
deleted file mode 100644
index d6fb553..0000000
--- a/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
+++ /dev/null
@@ -1,65 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl ;
-import jena.cmd.CmdGeneral ;
-import org.apache.jena.Jena ;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.RIOT ;
-import org.apache.jena.sparql.engine.iterator.QueryIteratorBase ;
-import org.apache.jena.system.JenaSystem ;
-
-public abstract class CmdARQ extends CmdGeneral
-{
- static { JenaSystem.init() ; }
-
- protected ModContext modContext = new ModContext() ;
- ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict") ;
-
- protected boolean cmdStrictMode = false ;
-
- protected CmdARQ(String[] argv)
- {
- super(argv) ;
- modVersion.addClass(Jena.class) ;
- modVersion.addClass(ARQ.class) ;
- modVersion.addClass(RIOT.class) ;
- super.add(strictDecl, "--strict", "Operate in strict SPARQL mode (no extensions of any kind)") ;
- addModule(modContext) ;
- }
-
- @Override
- protected void processModulesAndArgs()
- {
- super.processModulesAndArgs();
- if ( super.contains(strictDecl) )
- ARQ.setStrictMode() ;
- cmdStrictMode = super.contains(strictDecl) ;
- if ( modGeneral.debug )
- QueryIteratorBase.traceIterators = true ;
- }
-
- @Override
- protected String getCommandName()
- {
- return Lib.className(this) ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/CmdARQ_SSE.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdARQ_SSE.java b/jena-arq/src/main/java/arq/cmdline/CmdARQ_SSE.java
deleted file mode 100644
index 7834a12..0000000
--- a/jena-arq/src/main/java/arq/cmdline/CmdARQ_SSE.java
+++ /dev/null
@@ -1,45 +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 arq.cmdline;
-
-import org.apache.jena.sparql.sse.Item ;
-
-/** Root of read an SSE file and do something */
-public abstract class CmdARQ_SSE extends CmdARQ
-{
- protected ModItem modItem = new ModItem() ;
-
- public CmdARQ_SSE(String[] argv)
- {
- super(argv) ;
- super.addModule(modItem) ;
- }
-
- @Override
- protected String getSummary() { return getCommandName()+" [--file<file> | string]" ; }
-
- @Override
- final protected void exec()
- {
- Item item = modItem.getItem() ;
- exec(item) ;
- }
-
- protected abstract void exec(Item item) ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java b/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
deleted file mode 100644
index 9ff706c..0000000
--- a/jena-arq/src/main/java/arq/cmdline/CmdUpdate.java
+++ /dev/null
@@ -1,63 +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 arq.cmdline;
-
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-
-public abstract class CmdUpdate extends CmdARQ
-{
- protected ModDataset modDataset = null ;
- protected Syntax updateSyntax = Syntax.defaultUpdateSyntax ;
-
- protected CmdUpdate(String[] argv)
- {
- super(argv) ;
- modDataset = setModeDataset() ;
- addModule(modDataset) ;
- }
-
- protected ModDataset setModeDataset() {
- return new ModDatasetGeneralAssembler() ;
- }
-
- @Override
- protected void processModulesAndArgs()
- {
- super.processModulesAndArgs() ;
- if ( super.cmdStrictMode )
- updateSyntax = Syntax.syntaxSPARQL_11 ;
- }
-
- @Override
- protected final void exec() {
- DatasetGraph dataset = modDataset.getDatasetGraph() ;
- if ( dataset == null )
- dataset = dealWithNoDataset() ;
-
- if ( dataset.getDefaultGraph() == null )
- dataset.setDefaultGraph(ModelFactory.createDefaultModel().getGraph()) ;
- execUpdate(dataset) ;
- }
-
- protected abstract DatasetGraph dealWithNoDataset() ;
-
- protected abstract void execUpdate(DatasetGraph graphStore) ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModAlgebra.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModAlgebra.java b/jena-arq/src/main/java/arq/cmdline/ModAlgebra.java
deleted file mode 100644
index cb269b5..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModAlgebra.java
+++ /dev/null
@@ -1,82 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.util.FileManager ;
-
-public class ModAlgebra extends ModBase
-{
- protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file") ;
-
- private String queryFilename = null ;
- private String queryString = null ;
- private Op op = null ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Query") ;
- cmdLine.add(queryFileDecl,
- "--query, --file",
- "File containing an algebra query") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- if ( cmdLine.contains(queryFileDecl) )
- {
- queryFilename = cmdLine.getValue(queryFileDecl) ;
- queryString = FileManager.get().readWholeFileAsUTF8(queryFilename) ;
- }
-
- if ( cmdLine.getNumPositional() == 0 && queryFilename == null )
- cmdLine.cmdError("No query string or query file") ;
-
- if ( cmdLine.getNumPositional() > 1 )
- cmdLine.cmdError("Only one query string allowed") ;
-
- if ( cmdLine.getNumPositional() == 1 && queryFilename != null )
- cmdLine.cmdError("Either query string or query file - not both") ;
-
-
- if ( queryFilename == null )
- {
- String qs = cmdLine.getPositionalArg(0) ;
- queryString = cmdLine.indirect(qs) ;
- }
- }
-
- public Op getOp()
- {
- if ( op != null )
- return op ;
- op = SSE.parseOp(queryString) ;
- if ( op == null )
- System.err.println("Failed to parse : "+queryString) ;
- return op ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModAssembler.java b/jena-arq/src/main/java/arq/cmdline/ModAssembler.java
deleted file mode 100644
index 30e4573..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModAssembler.java
+++ /dev/null
@@ -1,84 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.shared.NotFoundException ;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
-
-
-public class ModAssembler extends ModBase
-{
- public static final ArgDecl assemblerDescDecl = new ArgDecl(ArgDecl.HasValue, "desc", "dataset") ;
- private String assemblerFile = null ;
- Object thingDescribed = null ;
-
- public ModAssembler()
- {
- // Wire in assembler implementations
- AssemblerUtils.init() ;
- }
-
- // Dataset : default graph and named graphs
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- if ( cmdLine.contains(assemblerDescDecl) )
- assemblerFile = cmdLine.getValue(assemblerDescDecl) ;
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- //cmdLine.getUsage().startCategory("Dataset") ;
- cmdLine.add(assemblerDescDecl,
- "--desc=",
- "Assembler description file") ;
- }
-
- public String getAssemblerFile() { return assemblerFile ; }
-
- // Should subclass and apply typing.
-
- public Object create(Resource type)
- {
- Object thing = null ;
- try {
- thing = AssemblerUtils.build(assemblerFile, type) ;
- }
- catch (ARQException ex) { throw ex; }
- catch (NotFoundException ex)
- { throw new CmdException("Not found: "+ex.getMessage()) ; }
- catch (JenaException ex)
- { throw ex ; }
- catch (Exception ex)
- { throw new CmdException("Error creating", ex) ; }
-
- return thing ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/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
deleted file mode 100644
index 2d20f87..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModContext.java
+++ /dev/null
@@ -1,91 +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 arq.cmdline;
-
-import java.io.PrintStream ;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.query.ARQ ;
-import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.sparql.util.MappingRegistry ;
-import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.system.JenaSystem ;
-
-/** Set Context items */
-public class ModContext extends ModBase
-{
- static { JenaSystem.init(); }
-
- protected final ArgDecl setDecl = new ArgDecl(ArgDecl.HasValue, "set", "define", "defn", "def") ;
-
- private Context context = new Context() ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine) {
- cmdLine.getUsage().startCategory("Symbol definition");
- cmdLine.add(setDecl, "--set", "Set a configuration symbol to a value");
- }
-
- public void checkCommandLine(CmdArgModule cmdLine) {}
-
- @Override
- public void processArgs(CmdArgModule cmdLine) {
- if ( cmdLine.getValues(setDecl) == null || cmdLine.getValues(setDecl).size() == 0 )
- return;
-
- for ( String arg : cmdLine.getValues(setDecl) ) {
- String[] frags = arg.split("=", 2);
- if ( frags.length != 2 ) {
- throw new RuntimeException("Can't split '" + arg + "' -- looking for '=' to separate name and value");
- }
-
- String symbolName = frags[0];
- String value = frags[1];
-
- // Make it a long name.
- symbolName = MappingRegistry.mapPrefixName(symbolName);
- Symbol symbol = Symbol.create(symbolName);
- context.set(symbol, value);
- }
-
- ARQ.getContext().putAll(context);
- }
-
- public void verbose() {
- verbose(System.out);
- }
-
- public void verbose(PrintStream stream) {
- IndentedWriter out = new IndentedWriter(stream);
- verbose(out);
- out.flush();
- }
-
- public void verbose(IndentedWriter out) {
- for ( Symbol symbol : context.keys() ) {
- String value = context.getAsString(symbol);
- out.println(symbol + " -> " + value);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDataset.java b/jena-arq/src/main/java/arq/cmdline/ModDataset.java
deleted file mode 100644
index 01a0bb8..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModDataset.java
+++ /dev/null
@@ -1,49 +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 arq.cmdline;
-
-import jena.cmd.ModBase;
-
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-
-public abstract class ModDataset extends ModBase
-{
- protected boolean createAttempted = false ;
- protected Dataset dataset = null ;
-
- public ModDataset() {}
-
- final
- public Dataset getDataset() {
- if ( ! createAttempted )
- dataset = createDataset() ;
- createAttempted = true ;
- return dataset ;
- }
-
- public DatasetGraph getDatasetGraph() {
- Dataset ds = getDataset() ;
- if ( ds == null )
- return null ;
- return ds.asDatasetGraph() ;
- }
-
- public abstract Dataset createDataset() ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDatasetAssembler.java b/jena-arq/src/main/java/arq/cmdline/ModDatasetAssembler.java
deleted file mode 100644
index 840136c..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModDatasetAssembler.java
+++ /dev/null
@@ -1,70 +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 arq.cmdline;
-
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.shared.NotFoundException ;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab ;
-
-/** Add assembler to a general dataset description */
-public class ModDatasetAssembler extends ModDataset
-{
- private ModAssembler modAssembler = new ModAssembler() ;
-
- @Override
- public Dataset createDataset()
- {
- if ( modAssembler.getAssemblerFile() == null )
- return null ;
-
- try {
- dataset = (Dataset)modAssembler.create(DatasetAssemblerVocab.tDataset) ;
- if ( dataset == null )
- throw new CmdException("No dataset description found in: "+modAssembler.getAssemblerFile()) ;
- }
- catch (CmdException | ARQException ex) { throw ex ; }
- catch (NotFoundException ex)
- { throw new CmdException("Not found: "+ex.getMessage()) ; }
- catch (JenaException ex)
- { throw ex ; }
- catch (Exception ex)
- { throw new CmdException("Error creating dataset", ex) ; }
- return dataset ;
-
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- modAssembler.registerWith(cmdLine) ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- modAssembler.processArgs(cmdLine) ;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java b/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
deleted file mode 100644
index 5960f02..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
+++ /dev/null
@@ -1,119 +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 arq.cmdline;
-
-import java.util.List ;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
-import org.apache.jena.query.LabelExistsException ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.sparql.util.DatasetUtils ;
-
-/** ModDataset: arguments to build a dataset -
- * see also ModDatasetAssembler which extends ModDataset
- * with a description parameter. */
-
-public class ModDatasetGeneral extends ModDataset
-{
- // See also ModDatasetAssembler
- protected final ArgDecl graphDecl = new ArgDecl(ArgDecl.HasValue, "graph") ;
- protected final ArgDecl dataDecl = new ArgDecl(ArgDecl.HasValue, "data") ;
- protected final ArgDecl namedGraphDecl = new ArgDecl(ArgDecl.HasValue, "named", "namedgraph", "namedGraph", "namedData", "nameddata") ;
- //protected final ArgDecl dataFmtDecl = new ArgDecl(ArgDecl.HasValue, "fmt", "format") ;
- //protected final ArgDecl dirDecl = new ArgDecl(ArgDecl.HasValue, "dir") ;
-
- private List<String> dataURLs = null ;
- private List<String> graphURLs = null ;
- private List<String> namedGraphURLs = null ;
- protected ModDatasetGeneral() {}
-
- @Override
- public void registerWith(CmdGeneral cl)
- {
- cl.getUsage().startCategory("Dataset") ;
- cl.add(dataDecl,
- "--data=FILE",
- "Data for the datset - triple or quad formats") ;
- cl.add(graphDecl,
- "--graph=FILE",
- "Graph for default graph of the datset") ;
- cl.add(namedGraphDecl,
- "--namedGraph=FILE",
- "Add a graph into the dataset as a named graph") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- dataURLs = cmdLine.getValues(dataDecl) ;
- graphURLs = cmdLine.getValues(graphDecl) ;
- namedGraphURLs = cmdLine.getValues(namedGraphDecl) ;
- }
-
- @Override
- public Dataset createDataset()
- {
- // If nothing specified to the module. Leave alone and hope the query has FROM/FROM NAMED
- if ( ( dataURLs == null || dataURLs.size() == 0) &&
- (graphURLs == null || graphURLs.size() == 0) &&
- (namedGraphURLs == null || namedGraphURLs.size() == 0 ) )
- return null ;
-
- Dataset ds = DatasetFactory.createTxnMem() ;
- addGraphs(ds) ;
- dataset = ds ;
- return dataset ;
- }
-
- protected void addGraphs(Dataset ds)
- {
- try {
- if ( dataURLs != null )
- {
- for ( String url : dataURLs )
- RDFDataMgr.read(ds, url) ;
- }
-
- if ( (graphURLs != null) || (namedGraphURLs != null) )
- ds = DatasetUtils.addInGraphs(ds, graphURLs, namedGraphURLs, null) ;
- }
- catch (LabelExistsException ex)
- { throw new CmdException(ex.getMessage()) ; }
- catch (JenaException ex)
- { throw ex ; }
- catch (Exception ex)
- { throw new CmdException("Error creating dataset", ex) ; }
- }
-
- public List<String> getGraphURLs()
- {
- return graphURLs ;
- }
-
- public List<String> getNamedGraphURLs()
- {
- return namedGraphURLs ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java b/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
deleted file mode 100644
index c6ec7b5..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
+++ /dev/null
@@ -1,56 +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 arq.cmdline;
-
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-
-import org.apache.jena.query.Dataset ;
-
-/** Add assembler to a general dataset description */
-public class ModDatasetGeneralAssembler extends ModDatasetGeneral
-{
- public ModDatasetGeneralAssembler() {}
-
- private ModDatasetAssembler modAssembler = new ModDatasetAssembler() ;
-
- @Override
- public Dataset createDataset()
- {
- Dataset ds = modAssembler.createDataset() ;
- if ( ds == null )
- ds = super.createDataset() ;
- return ds ;
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- modAssembler.registerWith(cmdLine) ;
- super.registerWith(cmdLine) ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- modAssembler.processArgs(cmdLine) ;
- super.processArgs(cmdLine) ;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModEngine.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModEngine.java b/jena-arq/src/main/java/arq/cmdline/ModEngine.java
deleted file mode 100644
index 998d656..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModEngine.java
+++ /dev/null
@@ -1,110 +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 arq.cmdline;
-
-import java.util.List ;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.sparql.engine.main.QueryEngineMain ;
-import org.apache.jena.sparql.engine.main.QueryEngineMainQuad ;
-import org.apache.jena.sparql.engine.ref.QueryEngineRef ;
-import org.apache.jena.sparql.engine.ref.QueryEngineRefQuad ;
-
-
-public class ModEngine extends ModBase
-{
- // Special case of a "ModEnvironment"
- // Alters the ARQ environment but provides nothing at execution time.
- // Combine with ModSymbol?
-
- protected final ArgDecl engineDecl = new ArgDecl(ArgDecl.HasValue, "engine") ;
- protected final ArgDecl unEngineDecl = new ArgDecl(ArgDecl.HasValue,
- "unengine",
- "unEngine",
- "removeEngine",
- "removeengine"
- ) ;
-
- private boolean timing = false ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Query Engine") ;
- cmdLine.add(engineDecl, "--engine=EngineName", "Register another engine factory[ref]") ;
- cmdLine.add(unEngineDecl, "--unengine=EngineName", "Unregister an engine factory") ;
- }
-
- public void checkCommandLine(CmdGeneral cmdLine)
- {}
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
-
- List<String> engineDecls = cmdLine.getValues(engineDecl) ;
-
-// if ( x.size() > 0 )
-// QueryEngineRegistry.get().factories().clear() ;
-
- for ( String engineName : engineDecls )
- {
- switch (engineName.toLowerCase()) {
- case "reference":
- case "ref":
- QueryEngineRef.register();
- continue;
- case "refQuad":
- QueryEngineRefQuad.register();
- continue;
- case "main":
- QueryEngineMain.register();
- continue;
- case "quad":
- QueryEngineMainQuad.register();
- continue;
- }
- throw new CmdException("Engine name not recognized: " + engineName);
- }
-
- List<String> unEngineDecls = cmdLine.getValues(unEngineDecl) ;
- for (String engineName : unEngineDecls)
- {
- switch (engineName.toLowerCase()) {
- case "reference":
- case "ref":
- QueryEngineRef.register();
- continue;
- case "refQuad":
- QueryEngineRefQuad.register();
- continue;
- case "main":
- QueryEngineMain.register();
- QueryEngineMainQuad.register();
- continue;
- }
- throw new CmdException("Engine name not recognized: "+engineName) ;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModFormat.java b/jena-arq/src/main/java/arq/cmdline/ModFormat.java
deleted file mode 100644
index b73215e..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModFormat.java
+++ /dev/null
@@ -1,91 +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 arq.cmdline;
-
-
-import java.util.Arrays;
-import java.util.List;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-public class ModFormat extends ModBase
-{
- protected final
- ArgDecl resultsFmtDecl = new ArgDecl(ArgDecl.HasValue, "fmt", "format") ;
-
- private String format = "N-TRIPLES" ;
-
- public ModFormat() {}
-
- @Override
- public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException
- {
- if ( cmdline.contains(resultsFmtDecl) )
- {
- String rFmt = cmdline.getValue(resultsFmtDecl) ;
- format = lookup(rFmt) ;
- if ( format == null )
- cmdline.cmdError("Unrecognized format: "+rFmt) ;
- }
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Output format") ;
- cmdLine.add(resultsFmtDecl,
- "--format",
- "Format (Result sets: text, XML, JSON; Graph: RDF serialization)") ;
- }
-
- public void checkCommandLine(CmdArgModule cmdLine)
- {}
-
- public String getFormat() { return format ; }
-
- public String getFormat(String defaultFormat)
- {
- if ( format == null )
- return defaultFormat ;
- return format ;
- }
-
- private String lookup(String fmt)
- {
- return formats.stream().filter(fmt::equalsIgnoreCase).findFirst().orElse("TURTLE");
- }
-
- static final List<String> formats = Arrays.asList(
- "RDF/XML",
- "RDF/XML-ABBREV",
- "N-TRIPLE",
- "N-TRIPLES",
- "N3",
- "N3-PP" ,
- "N3-PLAIN" ,
- "N3-TRIPLES" ,
- "N3-TRIPLE" ,
- "TURTLE" ,
- //"Turtle" ,
- "TTL"
- ) ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModItem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModItem.java b/jena-arq/src/main/java/arq/cmdline/ModItem.java
deleted file mode 100644
index c7ee7c1..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModItem.java
+++ /dev/null
@@ -1,80 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.sparql.sse.Item ;
-import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.util.FileManager ;
-
-public class ModItem extends ModBase
-{
- protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "file") ;
-
- private String filename = null ;
- private String parseString = null ;
- private Item item = null ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Item") ;
- cmdLine.add(queryFileDecl, "--file=", "File") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- if ( cmdLine.contains(queryFileDecl) )
- {
- filename = cmdLine.getValue(queryFileDecl) ;
- parseString = FileManager.get().readWholeFileAsUTF8(filename) ;
- return ;
- }
-
- if ( cmdLine.getNumPositional() == 0 && filename == null )
- cmdLine.cmdError("No query string or query file") ;
-
- if ( cmdLine.getNumPositional() > 1 )
- cmdLine.cmdError("Only one query string allowed") ;
-
- if ( cmdLine.getNumPositional() == 1 && filename != null )
- cmdLine.cmdError("Either query string or query file - not both") ;
-
- if ( filename == null )
- {
- String qs = cmdLine.getPositionalArg(0) ;
- parseString = cmdLine.indirect(qs) ;
- }
- }
-
- public Item getItem()
- {
- if ( item != null )
- return item ;
- // Need to get the (outer) prologue.
- item = SSE.parseItem(parseString) ;
- return item ;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java b/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
deleted file mode 100644
index ecc82ca..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
+++ /dev/null
@@ -1,150 +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 arq.cmdline;
-
-import java.io.PrintStream ;
-import java.util.HashSet ;
-import java.util.Set ;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFFormat ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RDFWriterRegistry ;
-import org.apache.jena.riot.system.StreamRDFWriter ;
-
-public class ModLangOutput extends ModBase
-{
- protected ArgDecl argOutput = new ArgDecl(ArgDecl.HasValue, "out", "output") ;
- protected ArgDecl argPretty = new ArgDecl(ArgDecl.HasValue, "formatted", "pretty", "fmt") ;
- protected ArgDecl argStream = new ArgDecl(ArgDecl.HasValue, "stream") ;
- protected ArgDecl argCompress = new ArgDecl(ArgDecl.NoValue, "compress") ;
- private boolean compressedOutput = false ;
- private RDFFormat streamOutput = null ;
- private RDFFormat formattedOutput = null ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine) {
- cmdLine.getUsage().startCategory("Output control") ;
- cmdLine.add(argOutput, "--output=FMT", "Output in the given format, streaming if possible.") ;
- cmdLine.add(argPretty, "--formatted=FMT", "Output, using pretty printing (consumes memory)") ;
- cmdLine.add(argStream, "--stream=FMT", "Output, using a streaming format") ;
- cmdLine.add(argCompress, "--compress", "Compress the output with gzip") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine) {
- if ( cmdLine.contains(argPretty) ) {
- String langName = cmdLine.getValue(argPretty) ;
- Lang lang = RDFLanguages.nameToLang(langName) ;
- if ( lang == null )
- throw new CmdException("Not recognized as an RDF language : '"+langName+"'") ;
- formattedOutput = RDFWriterRegistry.defaultSerialization(lang) ;
- if ( formattedOutput == null ) {
- System.err.println("Language '"+lang.getLabel()+"' not registered.") ;
- printRegistered(System.err) ;
- throw new CmdException("No output set: '"+langName+"'") ;
- }
- }
-
- if ( cmdLine.contains(argStream) ) {
- String langName = cmdLine.getValue(argStream) ;
- Lang lang = RDFLanguages.nameToLang(langName) ;
- if ( lang == null )
- throw new CmdException("Not recognized as an RDF language : '"+langName+"'") ;
- streamOutput = StreamRDFWriter.defaultSerialization(lang) ;
- if ( streamOutput == null ) {
- System.err.println("Language '"+lang.getLabel()+"' not registered for streaming.") ;
- printRegistered(System.err) ;
- throw new CmdException("No output set: '"+langName+"'") ;
- }
- }
-
- if ( cmdLine.contains(argOutput) ) {
- String langName = cmdLine.getValue(argOutput) ;
- Lang lang = RDFLanguages.nameToLang(langName) ;
- if ( lang == null )
- throw new CmdException("Not recognized as an RDF language : '"+langName+"'") ;
-
- if ( StreamRDFWriter.registered(lang) ) {
- streamOutput = StreamRDFWriter.defaultSerialization(lang) ;
- } else {
- formattedOutput = RDFWriterRegistry.defaultSerialization(lang) ;
- if ( formattedOutput == null ) {
- System.err.println("Language '"+lang.getLabel()+"' not recognized.") ;
- printRegistered(System.err) ;
- throw new CmdException("No output set: '"+langName+"'") ;
- }
- }
- }
-
- if ( cmdLine.contains(argCompress))
- compressedOutput = true ;
-
- if ( streamOutput == null && formattedOutput == null )
- streamOutput = RDFFormat.NQUADS ;
- }
-
- private static Set<Lang> hiddenLanguages = new HashSet<>() ;
- static {
- hiddenLanguages.add(Lang.RDFNULL) ;
- hiddenLanguages.add(Lang.CSV) ;
- }
-
- private static void printRegistered(PrintStream out) {
- out.println("Streaming languages:") ;
- Set<Lang> seen = new HashSet<>() ;
- for ( RDFFormat fmt : StreamRDFWriter.registered()) {
- Lang lang = fmt.getLang() ;
- if ( hiddenLanguages.contains(lang))
- continue ;
- if ( seen.contains(lang) )
- continue ;
- seen.add(lang) ;
- out.println(" "+lang.getLabel()) ;
- }
- System.err.println("Non-streaming languages:") ;
- for ( RDFFormat fmt : RDFWriterRegistry.registered() ) {
- Lang lang = fmt.getLang() ;
- if ( hiddenLanguages.contains(lang))
- continue ;
- if ( seen.contains(lang) )
- continue ;
- seen.add(lang) ;
- out.println(" "+lang.getLabel()) ;
- }
- }
-
- public RDFFormat getOutputStreamFormat() {
- return streamOutput ;
- }
-
- public RDFFormat getOutputFormatted() {
- return formattedOutput ;
- }
-
- public boolean compressedOutput() {
- return compressedOutput ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModLangParse.java b/jena-arq/src/main/java/arq/cmdline/ModLangParse.java
deleted file mode 100644
index 212807d..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModLangParse.java
+++ /dev/null
@@ -1,180 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.iri.IRI ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.IRIResolver ;
-import org.apache.jena.util.FileManager ;
-
-public class ModLangParse extends ModBase
-{
- private ArgDecl argCheck = new ArgDecl(ArgDecl.NoValue, "check") ;
- private ArgDecl argNoCheck = new ArgDecl(ArgDecl.NoValue, "nocheck", "noCheck") ;
- private ArgDecl argSink = new ArgDecl(ArgDecl.NoValue, "sink", "null") ;
-
- private ArgDecl argStrict = new ArgDecl(ArgDecl.NoValue, "strict") ;
- private ArgDecl argValidate = new ArgDecl(ArgDecl.NoValue, "validate") ;
-
- private ArgDecl argSkip = new ArgDecl(ArgDecl.NoValue, "skip") ;
- private ArgDecl argNoSkip = new ArgDecl(ArgDecl.NoValue, "noSkip") ;
- private ArgDecl argStop = new ArgDecl(ArgDecl.NoValue, "stopOnError", "stoponerror", "stop") ;
-
- private ArgDecl argBase = new ArgDecl(ArgDecl.HasValue, "base") ;
-
- private ArgDecl argRDFS = new ArgDecl(ArgDecl.HasValue, "rdfs") ;
-
- private ArgDecl argSyntax = new ArgDecl(ArgDecl.HasValue, "syntax") ;
-
- private String rdfsVocabFilename = null ;
- private Model rdfsVocab = null ;
- private String baseIRI = null ;
- private boolean explicitCheck = false ;
- private boolean explicitNoCheck = false ;
- private boolean skipOnBadTerm = false ;
- private boolean stopOnBadTerm = false ;
- private boolean bitbucket = false ;
- private boolean strict = false ;
- private boolean validate = false ;
- private Lang lang = null ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine) {
- cmdLine.getUsage().startCategory("Parser control") ;
- cmdLine.add(argSink, "--sink", "Parse but throw away output") ;
- cmdLine.add(argSyntax, "--syntax=NAME", "Set syntax (otherwise syntax guessed from file extension)") ;
- cmdLine.add(argBase, "--base=URI", "Set the base URI (does not apply to N-triples and N-Quads)") ;
- cmdLine.add(argCheck, "--check", "Addition checking of RDF terms") ; // (default: off for N-triples, N-Quads, on for Turtle and TriG)") ;
- cmdLine.add(argStrict, "--strict", "Run with in strict mode") ;
- cmdLine.add(argValidate,"--validate", "Same as --sink --check --strict") ;
- cmdLine.add(argRDFS, "--rdfs=file", "Apply some RDFS inference using the vocabulary in the file") ;
-
- cmdLine.add(argNoCheck, "--nocheck", "Turn off checking of RDF terms") ;
-// cmdLine.add(argSkip, "--noSkip", "Skip (do not output) triples failing the RDF term tests") ;
-// cmdLine.add(argNoSkip, "--skip", "Include triples failing the RDF term tests (not recommended)") ;
- cmdLine.add(argStop, "--stop", "Stop parsing on encountering a bad RDF term") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdLine) {
- if ( cmdLine.contains(argValidate) ) {
- validate = true ;
- strict = true ;
- explicitCheck = true ;
- bitbucket = true ;
- }
-
- if ( cmdLine.contains(argSyntax) ) {
- String syntax = cmdLine.getValue(argSyntax) ;
- Lang lang$ = RDFLanguages.nameToLang(syntax) ;
- if ( lang$ == null )
- throw new CmdException("Can not detemine the syntax from '" + syntax + "'") ;
- this.lang = lang$ ;
- }
-
- if ( cmdLine.contains(argCheck) )
- explicitCheck = true ;
-
- if ( cmdLine.contains(argNoCheck) )
- explicitNoCheck = true ;
-
- if ( cmdLine.contains(argStrict) )
- strict = true ;
-
- if ( cmdLine.contains(argSkip) )
- skipOnBadTerm = true ;
- if ( cmdLine.contains(argNoSkip) )
- skipOnBadTerm = false ;
-
- if ( cmdLine.contains(argBase) ) {
- baseIRI = cmdLine.getValue(argBase) ;
- IRI iri = IRIResolver.resolveIRI(baseIRI) ;
- if ( iri.hasViolation(false) )
- throw new CmdException("Bad base IRI: " + baseIRI) ;
- if ( !iri.isAbsolute() )
- throw new CmdException("Base IRI must be an absolute IRI: " + baseIRI) ;
- }
-
- if ( cmdLine.contains(argStop) )
- stopOnBadTerm = true ;
-
- if ( cmdLine.contains(argSink) )
- bitbucket = true ;
-
- if ( cmdLine.contains(argRDFS) ) {
- try {
- rdfsVocabFilename = cmdLine.getArg(argRDFS).getValue() ;
- rdfsVocab = FileManager.get().loadModel(rdfsVocabFilename) ;
- } catch (RiotException ex) {
- throw new CmdException("Error in RDFS vocabulary: " + rdfsVocabFilename) ;
- } catch (Exception ex) {
- throw new CmdException("Error: " + ex.getMessage()) ;
- }
- }
- }
-
- public boolean explicitChecking() {
- return explicitCheck ;
- }
-
- public boolean explicitNoChecking() {
- return explicitNoCheck ;
- }
-
- public boolean strictMode() {
- return strict ;
- }
-
- public boolean validate() {
- return validate ;
- }
-
- public boolean skipOnBadTerm() {
- return skipOnBadTerm ;
- }
-
- public boolean stopOnBadTerm() {
- return stopOnBadTerm ;
- }
-
- public boolean toBitBucket() {
- return bitbucket ;
- }
-
- public String getBaseIRI() {
- return baseIRI ;
- }
-
- public Model getRDFSVocab() {
- return rdfsVocab ;
- }
-
- public Lang getLang() {
- return lang ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModQueryIn.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModQueryIn.java b/jena-arq/src/main/java/arq/cmdline/ModQueryIn.java
deleted file mode 100644
index 290df7c..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModQueryIn.java
+++ /dev/null
@@ -1,156 +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 arq.cmdline ;
-
-import java.io.IOException ;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdException;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-import jena.cmd.TerminationException;
-
-import org.apache.jena.query.Query ;
-import org.apache.jena.query.QueryFactory ;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.sparql.ARQInternalErrorException ;
-import org.apache.jena.util.FileUtils ;
-
-public class ModQueryIn extends ModBase {
- protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file") ;
- protected final ArgDecl querySyntaxDecl = new ArgDecl(ArgDecl.HasValue, "syntax", "syn", "in") ;
- protected final ArgDecl queryBaseDecl = new ArgDecl(ArgDecl.HasValue, "base") ;
-
- private Syntax defaultQuerySyntax = Syntax.syntaxARQ ;
- private Syntax querySyntax = null ;
- private String queryFilename = null ;
- private String queryString = null ;
- private Query query = null ;
- private String baseURI = null ;
-
- public ModQueryIn(Syntax defaultSyntax) {
- defaultQuerySyntax = defaultSyntax ;
- querySyntax = defaultSyntax ;
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine) {
- cmdLine.getUsage().startCategory("Query") ;
- cmdLine.add(queryFileDecl, "--query, --file", "File containing a query") ;
- cmdLine.add(querySyntaxDecl, "--syntax, --in", "Syntax of the query") ;
- cmdLine.add(queryBaseDecl, "--base", "Base URI for the query") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException {
- if ( cmdline.contains(queryBaseDecl) )
- baseURI = cmdline.getValue(queryBaseDecl) ;
-
- if ( cmdline.contains(queryFileDecl) ) {
- queryFilename = cmdline.getValue(queryFileDecl) ;
- querySyntax = Syntax.guessFileSyntax(queryFilename, defaultQuerySyntax) ;
- }
-
- if ( cmdline.getNumPositional() == 0 && queryFilename == null )
- cmdline.cmdError("No query string or query file") ;
-
- if ( cmdline.getNumPositional() > 1 )
- cmdline.cmdError("Only one query string allowed") ;
-
- if ( cmdline.getNumPositional() == 1 && queryFilename != null )
- cmdline.cmdError("Either query string or query file - not both") ;
-
- if ( queryFilename == null ) {
- // One positional argument.
- String qs = cmdline.getPositionalArg(0) ;
- if ( cmdline.matchesIndirect(qs) )
- querySyntax = Syntax.guessFileSyntax(qs, defaultQuerySyntax) ;
-
- queryString = cmdline.indirect(qs) ;
- }
-
- // Set syntax
- if ( cmdline.contains(querySyntaxDecl) ) {
- // short name
- String s = cmdline.getValue(querySyntaxDecl) ;
- Syntax syn = Syntax.lookup(s) ;
- if ( syn == null )
- cmdline.cmdError("Unrecognized syntax: " + s) ;
- querySyntax = syn ;
- }
- }
-
- public Syntax getQuerySyntax() {
- return querySyntax ;
- }
-
- public Query getQuery() {
- if ( query != null )
- return query ;
-
- if ( queryFilename != null && queryString != null ) {
- System.err.println("Both query string and query file name given") ;
- throw new TerminationException(1) ;
- }
-
- if ( queryFilename == null && queryString == null ) {
- System.err.println("No query string and no query file name given") ;
- throw new TerminationException(1) ;
- }
-
- try {
- if ( queryFilename != null ) {
- if ( queryFilename.equals("-") ) {
- try {
- // Stderr?
- queryString = FileUtils.readWholeFileAsUTF8(System.in) ;
- // And drop into next if
- } catch (IOException ex) {
- throw new CmdException("Error reading stdin", ex) ;
- }
- } else {
- query = QueryFactory.read(queryFilename, baseURI, getQuerySyntax()) ;
- return query ;
- }
- }
-
- query = QueryFactory.create(queryString, baseURI, getQuerySyntax()) ;
- return query ;
- } catch (ARQInternalErrorException intEx) {
- System.err.println(intEx.getMessage()) ;
- if ( intEx.getCause() != null ) {
- System.err.println("Cause:") ;
- intEx.getCause().printStackTrace(System.err) ;
- System.err.println() ;
- }
- intEx.printStackTrace(System.err) ;
- throw new TerminationException(99) ;
- }
- catch (JenaException ex) {
- System.err.println(ex.getMessage()) ;
- throw new TerminationException(2) ;
- } catch (Exception ex) {
- System.out.flush() ;
- ex.printStackTrace(System.err) ;
- throw new TerminationException(98) ;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModQueryOut.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModQueryOut.java b/jena-arq/src/main/java/arq/cmdline/ModQueryOut.java
deleted file mode 100644
index d32f6c0..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModQueryOut.java
+++ /dev/null
@@ -1,92 +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 arq.cmdline;
-
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.query.Query ;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.sparql.util.QueryOutputUtils ;
-
-public class ModQueryOut extends ModBase
-{
- protected final ArgDecl queryOutputSyntaxDecl = new ArgDecl(ArgDecl.HasValue, "out", "format") ;
- protected final ArgDecl queryNumberDecl = new ArgDecl(ArgDecl.NoValue, "num", "number") ;
-
- private Syntax outputSyntax = Syntax.syntaxSPARQL ;
- private boolean lineNumbers = false ;
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Output") ;
- cmdLine.add(queryOutputSyntaxDecl, "--out, --format", "Output syntax") ;
- cmdLine.add(queryNumberDecl, "--num", "Print line numbers") ;
- }
-
- @Override
- public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException
- {
- if ( cmdline.contains(queryOutputSyntaxDecl) )
- {
- // short name
- String s = cmdline.getValue(queryOutputSyntaxDecl) ;
- Syntax syn = Syntax.lookup(s) ;
- if ( syn == null )
- cmdline.cmdError("Unrecognized syntax: "+s) ;
- outputSyntax = syn ;
- }
-
- lineNumbers = cmdline.contains(queryNumberDecl) ;
- }
-
- public Syntax getOutputSyntax()
- {
- return outputSyntax ;
- }
-
- public void output(Query query)
- { output(out(), query) ; }
-
- public void output(IndentedWriter out, Query query)
- { QueryOutputUtils.printQuery(out, query, outputSyntax) ; }
-
- public void outputOp(Query query, boolean printOptimized)
- { outputOp(out(), query, printOptimized) ; }
-
- public void outputOp(IndentedWriter out, Query query, boolean printOptimized)
- { QueryOutputUtils.printOp(out, query, printOptimized) ; }
-
- public void outputQuad(Query query, boolean printOptimized)
- { outputQuad(out(), query, printOptimized) ; }
-
- public void outputQuad(IndentedWriter out, Query query, boolean printOptimized)
- { QueryOutputUtils.printQuad(out, query, printOptimized) ; }
-
- private IndentedWriter out()
- {
- return new IndentedWriter(System.out, lineNumbers) ;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/498b2264/jena-arq/src/main/java/arq/cmdline/ModRemote.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModRemote.java b/jena-arq/src/main/java/arq/cmdline/ModRemote.java
deleted file mode 100644
index 97f03eb..0000000
--- a/jena-arq/src/main/java/arq/cmdline/ModRemote.java
+++ /dev/null
@@ -1,75 +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 arq.cmdline;
-
-import jena.cmd.ArgDecl;
-import jena.cmd.CmdArgModule;
-import jena.cmd.CmdGeneral;
-import jena.cmd.ModBase;
-
-
-public class ModRemote extends ModBase
-{
- protected final
- ArgDecl serviceDecl = new ArgDecl(ArgDecl.HasValue, "service") ;
-
- // Or --serviceType GET, POST, SOAP
- protected final
- ArgDecl postServiceDecl = new ArgDecl(ArgDecl.NoValue, "post", "POST") ;
-
- private String serviceURL ;
- private boolean usePost ;
-
- public void checkCommandLine(CmdArgModule cmdLine)
- {}
-
- @Override
- public void processArgs(CmdArgModule cmdLine)
- {
- serviceURL = cmdLine.getValue(serviceDecl) ;
- usePost = cmdLine.contains(postServiceDecl) ;
- }
-
- @Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Remote") ;
- cmdLine.add(serviceDecl,
- "--service=",
- "Service endpoint URL") ;
- cmdLine.add(postServiceDecl,
- "--post",
- "Force use of HTTP POST") ;
-
- }
-
- public String getServiceURL()
- {
- return serviceURL ;
- }
-
- public boolean usePost()
- {
- return usePost ;
- }
-
-
-
-
-}