Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6C3110613 for ; Wed, 9 Apr 2014 11:05:40 +0000 (UTC) Received: (qmail 3826 invoked by uid 500); 9 Apr 2014 11:04:12 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 3592 invoked by uid 500); 9 Apr 2014 11:04:09 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 3468 invoked by uid 99); 9 Apr 2014 11:04:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2014 11:04:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DCA4B98BC87; Wed, 9 Apr 2014 11:04:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jakob@apache.org To: commits@marmotta.apache.org Date: Wed, 09 Apr 2014 11:04:07 -0000 Message-Id: <3bef68f010f7414895ceeed098e927dc@git.apache.org> In-Reply-To: <2077651e2c244af5aa4fff6998f85e1f@git.apache.org> References: <2077651e2c244af5aa4fff6998f85e1f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] git commit: Merge branch 'develop' into ldp Merge branch 'develop' into ldp Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f171cc1f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f171cc1f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f171cc1f Branch: refs/heads/master Commit: f171cc1f6abeab112c6bc1be8ad6aa2db8f9d8a2 Parents: 1b4705b 29c8849 Author: Sergio Fernández Authored: Thu Mar 27 14:49:19 2014 +0100 Committer: Sergio Fernández Committed: Thu Mar 27 14:49:19 2014 +0100 ---------------------------------------------------------------------- .../test/java/webservices/MyWebServiceTest.java | 19 +- .../marmotta-archetype-webapp/pom.xml | 16 + .../main/resources/archetype-resources/pom.xml | 13 +- .../src/test/resources/projects/basic/goal.txt | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/installer/LICENSE.txt | 232 ++++---- .../src/main/webapp/META-INF/LICENSE | 536 ++++++------------- .../src/main/webapp/META-INF/NOTICE | 2 +- .../src/main/doc/LICENSE.txt | 157 ++++-- .../src/main/resources/META-INF/LICENSE | 356 ------------ .../src/main/resources/META-INF/NOTICE | 13 - .../src/main/resources/META-INF/NOTICE | 11 - .../src/main/resources/META-INF/LICENSE | 296 ---------- .../src/main/resources/META-INF/NOTICE | 11 - 14 files changed, 456 insertions(+), 1210 deletions(-) ----------------------------------------------------------------------