Updated Branches: refs/heads/develop 4cb2eca9e -> c27139de2
more merge-errors to fix: - removed non-required dependency to kiwi-triplestore in sesame-transactions - updated dependencies to sesame-transactions Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c27139de Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c27139de Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c27139de Branch: refs/heads/develop Commit: c27139de29377fa123969623ef4a298a32db9954 Parents: 4cb2eca Author: Jakob Frank <[email protected]> Authored: Thu Nov 28 10:57:26 2013 +0100 Committer: Jakob Frank <[email protected]> Committed: Thu Nov 28 11:46:26 2013 +0100 ---------------------------------------------------------------------- commons/sesame-transactions/pom.xml | 16 ++++--------- .../marmotta/kiwi/test/TransactionTest.java | 24 ++++--------------- .../services/ReasoningSailProvider.java | 18 +++++++------- .../services/VersioningSailProvider.java | 25 ++++++++++---------- 4 files changed, 33 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/c27139de/commons/sesame-transactions/pom.xml ---------------------------------------------------------------------- diff --git a/commons/sesame-transactions/pom.xml b/commons/sesame-transactions/pom.xml index 74c592c..1d3aef6 100644 --- a/commons/sesame-transactions/pom.xml +++ b/commons/sesame-transactions/pom.xml @@ -78,22 +78,11 @@ <!-- Testing --> <dependency> - <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-triplestore</artifactId> - <scope>test</scope> - </dependency> - <dependency> <artifactId>junit</artifactId> <groupId>junit</groupId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-triplestore</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> <scope>test</scope> @@ -109,6 +98,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-sail-memory</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/marmotta/blob/c27139de/commons/sesame-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java ---------------------------------------------------------------------- diff --git a/commons/sesame-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java b/commons/sesame-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java index f7a5258..75da3a8 100644 --- a/commons/sesame-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java +++ b/commons/sesame-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java @@ -23,24 +23,16 @@ import static org.junit.Assume.assumeThat; import java.io.IOException; import java.io.InputStream; -import java.sql.SQLException; import java.util.List; import org.apache.marmotta.commons.sesame.repository.ResourceUtils; import org.apache.marmotta.commons.sesame.transactions.api.TransactionListener; import org.apache.marmotta.commons.sesame.transactions.model.TransactionData; import org.apache.marmotta.commons.sesame.transactions.sail.KiWiTransactionalSail; -import org.apache.marmotta.kiwi.config.KiWiConfiguration; -import org.apache.marmotta.kiwi.sail.KiWiStore; -import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner; 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.openrdf.model.Resource; import org.openrdf.repository.Repository; import org.openrdf.repository.RepositoryConnection; @@ -48,6 +40,8 @@ import org.openrdf.repository.RepositoryException; import org.openrdf.repository.sail.SailRepository; import org.openrdf.rio.RDFFormat; import org.openrdf.rio.RDFParseException; +import org.openrdf.sail.NotifyingSail; +import org.openrdf.sail.memory.MemoryStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,27 +54,20 @@ import com.google.common.collect.Iterables; * * @author Sebastian Schaffert ([email protected]) */ -@RunWith(KiWiDatabaseRunner.class) public class TransactionTest { private static Logger log = LoggerFactory.getLogger(TransactionTest.class); private Repository repository; - private KiWiStore store; + private NotifyingSail store; private KiWiTransactionalSail tstore; private MockListener listener; - private final KiWiConfiguration kiwiConfiguration; - - public TransactionTest(KiWiConfiguration configuration) { - this.kiwiConfiguration = configuration; - } - @Before public void initDatabase() throws RepositoryException { - store = new KiWiStore(kiwiConfiguration); + store = new MemoryStore(); tstore = new KiWiTransactionalSail(store); listener = new MockListener(); tstore.addTransactionListener(listener); @@ -89,8 +76,7 @@ public class TransactionTest { } @After - public void dropDatabase() throws RepositoryException, SQLException { - store.getPersistence().dropDatabase(); + public void dropDatabase() throws RepositoryException { repository.shutDown(); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/c27139de/platform/marmotta-reasoner-kiwi/src/main/java/org/apache/marmotta/platform/reasoner/services/ReasoningSailProvider.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-reasoner-kiwi/src/main/java/org/apache/marmotta/platform/reasoner/services/ReasoningSailProvider.java b/platform/marmotta-reasoner-kiwi/src/main/java/org/apache/marmotta/platform/reasoner/services/ReasoningSailProvider.java index 4f47c63..3d08823 100644 --- a/platform/marmotta-reasoner-kiwi/src/main/java/org/apache/marmotta/platform/reasoner/services/ReasoningSailProvider.java +++ b/platform/marmotta-reasoner-kiwi/src/main/java/org/apache/marmotta/platform/reasoner/services/ReasoningSailProvider.java @@ -18,13 +18,21 @@ package org.apache.marmotta.platform.reasoner.services; import info.aduna.iteration.CloseableIteration; + +import java.io.IOException; +import java.io.InputStream; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.inject.Inject; + +import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; +import org.apache.marmotta.commons.sesame.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.kiwi.reasoner.engine.ReasoningConfiguration; import org.apache.marmotta.kiwi.reasoner.model.program.Justification; import org.apache.marmotta.kiwi.reasoner.model.program.Program; import org.apache.marmotta.kiwi.reasoner.parser.ParseException; import org.apache.marmotta.kiwi.reasoner.sail.KiWiReasoningSail; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.apache.marmotta.kiwi.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.api.triplestore.SesameService; import org.apache.marmotta.platform.core.api.triplestore.TransactionalSailProvider; @@ -32,12 +40,6 @@ import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent; import org.openrdf.sail.SailException; import org.slf4j.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import java.io.IOException; -import java.io.InputStream; - /** * Add file description here! * <p/> http://git-wip-us.apache.org/repos/asf/marmotta/blob/c27139de/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/services/VersioningSailProvider.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/services/VersioningSailProvider.java b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/services/VersioningSailProvider.java index ad89c40..c9be1b0 100644 --- a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/services/VersioningSailProvider.java +++ b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/services/VersioningSailProvider.java @@ -17,11 +17,22 @@ */ package org.apache.marmotta.platform.versioning.services; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.marmotta.commons.sesame.filter.AllOfFilter; import org.apache.marmotta.commons.sesame.filter.SesameFilter; import org.apache.marmotta.commons.sesame.filter.statement.StatementFilter; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.apache.marmotta.kiwi.transactions.wrapper.TransactionalSailWrapper; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; +import org.apache.marmotta.commons.sesame.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.kiwi.versioning.model.Version; import org.apache.marmotta.kiwi.versioning.repository.SnapshotRepositoryConnection; import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail; @@ -36,16 +47,6 @@ import org.openrdf.repository.RepositoryResult; import org.openrdf.sail.SailException; import org.slf4j.Logger; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.inject.Named; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - /** * A SAIL provider wrapping a versioning component around the repository * <p/>
