Updated Branches: refs/heads/master 855e59166 -> 0009aef9c Updated Tags: refs/tags/3.0.0-incubating [created] 18ee08fb9
- fixed license and notice for marmotta-core and marmotta-sparql to be the same style as the others - some more test logging Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6ae50a0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6ae50a0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6ae50a0b Branch: refs/heads/master Commit: 6ae50a0bcbed1b38b7f4f905e4cf3292ae961991 Parents: ff51a6f Author: Sebastian Schaffert <[email protected]> Authored: Wed Apr 10 14:05:12 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Apr 10 14:05:12 2013 +0200 ---------------------------------------------------------------------- .../apache/marmotta/kiwi/test/TransactionTest.java | 15 ++ .../versioning/test/SnapshotRepositoryTest.java | 19 ++ .../versioning/test/VersioningPersistenceTest.java | 18 ++ .../versioning/test/VersioningRepositoryTest.java | 20 ++ .../backend/file/test/LDCacheBackendTest.java | 18 ++ .../backend/kiwi/test/LDCacheBackendTest.java | 19 ++ .../backend/kiwi/test/LDCachePersistenceTest.java | 18 ++ .../marmotta/ldclient/test/TestLDClientTest.java | 19 ++ .../test/facebook/FacebookProviderTest.java | 16 ++ .../test/mediawiki/TestMediawikiProvider.java | 17 ++ .../ldclient/test/vimeo/TestVimeoProvider.java | 17 ++ .../ldclient/test/youtube/TestYoutubeProvider.java | 17 ++ .../marmotta/ldpath/test/AbstractTestBase.java | 20 ++ .../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 +++- 17 files changed, 589 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java b/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java index 8bb28e9..52b92b1 100644 --- a/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java +++ b/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java @@ -33,7 +33,10 @@ import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail; 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.openrdf.model.Resource; @@ -162,6 +165,18 @@ public class TransactionTest { repository.shutDown(); } + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + log.info("{} being run...", description.getMethodName()); + } + }; + + /** * Test importing data; the test will load a small sample RDF file and check whether the expected resources are * present. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java index a4ed8a1..7cc52e3 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/SnapshotRepositoryTest.java @@ -29,7 +29,10 @@ import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail; 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.openrdf.model.Statement; @@ -39,6 +42,8 @@ import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; import org.openrdf.rio.RDFFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.InputStream; import java.sql.SQLException; @@ -159,6 +164,20 @@ public class SnapshotRepositoryTest { repository.shutDown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + @Test public void testSnapshotConnection() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java ---------------------------------------------------------------------- diff --git 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 index 960bbc7..e5335fa 100644 --- 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 @@ -35,9 +35,14 @@ import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningPersistence 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; @@ -153,6 +158,19 @@ public class VersioningPersistenceTest { persistence.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; @Test public void testTablesCreateDrop() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java index 980fe69..f0b720a 100644 --- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java +++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java @@ -29,7 +29,10 @@ import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail; 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.openrdf.repository.Repository; @@ -38,6 +41,8 @@ import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; import org.openrdf.repository.sail.SailRepository; import org.openrdf.rio.RDFFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.InputStream; import java.sql.SQLException; @@ -156,6 +161,21 @@ public class VersioningRepositoryTest { repository.shutDown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + + /** * This test imports three small RDF files in sequence and checks afterwards that the number of versions * is correct and they contain the correct information http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheBackendTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheBackendTest.java b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheBackendTest.java index 89f8815..2061c9f 100644 --- a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheBackendTest.java +++ b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheBackendTest.java @@ -26,13 +26,18 @@ import org.apache.marmotta.ldcache.model.CacheEntry; 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.openrdf.model.Literal; import org.openrdf.model.Statement; import org.openrdf.model.URI; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -69,6 +74,19 @@ public class LDCacheBackendTest { } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; /** * This test verifies if triples are added to the correct context using the repository connection obtained from the backend * @throws Exception http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCacheBackendTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCacheBackendTest.java b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCacheBackendTest.java index 9e582f5..bfd12c9 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCacheBackendTest.java +++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCacheBackendTest.java @@ -30,7 +30,10 @@ import org.apache.marmotta.ldcache.model.CacheEntry; 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.openrdf.model.Literal; @@ -41,6 +44,8 @@ import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; import org.openrdf.repository.RepositoryResult; import org.openrdf.repository.sail.SailRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.SQLException; import java.util.ArrayList; @@ -156,6 +161,20 @@ public class LDCacheBackendTest { } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + /** * This test verifies if triples are added to the correct context using the repository connection obtained from the backend * @throws Exception http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java index 9d05a32..c25f166 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java +++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/java/org/apache/marmotta/ldcache/backend/kiwi/test/LDCachePersistenceTest.java @@ -31,10 +31,15 @@ import org.apache.marmotta.ldcache.backend.kiwi.persistence.LDCachingKiWiPersist 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.openrdf.repository.RepositoryException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.sql.SQLException; import java.util.ArrayList; @@ -145,6 +150,19 @@ public class LDCachePersistenceTest { persistence.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; @Test public void testTablesCreateDrop() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/TestLDClientTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/TestLDClientTest.java b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/TestLDClientTest.java index c31523f..2cf0a4f 100644 --- a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/TestLDClientTest.java +++ b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/TestLDClientTest.java @@ -23,7 +23,12 @@ import org.apache.marmotta.ldclient.test.helper.TestLDClient; 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.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestLDClientTest { @@ -40,6 +45,20 @@ public class TestLDClientTest { client.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + @Test(expected = UnsupportedOperationException.class) public void testConnectionRefused() throws Exception { client.retrieveResource("http://no.host.for/this/url";); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldclient/ldclient-provider-facebook/src/test/java/org/apache/marmotta/ldclient/test/facebook/FacebookProviderTest.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-facebook/src/test/java/org/apache/marmotta/ldclient/test/facebook/FacebookProviderTest.java b/libraries/ldclient/ldclient-provider-facebook/src/test/java/org/apache/marmotta/ldclient/test/facebook/FacebookProviderTest.java index 2e98946..262dd70 100644 --- a/libraries/ldclient/ldclient-provider-facebook/src/test/java/org/apache/marmotta/ldclient/test/facebook/FacebookProviderTest.java +++ b/libraries/ldclient/ldclient-provider-facebook/src/test/java/org/apache/marmotta/ldclient/test/facebook/FacebookProviderTest.java @@ -26,7 +26,10 @@ import org.junit.After; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.openrdf.query.BooleanQuery; import org.openrdf.query.QueryLanguage; import org.openrdf.repository.RepositoryConnection; @@ -59,6 +62,19 @@ public class FacebookProviderTest { ldclient.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; @Test public void testMovie() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java index 9adf154..63d73a8 100644 --- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java +++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java @@ -25,7 +25,10 @@ import org.apache.marmotta.ldclient.test.helper.TestLDClient; 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.openrdf.query.BooleanQuery; import org.openrdf.query.QueryLanguage; import org.openrdf.repository.RepositoryConnection; @@ -58,6 +61,20 @@ public class TestMediawikiProvider { ldclient.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + /** * This method tests accessing the Youtube Video service via the GData API. * http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldclient/ldclient-provider-vimeo/src/test/java/org/apache/marmotta/ldclient/test/vimeo/TestVimeoProvider.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-vimeo/src/test/java/org/apache/marmotta/ldclient/test/vimeo/TestVimeoProvider.java b/libraries/ldclient/ldclient-provider-vimeo/src/test/java/org/apache/marmotta/ldclient/test/vimeo/TestVimeoProvider.java index b271274..57d39c1 100644 --- a/libraries/ldclient/ldclient-provider-vimeo/src/test/java/org/apache/marmotta/ldclient/test/vimeo/TestVimeoProvider.java +++ b/libraries/ldclient/ldclient-provider-vimeo/src/test/java/org/apache/marmotta/ldclient/test/vimeo/TestVimeoProvider.java @@ -25,7 +25,10 @@ import org.apache.marmotta.ldclient.test.helper.TestLDClient; 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.openrdf.query.BooleanQuery; import org.openrdf.query.QueryLanguage; import org.openrdf.repository.RepositoryConnection; @@ -58,6 +61,20 @@ public class TestVimeoProvider { ldclient.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + /** * This method tests accessing the Youtube Video service via the GData API. * http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldclient/ldclient-provider-youtube/src/test/java/org/apache/marmotta/ldclient/test/youtube/TestYoutubeProvider.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-youtube/src/test/java/org/apache/marmotta/ldclient/test/youtube/TestYoutubeProvider.java b/libraries/ldclient/ldclient-provider-youtube/src/test/java/org/apache/marmotta/ldclient/test/youtube/TestYoutubeProvider.java index 866e217..ff91af5 100644 --- a/libraries/ldclient/ldclient-provider-youtube/src/test/java/org/apache/marmotta/ldclient/test/youtube/TestYoutubeProvider.java +++ b/libraries/ldclient/ldclient-provider-youtube/src/test/java/org/apache/marmotta/ldclient/test/youtube/TestYoutubeProvider.java @@ -26,7 +26,10 @@ import org.junit.After; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.openrdf.query.BooleanQuery; import org.openrdf.query.QueryLanguage; import org.openrdf.repository.RepositoryConnection; @@ -59,6 +62,20 @@ public class TestYoutubeProvider { ldclient.shutdown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + /** * This method tests accessing the Youtube Video service via the GData API. * http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java index 32ef87a..9152031 100644 --- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java +++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java @@ -26,6 +26,9 @@ import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Assume; import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.openrdf.model.URI; import org.openrdf.model.Value; import org.openrdf.repository.RepositoryException; @@ -34,6 +37,8 @@ import org.openrdf.repository.sail.SailRepositoryConnection; import org.openrdf.rio.RDFFormat; import org.openrdf.rio.RDFParseException; import org.openrdf.sail.memory.MemoryStore; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; @@ -88,6 +93,21 @@ public abstract class AbstractTestBase { repository.shutDown(); } + final Logger logger = + LoggerFactory.getLogger(this.getClass()); + + @Rule + public TestWatcher watchman = new TestWatcher() { + /** + * Invoked when a test is about to start + */ + @Override + protected void starting(Description description) { + logger.info("{} being run...", description.getMethodName()); + } + }; + + protected RdfPathParser<Value> createParserFromResource(String input) throws IOException { final URL resource = this.getClass().getResource(input); assumeThat("Could not load test input data '" + input + "'", resource, CoreMatchers.notNullValue()); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/platform/marmotta-core/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/META-INF/LICENSE b/platform/marmotta-core/src/main/resources/META-INF/LICENSE index e18efe8..a53faaa 100644 --- a/platform/marmotta-core/src/main/resources/META-INF/LICENSE +++ b/platform/marmotta-core/src/main/resources/META-INF/LICENSE @@ -1,4 +1,5 @@ - Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -201,22 +202,155 @@ limitations under the License. -This library bundles the D3.js Javascript library, which is available under a -"New BSD" license. Copyright (c) 2012, Michael Bostock. -For details, see http://d3js.org/. -This library bundles the Dracula Javascript library, which is available under a -"MIT" license. (c) 2010 by Johann Philipp Strathausen <[email protected]>. -For details, see http://jquery.com/. +Apache Marmotta subcomponents: +============================= -This library bundles the jQuery Javascript library, which is available under a -"MIT" license. Copyright 2013 jQuery Foundation and other contributors. -For details, see http://jquery.com/. +The Apache Marmotta project includes a number of subcomponents (libraries) from +external projects with separate copyright notices and license terms. Your use of +the code for the these subcomponents is subject to the terms and conditions of the +following licenses. + +For the D3.js component, + + located at: + platform/marmotta-core/src/main/resources/web/admin/js/lib/ + platform/marmotta-sparql/src/main/resources/web/admin/sgvizler/0.5/lib/ + + Copyright (c) 2013 Michael Bostock, http://d3js.org + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * The name Michael Bostock may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +For the Dracula Graph Library component, + + located at: + platform/marmotta-core/src/main/resources/web/admin/js/lib/ + + Copyright (c) 2013 Johann Philipp Strathausen, http://www.graphdracula.net + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +For the strftime component, + + located at: + platform/marmotta-core/src/main/resources/web/public/js/lib + + Copyright (c) 2008 Philip S Tellis, http://hacks.bluesmoon.info/strftime + Extended by Marmotta with German locales and %F formatter. + + Redistribution and use of this software in source and binary forms, with or + without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or other + materials provided with the distribution. + * The names of the contributors to this file may not be used to endorse or promote + products derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +For the jQuery component, + + located at: + platform/marmotta-core/src/main/resources/web/public/js/lib + + Copyright (c) 2013 jQuery Foundation, http://jquery.com + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + + +For the Sgvizler component, + + located at: + platform/marmotta-core/src/main/resources/web/admin/js/lib + platform/marmotta-sparql/src/main/resources/web/admin/sgvizler + + Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -This library bundles the Sgvizler Javascript library, which is available under a -"MIT" license. Copyright (c) 2011 Martin G. Skjæveland. -For details, see https://code.google.com/p/sgvizler/. -This library bundles the strftime Javascript library, which is available under a -"New BSD" license. Copyright (c) 2008, Philip S Tellis <[email protected]> -For details, http://hacks.bluesmoon.info/strftime/. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/platform/marmotta-core/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/META-INF/NOTICE b/platform/marmotta-core/src/main/resources/META-INF/NOTICE index 043d117..a49305c 100644 --- a/platform/marmotta-core/src/main/resources/META-INF/NOTICE +++ b/platform/marmotta-core/src/main/resources/META-INF/NOTICE @@ -1,13 +1,30 @@ -Apache Marmotta Web Application +Apache Marmotta Platform Core Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Additionally, it includes the following 3rd party modules: +Apache Marmotta, Copyright 2012-2013 The Apache Software Foundation + +This product also includes the following third-party components: + +* D3.js, http://d3js.org + + Copyright (c) 2013 Michael Bostock + +* Dracula Graph Library, http://www.graphdracula.net + + Copyright (c) 2013 Johann Philipp Strathausen + +* strftime, http://hacks.bluesmoon.info/strftime + + Copyright (c) 2008 Philip S Tellis + +* jQuery, http://jquery.com + + Copyright (c) 2013 jQuery Foundation + +* Sgvizler, http://sgvizler.googlecode.com + + Copyright (c) 2011 Martin G. Skjæveland - D3.js licensed under New BSD License - Dracula Graph Library licensed under MIT License - jQuery under MIT License - Sgvizler licensed under a MIT license - strftime licensed under New BSD License http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/platform/marmotta-sparql/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/META-INF/LICENSE b/platform/marmotta-sparql/src/main/resources/META-INF/LICENSE index c8508ed..693bd00 100644 --- a/platform/marmotta-sparql/src/main/resources/META-INF/LICENSE +++ b/platform/marmotta-sparql/src/main/resources/META-INF/LICENSE @@ -1,4 +1,5 @@ - Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -201,7 +202,158 @@ limitations under the License. -This library bundles the Sgvizler Javascript library, which is available under a -"MIT" license. Copyright (c) 2011 Martin G. Skjæveland. -For details, see https://code.google.com/p/sgvizler/. + +Apache Marmotta subcomponents: +============================= + +The Apache Marmotta project includes a number of subcomponents (libraries) from +external projects with separate copyright notices and license terms. Your use of +the code for the these subcomponents is subject to the terms and conditions of the +following licenses. + + + +For the CodeMirror component, + + located at: + platform/marmotta-ldpath/src/main/resources/web/cm + platform/marmotta-sparql/src/main/resources/web/cm + platform/marmotta-sparql/src/main/resources/web/admin/editor/sparql/lib + + Copyright (c) 2013 Marijn Haverbeke, http://codemirror.net + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +For the D2R Snorql component, + + located at: + platform/marmotta-sparql/src/main/resources/web/admin/snorql + + Copyright (c) 2007 Richard Cyganiak, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/ + with some minor modifications for Apache Marmotta. + + D2R Snorql is provided under the Apache License, version 2.0. + + +For the script.aculo.us component, + + located at: + platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous + + Copyright (c) 2010 Thomas Fuchs, http://script.aculo.us + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +For the Prototype component, + + located at: + platform/marmotta-sparql/src/main/resources/web/admin/snorql + + Copyright (c) 2010 Sam Stephenson, http://prototypejs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +For the SPARQL Flint Editor component, + + located at: + platform/marmotta-sparql/src/main/resources/web/admin/editor/ + + Copyright (c) 2011 TSO Ltd, http://github.com/TSO-Openup/FlintSparqlEditor + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +For the Sgvizler component, + + located at: + platform/marmotta-core/src/main/resources/web/admin/js/lib + platform/marmotta-sparql/src/main/resources/web/admin/sgvizler + + Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6ae50a0b/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE b/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE index 71af026..83e9f63 100644 --- a/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE +++ b/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE @@ -1,12 +1,32 @@ -Apache Marmotta Web Application +Apache Marmotta Platform SPARQL Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Additionally, it includes the following 3rd party modules: +This product also includes the following third-party components: - CodeMirror licensed under Apache License 2.0 - D2R Snorql licensed under Apache License 2.0 - Sgvizler licensed under a MIT-style license - SPARQL Flint Editor licensed under Apache License 2.0 + +* CodeMirror, http://codemirror.net + + Copyright (c) 2013 Marijn Haverbeke + +* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/, + + Copyright (c) 2007 Richard Cyganiak + +* script.aculo.us, http://script.aculo.us + + Copyright (c) 2010 Thomas Fuchs + +* Prototype, http://prototypejs.org + + Copyright (c) 2010 Sam Stephenson + +* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor + + Copyright (c) 2011 TSO Ltd + +* Sgvizler, http://sgvizler.googlecode.com + + Copyright (c) 2011 Martin G. Skjæveland
