[jboss-svn-commits] JBL Code SVN: r37209 - in labs/jbosstm/workspace/mlittle/STM-Arjuna/src: main/java/org/jboss/stm/annotations and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 2 12:33:04 EDT 2011
Author: mark.little at jboss.com
Date: 2011-07-02 12:33:04 -0400 (Sat, 02 Jul 2011)
New Revision: 37209
Added:
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/State.java
Removed:
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/DurableState.java
Modified:
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/PersistentContainer.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/RecoverableContainer.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/Transactional.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/reflect/InvocationHandler.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/types/AtomicInteger.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/BasicContainerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/HammerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/InvocationHandlerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/NestedHammerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/PersistentContainerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/ProxyUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/RecoverableContainerUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/BasicUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/InheritedUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/ComplexLockManagerProxyUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/InheritenceLockManagerProxyUnitTest.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/LockManagerProxyUnitTest.java
Log:
Added more types.
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/PersistentContainer.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/PersistentContainer.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/PersistentContainer.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -90,24 +90,4 @@
return proxy;
}
-
- @SuppressWarnings(value={"unchecked"})
- public Uid getUid (T member)
- {
- T proxy = _transactionalProxies.get(member);
-
- if (proxy == null)
- throw new IllegalArgumentException("No such instance in this container.");
-
- try
- {
- InvocationHandler<T> handler = (InvocationHandler<T>) Proxy.getInvocationHandler(proxy);
-
- return handler.get_uid();
- }
- catch (final Exception ex)
- {
- throw new IllegalArgumentException(ex);
- }
- }
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/RecoverableContainer.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/RecoverableContainer.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/RecoverableContainer.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -22,6 +22,8 @@
package org.jboss.stm;
import java.lang.reflect.Proxy;
+import java.util.Iterator;
+import java.util.Set;
import java.util.WeakHashMap;
import org.jboss.stm.annotations.Transactional;
@@ -29,6 +31,7 @@
import com.arjuna.ats.arjuna.ObjectType;
import com.arjuna.ats.arjuna.StateManager;
+import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.txoj.LockManager;
/**
@@ -40,6 +43,7 @@
* the implementing class, must also use the @Lockable annotation.
*
* TODO look at using JBossAOP to get round the problem of requiring an interface for proxying.
+ * Now ByteMan.
*
* @author marklittle
*/
@@ -75,6 +79,11 @@
return create(member, ObjectType.RECOVERABLE);
}
+ /**
+ * Return a handle through which the object should be used, rather than the one
+ * passed in. Can specify the type of the object (recoverable, persistent, neither).
+ */
+
@SuppressWarnings(value={"unchecked"})
protected synchronized T create (T member, int ot)
{
@@ -104,7 +113,93 @@
return proxy;
}
+ /**
+ * Given a Uid, return the proxy for that instance.
+ *
+ * @param reference
+ * @return
+ */
+
+ @SuppressWarnings("unchecked")
+ public synchronized T getMember (Uid reference)
+ {
+ if (reference == null)
+ throw new IllegalArgumentException();
+
+ Set<T> keys = _transactionalProxies.keySet();
+ Iterator<T> iter = keys.iterator();
+
+ try
+ {
+ while (iter.hasNext())
+ {
+ T obj = _transactionalProxies.get(iter.next());
+ InvocationHandler<T> handler = (InvocationHandler<T>) Proxy.getInvocationHandler(obj);
+
+ if (handler.get_uid().equals(reference))
+ return obj;
+ }
+ }
+ catch (final Exception ex)
+ {
+ throw new IllegalArgumentException(ex);
+ }
+
+ return null;
+ }
+
+ /**
+ * Given a real object, return the Uid if it exists in this container.
+ *
+ * @param member
+ * @return
+ */
+
@SuppressWarnings(value={"unchecked"})
+ public Uid getUidForInstance (T member)
+ {
+ T proxy = _transactionalProxies.get(member);
+
+ if (proxy == null)
+ throw new IllegalArgumentException("No such instance in this container.");
+
+ try
+ {
+ InvocationHandler<T> handler = (InvocationHandler<T>) Proxy.getInvocationHandler(proxy);
+
+ return handler.get_uid();
+ }
+ catch (final Exception ex)
+ {
+ throw new IllegalArgumentException(ex);
+ }
+ }
+
+ /**
+ * Given a real object, return the Uid if it exists in this container.
+ *
+ * @param member
+ * @return
+ */
+
+ @SuppressWarnings(value={"unchecked"})
+ public Uid getUidForProxy (T proxy)
+ {
+ System.err.println("**getting Uid");
+
+ try
+ {
+ InvocationHandler<T> handler = (InvocationHandler<T>) Proxy.getInvocationHandler(proxy);
+
+ return handler.get_uid();
+ }
+ catch (final Exception ex)
+ {
+ throw new IllegalArgumentException("No such instance in this container.", ex);
+ }
+ }
+
+ @SuppressWarnings(value={"unchecked"})
protected final void checkObjectType (Object member)
{
if ((member instanceof LockManager) || (member instanceof StateManager))
Deleted: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/DurableState.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/DurableState.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/DurableState.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-package org.jboss.stm.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * State that will be written to the log (or restored).
- *
- * @author marklittle
- */
-
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ ElementType.FIELD })
-public @interface DurableState
-{
-}
\ No newline at end of file
Copied: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/State.java (from rev 25874, labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/DurableState.java)
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/State.java (rev 0)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/State.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+package org.jboss.stm.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * State that will be written to the log (or restored).
+ *
+ * @author marklittle
+ */
+
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.FIELD })
+public @interface State
+{
+}
\ No newline at end of file
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/Transactional.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/Transactional.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/annotations/Transactional.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -30,9 +30,24 @@
* require write locks. The only state that will be saved/restored is that
* which is marked using the DurableState annotation or SaveState/RestoreState.
*
+ * This assumes currently that all state modification and locking occurs through
+ * public methods. This means that even if there are private, protected or
+ * package scope methods that would change the state, they will not be tracked.
+ * Therefore, the implementation class should not modify state unless by calling
+ * its own public methods.
+ *
* @author marklittle
*
*/
+
+/*
+ * TODO fix this, so that we can either proxy private, protected and package
+ * methods, or provide a means whereby the implementation class can inform the
+ * transaction system. For instance, maybe the implementation class can call into
+ * the container that maintains the proxy, passing itself as a reference, and
+ * drive setlock, modified etc. implicity.
+ */
+
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE })
public @interface Transactional
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -27,7 +27,7 @@
import java.util.ArrayList;
import org.jboss.stm.InvalidAnnotationException;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.RestoreState;
import org.jboss.stm.annotations.SaveState;
@@ -97,7 +97,7 @@
{
// ignore if not flagged with @DurableState
- if (afield.isAnnotationPresent(DurableState.class))
+ if (afield.isAnnotationPresent(State.class))
_fields.add(afield);
}
}
@@ -113,7 +113,7 @@
// ignore if not flagged with @DurableState
- if (afield.isAnnotationPresent(DurableState.class))
+ if (afield.isAnnotationPresent(State.class))
{
afield.setAccessible(true);
@@ -172,7 +172,7 @@
{
// ignore if not flagged with DurableState
- if (afield.isAnnotationPresent(DurableState.class))
+ if (afield.isAnnotationPresent(State.class))
_fields.add(afield);
}
}
@@ -215,7 +215,11 @@
{
try
{
- // TODO arrays
+ /*
+ * TODO deal with arrays of primitive types.
+ *
+ * Workaround - provide saveState and restoreState annotations.
+ */
if (afield.getType().equals(Boolean.TYPE))
os.packBoolean(afield.getBoolean(_theObject));
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/reflect/InvocationHandler.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/reflect/InvocationHandler.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/reflect/InvocationHandler.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -30,7 +30,6 @@
import org.jboss.stm.TransactionException;
import org.jboss.stm.annotations.Nested;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.WriteLock;
import org.jboss.stm.internal.proxy.LockManagerProxy;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/types/AtomicInteger.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/types/AtomicInteger.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/types/AtomicInteger.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -21,16 +21,30 @@
package org.jboss.stm.types;
+import org.jboss.stm.annotations.ReadLock;
import org.jboss.stm.annotations.Transactional;
+import org.jboss.stm.annotations.WriteLock;
// TODO maybe pull all of this into a separate jar
@Transactional
public interface AtomicInteger
{
+ @WriteLock
public void set (int val);
+
+ @ReadLock
public int get ();
+ @WriteLock
+ public AtomicInteger increment ();
+
+ @WriteLock
+ public AtomicInteger decrement ();
+
+ @WriteLock
public AtomicInteger add (AtomicInteger obj);
+
+ @WriteLock
public AtomicInteger subtract (AtomicInteger obj);
-}
+}
\ No newline at end of file
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/BasicContainerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/BasicContainerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/BasicContainerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.ObjectType;
@@ -101,7 +101,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value={"unused"})
private int _isState;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/HammerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/HammerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/HammerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -26,7 +26,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.AtomicAction;
@@ -76,7 +76,7 @@
_isState--;
}
- @DurableState
+ @State
private int _isState;
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/InvocationHandlerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/InvocationHandlerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/InvocationHandlerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.AtomicAction;
@@ -78,7 +78,7 @@
{
}
- @DurableState
+ @State
private int _isState;
@SuppressWarnings(value =
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/NestedHammerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/NestedHammerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/NestedHammerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -27,7 +27,7 @@
import org.jboss.stm.annotations.Nested;
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.AtomicAction;
@@ -78,7 +78,7 @@
_isState--;
}
- @DurableState
+ @State
private int _isState;
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/PersistentContainerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/PersistentContainerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/PersistentContainerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.ObjectType;
@@ -102,7 +102,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value={"unused"})
private int _isState;
@@ -158,7 +158,7 @@
try
{
Sample proxy = theContainer.enlist(tester);
- Uid u = theContainer.getUid(proxy);
+ Uid u = theContainer.getUidForInstance(proxy);
assertNotNull(u);
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/ProxyUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/ProxyUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/ProxyUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import junit.framework.TestCase;
@@ -72,7 +72,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value =
{ "unused" })
private int _isState;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/RecoverableContainerUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/RecoverableContainerUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/RecoverableContainerUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.ReadLock;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.WriteLock;
import com.arjuna.ats.arjuna.ObjectType;
@@ -101,7 +101,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value={"unused"})
private int _isState;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/BasicUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/BasicUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/BasicUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -55,7 +55,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value={"unused"})
private int _isState;
@@ -112,13 +112,13 @@
{
if (afield.getName().equals("_isState"))
{
- assertTrue(afield.isAnnotationPresent(DurableState.class));
+ assertTrue(afield.isAnnotationPresent(State.class));
assertTrue(afield.getType().equals(Integer.TYPE));
}
if (afield.getName().equals("_isNotState"))
{
- assertFalse(afield.isAnnotationPresent(DurableState.class));
+ assertFalse(afield.isAnnotationPresent(State.class));
assertTrue(afield.getType().equals(Integer.class));
}
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/InheritedUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/InheritedUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/annotations/InheritedUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -62,7 +62,7 @@
{
}
- @DurableState
+ @State
@SuppressWarnings(value={"unused"})
private int _isState;
@@ -150,12 +150,12 @@
{
if (afield.getName().equals("_isState"))
{
- assertTrue(afield.isAnnotationPresent(DurableState.class));
+ assertTrue(afield.isAnnotationPresent(State.class));
}
if (afield.getName().equals("_isNotState"))
{
- assertFalse(afield.isAnnotationPresent(DurableState.class));
+ assertFalse(afield.isAnnotationPresent(State.class));
}
}
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/ComplexLockManagerProxyUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/ComplexLockManagerProxyUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/ComplexLockManagerProxyUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import java.io.IOException;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.RestoreState;
import org.jboss.stm.annotations.SaveState;
@@ -70,7 +70,7 @@
_saved = os.unpackInt();
}
- @DurableState // will be ignored!!
+ @State // will be ignored!!
public int _isState;
public int _isNotState;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/InheritenceLockManagerProxyUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/InheritenceLockManagerProxyUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/InheritenceLockManagerProxyUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -24,7 +24,7 @@
import java.io.IOException;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import org.jboss.stm.annotations.Transactional;
import org.jboss.stm.annotations.RestoreState;
import org.jboss.stm.annotations.SaveState;
@@ -112,7 +112,7 @@
_saved = os.unpackInt();
}
- @DurableState // will be ignored!!
+ @State // will be ignored!!
public int _isState;
public int _isNotState;
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/LockManagerProxyUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/LockManagerProxyUnitTest.java 2011-07-01 17:21:18 UTC (rev 37208)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/internal/proxy/LockManagerProxyUnitTest.java 2011-07-02 16:33:04 UTC (rev 37209)
@@ -22,7 +22,7 @@
package org.jboss.stm.internal.proxy;
-import org.jboss.stm.annotations.DurableState;
+import org.jboss.stm.annotations.State;
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.ObjectType;
@@ -55,7 +55,7 @@
return "SampleLockable < "+_isState+", "+_isNotState+" >";
}
- @DurableState
+ @State
public int _isState;
public int _isNotState;
@@ -80,12 +80,12 @@
return _field;
}
- @DurableState
+ @State
public Double _isState;
public Integer _isNotState;
- @DurableState
+ @State
private String _field;
}
More information about the jboss-svn-commits
mailing list