[jbosstools-commits] JBoss Tools SVN: r30933 - trunk/requirements/jbossas.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2011-04-28 15:43:05 -0400 (Thu, 28 Apr 2011)
New Revision: 30933

Modified:
   trunk/requirements/jbossas/buildRequirement.xml
Log:
fix path to search for things to rename; echo variables to confirm

Modified: trunk/requirements/jbossas/buildRequirement.xml
===================================================================
--- trunk/requirements/jbossas/buildRequirement.xml	2011-04-28 19:25:56 UTC (rev 30932)
+++ trunk/requirements/jbossas/buildRequirement.xml	2011-04-28 19:43:05 UTC (rev 30933)
@@ -51,13 +51,21 @@
 			<param name="build.archive" value="${jboss60.build.archive}" />
 			<param name="md5" value="${jboss60.build.archive.md5}" />
 		</antcall>
+
+<!-- this is called via the requirements profile in ../../build/parent/pom.xml, which sets these properties:
+		<requirements.root>${basedir}/../../../requirements</requirements.root>
+		<requirement.build.root>${requirements.root}/target</requirement.build.root>
+-->
+		<echo>${ant.file}, ${basedir}, ${unzip.dest}, ${requirement.build.root}</echo>
+
 		<!-- rename target folder from 6.0.0.Final to 6.0.0 -->
+		
 		<for param="dir">
 			<path>
-				<fileset dir="../target/" includes="jboss-6.0.0*" />
+				<fileset dir="${requirement.build.root}/" includes="jboss-6.0.0*" />
 			</path>
 			<sequential>
-				<rename src="@{dir}" dest="../target/jboss-6.0.0" />
+				<rename src="@{dir}" dest="${requirement.build.root}/jboss-6.0.0" />
 			</sequential>
 		</for>
 
@@ -69,10 +77,10 @@
 		<!-- rename target folder from 7.0.0.Beta3 to 7.0.0 -->
 		<for param="dir">
 			<path>
-				<fileset dir="../target/" includes="jboss-7.0.0*" />
+				<fileset dir="${requirement.build.root}/" includes="jboss-7.0.0*" />
 			</path>
 			<sequential>
-				<rename src="../target/jboss-7.0.0.Beta3" dest="../target/jboss-7.0.0" />
+				<rename src="${requirement.build.root}/jboss-7.0.0.Beta3" dest="${requirement.build.root}/jboss-7.0.0" />
 			</sequential>
 		</for>
 	</target>