Author: nickboldt Date: 2011-08-01 01:47:42 -0400 (Mon, 01 Aug 2011) New Revision: 33403 Modified: trunk/build/aggregate/soa-site/build.xml Log: apply changes to ../site/build.xml to ../soa-site/build.xml to suppress using staging.previous URLs Modified: trunk/build/aggregate/soa-site/build.xml =================================================================== --- trunk/build/aggregate/soa-site/build.xml 2011-08-01 05:37:19 UTC (rev 33402) +++ trunk/build/aggregate/soa-site/build.xml 2011-08-01 05:47:42 UTC (rev 33403) @@ -276,30 +276,49 @@ <echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo> <xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" /> <echo level="verbose">Found ${repository.children.size} contained repos to search</echo> + + <!-- counter variable --> + <var name="counter" value="" /> <!-- foreach entry repository.children.child.location --> <for param="location" list="${repository.children.child.location}"> <sequential> + <var name="counter" value="${counter}0" /> + <var name="i" unset="true"/> + <length property="i" string="${counter}" /> <if> - <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" /> + <not> + <contains string="@{location}" substring="/staging.previous/"/> + </not> <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" /> <if> - <not> - <available file="${location.cleaned}" /> - </not> + <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" /> <then> + <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" /> + <if> + <not> + <available file="${location.cleaned}" /> + </not> + <then> + <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> + </then> + </if> + </then> + <else> <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </then> + </else> </if> + <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> + <fetchZipsFromList repo="${location.cleaned}" /> </then> <else> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> + <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> </else> </if> - <echo level="error">Site URL = ${location.cleaned} (@{location})</echo> - <fetchZipsFromList repo="${location.cleaned}" /> </sequential> </for> + <var name="counter" unset="true" /> + <var name="i" unset="true"/> + <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> </then> <else>