Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7e7bf2b3 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7e7bf2b3 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7e7bf2b3 Branch: refs/heads/master Commit: 7e7bf2b3a3f16c11ad451321c1b4b4a20f6496b9 Parents: da8b220 7442161 Author: Claude Warren <[email protected]> Authored: Fri Aug 7 19:50:19 2015 +0100 Committer: Claude Warren <[email protected]> Committed: Fri Aug 7 19:50:19 2015 +0100 ---------------------------------------------------------------------- .../sparql/pfunction/PropertyFunctionBase.java | 25 +- jena-core/src/main/java/jena/schemagen.java | 3 +- .../apache/jena/fuseki/mgt/ActionDatasets.java | 57 +- .../apache/jena/fuseki/server/FusekiEnv.java | 53 +- .../jena/fuseki/servlets/SPARQL_Protocol.java | 68 +- .../jena/fuseki/servlets/SPARQL_Query.java | 2 +- .../fuseki/servlets/SPARQL_QueryDataset.java | 20 +- .../fuseki/servlets/SPARQL_QueryGeneral.java | 100 +- .../java/org/apache/jena/fuseki/TestQuery.java | 134 ++- jena-parent/pom.xml | 5 +- .../java/org/apache/jena/tdb/TDBFactory.java | 17 +- .../jena/tdb/setup/DatasetBuilderBasic.java | 197 ---- .../jena/tdb/setup/DatasetBuilderStd.java | 27 +- .../org/apache/jena/tdb/sys/TDBInternal.java | 128 ++- .../java/org/apache/jena/tdb/sys/TDBMaker.java | 92 +- .../org/apache/jena/query/text/TextQueryPF.java | 914 +++++++++++-------- 16 files changed, 900 insertions(+), 942 deletions(-) ----------------------------------------------------------------------
