[jboss-svn-commits] JBL Code SVN: r28952 - in labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR: src/main/resources/META-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 16 14:20:42 EDT 2009
Author: whitingjr
Date: 2009-08-16 14:20:42 -0400 (Sun, 16 Aug 2009)
New Revision: 28952
Modified:
labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/build.xml
labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/main/resources/META-INF/jboss-aop.xml
labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMReadAspect.java
labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMWriteAspect.java
Log:
Corrected aop configuration.
Updated test cases.
Modified: labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/build.xml 2009-08-16 18:19:55 UTC (rev 28951)
+++ labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/build.xml 2009-08-16 18:20:42 UTC (rev 28952)
@@ -10,59 +10,6 @@
<include name="**/*.class"/>
</fileset>
</copy>
- <!--javac destdir="${build.dir}/classes" classpathref="COMPILE_DEPENDENCIES" debug="true" target="1.6">
- <src path="${basedir}/src/main/java"/>
- </javac-->
-
- <!--antcall target="aopc">
- <reference refid="COMPILE_DEPENDENCIES"/>
- </antcall>
- <antcall target="aopc">
- <reference refid="COMPILE_DEPENDENCIES"/>
- </antcall-->
-
-
- <!-- hack attack, this relies on eclipse m2 having compile the aopc, the Ant Aoc task doesn't work -->
- <!--copy todir="${basedir}/classes">
- <fileset dir="${basedir}/target/classes">
- <include name="uk/ac/ncl/sdia/a8905943/model/*.class"/>
- </fileset>
- </copy>
-
-
- <jar jarfile="${artifact-target}/STMAnnotationsJAR.aop" manifest="${basedir}/src/main/resources/META-INF/MANIFEST.MF">
- <fileset dir="${basedir}/classes">
- <include name="uk/ac/ncl/sdia/a8905943/stm/annotation/**"/>
- <include name="uk/ac/ncl/sdia/a8905943/aspects/**"/>
- <include name="uk/ac/ncl/sdia/a8905943/model/*.class"/>
- <patternset refid="testcase.filename.patternset"/>
- </fileset>
-
- <fileset dir="${basedir}/src/main/resources">
- <include name="jboss-aop.xml" />
- </fileset>
-
- <metainf dir="${basedir}/src/main/resources/META-INF">
- <include name="*"/>
- </metainf>
-
- </jar>
-
- <copy todir="${build.dir}/classes">
- <fileset dir="${basedir}/classes">
- <include name="**/*.class"/>
- </fileset>
- </copy>
-
- <copy todir="${build.dir}/classes">
- <fileset dir="${basedir}/target/classes">
- <include name="uk/ac/ncl/sdia/a8905943/model/*.class"/>
- </fileset>
- </copy-->
-
-
-
-
</target>
<target name="usage">
@@ -101,20 +48,6 @@
<classpath refid="classpath"/>
</javac>
- <!--javac srcdir="src/test/java"
- destdir="${basedir}/classes"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**">
- <classpath refid="classpath"/>
- </javac>
-
- <copy todir="${basedir}/classes" filtering="no">
- <fileset dir="src">
- <include name="**/*.properties"/>
- </fileset>
- </copy-->
</target>
<target name="aopc" depends="compile">
@@ -126,33 +59,8 @@
</aopc>
- <!--aopc compilerclasspathref="classpath" classpathref="classpath" verbose="true" report="true">
- <classpath >
- <pathelement path="${build.dir}/classes"/>
- <pathelement path="${basedir}/classes"/>
- <pathelement path="src/main/resources"/>
- </classpath>
-
- <include name="uk/ac/ncl/sdia/a8905943/model/*.class"/>
- <src path="${build.dir}/classes"/>
- <aoppath path="src/main/resources/META-INF/jboss-aop.xml"/>
- </aopc-->
</target>
- <!-- unused target name="run-compile-time" depends="aopc">
- <java fork="yes" failOnError="true" className="bank.Bank">
- <sysproperty key="jboss.aop.path" value="jboss-aop.xml"/>
- <classpath refid="classpath"/>
- </java>
- </target>
- <target name="run-load-time" depends="compile">
- <java fork="yes" failOnError="true" className="bank.Bank">
- <sysproperty key="jboss.aop.path" value="jboss-aop.xml"/>
- <jvmarg value="-javaagent:../aop-lesson-1/jboss-aop-jdk50-single.jar"/>
- <classpath refid="classpath"/>
- </java>
- </target-->
-
</project>
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/main/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/main/resources/META-INF/jboss-aop.xml 2009-08-16 18:19:55 UTC (rev 28951)
+++ labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/main/resources/META-INF/jboss-aop.xml 2009-08-16 18:20:42 UTC (rev 28952)
@@ -24,12 +24,12 @@
-->
<bind
pointcut="execution(* *->@uk.ac.ncl.sdia.a8905943.aspects.annotation.STMWriteable(..))">
- <advice name="stmread" aspect="stmreadaspect" />
+ <advice name="stmwrite" aspect="stmwriteaspect" />
</bind>
<bind
pointcut="execution(* *->@uk.ac.ncl.sdia.a8905943.aspects.annotation.STMReadable(..))">
- <advice name="stmwrite" aspect="stmwriteaspect" />
+ <advice name="stmread" aspect="stmreadaspect" />
</bind>
<bind
Modified: labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMReadAspect.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMReadAspect.java 2009-08-16 18:19:55 UTC (rev 28951)
+++ labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMReadAspect.java 2009-08-16 18:20:42 UTC (rev 28952)
@@ -6,8 +6,12 @@
*/
package uk.ac.ncl.sdia.a8905943.aspects;
+import java.sql.Connection;
+
import junit.framework.Assert;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.DefaultCacheManager;
import org.junit.Before;
import org.junit.Test;
@@ -24,16 +28,18 @@
public void testReadAspectInvoked()
{
Bike bike = new Bike(2l);
- bike.setName("Raleigh"); // write
+ String name = "Raleigh";
+ bike.setName(name); // write
Assert.assertNotNull(bike);
Assert.assertNotNull(bike.getName()); // read
+ Assert.assertEquals("Raleigh", bike.getName());
}
@Before
public void setUp()
{
- STM stm = new STM("retail");
+ CacheManager cacheManager = new DefaultCacheManager( );
+ STM stm = new STM("retail", cacheManager.getCache());
STMFactory.getFactoryInstance().allocate(stm);
-
+ stm.begin(Connection.TRANSACTION_REPEATABLE_READ);
}
-
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMWriteAspect.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMWriteAspect.java 2009-08-16 18:19:55 UTC (rev 28951)
+++ labs/jbosstm/workspace/whitingjr/trunk/STMAnnotationsJAR/src/test/java/uk/ac/ncl/sdia/a8905943/aspects/TestSTMWriteAspect.java 2009-08-16 18:20:42 UTC (rev 28952)
@@ -1,6 +1,10 @@
package uk.ac.ncl.sdia.a8905943.aspects;
+import java.sql.Connection;
+
import junit.framework.Assert;
+import org.infinispan.manager.CacheManager;
+import org.infinispan.manager.DefaultCacheManager;
import org.junit.Before;
import org.junit.Test;
@@ -51,8 +55,9 @@
@Before
public void setUp()
{
- STM stm = new STM("retail");
+ CacheManager cacheManager = new DefaultCacheManager( ); // default used
+ STM stm = new STM("retail", cacheManager.getCache());
STMFactory.getFactoryInstance().allocate(stm);
-
+ stm.begin(Connection.TRANSACTION_REPEATABLE_READ);
}
}
More information about the jboss-svn-commits
mailing list