ozeigermann 2004/07/19 05:39:42
Modified: src/stores/org/apache/slide/store/txfile
FileSequenceStore.java
AbstractTxFileStoreService.java
TxFileContentStore.java
TxXMLFileDescriptorsStore.java
XMLResourceDescriptor.java
src/share/org/apache/slide/store ExtendedStore.java
. build.xml
src/share/org/apache/slide/util/logger TxLogger.java
webdavclient build.xml
Removed: src/share/org/apache/slide/util XidWrapper.java
src/stores/org/apache/slide/store/txfile/rm
StreamableResourceManager.java
ResourceManagerErrorCodes.java ResourceManager.java
ResourceManagerSystemException.java
ResourceManagerException.java
src/stores/org/apache/slide/store/txfile/rm/impl
FileSequence.java FileResourceManager.java
src/share/org/apache/slide/util/logger StoreLogger.java
src/share/org/apache/slide/util/locking LockManager.java
MultiLevelLock.java
src/share/org/apache/slide/util/locking/impl
GenericLockManager.java GenericLock.java
Log:
Final step to migrate Slide's tx classes to commons transaction
Revision Changes Path
1.3 +7 -7
jakarta-slide/src/stores/org/apache/slide/store/txfile/FileSequenceStore.java
Index: FileSequenceStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/FileSequenceStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileSequenceStore.java 5 May 2004 15:50:33 -0000 1.2
+++ FileSequenceStore.java 19 Jul 2004 12:39:41 -0000 1.3
@@ -31,6 +31,8 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.apache.commons.transaction.file.FileSequence;
+import org.apache.commons.transaction.file.ResourceManagerException;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.ServiceConnectionFailedException;
import org.apache.slide.common.ServiceDisconnectionFailedException;
@@ -40,10 +42,8 @@
import org.apache.slide.common.AbstractServiceBase;
import org.apache.slide.store.SequenceStore;
-import org.apache.slide.store.txfile.rm.ResourceManagerException;
-import org.apache.slide.store.txfile.rm.impl.FileSequence;
import org.apache.slide.util.logger.Logger;
-import org.apache.slide.util.logger.StoreLogger;
+import org.apache.slide.util.logger.TxLogger;
/**
* Sequence store using the file system.
@@ -71,7 +71,7 @@
}
try {
- fileSequence = new FileSequence(storeDir, new StoreLogger(getLogger(),
LOG_CHANNEL));
+ fileSequence = new FileSequence(storeDir, new TxLogger(getLogger(),
LOG_CHANNEL));
getLogger().log("File Sequence Store configured to " + storeDir,
LOG_CHANNEL, Logger.INFO);
} catch (ResourceManagerException e) {
getLogger().log("Can not initialize File Sequence Store", e,
LOG_CHANNEL, Logger.CRITICAL);
1.14 +9 -10
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractTxFileStoreService.java 23 Jun 2004 09:57:14 -0000 1.13
+++ AbstractTxFileStoreService.java 19 Jul 2004 12:39:41 -0000 1.14
@@ -23,13 +23,13 @@
package org.apache.slide.store.txfile;
+import org.apache.commons.transaction.file.FileResourceManager;
+import org.apache.commons.transaction.file.ResourceManager;
+import org.apache.commons.transaction.file.ResourceManagerException;
+import org.apache.commons.transaction.util.xa.XidWrapper;
import org.apache.slide.common.*;
import org.apache.slide.macro.ConflictException;
-import org.apache.slide.store.txfile.rm.ResourceManager;
-import org.apache.slide.store.txfile.rm.ResourceManagerException;
-import org.apache.slide.store.txfile.rm.impl.FileResourceManager;
-
import java.io.File;
import java.util.Hashtable;
@@ -38,8 +38,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.apache.slide.util.XidWrapper;
-import org.apache.slide.util.logger.*;
+import org.apache.slide.util.logger.TxLogger;
import org.apache.slide.util.logger.Logger;
/**
@@ -104,7 +103,7 @@
storeDir,
workDir,
urlEncodePath,
- new StoreLogger(getLogger(), FileResourceManager.class.getName()),
+ new TxLogger(getLogger(), FileResourceManager.class.getName()),
debug);
getLogger().log(
1.9 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/txfile/TxFileContentStore.java
Index: TxFileContentStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/TxFileContentStore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TxFileContentStore.java 23 Jun 2004 09:57:14 -0000 1.8
+++ TxFileContentStore.java 19 Jul 2004 12:39:41 -0000 1.9
@@ -27,6 +27,7 @@
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.commons.transaction.file.ResourceManagerException;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.Uri;
import org.apache.slide.content.NodeRevisionContent;
@@ -35,7 +36,6 @@
import org.apache.slide.content.RevisionNotFoundException;
import org.apache.slide.store.ContentStore;
-import org.apache.slide.store.txfile.rm.ResourceManagerException;
import org.apache.slide.store.util.*;
/**
1.15 +6 -6
jakarta-slide/src/stores/org/apache/slide/store/txfile/TxXMLFileDescriptorsStore.java
Index: TxXMLFileDescriptorsStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/TxXMLFileDescriptorsStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TxXMLFileDescriptorsStore.java 23 Jun 2004 09:57:14 -0000 1.14
+++ TxXMLFileDescriptorsStore.java 19 Jul 2004 12:39:41 -0000 1.15
@@ -23,14 +23,14 @@
package org.apache.slide.store.txfile;
+import org.apache.commons.transaction.file.ResourceManager;
+import org.apache.commons.transaction.file.ResourceManagerException;
+import org.apache.commons.transaction.util.xa.XidWrapper;
import org.apache.slide.common.*;
import org.apache.slide.store.*;
-import org.apache.slide.store.txfile.rm.ResourceManager;
-import org.apache.slide.store.txfile.rm.ResourceManagerException;
import org.apache.slide.structure.*;
import org.apache.slide.security.*;
-import org.apache.slide.util.XidWrapper;
import org.apache.slide.util.logger.Logger;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
1.14 +14 -28
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLResourceDescriptor.java 1 Jul 2004 12:52:25 -0000 1.13
+++ XMLResourceDescriptor.java 19 Jul 2004 12:39:41 -0000 1.14
@@ -26,29 +26,15 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.lang.reflect.Constructor;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.slide.common.*;
-import org.apache.slide.lock.LockTokenNotFoundException;
-import org.apache.slide.lock.NodeLock;
-import org.apache.slide.security.NodePermission;
-import org.apache.slide.structure.*;
-import org.apache.slide.content.*;
-
-import org.jdom.*;
-import org.jdom.input.*;
-import org.jdom.output.*;
-
-import org.apache.slide.store.txfile.rm.ResourceManagerException;
-import org.apache.slide.store.txfile.rm.impl.FileResourceManager;
-import org.apache.slide.util.logger.*;
+
+import org.apache.commons.transaction.file.FileResourceManager;
+import org.apache.commons.transaction.file.ResourceManagerException;
+import org.apache.commons.transaction.util.LoggerFacade;
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.Uri;
+import org.apache.slide.structure.ObjectAlreadyExistsException;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.jdom.JDOMException;
/**
* XML descriptor as a resource in a [EMAIL PROTECTED] FileResourceManager}.
@@ -64,7 +50,7 @@
protected final FileResourceManager rm;
protected final TxXMLFileDescriptorsStore store;
protected final String loadPath;
- protected StoreLogger logger;
+ protected LoggerFacade logger;
/**
* Creates an XML descriptor resource.
@@ -86,7 +72,7 @@
super(uri, txId, characterEncoding);
- logger =
rm.getLogger().cloneWithNewLogChannel(XMLResourceDescriptor.class.getName());
+ logger = rm.getLogger().createLogger(XMLResourceDescriptor.class.getName());
this.rm = rm;
this.store = store;
1.15 +9 -9
jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java
Index: ExtendedStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ExtendedStore.java 12 Jul 2004 09:42:59 -0000 1.14
+++ ExtendedStore.java 19 Jul 2004 12:39:42 -0000 1.15
@@ -31,6 +31,9 @@
import java.util.Map;
import java.util.Vector;
+import org.apache.commons.transaction.locking.GenericLock;
+import org.apache.commons.transaction.locking.GenericLockManager;
+import org.apache.commons.transaction.util.xa.XidWrapper;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.ServiceParameterErrorException;
import org.apache.slide.common.ServiceParameterMissingException;
@@ -53,15 +56,12 @@
import org.apache.slide.util.ByteSizeLimitedObjectCache;
import org.apache.slide.util.ObjectCache;
import org.apache.slide.util.TxLRUObjectCache;
-import org.apache.slide.util.XidWrapper;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
-import org.apache.slide.util.locking.impl.GenericLock;
-import org.apache.slide.util.locking.impl.GenericLockManager;
import org.apache.slide.util.logger.Logger;
-import org.apache.slide.util.logger.StoreLogger;
+import org.apache.slide.util.logger.TxLogger;
/**
* Store that allows for transactional caching of data. Takes over much modified
code from StandardStore.
@@ -150,7 +150,7 @@
private Map suspendedLocks = new HashMap();
public ExtendedStore() {
- lockManager = new GenericLockManager(1, new StoreLogger(getLogger(),
LOG_CHANNEL));
+ lockManager = new GenericLockManager(1, new TxLogger(getLogger(),
LOG_CHANNEL));
}
public void setParameters(Hashtable parameters)
1.217 +3 -0 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- build.xml 19 Jul 2004 10:18:44 -0000 1.216
+++ build.xml 19 Jul 2004 12:39:42 -0000 1.217
@@ -44,6 +44,7 @@
<property name="pdfbox.jar" value="${lib.dir}/PDFBox-0.6.5.jar"/>
<property name="tm-extractors.jar" value="${lib.dir}/tm-extractors-0.4.jar"/>
<property name="ehcache.jar" value="${lib.dir}/ehcache-0.8.jar"/>
+ <property name="commons-transaction.jar"
value="${lib.dir}/commons-transaction-20040719.jar"/>
<!-- ===================================================================
-->
<!-- Produced jars Properties -->
<!-- =================================================================== -->
@@ -110,6 +111,7 @@
<pathelement location="${pdfbox.jar}"/>
<pathelement location="${tm-extractors.jar}"/>
<pathelement location="${ehcache.jar}"/>
+ <pathelement location="${commons-transaction.jar}"/>
</path>
<path id="stores.classpath">
<pathelement location="${xmlapi.jar}"/>
@@ -122,6 +124,7 @@
<pathelement location="${lucene.jar}"/>
<pathelement location="${oracle-jdbc.jar}"/>
<pathelement location="${ehcache.jar}"/>
+ <pathelement location="${commons-transaction.jar}"/>
</path>
<path id="wrappers.classpath">
<pathelement location="${slide.build}/classes"/>
1.3 +5 -6
jakarta-slide/src/share/org/apache/slide/util/logger/TxLogger.java
Index: TxLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/logger/TxLogger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TxLogger.java 19 Jul 2004 11:02:02 -0000 1.2
+++ TxLogger.java 19 Jul 2004 12:39:42 -0000 1.3
@@ -26,8 +26,7 @@
import org.apache.commons.transaction.util.LoggerFacade;
/**
- * Default logger implementation. Uses java.util.logging implementation provided
- * by Java 1.4.
+ * Mapper from Slide logging to commons tx logging.
*
* @version $Revision$
*/
1.18 +1 -1 jakarta-slide/webdavclient/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 19 Jul 2004 10:18:44 -0000 1.17
+++ build.xml 19 Jul 2004 12:39:42 -0000 1.18
@@ -52,7 +52,7 @@
<property name="antlr.jar" value="lib/antlr.jar"/>
<property name="commons-logging.jar" value="lib/commons-logging.jar"/>
<property name="ant.jar" value="lib/ant.jar"/>
- <property name="commons-transaction.jar"
value="lib/commons-transaction-0.1pre.jar"/>
+ <property name="commons-transaction.jar"
value="lib/commons-transaction-20040719.jar"/>
<property name="j2ee-spec.jar" value="lib/geronimo-spec-j2ee-1.0-M1.jar"/>
<property name="jdom.jar" value="lib/jdom-20040226-.jar"/>
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
