Author: nickboldt Date: 2010-05-05 15:30:56 -0400 (Wed, 05 May 2010) New Revision: 21924 Modified: branches/modular_build/build/build.xml Log: add plugin.id method and tests; refactor feature.id tests; reorg file; add hook to run external per-component build.xml (eg., for Drools) Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-05 18:24:41 UTC (rev 21923) +++ branches/modular_build/build/build.xml 2010-05-05 19:30:56 UTC (rev 21924) @@ -454,6 +454,17 @@ <property name="COMPONENT" value="@{COMPONENT}" /> </ant> + <!-- optional extra instructions to do before a maven build --> + <if> + <available file=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot; type="file" /> + <then> + <echo>Run custom @{COMPONENT}/build.xml</echo> + <ant antfile=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot;&gt; + <property name="COMPONENT" value="@{COMPONENT}" /> + </ant> + </then> + </if> + <antcall target="mvn"> <param name="COMPONENT" value="@{COMPONENT}" /> </antcall> @@ -860,83 +871,57 @@ </target> <target name="get.feature.id"> - <propertyregex property="feature.jarfile" - defaultvalue="${featureJar}" - input="${featureJar}" - regexp=".+/features/[^/]+/target/([^/]+feature.+\.jar)" + <antcallback target="get.artifact.id" return="artifact.id"> + <param name="regexp.path" value=".+/features/[^/]+/target/([^/]+feature.+\.jar)" /> + <param name="artifactJar" value="${featureJar}" /> + </antcallback> + <var name="feature.id" value="${artifact.id}" /> + </target> + + <target name="get.plugin.id"> + <antcallback target="get.artifact.id" return="artifact.id"> + <param name="regexp.path" value=".+/plugins/([^/]+.+\.jar)" /> + <param name="artifactJar" value="${pluginJar}" /> + </antcallback> + <var name="plugin.id" value="${artifact.id}" /> + </target> + + <target name="get.artifact.id"> + <!-- for a feature: regexp=".+/features/[^/]+/target/([^/]+feature.+\.jar)" + for a plugin: regexp=".+/plugins/([^/]+.+\.jar)" --> + <property name="regexp.path" value=".+/plugins/([^/]+.+\.jar)" /> + + <propertyregex property="artifact.jarfile" + defaultvalue="${artifactJar}" + input="${artifactJar}" + regexp="${regexp.path}" replace="\1" override="true" /> - <propertyregex property="feature.id" - defaultvalue="${feature.jarfile}" - input="${feature.jarfile}" - regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar" + <propertyregex property="artifact.id" + defaultvalue="${artifact.jarfile}" + input="${artifact.jarfile}" + regexp="([^_]+)_(\d+\.\d+\.\d+.+)\.jar" replace="\1" override="true" /> - <propertyregex property="feature.id" - defaultvalue="${feature.id}" - input="${feature.id}" - regexp="([^_]+)-(\d+\.\d+\.\d+\..+)\.jar" + <propertyregex property="artifact.id" + defaultvalue="${artifact.id}" + input="${artifact.id}" + regexp="([^_]+)-(\d+\.\d+\.\d+.+)\.jar" replace="\1" override="true" /> - <propertyregex property="feature.id" - defaultvalue="${feature.id}" - input="${feature.id}" - regexp="([^_]+)-(\d+\.\d+\.\d+-SNAPSHOT)\.jar" + <propertyregex property="artifact.id" + defaultvalue="${artifact.id}" + input="${artifact.id}" + regexp="([^_]+)-(\d+\.\d+\.\d+.SNAPSHOT)\.jar" replace="\1" override="true" /> - <var name="featureJar" unset="true" /> + <var name="artifactJar" unset="true" /> </target> - - <!-- single test, runs faster --> - <target name="test.get.feature.id.vpe"> - <antcall target="test.get.feature.id"> - <param name="COMPONENTS" value="vpe" /> - </antcall> - </target> - - <!-- test all feature.id fetches --> - <target name="test.get.feature.id" depends="init, test.expected.values"> - <for param="COMPONENT" list="${COMPONENTS}" delimiter=";, - "> - <sequential> - <for param="featureJar" delimiter=", "> - <!-- list="org.jboss.tools.xulrunner.feature, org.jboss.tools.vpe.feature" --> - <path> - <fileset dir="${basedir}/@{COMPONENT}" includes="**/features/**/target/*.jar" /> - </path> - <sequential> - <echo level="info">Test @{featureJar}</echo> - <antcallback target="get.feature.id" return="feature.id"> - <property name="featureJar" value="@{featureJar}" /> - </antcallback> - <var name="featureJar.path" unset="true" /> - <propertyregex override="true" - property="feature.id.expected.name" - defaultvalue="@{featureJar}" - input="@{featureJar}" - regexp="${basedir}\/(.+)" - replace="get.feature.id.expected.\1" - /> - <!-- <echo>&lt;property name="get.feature.id.expected.@{featureJar}" value="${feature.id}"/&gt; </echo> --> - - <propertycopy name="feature.id.expected" from="${feature.id.expected.name}" /> - <assert failonerror="true" message="Expected: ${feature.id.expected}; got: ${feature.id}"> - <bool> - <equals arg1="${feature.id.expected}" arg2="${feature.id}" /> - </bool> - </assert> - <var name="feature.id.expected" unset="true" /> - </sequential> - </for> - </sequential> - </for> - </target> - <!-- TODO: figure out why this fails with error: insecure -e option not allowed. This account is restricted by rssh. @@ -1016,176 +1001,311 @@ /> <!-- expected values for test.get.feature.id --> - <property name="get.feature.id.expected.tests/features/org.jboss.tools.test.feature/target/org.jboss.tools.test.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.tests/features/org.jboss.tools.test.feature/target/org.jboss.tools.test.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.test.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.all.feature/target/org.jboss.tools.common.all.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.all.feature/target/org.jboss.tools.common.all.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.all.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.all.tests.feature/target/org.jboss.tools.common.all.tests.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.all.tests.feature/target/org.jboss.tools.common.all.tests.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.all.tests.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.core.feature/target/org.jboss.tools.common.core.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.core.feature/target/org.jboss.tools.common.core.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.core.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.feature/target/org.jboss.tools.common.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.feature/target/org.jboss.tools.common.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.text.ext.feature/target/org.jboss.tools.common.text.ext.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.text.ext.feature/target/org.jboss.tools.common.text.ext.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.text.ext.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.ui.feature/target/org.jboss.tools.common.ui.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.ui.feature/target/org.jboss.tools.common.ui.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.ui.feature" /> - <property name="get.feature.id.expected.common/features/org.jboss.tools.common.verification.feature/target/org.jboss.tools.common.verification.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.common/features/org.jboss.tools.common.verification.feature/target/org.jboss.tools.common.verification.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.common.verification.feature" /> - <property name="get.feature.id.expected.flow/features/org.jboss.tools.flow.common.feature/target/org.jboss.tools.flow.common.feature-4.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.flow/features/org.jboss.tools.flow.common.feature/target/org.jboss.tools.flow.common.feature-4.0.0-SNAPSHOT.jar" value="org.jboss.tools.flow.common.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.flow.jpdl4.feature/target/org.jboss.tools.flow.jpdl4.feature-4.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.flow.jpdl4.feature/target/org.jboss.tools.flow.jpdl4.feature-4.0.0-SNAPSHOT.jar" value="org.jboss.tools.flow.jpdl4.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm.common.feature/target/org.jboss.tools.jbpm.common.feature-4.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm.common.feature/target/org.jboss.tools.jbpm.common.feature-4.3.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm.common.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm.convert.feature/target/org.jboss.tools.jbpm.convert.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm.convert.feature/target/org.jboss.tools.jbpm.convert.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm.convert.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm3.feature/target/org.jboss.tools.jbpm3.feature-3.2.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm3.feature/target/org.jboss.tools.jbpm3.feature-3.2.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm3.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm3.tests.feature/target/org.jboss.tools.jbpm3.tests.feature-3.2.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm3.tests.feature/target/org.jboss.tools.jbpm3.tests.feature-3.2.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm3.tests.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm4.feature/target/org.jboss.tools.jbpm4.feature-4.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm4.feature/target/org.jboss.tools.jbpm4.feature-4.0.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm4.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm4.tests.feature/target/org.jboss.tools.jbpm4.tests.feature-4.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jboss.tools.jbpm4.tests.feature/target/org.jboss.tools.jbpm4.tests.feature-4.3.0-SNAPSHOT.jar" value="org.jboss.tools.jbpm4.tests.feature" /> - <property name="get.feature.id.expected.jbpm/features/org.jbpm.gd.jpdl.feature/target/org.jbpm.gd.jpdl.feature-3.2.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jbpm/features/org.jbpm.gd.jpdl.feature/target/org.jbpm.gd.jpdl.feature-3.2.0-SNAPSHOT.jar" value="org.jbpm.gd.jpdl.feature" /> - <property name="get.feature.id.expected.jmx/features/org.jboss.tools.jmx.feature/target/org.jboss.tools.jmx.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jmx/features/org.jboss.tools.jmx.feature/target/org.jboss.tools.jmx.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.jmx.feature" /> - <property name="get.feature.id.expected.jmx/features/org.jboss.tools.jmx.tests.feature/target/org.jboss.tools.jmx.tests.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jmx/features/org.jboss.tools.jmx.tests.feature/target/org.jboss.tools.jmx.tests.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.jmx.tests.feature" /> - <property name="get.feature.id.expected.archives/features/org.jboss.ide.eclipse.archives.feature/target/org.jboss.ide.eclipse.archives.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.archives/features/org.jboss.ide.eclipse.archives.feature/target/org.jboss.ide.eclipse.archives.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.ide.eclipse.archives.feature" /> - <property name="get.feature.id.expected.archives/features/org.jboss.ide.eclipse.archives.test.feature/target/org.jboss.ide.eclipse.archives.test.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.archives/features/org.jboss.ide.eclipse.archives.test.feature/target/org.jboss.ide.eclipse.archives.test.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.ide.eclipse.archives.test.feature" /> - <property name="get.feature.id.expected.as/features/org.jboss.ide.eclipse.as.test.feature/target/org.jboss.ide.eclipse.as.test.feature-2.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.as/features/org.jboss.ide.eclipse.as.test.feature/target/org.jboss.ide.eclipse.as.test.feature-2.1.0-SNAPSHOT.jar" value="org.jboss.ide.eclipse.as.test.feature" /> - <property name="get.feature.id.expected.bpel/features/org.jboss.tools.bpel.feature/target/org.jboss.tools.bpel.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.bpel/features/org.jboss.tools.bpel.feature/target/org.jboss.tools.bpel.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.bpel.feature" /> - <property name="get.feature.id.expected.bpel/features/org.jboss.tools.bpel.tests.feature/target/org.jboss.tools.bpel.tests.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.bpel/features/org.jboss.tools.bpel.tests.feature/target/org.jboss.tools.bpel.tests.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.bpel.tests.feature" /> - <property name="get.feature.id.expected.smooks/features/org.jboss.tools.smooks.feature/target/org.jboss.tools.smooks.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.smooks/features/org.jboss.tools.smooks.feature/target/org.jboss.tools.smooks.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.smooks.feature" /> - <property name="get.feature.id.expected.smooks/features/org.jboss.tools.smooks.test.feature/target/org.jboss.tools.smooks.test.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.smooks/features/org.jboss.tools.smooks.test.feature/target/org.jboss.tools.smooks.test.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.smooks.test.feature" /> - <property name="get.feature.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.feature/target/org.jboss.ide.eclipse.freemarker.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.feature/target/org.jboss.ide.eclipse.freemarker.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.ide.eclipse.freemarker.feature" /> - <property name="get.feature.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/target/org.jboss.ide.eclipse.freemarker.test.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/target/org.jboss.ide.eclipse.freemarker.test.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.ide.eclipse.freemarker.test.feature" /> - <property name="get.feature.id.expected.profiler/features/org.jboss.tools.profiler.feature/target/org.jboss.tools.profiler.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.profiler/features/org.jboss.tools.profiler.feature/target/org.jboss.tools.profiler.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.profiler.feature" /> - <property name="get.feature.id.expected.portlet/features/org.jboss.tools.portlet.feature/target/org.jboss.tools.portlet.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.portlet/features/org.jboss.tools.portlet.feature/target/org.jboss.tools.portlet.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.portlet.feature" /> - <property name="get.feature.id.expected.portlet/features/org.jboss.tools.portlet.test.feature/target/org.jboss.tools.portlet.test.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.portlet/features/org.jboss.tools.portlet.test.feature/target/org.jboss.tools.portlet.test.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.portlet.test.feature" /> - <property name="get.feature.id.expected.jst/features/org.jboss.tools.jst.feature/target/org.jboss.tools.jst.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jst/features/org.jboss.tools.jst.feature/target/org.jboss.tools.jst.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.jst.feature" /> - <property name="get.feature.id.expected.jst/features/org.jboss.tools.jst.web.tiles.feature/target/org.jboss.tools.jst.web.tiles.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jst/features/org.jboss.tools.jst.web.tiles.feature/target/org.jboss.tools.jst.web.tiles.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.jst.web.tiles.feature" /> - <property name="get.feature.id.expected.vpe/features/org.jboss.tools.vpe.feature/target/org.jboss.tools.vpe.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.vpe/features/org.jboss.tools.vpe.feature/target/org.jboss.tools.vpe.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.vpe.feature" /> - <property name="get.feature.id.expected.vpe/features/org.jboss.tools.xulrunner.feature/target/org.jboss.tools.xulrunner.feature-1.9.1.2.jar" + <property name="get.artifact.id.expected.vpe/features/org.jboss.tools.xulrunner.feature/target/org.jboss.tools.xulrunner.feature-1.9.1.2.jar" value="org.jboss.tools.xulrunner.feature" /> - <property name="get.feature.id.expected.jsf/features/org.jboss.tools.jsf.feature/target/org.jboss.tools.jsf.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jsf/features/org.jboss.tools.jsf.feature/target/org.jboss.tools.jsf.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.jsf.feature" /> - <property name="get.feature.id.expected.jsf/features/org.jboss.tools.richfaces.feature/target/org.jboss.tools.richfaces.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.jsf/features/org.jboss.tools.richfaces.feature/target/org.jboss.tools.richfaces.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.richfaces.feature" /> - <property name="get.feature.id.expected.esb/features/org.jboss.tools.esb.feature/target/org.jboss.tools.esb.feature-1.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.esb/features/org.jboss.tools.esb.feature/target/org.jboss.tools.esb.feature-1.3.0-SNAPSHOT.jar" value="org.jboss.tools.esb.feature" /> - <property name="get.feature.id.expected.esb/features/org.jboss.tools.esb.test.feature/target/org.jboss.tools.esb.test.feature-1.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.esb/features/org.jboss.tools.esb.test.feature/target/org.jboss.tools.esb.test.feature-1.3.0-SNAPSHOT.jar" value="org.jboss.tools.esb.test.feature" /> - <property name="get.feature.id.expected.tptp/features/org.jboss.tools.tptp.feature/target/org.jboss.tools.tptp.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.tptp/features/org.jboss.tools.tptp.feature/target/org.jboss.tools.tptp.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.tptp.feature" /> - <property name="get.feature.id.expected.ws/features/org.jboss.tools.ws.feature/target/org.jboss.tools.ws.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.ws/features/org.jboss.tools.ws.feature/target/org.jboss.tools.ws.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.ws.feature" /> - <property name="get.feature.id.expected.cdi/features/org.jboss.tools.cdi.feature/target/org.jboss.tools.cdi.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.cdi/features/org.jboss.tools.cdi.feature/target/org.jboss.tools.cdi.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.cdi.feature" /> - <property name="get.feature.id.expected.struts/features/org.jboss.tools.struts.feature/target/org.jboss.tools.struts.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.struts/features/org.jboss.tools.struts.feature/target/org.jboss.tools.struts.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.struts.feature" /> - <property name="get.feature.id.expected.hibernatetools/features/org.hibernate.eclipse.feature/target/org.hibernate.eclipse.feature-3.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.hibernatetools/features/org.hibernate.eclipse.feature/target/org.hibernate.eclipse.feature-3.3.0-SNAPSHOT.jar" value="org.hibernate.eclipse.feature" /> - <property name="get.feature.id.expected.hibernatetools/features/org.hibernate.eclipse.test.feature/target/org.hibernate.eclipse.test.feature-3.3.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.hibernatetools/features/org.hibernate.eclipse.test.feature/target/org.hibernate.eclipse.test.feature-3.3.0-SNAPSHOT.jar" value="org.hibernate.eclipse.test.feature" /> - <property name="get.feature.id.expected.seam/features/org.jboss.tools.seam.feature/target/org.jboss.tools.seam.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.seam/features/org.jboss.tools.seam.feature/target/org.jboss.tools.seam.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.seam.feature" /> - <property name="get.feature.id.expected.seam/features/org.jboss.tools.seam.test.feature/target/org.jboss.tools.seam.test.feature-3.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.seam/features/org.jboss.tools.seam.test.feature/target/org.jboss.tools.seam.test.feature-3.1.0-SNAPSHOT.jar" value="org.jboss.tools.seam.test.feature" /> - <property name="get.feature.id.expected.examples/features/org.jboss.tools.community.project.examples.feature/target/org.jboss.tools.community.project.examples.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.examples/features/org.jboss.tools.community.project.examples.feature/target/org.jboss.tools.community.project.examples.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.community.project.examples.feature" /> - <property name="get.feature.id.expected.examples/features/org.jboss.tools.project.examples.feature/target/org.jboss.tools.project.examples.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.examples/features/org.jboss.tools.project.examples.feature/target/org.jboss.tools.project.examples.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.project.examples.feature" /> - <property name="get.feature.id.expected.examples/features/org.jboss.tools.project.examples.test.feature/target/org.jboss.tools.project.examples.test.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.examples/features/org.jboss.tools.project.examples.test.feature/target/org.jboss.tools.project.examples.test.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.project.examples.test.feature" /> - <property name="get.feature.id.expected.birt/features/org.jboss.tools.birt.feature/target/org.jboss.tools.birt.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.birt/features/org.jboss.tools.birt.feature/target/org.jboss.tools.birt.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.birt.feature" /> - <property name="get.feature.id.expected.birt/features/org.jboss.tools.birt.test.feature/target/org.jboss.tools.birt.test.feature-1.1.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.birt/features/org.jboss.tools.birt.test.feature/target/org.jboss.tools.birt.test.feature-1.1.0-SNAPSHOT.jar" value="org.jboss.tools.birt.test.feature" /> - <property name="get.feature.id.expected.maven/features/org.jboss.tools.maven.feature/target/org.jboss.tools.maven.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.maven/features/org.jboss.tools.maven.feature/target/org.jboss.tools.maven.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.maven.feature" /> - <property name="get.feature.id.expected.maven/features/org.jboss.tools.maven.seam.feature/target/org.jboss.tools.maven.seam.feature-1.0.0-SNAPSHOT.jar" + <property name="get.artifact.id.expected.maven/features/org.jboss.tools.maven.seam.feature/target/org.jboss.tools.maven.seam.feature-1.0.0-SNAPSHOT.jar" value="org.jboss.tools.maven.seam.feature" /> + <property name="get.artifact.id.expected.as/features/org.jboss.ide.eclipse.as.feature/target/org.jboss.ide.eclipse.as.feature-2.1.0-SNAPSHOT.jar" + value="org.jboss.ide.eclipse.as.feature" + /> + <property name="get.artifact.id.expected.xulrunner/features/org.mozilla.xpcom.feature/target/org.mozilla.xpcom.feature-1.9.1.2a.jar" + value="org.mozilla.xpcom.feature" + /> + <property name="get.artifact.id.expected.xulrunner/features/org.mozilla.xulrunner.feature/target/org.mozilla.xulrunner.feature-1.9.1.2.jar" + value="org.mozilla.xulrunner.feature" + /> + + <!-- expected values for test.get.plugin.id --> + <property name="get.artifact.id.expected.drools/plugins/org.eclipse.webdav_3.0.101.jar" + value="org.eclipse.webdav" + /> + <property name="get.artifact.id.expected.drools/plugins/org.guvnor.tools_5.1.0.SNAPSHOT.jar" + value="org.guvnor.tools" + /> + <property name="get.artifact.id.expected.drools/plugins/org.drools.eclipse_5.1.0.SNAPSHOT.jar" + value="org.drools.eclipse" + /> + <property name="get.artifact.id.expected.drools/plugins/org.drools.eclipse.task_5.1.0.SNAPSHOT.jar" + value="org.drools.eclipse.task" + /> + </target> <target name="test.all"> <antcall target="test.get.sources.build.all" /> <antcall target="test.get.sources" /> + <antcall target="test.get.feature.id" /> + <antcall target="test.get.plugin.id.drools" /> </target> + <!-- simpler tests, run faster --> + <target name="test.get.feature.id.vpe"> + <antcall target="test.get.feature.id"> + <param name="COMPONENTS" value="vpe" /> + </antcall> + </target> + <target name="test.get.plugin.id.drools"> + <antcall target="test.get.plugin.id"> + <param name="COMPONENTS" value="drools" /> + </antcall> + </target> + + <!-- test all feature.id fetches --> + <target name="test.get.feature.id" depends="init, test.expected.values"> + <for param="COMPONENT" list="${COMPONENTS}" delimiter=";, + "> + <sequential> + <echo level="warn">Test feature.ids for @{COMPONENT}</echo> + <for param="artifactJar" delimiter=", "> + <path> + <fileset dir="${basedir}/@{COMPONENT}" includes="**/features/**/target/*.jar" /> + </path> + <sequential> + <echo level="info">Test @{artifactJar}</echo> + <antcallback target="get.artifact.id" return="artifact.id"> + <property name="artifactJar" value="@{artifactJar}" /> + <param name="regexp.path" value=".+/features/[^/]+/target/([^/]+feature.+\.jar)" /> + </antcallback> + <propertyregex override="true" + property="artifact.id.expected.name" + defaultvalue="@{artifactJar}" + input="@{artifactJar}" + regexp="${basedir}\/(.+)" + replace="get.artifact.id.expected.\1" + /> + <!-- <echo>&lt;property name="get.artifact.id.expected.@{artifactJar}" value="${artifact.id}"/&gt; </echo> --> + <propertycopy name="artifact.id.expected" from="${artifact.id.expected.name}" /> + <assert failonerror="true" message="Expected: ${artifact.id.expected}; got: ${artifact.id}"> + <bool> + <equals arg1="${artifact.id.expected}" arg2="${artifact.id}" /> + </bool> + </assert> + <var name="artifact.id.expected" unset="true" /> + </sequential> + </for> + </sequential> + </for> + </target> + + <!-- test all plugin.id fetches --> + <target name="test.get.plugin.id" depends="init, test.expected.values"> + <for param="COMPONENT" list="${COMPONENTS}" delimiter=";, + "> + <sequential> + <echo level="warn">Test plugin.ids for @{COMPONENT}</echo> + <for param="artifactJar" delimiter=", "> + <path> + <fileset dir="${basedir}/@{COMPONENT}" includes="**/plugins/*.jar" excludes="**/target/**" /> + </path> + <sequential> + <echo level="info">[1] Test @{artifactJar}</echo> + <antcallback target="get.artifact.id" return="artifact.id"> + <property name="artifactJar" value="@{artifactJar}" /> + <property name="regexp.path" value=".+/plugins/([^/]+.+\.jar)" /> + </antcallback> + <propertyregex override="true" + property="artifact.id.expected.name" + defaultvalue="@{artifactJar}" + input="@{artifactJar}" + regexp="${basedir}\/(.+)" + replace="get.artifact.id.expected.\1" + /> + <!-- <echo>&lt;property name="get.artifact.id.expected.@{artifactJar}" value="${artifact.id}"/&gt; </echo> --> + <propertycopy name="artifact.id.expected" from="${artifact.id.expected.name}" /> + <assert failonerror="true" message="Expected: ${artifact.id.expected}; got: ${artifact.id}"> + <bool> + <equals arg1="${artifact.id.expected}" arg2="${artifact.id}" /> + </bool> + </assert> + <var name="artifact.id.expected" unset="true" /> + <var name="artifact.id" unset="true" /> + + <echo level="info">[2] Test @{artifactJar}</echo> + <antcallback target="get.plugin.id" return="plugin.id"> + <property name="artifactJar" value="@{artifactJar}" /> + <property name="regexp.path" value=".+/plugins/([^/]+.+\.jar)" /> + </antcallback> + <propertyregex override="true" + property="artifact.id.expected.name" + defaultvalue="@{artifactJar}" + input="@{artifactJar}" + regexp="${basedir}\/(.+)" + replace="get.artifact.id.expected.\1" + /> + <!-- <echo>&lt;property name="get.artifact.id.expected.@{artifactJar}" value="${artifact.id}"/&gt; </echo> --> + <propertycopy name="artifact.id.expected" from="${artifact.id.expected.name}" /> + <assert failonerror="true" message="Expected: ${artifact.id.expected}; got: ${plugin.id}"> + <bool> + <equals arg1="${artifact.id.expected}" arg2="${plugin.id}" /> + </bool> + </assert> + <var name="artifact.id.expected" unset="true" /> + <var name="artifact.id" unset="true" /> + </sequential> + </for> + </sequential> + </for> + </target> + <target name="test.get.sources.build.all" depends="init, test.expected.values" description="verify get.sources works to fetch, then update; verify all components will be built"