Merge pull request #12 from apache/master pull master 2015-08-06
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b084878a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b084878a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b084878a Branch: refs/heads/master Commit: b084878a1d49e240c702f7961b316819d8a33b9f Parents: 2bb0e58 7442161 Author: confidencesun <[email protected]> Authored: Thu Aug 6 00:02:12 2015 -0300 Committer: confidencesun <[email protected]> Committed: Thu Aug 6 00:02:12 2015 -0300 ---------------------------------------------------------------------- .../sparql/pfunction/PropertyFunctionBase.java | 25 +- jena-core/src/main/java/jena/schemagen.java | 3 +- .../apache/jena/fuseki/mgt/ActionDatasets.java | 120 +-- .../fuseki/server/DataAccessPointRegistry.java | 14 + .../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/TestAdmin.java | 24 +- .../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 +++++++++++-------- 18 files changed, 944 insertions(+), 999 deletions(-) ----------------------------------------------------------------------
