Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9125917EB2 for ; Thu, 23 Oct 2014 13:19:54 +0000 (UTC) Received: (qmail 25234 invoked by uid 500); 23 Oct 2014 13:19:54 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 25180 invoked by uid 500); 23 Oct 2014 13:19:54 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 25149 invoked by uid 99); 23 Oct 2014 13:19:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Oct 2014 13:19:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1937E16553; Thu, 23 Oct 2014 13:19:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rvesse@apache.org To: commits@jena.apache.org Date: Thu, 23 Oct 2014 13:20:06 -0000 Message-Id: <90ccd8cb07d44f24b7b9bb2214d00b22@git.apache.org> In-Reply-To: <3994dc0f551548a5a138c4d443bcafab@git.apache.org> References: <3994dc0f551548a5a138c4d443bcafab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] git commit: Merge branch 'master' into hadoop-rdf 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/d8019fbf Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d8019fbf Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d8019fbf Branch: refs/heads/hadoop-rdf Commit: d8019fbfe927237fa0b86f7e4bd0552f6275b56c Parents: 535a825 bead39e Author: Rob Vesse Authored: Thu Oct 23 14:19:42 2014 +0100 Committer: Rob Vesse Committed: Thu Oct 23 14:19:42 2014 +0100 ---------------------------------------------------------------------- .../org/apache/jena/riot/web/HttpNames.java | 10 +- jena-extras/jena-querybuilder/pom.xml | 59 +- .../querybuilder/rewriters/package-info.java | 2 +- .../querybuilder/AbstractQueryBuilderTest.java | 18 + .../arq/querybuilder/SelectBuilderTest.java | 18 + jena-extras/pom.xml | 2 +- jena-fuseki2/D.trig | 18 +- jena-fuseki2/D.ttl | 18 +- jena-fuseki2/Data/books.ttl | 16 + jena-fuseki2/Data/test_abox.ttl | 16 + jena-fuseki2/Data/test_data_rdfs.ttl | 16 + jena-fuseki2/Data/test_tbox.ttl | 16 + jena-fuseki2/assembly-dist.xml | 4 +- jena-fuseki2/backup | 15 + jena-fuseki2/dist/LICENSE | 608 +++++++++++++++++++ jena-fuseki2/dist/LICENSE-dist | 608 ------------------- jena-fuseki2/dist/NOTICE | 216 +++++++ jena-fuseki2/dist/NOTICE-dist | 216 ------- jena-fuseki2/dwim | 16 +- jena-fuseki2/dwim-upload | 16 + jena-fuseki2/examples/jetty-fuseki.xml | 17 + jena-fuseki2/fuseki-server.bat | 16 + jena-fuseki2/make-html | 15 + jena-fuseki2/make_cp_mvn | 16 + jena-fuseki2/pom.xml | 2 +- .../dev/BackwardForwardDescribeFactory.java | 95 --- jena-fuseki2/src-dev/dev/PROJECT.java | 80 --- jena-fuseki2/src-dev/dev/RunAsWebapp.java | 50 -- jena-fuseki2/src-dev/dev/RunFuseki2.java | 96 --- .../apache/jena/fuseki/jetty/JettyFuseki.java | 2 +- .../src/main/resources/log4j.properties | 2 + .../org/apache/jena/fuseki/server/config.ttl | 4 +- .../org/apache/jena/fuseki/server/shiro.ini | 2 + jena-fuseki2/src/main/webapp/WEB-INF/web.xml | 16 + jena-parent/pom.xml | 31 +- 35 files changed, 1153 insertions(+), 1199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d8019fbf/jena-parent/pom.xml ----------------------------------------------------------------------