[jboss-svn-commits] JBL Code SVN: r28907 - in labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main: java/uk/ac/ncl/sdia/a8905943/spec and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: whitingjr
Date: 2009-08-11 17:28:12 -0400 (Tue, 11 Aug 2009)
New Revision: 28907

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/impl/TransactionImpl.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/spec/STMTransaction.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/stm/STM.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/resources/META-INF/jboss-aop.xml
Log:
Removed aop configuration.
Started to look at hooking in the transactional framework.
Removed interface from STMtransaction.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/impl/TransactionImpl.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/impl/TransactionImpl.java	2009-08-11 21:27:13 UTC (rev 28906)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/impl/TransactionImpl.java	2009-08-11 21:28:12 UTC (rev 28907)
@@ -60,44 +60,8 @@
 		// notify all transactions committed, cleanup reader and writer traces.
 	}
 
-	@Override
-	public boolean delistResource(XAResource arg0, int arg1)
-			throws IllegalStateException, SystemException {
-		// TODO Auto-generated method stub
-		return false;
-	}
+	
 
-	@Override
-	public boolean enlistResource(XAResource arg0) throws RollbackException,
-			IllegalStateException, SystemException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public int getStatus() throws SystemException {
-		return status;
-	}
-
-	@Override
-	public void registerSynchronization(Synchronization arg0)
-			throws RollbackException, IllegalStateException, SystemException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void rollback() throws IllegalStateException, SystemException {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void setRollbackOnly() throws IllegalStateException, SystemException {
-		// TODO Auto-generated method stub
-		
-	}
-
    @Override
    public STMTransaction readField()
    {
@@ -120,10 +84,7 @@
          logger.info("Starting transaction.");
       }
    }
-   public TransactionImpl(Xid id) {
-	// FIXME TransactionImpl constructor
-
-   }
+   
    public TransactionImpl()
    {
       //TODO: incomplete

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/spec/STMTransaction.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/spec/STMTransaction.java	2009-08-11 21:27:13 UTC (rev 28906)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/spec/STMTransaction.java	2009-08-11 21:28:12 UTC (rev 28907)
@@ -6,7 +6,6 @@
  */
 package uk.ac.ncl.sdia.a8905943.spec;
 
-import javax.transaction.Transaction;
 
 /**
  * Purpose of this object is for behaviour of a transaction that 
@@ -15,10 +14,10 @@
  * @author <a href="whitingjr at hotmail.com">Jeremy Whiting</a>
  * @version $Revision: 1.1 $
  */
-public interface STMTransaction extends Transaction
+public interface STMTransaction 
 {
-   public Object readField();
-   public Object writeField();
+   public Boolean write(long hash, Object writtenObject);
+   public Object read( long hashIdentity);
    public void startTransaction();
    
 }

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/stm/STM.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/stm/STM.java	2009-08-11 21:27:13 UTC (rev 28906)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/java/uk/ac/ncl/sdia/a8905943/stm/STM.java	2009-08-11 21:28:12 UTC (rev 28907)
@@ -16,9 +16,17 @@
    private static final Logger logger = Logger.getLogger(STM.class);
    
 
-   public void write(long hash, Object writtenObject)
+   /**
+    * This method is where transactional updates are made..
+    * 
+    * @param hash
+    * @param writtenObject
+    * @return
+    */
+   public Boolean write(long hash, Object writtenObject)
    {
       //TODO:jrw complete implementation.
+      return Boolean.FALSE;
    }
    public Object read( long hashIdentity)
    {

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/resources/META-INF/jboss-aop.xml	2009-08-11 21:27:13 UTC (rev 28906)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/src/main/resources/META-INF/jboss-aop.xml	2009-08-11 21:28:12 UTC (rev 28907)
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop xmlns="urn:jboss:aop-beans:1.0">
+   <!-- 
    <aspect class="uk.ac.ncl.sdia.a8905943.aspects.VersioningAspectImpl"/>
+    -->
    <!-- field pointcut -->
+   <!-- 
    <bind pointcut="set(* uk.ac.ncl.sdia.a8905943.model.Car->*)">
       <advice  aspect="uk.ac.ncl.sdia.a8905943.aspects.VersioningAspectImpl" name="version"/>
    </bind>
-
+ -->
 </aop>