[jboss-svn-commits] JBL Code SVN: r30494 - labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build.

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

Author: whitingjr
Date: 2009-12-06 08:37:19 -0500 (Sun, 06 Dec 2009)
New Revision: 30494

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
Log:
Corrected property names. Now use standard environment properties.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml	2009-12-06 12:24:35 UTC (rev 30493)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml	2009-12-06 13:37:19 UTC (rev 30494)
@@ -8,10 +8,13 @@
 	<property name="artifact-target" value="${basedir}/artifacts" />
 	<property name="build.dir" value="${basedir}/build" />
 	<property name="deployment.artifact.filename" value="MVCCSampleEAR.ear" />
-	<property name="M2_HOME" value="${user.home}/.m2" />
+	<property environment="env"/>
+	<property name="M2_REPO" value="${user.home}/.m2"/>
+
+	
 	<property name="MAVEN_ANT_TASK_VERSION" value="2.0.10" />
 	<!-- to download dependencies execute mvn package on this module before calling ant script -->
-	<path id="maven-ant-tasks.classpath" path="${M2_HOME}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
+	<path id="maven-ant-tasks.classpath" path="${M2_REPO}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
 
 	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 
@@ -25,10 +28,10 @@
 			<arg value="-Dmaven.test.skip=true" />
 			<arg value="package" />
 		</artifact:mvn-->
-		<artifact:mvn pom="../MVCCSampleEAR/pom.xml" mavenHome="${user.home}/maven-home">
+		<artifact:mvn pom="../MVCCSampleEAR/pom.xml" mavenHome="${env.M2_HOME}">
 			<arg value="clean" />
 		</artifact:mvn>
-		<artifact:mvn pom="../MVCCSampleEAR/pom.xml" mavenHome="${user.home}/maven-home">
+		<artifact:mvn pom="../MVCCSampleEAR/pom.xml" mavenHome="${env.M2_HOME}">
 			<arg value="-Dmaven.test.skip=true" />
 			<arg value="package" />
 		</artifact:mvn>
@@ -61,7 +64,7 @@
 		<copy file="${basedir}/src/main/resources/jboss-log4j.xml" todir="${JBOSS_HOME}/server/default/conf" />
 
 		<copy file="${basedir}/cluster/cluster-cfg.xml" todir="${JBOSS_HOME}/server/default/conf" />
-		<copy file="${M2_HOME}/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" todir="${JBOSS_HOME}/common/lib" />
+		<copy file="${M2_REPO}/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" todir="${JBOSS_HOME}/common/lib" />
 
 		<copy file="${basedir}/../MVCCSampleSTM/target/${samplestmpom.artifactId}-${samplestmpom.version}.jar" todir="${JBOSS_HOME}/common/lib" />
 		<copy file="${basedir}/../MVCCSampleEAR/target/${applicationpom.artifactId}-${applicationpom.version}.ear" todir="${JBOSS_HOME}/server/default/deploy" />