ozeigermann 2003/11/14 08:25:06
Modified: src/stores/org/apache/slide/store/txfile/rm/impl
FileResourceManager.java
src/stores/org/apache/slide/store/txfile
XMLResourceDescriptor.java
AbstractTxFileStoreService.java
src/share/org/apache/slide/util/locking/impl
GenericLock.java GenericLockManager.java
Removed: src/stores/org/apache/slide/store/txfile StoreLogger.java
Log:
Moved StoreLocker into shared part to resolve reference from locking
Revision Changes Path
1.4 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/txfile/rm/impl/FileResourceManager.java
Index: FileResourceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/rm/impl/FileResourceManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileResourceManager.java 14 Nov 2003 13:11:25 -0000 1.3
+++ FileResourceManager.java 14 Nov 2003 16:25:06 -0000 1.4
@@ -82,12 +82,12 @@
import java.util.Iterator;
import java.util.Collections;
-import org.apache.slide.store.txfile.StoreLogger;
import org.apache.slide.store.txfile.rm.*;
import org.apache.slide.store.util.FileHelper;
import org.apache.slide.util.locking.*;
import org.apache.slide.util.locking.impl.*;
+import org.apache.slide.util.logger.StoreLogger;
/**
* A resource manager for streamable objects stored in a file system.
1.4 +4 -3
jakarta-slide/src/stores/org/apache/slide/store/txfile/XMLResourceDescriptor.java
Index: XMLResourceDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/XMLResourceDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLResourceDescriptor.java 14 Nov 2003 13:11:25 -0000 1.3
+++ XMLResourceDescriptor.java 14 Nov 2003 16:25:06 -0000 1.4
@@ -82,6 +82,7 @@
import org.apache.slide.store.txfile.rm.ResourceManagerException;
import org.apache.slide.store.txfile.rm.impl.FileResourceManager;
+import org.apache.slide.util.logger.*;
import slidestore.file.UriProperties;
1.4 +4 -3
jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java
Index: AbstractTxFileStoreService.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractTxFileStoreService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTxFileStoreService.java 14 Nov 2003 13:11:25 -0000 1.3
+++ AbstractTxFileStoreService.java 14 Nov 2003 16:25:06 -0000 1.4
@@ -78,6 +78,7 @@
import javax.transaction.xa.Xid;
import org.apache.slide.util.XidWrapper;
+import org.apache.slide.util.logger.*;
import org.apache.slide.util.logger.Logger;
/**
1.2 +1 -1
jakarta-slide/src/share/org/apache/slide/util/locking/impl/GenericLock.java
Index: GenericLock.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/locking/impl/GenericLock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericLock.java 14 Nov 2003 12:52:51 -0000 1.1
+++ GenericLock.java 14 Nov 2003 16:25:06 -0000 1.2
@@ -4,8 +4,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.slide.store.txfile.StoreLogger;
import org.apache.slide.util.locking.MultiLevelLock;
+import org.apache.slide.util.logger.StoreLogger;
/**
*
1.2 +1 -1
jakarta-slide/src/share/org/apache/slide/util/locking/impl/GenericLockManager.java
Index: GenericLockManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/locking/impl/GenericLockManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericLockManager.java 14 Nov 2003 12:52:51 -0000 1.1
+++ GenericLockManager.java 14 Nov 2003 16:25:06 -0000 1.2
@@ -4,9 +4,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.slide.store.txfile.StoreLogger;
import org.apache.slide.util.locking.LockManager;
import org.apache.slide.util.locking.MultiLevelLock;
+import org.apache.slide.util.logger.StoreLogger;
/**
* Manager for [EMAIL PROTECTED] GenericLock}s on resources.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
