You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/04/11 09:08:27 UTC
[15/15] git commit: merged masted branch into develop (cosmetic
details from 3.0.0-incubating RC7)
merged masted branch into develop (cosmetic details from 3.0.0-incubating RC7)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/849aa0c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/849aa0c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/849aa0c4
Branch: refs/heads/develop
Commit: 849aa0c46a96bfa92b54c448a4bc3724716b0ca9
Parents: 61f72cb 4dfdb52
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Apr 11 09:07:04 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Apr 11 09:07:04 2013 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/web.xml | 9 +-
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 +-
.../src/main/webapp/WEB-INF/web.xml | 12 -
.../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 ++-
54 files changed, 897 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/849aa0c4/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
----------------------------------------------------------------------
diff --cc libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
index 10ad516,e5335fa..9d723f3
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
@@@ -34,10 -35,17 +34,15 @@@ import org.apache.marmotta.kiwi.version
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+ import org.junit.Rule;
import org.junit.Test;
+ import org.junit.rules.TestWatcher;
+ import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Date;