You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/11/23 03:07:12 UTC
svn commit: r478440 - in /incubator/tuscany/java/sca:
kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/
services/persistence/ services/persistence/store.jdbc/
services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persis...
Author: jmarino
Date: Wed Nov 22 18:07:10 2006
New Revision: 478440
URL: http://svn.apache.org/viewvc?view=rev&rev=478440
Log:
move store spi to kernel spi
Added:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/RecoveryListener.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java (contents, props changed)
- copied, changed from r477964, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreMonitor.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreReadException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreWriteException.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java (contents, props changed)
- copied, changed from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/VersionException.java
Removed:
incubator/tuscany/java/sca/services/persistence/store/
Modified:
incubator/tuscany/java/sca/services/persistence/pom.xml
incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Converter.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/RecordNotFoundException.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverter.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/JDBCConverter.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/RecordTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverterTestCase.java
incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverterTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/pom.xml
incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/Journal.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/JournalStore.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreAppendTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreOverflowTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/LRUCacheTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/SerializationHelperTestCase.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalStoreThroughputTest.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalThroughputTest.java
incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockMonitor.java
incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml
incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java
incubator/tuscany/java/sca/services/persistence/store.memory/src/test/java/org/apache/tuscany/service/persistence/store/memory/MemoryStoreTestCase.java
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/RecoveryListener.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/RecoveryListener.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/RecoveryListener.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
import java.util.UUID;
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/RecoveryListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java (from r477964, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java&r1=477964&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/Store.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
import java.util.UUID;
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/Store.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreException.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
import org.apache.tuscany.api.TuscanyException;
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreMonitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreMonitor.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreMonitor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
import org.apache.tuscany.api.annotation.LogLevel;
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreReadException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreReadException.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreReadException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
/**
* Thrown when an error occurs reading from persistent storage
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreReadException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreWriteException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreWriteException.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/StoreWriteException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
/**
* Thrown when an error occurs writing to persistent storage
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/StoreWriteException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java (from r477962, incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/VersionException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java?view=diff&rev=478440&p1=incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/VersionException.java&r1=477962&p2=incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store/src/main/java/org/apache/tuscany/service/persistence/store/VersionException.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java Wed Nov 22 18:07:10 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.service.persistence.store;
+package org.apache.tuscany.spi.services.store;
/**
* Denotes an attempt to write a record to the store that is of a lesser version than the persistent version
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/store/VersionException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/pom.xml?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/pom.xml Wed Nov 22 18:07:10 2006
@@ -59,7 +59,6 @@
<module>common</module>
<module>openjpa</module>
<module>datasource</module>
- <module>store</module>
<module>store.jdbc</module>
<module>store.memory</module>
<module>store.journal</module>
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/pom.xml Wed Nov 22 18:07:10 2006
@@ -31,12 +31,19 @@
<description>Defines a JDBC-based persistent store.</description>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.persistence</groupId>
- <artifactId>persistence-store</artifactId>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-spi</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Converter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Converter.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Converter.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Converter.java Wed Nov 22 18:07:10 2006
@@ -23,8 +23,8 @@
import java.sql.PreparedStatement;
import java.util.UUID;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreReadException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Converters mediate the particularities of specific databases and JDBC drivers such as data types during read and
@@ -89,7 +89,7 @@
* @param id
* @param expiration
* @param object
- * @throws StoreWriteException
+ * @throws org.apache.tuscany.spi.services.store.StoreWriteException
*/
void insert(PreparedStatement stmt, String ownerId, UUID id, long expiration, Serializable object)
throws StoreWriteException;
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStore.java Wed Nov 22 18:07:10 2006
@@ -35,13 +35,16 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.services.store.RecoveryListener;
import org.apache.tuscany.api.annotation.Monitor;
-import org.apache.tuscany.service.persistence.store.RecoveryListener;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.Store;
+
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+
+import org.apache.tuscany.spi.services.store.StoreReadException;
+
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* A store implementation that uses a relational database to persist records transactionally.
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/Record.java Wed Nov 22 18:07:10 2006
@@ -44,7 +44,7 @@
* @param ownerId
* @param id the unique id of the record
* @param object the object to serialize
- * @param expiration the expirary time, {@link org.apache.tuscany.service.persistence.store.Store.NEVER} if there is
+ * @param expiration the expirary time, {@link org.apache.tuscany.spi.services.store.Store.NEVER} if there is
* no expiration
* @param operation an <code>INSERT</code> or <code>UPDATE</code> operation
*/
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/RecordNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/RecordNotFoundException.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/RecordNotFoundException.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/RecordNotFoundException.java Wed Nov 22 18:07:10 2006
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.service.persistence.store.jdbc;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverter.java Wed Nov 22 18:07:10 2006
@@ -27,7 +27,8 @@
import java.sql.SQLException;
import java.util.UUID;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
+
import org.apache.tuscany.service.persistence.store.jdbc.Converter;
import org.apache.tuscany.service.persistence.store.jdbc.TCCLObjectInputStream;
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverter.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverter.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverter.java Wed Nov 22 18:07:10 2006
@@ -26,8 +26,9 @@
import java.sql.SQLException;
import java.util.UUID;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreReadException;
+
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Performs writing and reading operations to HSQLDB
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/JDBCConverter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/JDBCConverter.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/JDBCConverter.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/main/java/org/apache/tuscany/service/persistence/store/jdbc/converter/JDBCConverter.java Wed Nov 22 18:07:10 2006
@@ -31,8 +31,8 @@
import java.sql.SQLException;
import java.util.UUID;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreReadException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Performs writing and reading operations to a JDBC driver/database combination that supports Blobs
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreAppendTestCase.java Wed Nov 22 18:07:10 2006
@@ -25,11 +25,12 @@
import javax.sql.DataSource;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.services.store.Store;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+
import org.apache.tuscany.service.persistence.store.jdbc.converter.AbstractConverter;
import org.apache.tuscany.service.persistence.store.jdbc.converter.HSQLDBConverter;
import org.easymock.EasyMock;
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreTestCase.java Wed Nov 22 18:07:10 2006
@@ -25,8 +25,8 @@
import org.apache.tuscany.spi.component.SCAObject;
import junit.framework.TestCase;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
import org.apache.tuscany.service.persistence.store.jdbc.converter.HSQLDBConverter;
import org.easymock.EasyMock;
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/JDBCStoreUpdateTestCase.java Wed Nov 22 18:07:10 2006
@@ -25,9 +25,9 @@
import org.apache.tuscany.spi.component.SCAObject;
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.Store;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.Store;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
import org.apache.tuscany.service.persistence.store.jdbc.converter.HSQLDBConverter;
import org.easymock.EasyMock;
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/RecordTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/RecordTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/RecordTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/RecordTestCase.java Wed Nov 22 18:07:10 2006
@@ -21,7 +21,7 @@
import java.util.UUID;
import junit.framework.TestCase;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverterTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverterTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/AbstractConverterTestCase.java Wed Nov 22 18:07:10 2006
@@ -24,9 +24,10 @@
import java.sql.PreparedStatement;
import java.util.UUID;
+import org.apache.tuscany.spi.services.store.StoreReadException;
+
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverterTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverterTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.jdbc/src/test/java/org/apache/tuscany/service/persistence/store/jdbc/converter/HSQLDBConverterTestCase.java Wed Nov 22 18:07:10 2006
@@ -24,8 +24,9 @@
import java.util.UUID;
import javax.sql.DataSource;
+import org.apache.tuscany.spi.services.store.Store;
+
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.Store;
import org.apache.tuscany.service.persistence.store.jdbc.Converter;
import static org.apache.tuscany.service.persistence.store.jdbc.TestUtils.cleanup;
import static org.apache.tuscany.service.persistence.store.jdbc.TestUtils.createTables;
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/pom.xml?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/pom.xml Wed Nov 22 18:07:10 2006
@@ -43,17 +43,17 @@
</repository>
</repositories>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.persistence</groupId>
- <artifactId>persistence-store</artifactId>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.services.persistence</groupId>
- <artifactId>persistence-datasource</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-spi</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/Journal.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/Journal.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/Journal.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/Journal.java Wed Nov 22 18:07:10 2006
@@ -20,7 +20,7 @@
import java.io.IOException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
import org.objectweb.howl.log.Configuration;
import org.objectweb.howl.log.LogClosedException;
import org.objectweb.howl.log.LogFileOverflowException;
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/JournalStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/JournalStore.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/JournalStore.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/main/java/org/apache/tuscany/persistence/store/journal/JournalStore.java Wed Nov 22 18:07:10 2006
@@ -40,11 +40,14 @@
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serialize;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeHeader;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeRecordId;
-import org.apache.tuscany.service.persistence.store.RecoveryListener;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
-import org.apache.tuscany.service.persistence.store.StoreReadException;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.RecoveryListener;
+import org.apache.tuscany.spi.services.store.Store;
+
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.StoreReadException;
+
+import org.apache.tuscany.spi.services.store.StoreWriteException;
+
import org.objectweb.howl.log.Configuration;
import org.objectweb.howl.log.InvalidFileSetException;
import org.objectweb.howl.log.InvalidLogBufferException;
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreAppendTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreAppendTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreAppendTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreAppendTestCase.java Wed Nov 22 18:07:10 2006
@@ -21,10 +21,11 @@
import java.util.UUID;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.services.store.Store;
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
import org.objectweb.howl.log.LogEventListener;
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreOverflowTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreOverflowTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreOverflowTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalStoreOverflowTestCase.java Wed Nov 22 18:07:10 2006
@@ -21,9 +21,9 @@
import java.util.UUID;
import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
import org.easymock.classextension.EasyMock;
/**
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/JournalTestCase.java Wed Nov 22 18:07:10 2006
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeHeader;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeRecordId;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
import org.objectweb.howl.log.LogRecord;
import org.objectweb.howl.log.Configuration;
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/LRUCacheTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/LRUCacheTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/LRUCacheTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/LRUCacheTestCase.java Wed Nov 22 18:07:10 2006
@@ -21,7 +21,7 @@
import java.util.UUID;
import junit.framework.TestCase;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
import org.easymock.EasyMock;
/**
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/SerializationHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/SerializationHelperTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/SerializationHelperTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/SerializationHelperTestCase.java Wed Nov 22 18:07:10 2006
@@ -22,7 +22,7 @@
import java.util.UUID;
import junit.framework.TestCase;
-import static org.apache.tuscany.service.persistence.store.Store.NEVER;
+import static org.apache.tuscany.spi.services.store.Store.NEVER;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalStoreThroughputTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalStoreThroughputTest.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalStoreThroughputTest.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalStoreThroughputTest.java Wed Nov 22 18:07:10 2006
@@ -32,7 +32,7 @@
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serialize;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeRecordId;
import org.apache.tuscany.persistence.store.journal.TestUtils;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Runs a basic throughput tests on JournalStore operations
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalThroughputTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalThroughputTest.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalThroughputTest.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/JournalThroughputTest.java Wed Nov 22 18:07:10 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.persistence.store.journal.Journal;
import static org.apache.tuscany.persistence.store.journal.SerializationHelper.serializeRecordId;
import org.apache.tuscany.persistence.store.journal.TestUtils;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Runs a basic throughput tests on Journal operations
Modified: incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockMonitor.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockMonitor.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.journal/src/test/java/org/apache/tuscany/persistence/store/journal/performance/MockMonitor.java Wed Nov 22 18:07:10 2006
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.persistence.store.journal.performance;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
import org.apache.tuscany.api.annotation.LogLevel;
/**
Modified: incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml (original)
+++ incubator/tuscany/java/sca/services/persistence/store.memory/pom.xml Wed Nov 22 18:07:10 2006
@@ -31,9 +31,15 @@
<description>Defines an in-memory, non-durable persistent store.</description>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.persistence</groupId>
- <artifactId>persistence-store</artifactId>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-api</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-spi</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.memory/src/main/java/org/apache/tuscany/service/persistence/store/memory/MemoryStore.java Wed Nov 22 18:07:10 2006
@@ -33,10 +33,11 @@
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.api.annotation.Monitor;
-import org.apache.tuscany.service.persistence.store.RecoveryListener;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
-import org.apache.tuscany.service.persistence.store.StoreWriteException;
+import org.apache.tuscany.spi.services.store.RecoveryListener;
+import org.apache.tuscany.spi.services.store.Store;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
+
+import org.apache.tuscany.spi.services.store.StoreWriteException;
/**
* Implements a non-durable, non-transactional store using a simple in-memory map
Modified: incubator/tuscany/java/sca/services/persistence/store.memory/src/test/java/org/apache/tuscany/service/persistence/store/memory/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/store.memory/src/test/java/org/apache/tuscany/service/persistence/store/memory/MemoryStoreTestCase.java?view=diff&rev=478440&r1=478439&r2=478440
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/store.memory/src/test/java/org/apache/tuscany/service/persistence/store/memory/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/store.memory/src/test/java/org/apache/tuscany/service/persistence/store/memory/MemoryStoreTestCase.java Wed Nov 22 18:07:10 2006
@@ -23,8 +23,8 @@
import org.apache.tuscany.spi.component.AtomicComponent;
import junit.framework.TestCase;
-import org.apache.tuscany.service.persistence.store.Store;
-import org.apache.tuscany.service.persistence.store.StoreMonitor;
+import org.apache.tuscany.spi.services.store.Store;
+import org.apache.tuscany.spi.services.store.StoreMonitor;
import org.easymock.EasyMock;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org