[jboss-svn-commits] JBL Code SVN: r28577 - in labs/jbosstm/workspace/whitingjr/trunk: MVCCSampleEAR and 1 other directories.

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

Author: whitingjr
Date: 2009-07-29 12:54:51 -0400 (Wed, 29 Jul 2009)
New Revision: 28577

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/pom.xml
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/build.xml
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/import.sql
Log:
UPdated configuration.
REmoved insert of dummy data.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml	2009-07-29 16:54:19 UTC (rev 28576)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml	2009-07-29 16:54:51 UTC (rev 28577)
@@ -68,8 +68,10 @@
 	
 	<target name="deploy" depends="build">
 		<copy file="${basedir}/datasource/stm-memory-ds.xml" todir="${JBOSS_HOME}/server/default/deploy"/>
-		<copy file="${basedir}/artifacts/STMDriverJAR.jar" todir="${JBOSS_HOME}/common/lib"/>
+		<!--copy file="${basedir}/artifacts/STMDriverJAR.jar" todir="${JBOSS_HOME}/common/lib"/-->
 		<copy file="${basedir}/artifacts/STMAnnotationsJAR.jar" todir="${JBOSS_HOME}/common/lib"/>
+		<copy file="${basedir}/artifacts/MVCCSampleSTM.jar" todir="${JBOSS_HOME}/common/lib"/>
+		<copy file="${M2_HOME}/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" todir="${JBOSS_HOME}/common/lib"/>
 		<copy file="${basedir}/artifacts/MVCCSampleEAR.ear" todir="${JBOSS_HOME}/server/default/deploy"/>
 		<echo>would have deployed artifact ${deployment.artifact.filename} to this directory [${JBOSS_HOME}/server/default/deploy]</echo>
 	</target>

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/pom.xml	2009-07-29 16:54:19 UTC (rev 28576)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/pom.xml	2009-07-29 16:54:51 UTC (rev 28577)
@@ -220,5 +220,13 @@
 			<artifactId>jbossjta</artifactId>
 			<version>4.4.0.GA</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-connector</artifactId>
+			<version>5.1.0.GA</version>
+			<scope>provided</scope>
+		</dependency>
+
+
 	</dependencies>
 </project>
\ No newline at end of file

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/build.xml	2009-07-29 16:54:19 UTC (rev 28576)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/build.xml	2009-07-29 16:54:51 UTC (rev 28577)
@@ -13,9 +13,9 @@
 				<include name="MVCCSampleEJB.jar"/>
 				<include name="ShowRoomEJB.jar"/>
 				<include name="CarWashEJB.jar"/>
+				<exclude name="MVCCSampleSTM.jar"/>
 				<exclude name="STMDriverJAR.jar"/>
 			</fileset>
-			
 		</jar>
 	</target>
 	

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/import.sql
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/import.sql	2009-07-29 16:54:19 UTC (rev 28576)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/import.sql	2009-07-29 16:54:51 UTC (rev 28577)
@@ -1,3 +1,3 @@
 -- put dummy data  in here
 
-insert into person (name, age) values ('Jeremy', 1);
\ No newline at end of file
+--insert into person (person_id, name, age) values (1, 'Jeremy', 1);
\ No newline at end of file