Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/17c6319d Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/17c6319d Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/17c6319d Branch: refs/heads/develop Commit: 17c6319d1f5cb1e1400c955f726dbd356e003866 Parents: 13c2daf 849aa0c Author: Jakob Frank <[email protected]> Authored: Thu Apr 11 09:21:25 2013 +0200 Committer: Jakob Frank <[email protected]> Committed: Thu Apr 11 09:21:25 2013 +0200 ---------------------------------------------------------------------- build/plugins/refpack-maven-plugin/pom.xml | 15 ++ .../maven/plugins/refpack/RefPackMojo.java | 53 ++--- build/scripts/check_signatures_and_digests.sh | 4 +- .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- launchers/marmotta-installer/pom.xml | 6 +- .../apache/marmotta/kiwi/test/TransactionTest.java | 15 ++ .../src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../kiwi/persistence/mysql/statements.properties | 6 +- .../versioning/test/SnapshotRepositoryTest.java | 19 ++ .../versioning/test/VersioningPersistenceTest.java | 18 ++ .../versioning/test/VersioningRepositoryTest.java | 20 ++ .../backend/file/test/LDCacheBackendTest.java | 18 ++ .../src/test/resources/logback.xml | 2 +- .../backend/kiwi/test/LDCacheBackendTest.java | 19 ++ .../backend/kiwi/test/LDCachePersistenceTest.java | 18 ++ .../src/test/resources/logback.xml | 2 +- .../ldcache-core/src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../src/test/resources/logback.xml | 2 +- .../marmotta/ldclient/test/TestLDClientTest.java | 19 ++ .../ldclient-core/src/test/resources/logback.xml | 2 +- .../test/facebook/FacebookProviderTest.java | 16 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 6 +- .../test/mediawiki/TestMediawikiProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 27 +++ .../ldclient/test/vimeo/TestVimeoProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../ldclient/test/youtube/TestYoutubeProvider.java | 17 ++ .../src/test/resources/logback.xml | 27 +++ .../src/test/resources/logback.xml | 27 +++ .../marmotta/ldpath/test/AbstractTestBase.java | 20 ++ .../ldpath-core/src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/main/resources/META-INF/LICENSE | 166 +++++++++++++-- .../src/main/resources/META-INF/NOTICE | 31 ++- .../src/main/resources/META-INF/LICENSE | 160 ++++++++++++++- .../src/main/resources/META-INF/NOTICE | 32 +++- pom.xml | 27 ++- 52 files changed, 892 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
