svn commit: r567076 - in /commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction: DefaultTransaction.java file/TxFileResourceManager.java locking/DefaultLockManager.java locking/SimpleLockManager.java

[oz...@apache.org]

Author: ozeigermann
Date: Fri Aug 17 09:02:39 2007
New Revision: 567076

URL: http://svn.apache.org/viewvc?view=rev&rev=567076
Log:
renamed default lock manager to simple as it really is not the default to take any more

Added:
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/SimpleLockManager.java
      - copied, changed from r566884, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/DefaultLockManager.java
Removed:
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/DefaultLockManager.java
Modified:
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java
    commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/TxFileResourceManager.java

Modified: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java?view=diff&rev=567076&r1=567075&r2=567076
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/DefaultTransaction.java Fri Aug 17 09:02:39 2007
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.transaction.locking.DefaultLockManager;
+import org.apache.commons.transaction.locking.SimpleLockManager;
 import org.apache.commons.transaction.locking.LockManager;
 
 /**
@@ -76,7 +76,7 @@
      * 
      */
     public DefaultTransaction() {
-        this(new DefaultLockManager<Object, Object>());
+        this(new SimpleLockManager<Object, Object>());
     }
 
     public synchronized void commit() throws TransactionException {

Modified: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/TxFileResourceManager.java
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/TxFileResourceManager.java?view=diff&rev=567076&r1=567075&r2=567076
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/TxFileResourceManager.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/file/TxFileResourceManager.java Fri Aug 17 09:02:39 2007
@@ -32,7 +32,7 @@
 import org.apache.commons.transaction.ManageableResourceManager;
 import org.apache.commons.transaction.AbstractTransactionalResourceManager.AbstractTxContext;
 import org.apache.commons.transaction.file.FileResourceManager.FileResource;
-import org.apache.commons.transaction.locking.DefaultLockManager;
+import org.apache.commons.transaction.locking.SimpleLockManager;
 import org.apache.commons.transaction.locking.HierarchicalLockManager;
 import org.apache.commons.transaction.locking.DefaultHierarchicalLockManager;
 import org.apache.commons.transaction.locking.LockManager;
@@ -52,7 +52,7 @@
  * <ul>
  * <li>{@link #setLm(LockManager)}: Sets the {@link LockManager lock manager}
  * that decides how to protect resources from concurrent modifications. Defaults
- * to {@link DefaultLockManager}.
+ * to {@link SimpleLockManager}.
  * <li>{@link #setUndoManager(FileResourceUndoManager)}: Sets the
  * {@link FileResourceUndoManager undo manager} that keeps track of all changes
  * and allows to undo them upon request.Defaults

Copied: commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/SimpleLockManager.java (from r566884, commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/DefaultLockManager.java)
URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/SimpleLockManager.java?view=diff&rev=567076&p1=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/DefaultLockManager.java&r1=566884&p2=commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/SimpleLockManager.java&r2=567076
==============================================================================
--- commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/DefaultLockManager.java (original)
+++ commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/locking/SimpleLockManager.java Fri Aug 17 09:02:39 2007
@@ -39,7 +39,7 @@
  * <p>
  * This implementation is <em>thread-safe</em>.
  */
-public class DefaultLockManager<K, M> extends AbstractLockManager<K, M> implements
+public class SimpleLockManager<K, M> extends AbstractLockManager<K, M> implements
         LockManager<K, M> {
     private Log logger = LogFactory.getLog(getClass());