OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | gotm-commits List | December 2005 Index

<--  Date Index  --> <--  Thread Index  -->

CVS update of ow-transaction/src/java/org/objectweb/transaction (5 files)


    Date: Thursday, December 22, 2005 @ 11:45:56
  Author: rouvoy
    Path: /cvsroot/gotm/ow-transaction/src/java/org/objectweb/transaction

Modified: api/lock/LockFeature.java
 Removed: api/lock/Lock.java api/lock/LockMode.java
          lib/lock/ReadLockMode.java lib/lock/WriteLockMode.java

* Updating the ACOM example.


-----------------------------+
 api/lock/Lock.java          |   46 ----------------------------
 api/lock/LockFeature.java   |   25 +++++++++------
 api/lock/LockMode.java      |   41 -------------------------
 lib/lock/ReadLockMode.java  |   68 ------------------------------------------
 lib/lock/WriteLockMode.java |   67 -----------------------------------------
 5 files changed, 15 insertions(+), 232 deletions(-)


Index: ow-transaction/src/java/org/objectweb/transaction/api/lock/Lock.java
diff -u 
ow-transaction/src/java/org/objectweb/transaction/api/lock/Lock.java:1.1 
ow-transaction/src/java/org/objectweb/transaction/api/lock/Lock.java:removed
--- ow-transaction/src/java/org/objectweb/transaction/api/lock/Lock.java:1.1  
  Tue Aug 16 15:36:21 2005
+++ ow-transaction/src/java/org/objectweb/transaction/api/lock/Lock.java      
  Thu Dec 22 11:45:56 2005
@@ -1,46 +0,0 @@
-/*====================================================================
- 
- ObjectWeb Transaction Working Group API
- Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
- Contact: http://www.objectweb.org
- 
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
- 
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- USA
- 
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
- 
- ---------------------------------------------------------------------
- $Id: Lock.java,v 1.1 2005/08/16 13:36:21 rouvoy Exp $
- ====================================================================*/
-package org.objectweb.transaction.api.lock;
-
-/**
- * Defines the interface of a Lock identifier.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
- */
-public interface Lock 
-{
-    /**
-     * 
-     */
-    void unlock();
-    
-    /**
-     * @return the lock mode currently acquired.
-     */
-    LockMode mode();    
-}
\ No newline at end of file
Index: 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockFeature.java
diff -u 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockFeature.java:1.1
 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockFeature.java:1.2
--- 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockFeature.java:1.1
     Tue Aug 16 15:36:21 2005
+++ 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockFeature.java 
Thu Dec 22 11:45:55 2005
@@ -23,35 +23,40 @@
  Contributor(s): ______________________________________.
  
  ---------------------------------------------------------------------
- $Id: LockFeature.java,v 1.1 2005/08/16 13:36:21 rouvoy Exp $
+ $Id: LockFeature.java,v 1.2 2005/12/22 10:45:55 rouvoy Exp $
  ====================================================================*/
 package org.objectweb.transaction.api.lock;
 
 /**
  * Definition of an exclusive Lock.
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  * @fractal.itf name="exclusive-lock"
  */
 public interface LockFeature 
 {
-    /** Fractal ADL Identifier for the <code>LockFeature</code> interface.*/
-    public static final String LOCK = "lock";
-    
     /**
      * Acquire the Lock. 
      * If the Lock is not available, the method wait for the release of the 
Lock
-     * @param hints the data to lock.
      * @param mode the mode of locking.
-     * @return the acquired lock (null if no lock available).
      */
-    public Lock lock(Object hints, LockMode mode);
+    void lock(String mode);
     
     /**
      * Check if the Lock is acquired.
-     * @param hints 
      * @param mode 
      * @return true if the lock is currently acquired - false if the lock is 
not acquired.
      */
-    public boolean checkLock(Object hints, LockMode mode);
+    boolean checkLock(String mode);
+    
+    /**
+     * Release the lock.
+     */
+    void unlock();
+    
+    /**
+     * Provides the current mode.
+     * @return the current mode of the lock.
+     */
+    String getMode();
 }
