Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ae528c29 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ae528c29 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ae528c29 Branch: refs/heads/master Commit: ae528c29d8417085eca114db52d6aebe10945f4b Parents: 4029f47 29c8849 Author: Sebastian Schaffert <[email protected]> Authored: Fri Mar 28 15:32:46 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Mar 28 15:32:46 2014 +0100 ---------------------------------------------------------------------- .../src/test/java/services/MyServiceTest.java | 2 +- .../test/java/webservices/MyWebServiceTest.java | 17 +- .../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 +- .../test/freebase/TestFreebaseProvider.java | 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 - .../src/main/resources/kiwi-module.properties | 4 +- 17 files changed, 460 insertions(+), 1212 deletions(-) ----------------------------------------------------------------------
