Author: nickboldt Date: 2011-04-28 16:47:47 -0400 (Thu, 28 Apr 2011) New Revision: 30946 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml trunk/requirements/jbossas/buildRequirement.xml Log: remove attempt to rename as 6/7 folders via req builder; instead just use properties in test's pom.xml Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 20:32:01 UTC (rev 30945) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2011-04-28 20:47:47 UTC (rev 30946) @@ -17,8 +17,8 @@ <jbosstools.test.jboss.home.4.2>${requirement.build.root}/jboss-4.2.3.GA</jbosstools.test.jboss.home.4.2> <jbosstools.test.jboss.home.5.0>${requirement.build.root}/jboss-5.0.1.GA</jbosstools.test.jboss.home.5.0> <jbosstools.test.jboss.home.5.1>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss.home.5.1> - <jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0</jbosstools.test.jboss.home.6.0> - <jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0</jbosstools.test.jboss.home.7.0> + <jbosstools.test.jboss.home.6.0>${requirement.build.root}/jboss-6.0.0.Final</jbosstools.test.jboss.home.6.0> + <jbosstools.test.jboss.home.7.0>${requirement.build.root}/jboss-7.0.0.Beta3</jbosstools.test.jboss.home.7.0> <systemProperties>-Djbosstools.test.jboss.home.3.2=${jbosstools.test.jboss.home.3.2} -Djbosstools.test.jboss.home.4.0=${jbosstools.test.jboss.home.4.0} -Djbosstools.test.jboss.home.4.2=${jbosstools.test.jboss.home.4.2} -Djbosstools.test.jboss.home.5.0=${jbosstools.test.jboss.home.5.0} -Djbosstools.test.jboss.home.5.1=${jbosstools.test.jboss.home.5.1} -Djbosstools.test.jboss.home.6.0=${jbosstools.test.jboss.home.6.0} -Djbosstools.test.jboss.home.7.0=${jbosstools.test.jboss.home.7.0} </systemProperties> <emma.filter>org.jboss.ide.eclipse.as.core*</emma.filter> <emma.instrument.bundles>org.jboss.ide.eclipse.as.core</emma.instrument.bundles> Modified: trunk/requirements/jbossas/buildRequirement.xml =================================================================== --- trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 20:32:01 UTC (rev 30945) +++ trunk/requirements/jbossas/buildRequirement.xml 2011-04-28 20:47:47 UTC (rev 30946) @@ -51,37 +51,10 @@ <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="${requirement.build.root}/" includes="jboss-6.0.0*" /> - </path> - <sequential> - <rename src="@{dir}" dest="${requirement.build.root}/jboss-6.0.0" /> - </sequential> - </for> - <antcall target="build-jbossas"> <param name="build.uri" value="${jboss70.build.uri}" /> <param name="build.archive" value="${jboss70.build.archive}" /> <param name="md5" value="${jboss70.build.archive.md5}" /> </antcall> - <!-- rename target folder from 7.0.0.Beta3 to 7.0.0 --> - <for param="dir"> - <path> - <fileset dir="${requirement.build.root}/" includes="jboss-7.0.0*" /> - </path> - <sequential> - <rename src="${requirement.build.root}/jboss-7.0.0.Beta3" dest="${requirement.build.root}/jboss-7.0.0" /> - </sequential> - </for> </target> </project>