You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/10/22 13:40:23 UTC

[68/68] [abbrv] git commit: Merge branch 'master' into hadoop-rdf

Merge branch 'master' into hadoop-rdf

Conflicts:
	jena-parent/pom.xml
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b32af6cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b32af6cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b32af6cd

Branch: refs/heads/hadoop-rdf
Commit: b32af6cdd6813c73782dd2d98b187f15f1c3dcd2
Parents: 92fb810 6252ace
Author: Rob Vesse <rv...@apache.org>
Authored: Wed Oct 22 12:34:31 2014 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Wed Oct 22 12:34:31 2014 +0100

----------------------------------------------------------------------
 apache-jena/jena-log4j.properties               |  16 +
 jena-arq/Grammar/BinaryRDF.thrift               |  18 +
 jena-arq/Grammar/Final/jj2html_11               |  16 +
 jena-arq/Grammar/JSON/json                      |  16 +
 jena-arq/Grammar/Notes                          |   2 +
 jena-arq/Grammar/XMLchars.txt                   |  56 --
 jena-arq/Grammar/gen-thrift                     |   1 +
 jena-arq/Grammar/grammarExtracts                |  16 +
 jena-arq/Grammar/jj2html                        |  16 +
 jena-arq/Grammar/jj2tokens                      |   2 +
 jena-arq/Grammar/sparql2html                    |   1 +
 jena-arq/Grammar/sse/grammar-sse                |  16 +
 jena-arq/Grammar/sse/jj2html                    | 922 ++++++++++---------
 jena-arq/Grammar/sse/sse.jj                     | 490 +++++-----
 jena-arq/Grammar/sse/tokens.inc                 | 334 +++----
 jena-arq/Grammar/tokens2bnf                     |  88 +-
 jena-arq/bat/make_classpath.bat                 |  20 +
 jena-arq/etc/dataset-db.ttl                     |  16 +
 jena-arq/etc/dataset-owl-inf.ttl                |  16 +
 jena-arq/etc/dataset-owl.ttl                    |  16 +
 jena-arq/etc/dataset-rdfs.ttl                   |  16 +
 jena-arq/etc/dataset-rules.ttl                  |  16 +
 jena-arq/etc/dataset-trans.ttl                  |  16 +
 jena-arq/etc/dataset.ttl                        |  16 +
 jena-arq/etc/graphstore.ttl                     |  16 +
 jena-arq/etc/update-data.ttl                    |  16 +
 jena-arq/log4j.properties                       |  16 +
 .../apache/jena/atlas/RuntimeIOException.java   |  34 +
 .../main/java/org/apache/jena/atlas/io/IO.java  |  10 +-
 .../apache/jena/atlas/io/IndentedWriter.java    |   6 +-
 .../org/apache/jena/atlas/json/JsonBuilder.java |   2 +
 .../apache/jena/atlas/lib/TestAlarmClock.java   |   5 +-
 jena-core/Grammar/turtle                        |  16 +
 jena-core/src/main/java/link2readme.html        |  16 +
 jena-extras/jena-querybuilder                   |   1 -
 jena-extras/jena-querybuilder/LICENSE           | 202 ++++
 jena-extras/jena-querybuilder/README.md         |  49 +
 .../jena-querybuilder/license-header.txt        |  14 +
 jena-extras/jena-querybuilder/pom.xml           |  65 ++
 .../arq/querybuilder/AbstractQueryBuilder.java  | 362 ++++++++
 .../jena/arq/querybuilder/AskBuilder.java       | 198 ++++
 .../jena/arq/querybuilder/ConstructBuilder.java | 244 +++++
 .../jena/arq/querybuilder/SelectBuilder.java    | 281 ++++++
 .../querybuilder/clauses/ConstructClause.java   |  74 ++
 .../arq/querybuilder/clauses/DatasetClause.java |  75 ++
 .../arq/querybuilder/clauses/PrologClause.java  | 105 +++
 .../arq/querybuilder/clauses/SelectClause.java  |  79 ++
 .../clauses/SolutionModifierClause.java         |  89 ++
 .../arq/querybuilder/clauses/WhereClause.java   | 153 +++
 .../arq/querybuilder/clauses/package-info.java  |   7 +
 .../querybuilder/handlers/ConstructHandler.java |  89 ++
 .../querybuilder/handlers/DatasetHandler.java   | 149 +++
 .../jena/arq/querybuilder/handlers/Handler.java |  42 +
 .../querybuilder/handlers/PrologHandler.java    | 126 +++
 .../querybuilder/handlers/SelectHandler.java    | 133 +++
 .../handlers/SolutionModifierHandler.java       | 269 ++++++
 .../arq/querybuilder/handlers/WhereHandler.java | 310 +++++++
 .../arq/querybuilder/handlers/package-info.java |   9 +
 .../jena/arq/querybuilder/package-info.java     |   9 +
 .../rewriters/AbstractRewriter.java             | 222 +++++
 .../querybuilder/rewriters/ElementRewriter.java | 213 +++++
 .../querybuilder/rewriters/ExprRewriter.java    | 203 ++++
 .../rewriters/NodeValueRewriter.java            |  96 ++
 .../arq/querybuilder/rewriters/OpRewriter.java  | 368 ++++++++
 .../querybuilder/rewriters/PathRewriter.java    | 163 ++++
 .../querybuilder/rewriters/package-info.java    |   7 +
 .../jena/arq/AbstractRegexpBasedTest.java       |  99 ++
 .../querybuilder/AbstractQueryBuilderTest.java  | 108 +++
 .../querybuilder/AskBuilderContractTest.java    |  53 ++
 .../ConstructBuilderContractTest.java           |  53 ++
 .../querybuilder/SelectBuilderContractTest.java |  53 ++
 .../arq/querybuilder/SelectBuilderTest.java     | 114 +++
 .../clauses/AbstractClauseTest.java             |  58 ++
 .../querybuilder/clauses/DatasetClauseTest.java | 150 +++
 .../querybuilder/clauses/PrologClauseTest.java  | 144 +++
 .../querybuilder/clauses/SelectClauseTest.java  | 170 ++++
 .../clauses/SolutionModifierTest.java           | 175 ++++
 .../querybuilder/clauses/WhereClauseTest.java   | 285 ++++++
 .../handlers/AbstractHandlerTest.java           |  44 +
 .../handlers/ConstructHandlerTest.java          |  96 ++
 .../handlers/DatasetHandlerTest.java            | 126 +++
 .../handlers/PrologHandlerTest.java             | 109 +++
 .../handlers/SelectHandlerTest.java             | 152 +++
 .../handlers/SolutionModifierHandlerTest.java   | 201 ++++
 .../querybuilder/handlers/WhereHandlerTest.java | 296 ++++++
 jena-extras/pom.xml                             |  15 +
 jena-fuseki/Data/books.ttl                      |  16 +
 jena-fuseki/Data/test_abox.ttl                  |  16 +
 jena-fuseki/Data/test_data_rdfs.ttl             |  16 +
 jena-fuseki/Data/test_tbox.ttl                  |  16 +
 jena-fuseki/SEE_FUSEKI2                         |   0
 jena-fuseki/assembly-dist.xml                   |   4 +-
 jena-fuseki/config-tdb-text.ttl                 |  16 +
 jena-fuseki/dist/LICENSE                        | 548 +++++++++++
 jena-fuseki/dist/LICENSE-dist                   | 548 -----------
 jena-fuseki/dist/NOTICE                         | 216 +++++
 jena-fuseki/dist/NOTICE-dist                    | 216 -----
 jena-fuseki/fuseki-server.bat                   |  16 +
 jena-fuseki/jetty-fuseki.xml                    |  17 +
 jena-fuseki/make_cp_mvn                         |  16 +
 jena-fuseki/run_cp                              |  15 +
 .../jena/fuseki/servlets/SPARQL_Query.java      |   6 +
 .../fuseki/servlets/SPARQL_ServletBase.java     |   4 +
 jena-fuseki/tdb.ttl                             |  16 +
 jena-fuseki2/pom.xml                            |   2 +-
 .../org/apache/jena/fuseki/mgt/ActionStats.java |   1 +
 .../apache/jena/fuseki/server/CounterName.java  |   3 +-
 .../apache/jena/fuseki/servlets/ActionBase.java |   4 +
 .../jena/fuseki/servlets/ActionSPARQL.java      |   3 +-
 .../jena/fuseki/servlets/ResponseResultSet.java |   3 +-
 .../jena/fuseki/servlets/SPARQL_Query.java      |   9 +-
 .../main/resources/jena-jdbc-log4j.properties   |  16 +
 jena-parent/pom.xml                             |  75 ++
 jena-sdb/Data/data.ttl                          |  16 +
 jena-sdb/Data/data2.ttl                         |  16 +
 jena-sdb/Old/PG_GRANT                           |  10 -
 jena-sdb/Old/ToDo-AFS                           |  67 --
 jena-sdb/Store/sdb-sap-layout1.ttl              |  16 +
 jena-sdb/Store/sdb-sap.ttl                      |  16 +
 jena-sdb/assembly.xml                           |   4 +-
 jena-sdb/dist/LICENSE                           | 246 +++++
 jena-sdb/dist/LICENSE-dist                      | 246 -----
 jena-sdb/dist/NOTICE                            |  42 +
 jena-sdb/dist/NOTICE-dist                       |  42 -
 jena-sdb/dist/dist.sh                           |  15 +
 jena-sdb/log4j.properties                       |  16 +
 jena-sdb/src-dev/resources/etc/daml-micro.rules |  16 +
 .../src-dev/resources/etc/dig-daml-axioms.rdf   |  17 +-
 .../src-dev/resources/etc/dig-owl-axioms.rdf    |  16 +
 .../src-dev/resources/etc/location-mapping.ex   |  16 +
 .../src-dev/resources/etc/ont-policy-test.rdf   |  17 +
 jena-sdb/src-dev/resources/etc/ont-policy.rdf   |  17 +
 jena-sdb/src-dev/resources/etc/owl-b.rules      |  16 +
 .../src-dev/resources/etc/owl-fb-micro.rules    |  16 +
 .../src-dev/resources/etc/owl-fb-mini.rules     |  16 +
 jena-sdb/src-dev/resources/etc/owl-fb-old.rules |  16 +
 jena-sdb/src-dev/resources/etc/owl-fb.rules     |  16 +
 jena-sdb/src-dev/resources/etc/owl.rules        |  16 +
 .../src-dev/resources/etc/rdfs-b-tuned.rules    |  16 +
 jena-sdb/src-dev/resources/etc/rdfs-b.rules     |  16 +
 .../src-dev/resources/etc/rdfs-fb-lp-expt.rules |  16 +
 .../resources/etc/rdfs-fb-tgc-noresource.rules  |  16 +
 .../resources/etc/rdfs-fb-tgc-simple.rules      |  16 +
 .../src-dev/resources/etc/rdfs-fb-tgc.rules     |  16 +
 jena-sdb/src-dev/resources/etc/rdfs-fb.rules    |  16 +
 .../src-dev/resources/etc/rdfs-noresource.rules |  16 +
 jena-sdb/src-dev/resources/etc/rdfs.rules       |  16 +
 .../src-dev/resources/etc/schemagen_example.rdf |  17 +
 .../apache/jena/security/example/example.ttl    |  16 +
 .../jena/query/spatial/SpatialIndexContext.java |   5 +-
 .../jena/query/spatial/SpatialIndexLucene.java  |   8 +-
 .../jena/query/spatial/SpatialIndexSolr.java    |  49 +-
 .../jena/query/spatial/SpatialQueryFuncs.java   |  61 ++
 jena-tdb/log4j.properties                       |  16 +
 jena-text/data.ttl                              |  16 +
 .../apache/jena/query/text/TextQueryFuncs.java  |   2 +-
 jena-text/text-config.ttl                       |  18 +-
 pom.xml                                         |   2 +
 158 files changed, 10158 insertions(+), 2147 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b32af6cd/jena-parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/jena/blob/b32af6cd/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 4b91882,b29f9a8..7dcd7ca
--- a/pom.xml
+++ b/pom.xml
@@@ -81,7 -81,7 +81,8 @@@
          <!-- <module>jena-maven-tools</module>    -->
          <!-- <module>apache-jena-libs</module>    -->
          <!-- <module>apache-jena</module>         -->
 +        <!-- <module>jena-hadoop-rdf</module> -->
+         <module>jena-extras</module>
        </modules>
      </profile>