[jboss-svn-commits] JBL Code SVN: r27406 - labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM.

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

Author: whitingjr
Date: 2009-07-01 14:04:37 -0400 (Wed, 01 Jul 2009)
New Revision: 27406

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/build.xml
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/pom.xml
Log:
updated maven configuration.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/build.xml	2009-07-01 18:04:02 UTC (rev 27405)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/build.xml	2009-07-01 18:04:37 UTC (rev 27406)
@@ -32,4 +32,83 @@
 	<target name="usage">
 		<echo>Please do not call this build file directly. Use master build script in ../MVCCSample-build directory.</echo>
 	</target>
+	
+
+	   <target name="prepare">
+	      <path id="jboss.aop.classpath">
+	         <fileset dir="../aop-lesson-1">
+	            <include name="jboss-aop-jdk50-single.jar"/>
+	         </fileset>
+	      </path>
+
+	      <path id="classpath">
+	         <path refid="jboss.aop.classpath"/>
+	         <pathelement path="classes"/>
+	      </path>
+
+	      <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+	   </target>
+
+	   <target name="compile" depends="prepare">
+	   	<delete dir="classes"/>
+	      <mkdir dir="classes"/>
+	      <javac srcdir="src/main/java"
+	         destdir="classes"
+	         debug="on"
+	         deprecation="on"
+	         optimize="off"
+	         includes="**">
+	         <classpath refid="classpath"/>
+	      </javac>
+	   		<javac srcdir="src/test/java"
+	   		         destdir="classes"
+	   		         debug="on"
+	   		         deprecation="on"
+	   		         optimize="off"
+	   		         includes="**">
+	   		         <classpath refid="classpath"/>
+	   		      </javac>
+	         	
+	      <copy todir="classes" filtering="no">
+	         <fileset dir="src">
+	            <include name="**/*.properties"/>
+	         </fileset>
+	      </copy>
+	   </target>
+		
+		<target name="aopc" depends="compile">
+	      <aopc compilerclasspathref="classpath" classpathref="classpath" verbose="true">
+	         <classpath path="classes"/>
+	         <src path="classes"/>
+	         <aoppath path="jboss-aop.xml"/>
+	      </aopc>
+	   </target>
+
+	   <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/MVCCSampleSTM/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/pom.xml	2009-07-01 18:04:02 UTC (rev 27405)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleSTM/pom.xml	2009-07-01 18:04:37 UTC (rev 27406)
@@ -24,16 +24,15 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.jboss.javaee</groupId>
-			<artifactId>jboss-javaee</artifactId>
-			<version>5.0.1.GA</version>
+			<groupId>javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.9.0.GA</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<!-- org/jboss/maven/plugins/maven-jbossaop-plugin -->
 				<groupId>org.jboss.maven.plugins</groupId>
 				<artifactId>maven-jbossaop-plugin</artifactId>
 				<version>1.0.0.GA</version>
@@ -41,23 +40,13 @@
 					<execution>
 						<id>compile</id>
 						<configuration>
-							<!--
-								if you want to include dependencies from the current module
-								(only needed if a class inherits a class thats not defined in
-								this module
-							-->
 							<includeProjectDependency>true</includeProjectDependency>
 							<aoppaths>
 								<aoppath>src/main/resources/versioning-aop.xml</aoppath>
-								<!--
-									for a second jboss-aop.xml file
-									<aoppath>src/main/resources/jboss-aop.xml</aoppath>
-								-->
 							</aoppaths>
-							<!--
-								You can specify to only aopc a specific set of classes
-								<includes> <include>POJO.class</include> </includes>
-							-->
+							<includes>
+								<include>uk/ac/ncl/sdia/a8905943/model/Car.class</include>
+							</includes>
 						</configuration>
 						<goals>
 							<goal>compile</goal>
@@ -68,7 +57,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.4.3</version>
 				<configuration>
 					<forkMode>always</forkMode>
 					<useSystemClassLoader>false</useSystemClassLoader>