Index: 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockMode.java
diff -u 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockMode.java:1.5 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockMode.java:removed
--- 
ow-transaction/src/java/org/objectweb/transaction/api/lock/LockMode.java:1.5  
      Mon Nov  7 09:50:30 2005
+++ ow-transaction/src/java/org/objectweb/transaction/api/lock/LockMode.java  
  Thu Dec 22 11:45:56 2005
@@ -1,41 +0,0 @@
-/*====================================================================
- 
- ObjectWeb Transaction Working Group API
- Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
- Contact: http://www.objectweb.org
- 
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
- 
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- USA
- 
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
- 
- ---------------------------------------------------------------------
- $Id: LockMode.java,v 1.5 2005/11/07 08:50:30 rouvoy Exp $
- ====================================================================*/
-package org.objectweb.transaction.api.lock;
-
-import org.objectweb.transaction.api.message.Event;
-
-/**
- * Particular  Event dealing with different kind of lock mode.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.5 $
- */
-public interface LockMode 
-extends Event
-{
-    // TODO: Add the implementation code.
-}
Index: 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/ReadLockMode.java
diff -u 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/ReadLockMode.java:1.4
 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/ReadLockMode.java:removed
--- 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/ReadLockMode.java:1.4
    Fri Dec 16 17:03:10 2005
+++ 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/ReadLockMode.java  
      Thu Dec 22 11:45:56 2005
@@ -1,68 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: ReadLockMode.java,v 1.4 2005/12/16 16:03:10 rouvoy Exp $
-====================================================================*/
-package org.objectweb.transaction.lib.lock;
-
-import org.objectweb.transaction.api.lock.LockMode;
-import org.objectweb.transaction.api.message.Event;
-import org.objectweb.transaction.lib.message.EventAbstract;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- */
-public class ReadLockMode 
-extends EventAbstract 
-implements LockMode{
-    /** Object value for the Lock mode <i>Read</i>. */
-    public final static LockMode mode = new ReadLockMode("Read Lock", false);
-    /** Object value for the Lock mode <i>Read</i>. */
-    public final static LockMode leaves = new ReadLockMode("Read Lock 
(end)", true);
-    
-
-    /**
-     * @param name
-     * @param leaving
-     */
-    protected ReadLockMode(String name, boolean leaving) {
-        super(name, leaving);
-    }
-    
-    /* (non-Javadoc)
-     * @see org.objectweb.transaction.api.message.Event#getEvent()
-     */
-    public Event event() {
-        return mode;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.transaction.api.message.Event#getLeavingEvent()
-     */
-    public Event leavingEvent() {
-        return leaves;
-    }
-}
Index: 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/WriteLockMode.java
diff -u 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/WriteLockMode.java:1.4
 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/WriteLockMode.java:removed
--- 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/WriteLockMode.java:1.4
   Fri Dec 16 17:03:10 2005
+++ 
ow-transaction/src/java/org/objectweb/transaction/lib/lock/WriteLockMode.java 
      Thu Dec 22 11:45:56 2005
@@ -1,67 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: WriteLockMode.java,v 1.4 2005/12/16 16:03:10 rouvoy Exp $
-====================================================================*/
-package org.objectweb.transaction.lib.lock;
-
-import org.objectweb.transaction.api.lock.LockMode;
-import org.objectweb.transaction.api.message.Event;
-import org.objectweb.transaction.lib.message.EventAbstract;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- */
-public class WriteLockMode extends EventAbstract 
-implements LockMode {
-    /** Object value for the Lock mode <i>Read</i>. */
-    public final static LockMode mode = new WriteLockMode("Write Lock", 
false);
-    /** Object value for the Lock mode <i>Read</i>. */
-    public final static LockMode leaves = new WriteLockMode("Write Lock 
(end)", true);
-    
-
-    /**
-     * @param name
-     * @param leaving
-     */
-    protected WriteLockMode(String name, boolean leaving) {
-        super(name, leaving);
-    }
-    
-    /* (non-Javadoc)
-     * @see org.objectweb.transaction.api.message.Event#getEvent()
-     */
-    public Event event() {
-        return mode;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.transaction.api.message.Event#getLeavingEvent()
-     */
-    public Event leavingEvent() {
-        return leaves;
-    }
-}



<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.