http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalConnection.java b/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalConnection.java deleted file mode 100644 index 8a0f4b3..0000000 --- a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalConnection.java +++ /dev/null @@ -1,167 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.marmotta.kiwi.transactions.sail; - -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSailConnection; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; -import org.openrdf.model.Statement; -import org.openrdf.sail.NotifyingSailConnection; -import org.openrdf.sail.SailConnectionListener; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.NotifyingSailConnectionWrapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Collection; -import java.util.Date; - -/** - * This is an extended version of the KiWi triple store connection with support for transaction tracking. It offers the - * possibility to register transaction listeners that are triggered whenever a connection commits or rolls back. - * If the transaction commits, they are also passed over the transaction data, i.e. the added and removed triples. - * <p/> - * Author: Sebastian Schaffert - */ -public class KiWiTransactionalConnection extends NotifyingSailConnectionWrapper implements SailConnectionListener, TransactionalSailConnection { - - private static Logger log = LoggerFactory.getLogger(KiWiTransactionalConnection.class); - - private Collection<TransactionListener> listeners; - - private TransactionData data; - - public KiWiTransactionalConnection(NotifyingSailConnection wrapped, Collection<TransactionListener> listeners) throws SailException { - super(wrapped); - wrapped.addConnectionListener(this); - - this.listeners = listeners; - } - - /** - * Add a transaction listener to the transactional connection. - * - * @param listener - */ - @Override - public void addTransactionListener(TransactionListener listener) { - if(!listeners.contains(listener)) { - listeners.add(listener); - } - } - - /** - * Remove a transaction listener from the transactional connection - * - * @param listener - */ - @Override - public void removeTransactionListener(TransactionListener listener) { - listeners.remove(listener); - } - - - /** - * This method is called when a triple has been added to the repository. It can be overridden by subclasses to - * add additional functionality. - * - * @param triple - */ - @Override - public void statementAdded(Statement triple) { - ensureTransactionStarted(); - data.addTriple(triple); - } - - /** - * This method is called when a triple has been removed from the repository. It can be overridden by subclasses to - * add additional functionality. - * - * @param triple - */ - @Override - public void statementRemoved(Statement triple) { - ensureTransactionStarted(); - data.removeTriple(triple); - } - - @Override - public void begin() throws SailException { - super.begin(); - - // start new transaction - data = new TransactionData(); - - } - - /** - * Notify the listeners of a commit before and after calling the super method - * @throws SailException - */ - @Override - public void commit() throws SailException { - // notify only if there is actually any data - if(data != null && data.getAddedTriples().size() + data.getRemovedTriples().size() > 0) { - data.setCommitTime(new Date()); - - // notify beforeCommit listeners - for(TransactionListener l : listeners) { - l.beforeCommit(data); - } - - // perform commit - super.commit(); - - // notify afterCommit listeners - for(TransactionListener l : listeners) { - l.afterCommit(data); - } - } else { - super.commit(); - } - - // empty transaction data - data = new TransactionData(); - } - - /** - * Notify the listeners after rolling back. - * @throws SailException - */ - @Override - public void rollback() throws SailException { - // perform rollback - super.rollback(); - - // notify rollback listeners - for(TransactionListener l : listeners) { - l.rollback(data); - } - - // empty transaction data - data = new TransactionData(); - } - - - private void ensureTransactionStarted() { - if(data == null) { - log.warn("transaction was not properly started, autostarting; please consider using connection.begin() explicitly!"); - data = new TransactionData(); - } - } -}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalSail.java b/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalSail.java deleted file mode 100644 index 15f73f5..0000000 --- a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/sail/KiWiTransactionalSail.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.marmotta.kiwi.transactions.sail; - -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.openrdf.sail.NotifyingSail; -import org.openrdf.sail.NotifyingSailConnection; -import org.openrdf.sail.SailException; -import org.openrdf.sail.helpers.NotifyingSailWrapper; - -import java.util.ArrayList; -import java.util.List; - -/** - * This is an extended version of the KiWi triple store with support for transaction tracking. It offers the - * possibility to register transaction listeners that are triggered whenever a connection commits or rolls back. - * If the transaction commits, they are also passed over the transaction data, i.e. the added and removed triples. - * <p/> - * Note that even the basic KiWiStore offers transaction support by directly wrapping database transactions. The - * extended transactions provided by the KiWiTransactionalStore are only necessary for getting access to the - * transaction data and triggering actions on commit or rollback.s - * <p/> - * Author: Sebastian Schaffert - */ -public class KiWiTransactionalSail extends NotifyingSailWrapper implements TransactionalSail { - - private List<TransactionListener> listeners; - - private boolean transactionsEnabled; - - public KiWiTransactionalSail(NotifyingSail base) { - super(base); - - this.listeners = new ArrayList<TransactionListener>(); - this.transactionsEnabled = true; - } - - /** - * Add a transaction listener to the KiWiTransactionalStore. The listener will be notified whenever a connection - * commits or rolls back. The listeners are collected in a list, i.e. a listener that is added first is also executed - * first. - * - * @param listener the listener to add to the list - */ - public void addTransactionListener(TransactionListener listener) { - listeners.add(listener); - } - - /** - * Remove a transaction listener from the list. - * - * @param listener the listener to remove - */ - public void removeTransactionListener(TransactionListener listener) { - listeners.remove(listener); - } - - /** - * Check if extended transaction support is enabled - * @return true if extended transactions are enabled - */ - public boolean isTransactionsEnabled() { - return transactionsEnabled; - } - - /** - * Temporarily enable/disable extended transactions. Disabling transactions might be useful when bulk loading large - * amounts of data. - * - * @param transactionsEnabled - */ - public void setTransactionsEnabled(boolean transactionsEnabled) { - this.transactionsEnabled = transactionsEnabled; - } - - /** - * Returns a store-specific SailConnection object. - * - * @return A connection to the store. - */ - @Override - public NotifyingSailConnection getConnection() throws SailException { - if(transactionsEnabled) - return new KiWiTransactionalConnection(super.getConnection(),listeners); - else - return super.getConnection(); - } -} http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailConnectionWrapper.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailConnectionWrapper.java b/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailConnectionWrapper.java deleted file mode 100644 index 2dfd3ac..0000000 --- a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailConnectionWrapper.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.marmotta.kiwi.transactions.wrapper; - -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSailConnection; -import org.openrdf.sail.helpers.NotifyingSailConnectionWrapper; - -/** - * Add file description here! - * <p/> - * Author: Sebastian Schaffert - */ -public class TransactionalSailConnectionWrapper extends NotifyingSailConnectionWrapper implements TransactionalSailConnection { - - private TransactionalSailConnection parent; - - public TransactionalSailConnectionWrapper(TransactionalSailConnection parent) { - super(parent); - this.parent = parent; - } - - /** - * Add a transaction listener to the KiWiTransactionalStore. The listener will be notified whenever a connection - * commits or rolls back. The listeners are collected in a list, i.e. a listener that is added first is also executed - * first. - * - * @param listener the listener to add to the list - */ - @Override - public void addTransactionListener(TransactionListener listener) { - parent.addTransactionListener(listener); - } - - /** - * Remove a transaction listener from the list. - * - * @param listener the listener to remove - */ - @Override - public void removeTransactionListener(TransactionListener listener) { - parent.removeTransactionListener(listener); - } -} http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailWrapper.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailWrapper.java b/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailWrapper.java deleted file mode 100644 index 694f908..0000000 --- a/libraries/kiwi/kiwi-transactions/src/main/java/org/apache/marmotta/kiwi/transactions/wrapper/TransactionalSailWrapper.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.marmotta.kiwi.transactions.wrapper; - -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.openrdf.sail.helpers.NotifyingSailWrapper; - -/** - * A Sail Wrapper allowing to pass through transaction functionality to other sails. - * <p/> - * Author: Sebastian Schaffert - */ -public class TransactionalSailWrapper extends NotifyingSailWrapper implements TransactionalSail { - - private TransactionalSail parent; - - /** - * Creates a new SailWrapper that wraps the supplied Sail. - */ - public TransactionalSailWrapper(TransactionalSail parent) { - super(parent); - this.parent = parent; - } - - /** - * Add a transaction listener to the KiWiTransactionalStore. The listener will be notified whenever a connection - * commits or rolls back. The listeners are collected in a list, i.e. a listener that is added first is also executed - * first. - * - * @param listener the listener to add to the list - */ - @Override - public void addTransactionListener(TransactionListener listener) { - parent.addTransactionListener(listener); - } - - /** - * Remove a transaction listener from the list. - * - * @param listener the listener to remove - */ - @Override - public void removeTransactionListener(TransactionListener listener) { - parent.removeTransactionListener(listener); - } - - /** - * Check if extended transaction support is enabled - * - * @return true if extended transactions are enabled - */ - @Override - public boolean isTransactionsEnabled() { - return parent.isTransactionsEnabled(); - } - - /** - * Temporarily enable/disable extended transactions. Disabling transactions might be useful when bulk loading large - * amounts of data. - * - * @param transactionsEnabled - */ - @Override - public void setTransactionsEnabled(boolean transactionsEnabled) { - parent.setTransactionsEnabled(transactionsEnabled); - } -} http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/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 deleted file mode 100644 index 6882ddf..0000000 --- a/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java +++ /dev/null @@ -1,216 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.marmotta.kiwi.test; - -import static org.hamcrest.CoreMatchers.hasItems; -import static org.hamcrest.CoreMatchers.notNullValue; -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.kiwi.config.KiWiConfiguration; -import org.apache.marmotta.kiwi.sail.KiWiStore; -import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner; -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; -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.openrdf.model.Resource; -import org.openrdf.repository.Repository; -import org.openrdf.repository.RepositoryConnection; -import org.openrdf.repository.RepositoryException; -import org.openrdf.repository.sail.SailRepository; -import org.openrdf.rio.RDFFormat; -import org.openrdf.rio.RDFParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; - -/** - * Test the Sesame repository functionality backed by the KiWi triple store. - * - * @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 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); - tstore = new KiWiTransactionalSail(store); - listener = new MockListener(); - tstore.addTransactionListener(listener); - repository = new SailRepository(tstore); - repository.initialize(); - } - - @After - public void dropDatabase() throws RepositoryException, SQLException { - store.getPersistence().dropDatabase(); - repository.shutDown(); - } - - - /** - * Test importing data; the test will load a small sample RDF file and check whether the expected resources are - * present. - * - * @throws RepositoryException - * @throws org.openrdf.rio.RDFParseException - * @throws java.io.IOException - */ - @Test - public void testImport() throws RepositoryException, RDFParseException, IOException { - long start, end; - - start = System.currentTimeMillis(); - // load demo data - InputStream rdfXML = this.getClass().getResourceAsStream("demo-data.foaf"); - assumeThat("Could not load test-data: demo-data.foaf", rdfXML, notNullValue(InputStream.class)); - - RepositoryConnection connectionRDF = repository.getConnection(); - try { - connectionRDF.begin(); - connectionRDF.add(rdfXML, "http://localhost/foaf/";, RDFFormat.RDFXML); - connectionRDF.commit(); - } finally { - connectionRDF.close(); - } - end = System.currentTimeMillis(); - - log.info("IMPORT: {} ms", end-start); - - - // check if the transaction data is available and contains added triples - Assert.assertNotNull("transaction data was null",listener.transactionData); - Assert.assertTrue("transaction data did not contain added triples", listener.transactionData.getAddedTriples().size() > 0); - } - - - @Test - public void testDeleteTriple() throws RepositoryException, RDFParseException, IOException { - // load demo data - InputStream rdfXML = this.getClass().getResourceAsStream("demo-data.foaf"); - assumeThat("Could not load test-data: demo-data.foaf", rdfXML, notNullValue(InputStream.class)); - - RepositoryConnection connectionRDF = repository.getConnection(); - try { - connectionRDF.begin(); - connectionRDF.add(rdfXML, "http://localhost/foaf/";, RDFFormat.RDFXML); - connectionRDF.commit(); - } finally { - connectionRDF.close(); - } - // get another connection and check if demo data is available - RepositoryConnection connection = repository.getConnection(); - - try { - connection.begin(); - List<String> resources = ImmutableList.copyOf( - Iterables.transform( - ResourceUtils.listSubjects(connection), - new Function<Resource, String>() { - @Override - public String apply(Resource input) { - return input.stringValue(); - } - } - ) - ); - - // test if the result has the expected size - Assert.assertEquals(4, resources.size()); - - // test if the result contains all resources that have been used as subject - Assert.assertThat(resources, hasItems( - "http://localhost:8080/LMF/resource/hans_meier";, - "http://localhost:8080/LMF/resource/sepp_huber";, - "http://localhost:8080/LMF/resource/anna_schmidt"; - )); - connection.commit(); - - - // remove a resource and all its triples - connection.begin(); - ResourceUtils.removeResource(connection, connection.getValueFactory().createURI("http://localhost:8080/LMF/resource/hans_meier";)); - connection.commit(); - - - // check if transaction contains removed triples now - Assert.assertNotNull("transaction data was null", listener.transactionData); - Assert.assertTrue("transaction did not contain removed triples", listener.transactionData.getRemovedTriples().size() > 0); - } finally { - connection.commit(); - connection.close(); - } - } - - - /** - * Mock implementation of a transaction listener - */ - private static class MockListener implements TransactionListener { - - private TransactionData transactionData; - - boolean rolledBack = false; - - @Override - public void afterCommit(TransactionData data) { - transactionData = data; - } - - @Override - public void beforeCommit(TransactionData data) { - } - - @Override - public void rollback(TransactionData data) { - rolledBack = true; - } - } -} http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml b/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml deleted file mode 100644 index 9678d31..0000000 --- a/libraries/kiwi/kiwi-transactions/src/test/resources/logback.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<configuration> - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern> - </encoder> - </appender> - - <logger name="net.sf.ehcache.pool.impl" level="WARN" /> - - <root level="${root-level:-INFO}"> - <appender-ref ref="CONSOLE"/> - </root> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf deleted file mode 100644 index 1b7695a..0000000 --- a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<rdf:RDF - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:foaf="http://xmlns.com/foaf/0.1/"; - xmlns:dc="http://purl.org/dc/elements/1.1/";> - - <foaf:Person rdf:about="http://localhost:8080/LMF/resource/hans_meier"; xmlns:foaf="http://xmlns.com/foaf/0.1/";> - <foaf:name>Hans Meier</foaf:name> - <dc:description>Hans Meier is a software engineer living in Salzburg</dc:description> - <foaf:interest rdf:resource="http://rdf.freebase.com/ns/en.software_engineering"/> - <foaf:interest rdf:resource="http://rdf.freebase.com/ns/en.linux"/> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Java"; /> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Climbing"/> - <foaf:based_near rdf:resource="http://sws.geonames.org/2766824/"/> - <foaf:depiction rdf:resource="http://localhost:8080/LMF/resource/hans_meier.jpg"/> - - <foaf:knows rdf:resource="http://localhost:8080/LMF/resource/sepp_huber"; /> - <foaf:knows rdf:resource="http://localhost:8080/LMF/resource/anna_schmidt"/> - - <foaf:account> - <foaf:OnlineAccount> - <foaf:accountName>Example</foaf:accountName> - <foaf:accountServiceHomepage>http://www.example.com</foaf:accountServiceHomepage> - </foaf:OnlineAccount> - </foaf:account> - </foaf:Person> - - <foaf:Person rdf:about="http://localhost:8080/LMF/resource/sepp_huber"; xmlns:foaf="http://xmlns.com/foaf/0.1/";> - <foaf:name>Sepp Huber</foaf:name> - <dc:description>Sepp Huber is an alpinist living in Traunstein. He is a good climber, but not as famous as his cousin Alexander Huber.</dc:description> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Mountaineering"/> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Climbing"/> - <foaf:interest rdf:resource="http://localhost:8080/LMF/resource/Chess"; /> - <foaf:based_near rdf:resource="http://dbpedia.org/resource/Traunstein"/> - - <foaf:knows rdf:resource="http://dbpedia.org/resource/Alexander_Huber"; /> - <foaf:knows rdf:resource="http://localhost:8080/LMF/resource/hans_meier"; /> - </foaf:Person> - - <foaf:Person rdf:about="http://localhost:8080/LMF/resource/anna_schmidt"; xmlns:foaf="http://xmlns.com/foaf/0.1/";> - <foaf:name>Anna Schmidt</foaf:name> - <dc:description>Anna Schmidt is working as PR manager for mountaineers coming from Garmisch-Partenkirchen. She likes mountaineering and is also a Linux enthusiast.</dc:description> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Mountaineering"/> - <foaf:interest rdf:resource="http://dbpedia.org/resource/Linux"/> - <foaf:interest rdf:resource="http://localhost:8080/LMF/resource/Chess"; /> - <foaf:based_near rdf:resource="http://dbpedia.org/resource/Garmisch-Partenkirchen"/> - <foaf:depiction rdf:resource="http://localhost:8080/LMF/resource/anna_schmidt.jpg"/> - - <foaf:knows rdf:resource="http://dbpedia.org/resource/Alexander_Huber"; /> - <foaf:knows rdf:resource="http://localhost:8080/LMF/resource/sepp_huber"; /> - </foaf:Person> - - -</rdf:RDF> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf deleted file mode 100644 index 14e3ed1..0000000 --- a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf +++ /dev/null @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!DOCTYPE rdf:RDF [ -<!ENTITY lmf "http://localhost:8080/LMF/resource/";>]> -<rdf:RDF - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; - xmlns:foaf="http://xmlns.com/foaf/0.1/"; - xmlns:lmfc="http://localhost:8080/LMF/resource/concepts/";> - - - <lmfc:NationalProject about="&lmf;SNML-TNG"> - <rdfs:label>SNML TNG</rdfs:label> - <rdfs:comment>Salzburg NewMediaLab - The Next Generation</rdfs:comment> - <lmfc:projectFolder>snml-tng</lmfc:projectFolder> - </lmfc:NationalProject> - - <lmfc:NationalProject about="&lmf;SNML"> - <rdfs:label>SNML</rdfs:label> - <rdfs:comment>Salzburg NewMediaLab</rdfs:comment> - <lmfc:projectFolder>snml</lmfc:projectFolder> - </lmfc:NationalProject> - - <lmfc:NationalProject about="&lmf;myTV"> - <rdfs:label>myTV</rdfs:label> - <rdfs:comment>my Semantically Enhanced Personalized TV Experience</rdfs:comment> - <lmfc:projectFolder>mytv</lmfc:projectFolder> - </lmfc:NationalProject> - - <lmfc:NationalProject about="&lmf;ConnectMe"> - <rdfs:label>ConnectMe</rdfs:label> - <rdfs:comment>Connected Media Experience</rdfs:comment> - <lmfc:projectFolder>connectme</lmfc:projectFolder> - </lmfc:NationalProject> - - <lmfc:NationalProject about="&lmf;CAPKOM"> - <rdfs:label>CAPKOM</rdfs:label> - <rdfs:comment>CAPKOM - Innovative Benutzeroberflächen für Men-schen mit kognitiver Beeinträchtigung</rdfs:comment> - <lmfc:projectFolder>capkom</lmfc:projectFolder> - </lmfc:NationalProject> - - - <lmfc:EUProject about="&lmf;KiWi"> - <rdfs:label>KiWi</rdfs:label> - <rdfs:comment>KiWi - Knowledge in a Wiki</rdfs:comment> - <lmfc:projectFolder>kiwi</lmfc:projectFolder> - </lmfc:EUProject> - - <lmfc:EUProject about="&lmf;IKS"> - <rdfs:label>IKS</rdfs:label> - <rdfs:comment>IKS - Interactive Knowledge Stack</rdfs:comment> - <lmfc:projectFolder>iks</lmfc:projectFolder> - </lmfc:EUProject> - - <lmfc:EUProject about="&lmf;Mosep"> - <rdfs:label>Mosep</rdfs:label> - <rdfs:comment>Mosep - More self-esteem with my ePortfolio</rdfs:comment> - <lmfc:projectFolder>mosep</lmfc:projectFolder> - </lmfc:EUProject> - - <lmfc:EUProject about="&lmf;ImportNET"> - <rdfs:label>ImportNET</rdfs:label> - <rdfs:comment>Intelligent modular open source Platform for intercultural and cross-domain SME Networks</rdfs:comment> - <lmfc:projectFolder>importnet</lmfc:projectFolder> - </lmfc:EUProject> - - - <foaf:Project about="&lmf;KMT"> - <rdfs:label>KMT</rdfs:label> - <rdfs:comment>Knowledge and Media Technologies</rdfs:comment> - </foaf:Project> - - - <foaf:Person about="&lmf;gguentner"> - <foaf:name>Georg Güntner</foaf:name> - <foaf:nick>gguentner</foaf:nick> - <foaf:nick>[email protected]</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;sschaffe"> - <foaf:name>Sebastian Schaffert</foaf:name> - <foaf:nick>sschaffe</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;wbehrendt"> - <foaf:name>Wernher Behrendt</foaf:name> - <foaf:nick>wbehrendt</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;uatzlinger"> - <foaf:name>Ursula Atzlinger</foaf:name> - <foaf:nick>uatzlinger</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;awagner"> - <foaf:name>Alexandra Wagner</foaf:name> - <foaf:nick>awagner</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;agruber"> - <foaf:name>Andreas Gruber</foaf:name> - <foaf:nick>agruber</foaf:nick> - </foaf:Person> - - <foaf:Person about="&lmf;bstroh"> - <foaf:name>Birgit Strohmeier</foaf:name> - <foaf:nick>bstroh</foaf:nick> - </foaf:Person> - - -</rdf:RDF> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-versioning/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml index 06c9aec..8e446da 100644 --- a/libraries/kiwi/kiwi-versioning/pom.xml +++ b/libraries/kiwi/kiwi-versioning/pom.xml @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <!-- Logging --> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java index dddd016..abc9dcc 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/api/VersioningSail.java @@ -17,7 +17,7 @@ */ package org.apache.marmotta.kiwi.versioning.api; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; import org.apache.marmotta.kiwi.versioning.model.Version; import org.openrdf.model.Resource; import org.openrdf.repository.RepositoryResult; http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/model/Version.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/model/Version.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/model/Version.java index 2329b05..20f8b8d 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/model/Version.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/model/Version.java @@ -17,8 +17,8 @@ */ package org.apache.marmotta.kiwi.versioning.model; +import org.apache.marmotta.commons.sesame.transactions.model.TransactionData; import org.apache.marmotta.kiwi.model.rdf.KiWiResource; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; /** * In-memory representation of a KiWi version. Consists of a set of added triples, a set of removed triples, http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersionListener.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersionListener.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersionListener.java index 676910a..fffc830 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersionListener.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersionListener.java @@ -17,8 +17,8 @@ */ package org.apache.marmotta.kiwi.versioning.sail; -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionListener; +import org.apache.marmotta.commons.sesame.transactions.model.TransactionData; import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningPersistence; /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java index 84f448b..5e882d2 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java @@ -19,12 +19,12 @@ package org.apache.marmotta.kiwi.versioning.sail; import org.apache.marmotta.commons.sesame.filter.AlwaysTrueFilter; import org.apache.marmotta.commons.sesame.filter.SesameFilter; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionListener; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; +import org.apache.marmotta.commons.sesame.transactions.model.TransactionData; +import org.apache.marmotta.commons.sesame.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.kiwi.model.rdf.KiWiResource; import org.apache.marmotta.kiwi.sail.KiWiStore; -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; -import org.apache.marmotta.kiwi.transactions.wrapper.TransactionalSailWrapper; import org.apache.marmotta.kiwi.versioning.api.VersioningSail; import org.apache.marmotta.kiwi.versioning.model.Version; import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningConnection; http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/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 b2550f6..1d776f9 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 @@ -26,10 +26,10 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +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.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail; import org.apache.marmotta.kiwi.versioning.repository.SnapshotRepository; import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail; import org.junit.After; http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/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 6f2d0c0..5b344dd 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 @@ -18,11 +18,12 @@ package org.apache.marmotta.kiwi.versioning.test; import info.aduna.iteration.Iterations; + +import org.apache.marmotta.commons.sesame.transactions.sail.KiWiTransactionalSail; import org.apache.marmotta.kiwi.config.KiWiConfiguration; import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect; import org.apache.marmotta.kiwi.sail.KiWiStore; import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner; -import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail; import org.apache.marmotta.kiwi.versioning.model.Version; import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail; import org.junit.After; http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/libraries/kiwi/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml index 08d9552..50d58ce 100644 --- a/libraries/kiwi/pom.xml +++ b/libraries/kiwi/pom.xml @@ -103,7 +103,6 @@ <modules> <module>kiwi-triplestore</module> - <module>kiwi-transactions</module> <module>kiwi-versioning</module> <module>kiwi-reasoner</module> <module>kiwi-sparql</module> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 01d9aa1..d55b7c7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1216,11 +1216,6 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.marmotta</groupId> <artifactId>kiwi-versioning</artifactId> <version>${project.version}</version> </dependency> @@ -1233,6 +1228,11 @@ <!-- LMF Sesame Tools --> <dependency> <groupId>org.apache.marmotta</groupId> + <artifactId>sesame-transactions</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> <artifactId>sesame-tripletable</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/backends/marmotta-backend-bigdata/pom.xml ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-bigdata/pom.xml b/platform/backends/marmotta-backend-bigdata/pom.xml index 7556610..53bdc82 100644 --- a/platform/backends/marmotta-backend-bigdata/pom.xml +++ b/platform/backends/marmotta-backend-bigdata/pom.xml @@ -166,7 +166,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <dependency> <groupId>com.bigdata</groupId> @@ -189,4 +189,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/backends/marmotta-backend-http/pom.xml ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-http/pom.xml b/platform/backends/marmotta-backend-http/pom.xml index 4ac5005..216cac1 100644 --- a/platform/backends/marmotta-backend-http/pom.xml +++ b/platform/backends/marmotta-backend-http/pom.xml @@ -142,7 +142,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> @@ -156,4 +156,4 @@ -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/backends/marmotta-backend-memory/pom.xml ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-memory/pom.xml b/platform/backends/marmotta-backend-memory/pom.xml index 8a9acc8..8ee9065 100644 --- a/platform/backends/marmotta-backend-memory/pom.xml +++ b/platform/backends/marmotta-backend-memory/pom.xml @@ -141,7 +141,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/backends/marmotta-backend-native/pom.xml ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-native/pom.xml b/platform/backends/marmotta-backend-native/pom.xml index ab97baf..9711718 100644 --- a/platform/backends/marmotta-backend-native/pom.xml +++ b/platform/backends/marmotta-backend-native/pom.xml @@ -158,7 +158,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/backends/marmotta-backend-sparql/pom.xml ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-sparql/pom.xml b/platform/backends/marmotta-backend-sparql/pom.xml index 95f04bb..a957dd0 100644 --- a/platform/backends/marmotta-backend-sparql/pom.xml +++ b/platform/backends/marmotta-backend-sparql/pom.xml @@ -142,7 +142,7 @@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> @@ -156,4 +156,4 @@ -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml index 487dacb..06eafad 100644 --- a/platform/marmotta-core/pom.xml +++ b/platform/marmotta-core/pom.xml @@ -568,7 +568,7 @@ <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-transactions</artifactId> + <artifactId>sesame-transactions</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/triplestore/TransactionalSailProvider.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/triplestore/TransactionalSailProvider.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/triplestore/TransactionalSailProvider.java index 2b80677..d0a49a1 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/triplestore/TransactionalSailProvider.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/triplestore/TransactionalSailProvider.java @@ -17,8 +17,8 @@ */ package org.apache.marmotta.platform.core.api.triplestore; -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; /** * An interface implemented by all modules that provide transactional sail wrappers for the sesame sail stack. http://git-wip-us.apache.org/repos/asf/marmotta/blob/070cb1fe/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java index 9881282..fb35c67 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java @@ -18,10 +18,11 @@ package org.apache.marmotta.platform.core.services.triplestore; import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.marmotta.kiwi.transactions.api.TransactionListener; -import org.apache.marmotta.kiwi.transactions.api.TransactionalSail; -import org.apache.marmotta.kiwi.transactions.model.TransactionData; -import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail; + +import org.apache.marmotta.commons.sesame.transactions.api.TransactionListener; +import org.apache.marmotta.commons.sesame.transactions.api.TransactionalSail; +import org.apache.marmotta.commons.sesame.transactions.model.TransactionData; +import org.apache.marmotta.commons.sesame.transactions.sail.KiWiTransactionalSail; import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.api.triplestore.*; import org.apache.marmotta.platform.core.qualifiers.event.transaction.AfterCommit;
![http://localhost:8080/LMF/resource/hans_meier.jpg"/](http://localhost:8080/LMF/resource/hans_meier.jpg"/){kind=link}
![http://localhost:8080/LMF/resource/anna_schmidt.jpg"/](http://localhost:8080/LMF/resource/anna_schmidt.jpg"/){kind=link}