svn commit: r1035015 - in /lenya/trunk: org.apache.lenya.core.transaction.api/src/main/java/org/ org.apache.lenya.core.transaction.api/src/main/java/org/apache/ org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/ org.apache.lenya.core...

[fl...@apache.org]

Author: florent
Date: Sun Nov 14 16:07:03 2010
New Revision: 1035015

URL: http://svn.apache.org/viewvc?rev=1035015&view=rev
Log:
-extract api from transaction impl

Added:
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/IdentifiableFactory.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/IdentifiableFactory.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Identity.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Identity.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/IdentityMap.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/IdentityMap.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lock.java
      - copied, changed from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lockable.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lockable.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/TransactionException.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/TransactionException.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Transactionable.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Transactionable.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/UnitOfWork.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWork.java
    lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Versionable.java
      - copied unchanged from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Versionable.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockImpl.java
      - copied, changed from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java
Removed:
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/IdentifiableFactory.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Identity.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/IdentityMap.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lockable.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/TransactionException.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Transactionable.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWork.java
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Versionable.java
Modified:
    lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml
    lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java

Copied: lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lock.java (from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lock.java?p2=lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lock.java&p1=lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java&r1=1035013&r2=1035015&rev=1035015&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java (original)
+++ lenya/trunk/org.apache.lenya.core.transaction.api/src/main/java/org/apache/lenya/transaction/Lock.java Sun Nov 14 16:07:03 2010
@@ -1,44 +1,10 @@
-/*
- * 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.lenya.transaction;
 
-/**
- * A lock on a transactionable.
- *
- * @version $Id$
- */
-public class Lock {
+public interface Lock {
 
-    /**
-     * Ctor.
-     * @param version The version of the transactionable when it was locked.
-     */
-    protected Lock(int version) {
-        this.version = version;
-    }
-    
-    private int version;
-    
-    /**
-     * @return The version number.
-     */
-    public int getVersion() {
-        return this.version;
-    }
-    
-}
+	/**
+	 * @return The version number.
+	 */
+	public abstract int getVersion();
+
+}
\ No newline at end of file

Modified: lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml?rev=1035015&r1=1035014&r2=1035015&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.transaction.impl/pom.xml Sun Nov 14 16:07:03 2010
@@ -16,7 +16,11 @@
   <description>Deals with transactions</description>
   
   <dependencies>
-  
+  <!-- lenya -->
+  <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-transaction-api</artifactId>
+    </dependency>
   <!-- TODO : see if all theses dependencies are required -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Copied: lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockImpl.java (from r1035013, lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockImpl.java?p2=lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockImpl.java&p1=lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java&r1=1035013&r2=1035015&rev=1035015&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/Lock.java (original)
+++ lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/LockImpl.java Sun Nov 14 16:07:03 2010
@@ -22,13 +22,13 @@ package org.apache.lenya.transaction;
  *
  * @version $Id$
  */
-public class Lock {
+public class LockImpl implements Lock {
 
     /**
      * Ctor.
      * @param version The version of the transactionable when it was locked.
      */
-    protected Lock(int version) {
+    protected LockImpl(int version) {
         this.version = version;
     }
     

Modified: lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java?rev=1035015&r1=1035014&r2=1035015&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.transaction.impl/src/main/java/org/apache/lenya/transaction/UnitOfWorkImpl.java Sun Nov 14 16:07:03 2010
@@ -208,7 +208,7 @@ public class UnitOfWorkImpl implements U
             throw new LockException("A lock is already placed on [" + lockable
                     + "]. A new lock could lead to inconsistent data.");
         }
-        Lock lock = new Lock(version);
+        Lock lock = new LockImpl(version);
         this.locks.put(lockable, lock);
         return lock;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org