Merge branch 'master' into hadoop-rdf
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e89032be Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e89032be Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e89032be Branch: refs/heads/hadoop-rdf Commit: e89032be1752455eaac9634eb274b8886e92b637 Parents: 6bb5d12 7e25656 Author: Rob Vesse <[email protected]> Authored: Tue Jan 13 15:39:19 2015 +0000 Committer: Rob Vesse <[email protected]> Committed: Tue Jan 13 15:39:19 2015 +0000 ---------------------------------------------------------------------- NOTICE | 2 +- apache-jena/NOTICE | 2 +- jena-arq/NOTICE | 2 +- .../org/apache/jena/riot/system/IRILib.java | 54 +- jena-arq/src/main/resources/META-INF/NOTICE | 2 +- jena-core/NOTICE | 2 +- jena-core/src/main/java/jena/rdfcat.java | 61 +- jena-core/src/main/resources/META-INF/NOTICE | 2 +- jena-csv/NOTICE | 2 +- jena-csv/src/main/resources/META-INF/NOTICE | 5 + jena-fuseki/NOTICE | 2 +- jena-fuseki/dist/NOTICE | 2 +- jena-fuseki/src/main/resources/META-INF/NOTICE | 2 +- jena-fuseki2/NOTICE | 2 +- jena-fuseki2/jena-fuseki-core/pom.xml | 2 +- .../jena/fuseki/build/DataServiceDesc.java | 2 +- .../jena/fuseki/build/TemplateFunctions.java | 34 +- .../org/apache/jena/fuseki/cmd/FusekiCmd.java | 2 + .../apache/jena/fuseki/mgt/ActionDatasets.java | 4 +- .../apache/jena/fuseki/server/FusekiEnv.java | 78 +- .../apache/jena/fuseki/server/FusekiServer.java | 4 +- .../src/main/resources/META-INF/NOTICE | 2 +- jena-fuseki2/jena-fuseki-dist/assembly-dist.xml | 27 +- jena-fuseki2/jena-fuseki-dist/dist/NOTICE | 2 +- jena-fuseki2/jena-fuseki-dist/pom.xml | 2 +- jena-fuseki2/jena-fuseki-server/pom.xml | 2 +- jena-fuseki2/jena-fuseki-war/pom.xml | 2 +- jena-fuseki2/pom.xml | 2 +- jena-iri/NOTICE | 2 +- .../src/main/java/org/apache/jena/iri/IRI.java | 16 +- .../org/apache/jena/iri/impl/AbsIRIImpl.java | 43 +- jena-iri/src/main/resources/META-INF/NOTICE | 2 +- .../java/org/apache/jena/iri/TestExample.java | 9 +- .../org/apache/jena/iri/TestMoreExamples.java | 7 +- .../org/apache/jena/iri/test/Additional.java | 61 - .../org/apache/jena/iri/test/MoreTests.java | 98 - .../org/apache/jena/iri/test/TestCreator.java | 254 - .../apache/jena/iri/test/TestErrorMessages.java | 144 - .../org/apache/jena/iri/test/TestExample.java | 279 - .../org/apache/jena/iri/test/TestMEIri.java | 39 - .../apache/jena/iri/test/TestMERelativize.java | 50 - .../org/apache/jena/iri/test/TestMEResolve.java | 42 - .../org/apache/jena/iri/test/TestMEResult.java | 46 - .../apache/jena/iri/test/TestMoreExamples.java | 264 - .../org/apache/jena/iri/test/TestPackage.java | 36 - .../test/resources/org/apache/jena/iri/test.xml | 18422 ++++++++--------- .../resources/org/apache/jena/iri/test/test.xml | 9217 --------- .../resources/org/apache/jena/iri/test/uris.xml | 463 - jena-jdbc/NOTICE | 2 +- jena-jdbc/jena-jdbc-core/NOTICE | 2 +- jena-jdbc/jena-jdbc-driver-bundle/NOTICE | 2 +- jena-jdbc/jena-jdbc-driver-mem/NOTICE | 2 +- jena-jdbc/jena-jdbc-driver-remote/NOTICE | 2 +- jena-jdbc/jena-jdbc-driver-tdb/NOTICE | 2 +- jena-parent/NOTICE | 2 +- jena-sdb/NOTICE | 2 +- jena-sdb/dist/NOTICE | 2 +- jena-sdb/src/main/resources/META-INF/NOTICE | 2 +- jena-security/NOTICE | 2 +- jena-spatial/NOTICE | 2 +- jena-spatial/src/main/resources/META-INF/NOTICE | 5 + jena-tdb/NOTICE | 2 +- .../com/hp/hpl/jena/tdb/index/SetupIndex.java | 173 + .../java/com/hp/hpl/jena/tdb/sys/SetupTDB.java | 162 +- jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +- jena-tdb/src/main/resources/META-INF/NOTICE | 2 +- .../jena/tdb/base/file/TestLocationLock.java | 47 - .../jena/tdb/index/AbstractTestTupleIndex.java | 271 - .../index/bplustree/TestBPlusTreeRewriter.java | 4 +- .../com/hp/hpl/jena/tdb/store/TS_Store.java | 1 + .../store/TestLocationLockStoreConnection.java | 98 + .../tupletable/AbstractTestTupleIndex.java | 271 + .../store/tupletable/TestTupleIndexRecord.java | 1 - jena-text/NOTICE | 2 +- jena-text/src/main/resources/LICENSE | 202 - jena-text/src/main/resources/META-INF/LICENSE | 202 + jena-text/src/main/resources/META-INF/NOTICE | 2 +- 77 files changed, 10255 insertions(+), 21019 deletions(-) ----------------------------------------------------------------------
