August 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r34431 - branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 02:52:38 -0400 (Wed, 31 Aug 2011) New Revision: 34431 Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: JBIDE-9464 remove org.jboss.tools.esb.ui.bot.test from site for now Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-31 06:43:03 UTC (rev 34430) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-31 06:52:38 UTC (rev 34431) @@ -42,7 +42,7 @@ <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> +  <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34430 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 02:43:03 -0400 (Wed, 31 Aug 2011) New Revision: 34430 Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: JBIDE-9464 remove org.jboss.tools.esb.ui.bot.test from site for now Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-31 06:39:13 UTC (rev 34429) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-31 06:43:03 UTC (rev 34430) @@ -42,7 +42,7 @@ <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> +  <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34429 - branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 02:39:13 -0400 (Wed, 31 Aug 2011) New Revision: 34429 Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/README.installation.txt branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index-template.html branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index.html branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/remove-uncategorized.xsl Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml Log: add missing files to make bottests site work Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/README.installation.txt =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/README.installation.txt (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/README.installation.txt 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,10 @@ +This file is an Eclipse update zip to be used from within an Eclipse installations update manager. + +Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work. + +In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager +( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from +this zip file. + +For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip + Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/build.xml 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,704 @@ +<project default="custom.build" name="jbosstools aggregate site build.xml"> + +  + +  + <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + + <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${COMMON_TOOLS}" /> + + <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> + <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build/build.xml"> + <available file="${basedir}/../../build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build.xml"> + <available file="${basedir}/../../build.xml" type="file" /> + </condition> +  + + <property name="update.site.source.dir" value="${output.dir}/target/site" /> + +  + <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> + <property file="${aggregateSite.properties}" /> + + <target name="init"> + <ant antfile="${build.xml}" target="init" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> + </classpath> + </taskdef> + </target> + + <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" /> + +  + <macrodef name="fetchZipsFromList"> + <attribute name="repo" default="" /> + <sequential> + + <var name="location.cleaned" value="@{repo}" /> + <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> + <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> + + <echo level="verbose">repo = ${location.cleaned}</echo> +  + <var unset="true" name="ALL_ZIPS" /> + <var unset="true" name="wget.return" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" /> + </else> + </if> + + <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo> + <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" /> + </else> + </if> + + <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo> + <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" /> + </else> + </if> + + <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo> + <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" /> + </else> + </if> + + <if> + <or> + <and> + <contains string="${location.cleaned}" substring=":/" /> + <equals arg1="${wget.return}" arg2="0" /> + <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> + </and> + <and> + <not> + <contains string="${location.cleaned}" substring=":/" /> + </not> + <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> + </and> + </or> + <then> +  + <var unset="true" name="ALL_ZIPS" /> + <property file="${aggregate.zips.dir}/zip.list.txt" /> + <if> + <isset property="ALL_ZIPS" /> + <then> + <var name="relativePath" unset="true" /> + <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> + <sequential> + <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" /> + + <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" /> + <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" /> + + <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" /> + <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> + + <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> + + <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> +  + <echo level="verbose">repoNum = @{repoNum} +relativePath = ${relativePath} +svnrevPath = ${svnrevPath} +buildPropertiesPath = ${buildPropertiesPath} +zipPath = @{zipPath} +DEST = ${aggregate.zips.dir}/@{zipPath} +</echo> + <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo> + <if> + <isset property="isTest" /> + <then> +  + <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo> + </then> + <else> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + + <var name="wget.return" unset="true" /> + <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" /> + </exec> + <if> + <not> + <equals arg1="${wget.return}" arg2="0" /> + </not> + <then> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo> + </then> + </if> + </then> + <else> + <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" /> + </else> + </if> + </else> + </if> + + <if> + <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> + <then> +  + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} +</echo> +  + <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> +  +  +  + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b} +</echo> + <var name="fs.length.b" unset="true" /> + <var name="fs.length.kb" unset="true" /> + +  + <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> + <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} +</echo> + <var name="${filePrefix}.filemd5" unset="true" /> + <var name="tempmd5" unset="true" /> + </then> + </if> + +  + <if> + <available file="${svnRevTXT}" type="file" /> + <then> + <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" /> + </then> + </if> + <if> + <available file="${svnRevXML}" type="file" /> + <then> + <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" /> + </then> + </if> + <if> + <available file="${buildProperties}" type="file" /> + <then> + <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" /> + </then> + </if> + </sequential> + </for> + <var name="relativePath" unset="true" /> + <var name="svnrevPath" unset="true" /> + <var name="buildPropertiesPath" unset="true" /> + </then> + </if> + <var unset="true" name="ALL_ZIPS" /> + </then> + <else> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo> + </else> + </if> + <var name="location.cleaned" unset="true" /> + <delete quiet="true"> + <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" /> + </delete> + <var name="svnRevFile" unset="true" /> + </sequential> + </macrodef> + +  + <macrodef name="fetchZipsFromMetadata"> + <attribute name="repo" default="" /> + <sequential> + <var name="location.cleaned" value="@{repo}" /> + <echo level="verbose">repo = ${location.cleaned}</echo> +  + <var name="wget.return" unset="true" /> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" /> + </exec> + <if> + <and> + <equals arg1="${wget.return}" arg2="0" /> + <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" /> + </and> + <then> + <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> + +  + <var name="counter" value="" /> +  + <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> + <not> + <contains string="@{location}" substring="/staging.previous/"/> + </not> + <then> + <if> + <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/" /> + </else> + </if> + <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> + <fetchZipsFromList repo="${location.cleaned}" /> + </then> + <else> + <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> + </else> + </if> + </sequential> + </for> + <var name="counter" unset="true" /> + <var name="i" unset="true"/> + + <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> + </then> + <else> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo> + </else> + </if> + </sequential> + </macrodef> + + <target name="add.associate.sites" if="associate.sites"> + <if> + <and> +  + <isset property="associate.sites" /> + <not> + <equals arg1="${associate.sites}" arg2="" /> + </not> + </and> + <then> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> +  + <var name="associate.sites.0" value="" /> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> + <var name="associate.sites.0" value="${associate.sites.0}00" /> + </sequential> + </for> + <length property="associate.sites.length" string="${associate.sites.0}" /> + + <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> + <filterchain> + <tailfilter lines="-1" skip="1" /> + </filterchain> + </loadfile> + <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> + <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> +</echo> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> +  + <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> + <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> +</echo> + </sequential> + </for> + <echo file="${update.site.source.dir}/content.xml" append="true"> </references> +</repository> +</echo> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> + <delete file="${update.site.source.dir}/content.xml" /> + <delete file="${update.site.source.dir}/content.old.xml" /> + </then> + </if> + </target> + + <target name="unpack.zip"> + <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> + </target> + + <target name="pack.zip"> + <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" /> + </target> + + <target name="check.target"> + <if> + <or> + <not> + <available file="${output.dir}/target/site" type="dir" /> + </not> + <not> + <available file="${output.dir}/target/site_assembly.zip" type="file" /> + </not> + </or> + <then> + <fail> +-- +This script must ONLY be called via the pom.xml in this directory, not run directly. +Cannot adjust an update site w/o first building it! +-- +To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` +</fail> + </then> + </if> + </target> + + <target name="add.web.content"> +  + <property name="update.site.description" value="Nightly Build" /> + <if> + <and> + <not> + <isset property="update.site.version" /> + </not> + <isset property="JOB_NAME" /> + <isset property="BUILD_ID" /> + <isset property="BUILD_NUMBER" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <property name="update.site.version" value="" /> + </else> + </if> + + <copy todir="${output.dir}" overwrite="true"> + <fileset file="index-template.html" /> + <mapper type="merge" to="index.html" /> + <filterchain> + <expandproperties /> + </filterchain> + </copy> + + <copy todir="${update.site.source.dir}"> + <fileset dir="${output.dir}" includes="index.html, **/*.css, README*" /> + </copy> + </target> + +  + <target name="collect.zips" description="collect zips from the sites we aggregated"> + <property name="aggregate.zips.dir" value="${output.dir}/zips" /> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + <mkdir dir="${aggregate.zips.dir}" /> + <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum"> + <sequential> + <var name="repo" value="${inputRepo@{repoNum}}" /> + <if> + <contains string="${repo}" substring="composite" /> + <then> + <fetchZipsFromMetadata repo="${repo}" /> + </then> + <else> + <fetchZipsFromList repo="${repo}" /> + </else> + </if> + </sequential> + </for> + </target> + + <target name="test.collect.zips.from.metadata" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" /> + </antcall> + </target> + + <target name="test.collect.zips.from.metadata.with.errors" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.xml" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2,3,4" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.txt" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2,3,4,5" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> + <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.with.errors" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2" /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + </antcall> + </target> + + <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml"> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + </target> + + <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors"> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + </target> + + <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> + <property name="aggregate.zips.dir" value="${output.dir}/zips" /> + +  + <if> + <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> + <then> + <property file="${aggregate.zips.dir}/build.properties.file.txt" /> + </then> + </if> + +  + <for param="propsfile"> + <path> + <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> + </path> + <sequential> +  + <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> + <echo level="verbose">Read ${prefix} from @{propsfile}</echo> + + <property file="@{propsfile}" prefix="${prefix}" /> + +  + <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" /> + <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" /> + <if> + <available file="${svnrevXML}" type="file" /> + <then> +  + <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> +  + <if> + <isset property="${prefix}.kind" /> + <then> + <var name="${prefix}.kind" unset="true" /> + </then> + </if> + +  + <if> + <and> + <isset property="${prefix}.revision.module" /> + <isset property="${prefix}.revision.revision" /> + </and> + <then> + <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> + <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> + <var name="i" value="0" /> + <for list="${temprm.all}" delimiter=", " param="module"> + <sequential> + <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" /> + <var name="j" value="0" /> + <for list="${temprr.all}" delimiter=", " param="revision"> + <sequential> + <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" /> + <if> + <equals arg1="${i}" arg2="${j}" /> + <then> + <var name="temprr" value="@{revision}" /> + <if> + <isset property="${prefix}.SVN_REVISION" /> + <then> + <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" /> + <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" /> + <var name="temp.all" unset="true" /> + </then> + <else> + <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" /> + </else> + </if> + <var name="temprr" unset="true" /> + </then> + </if> + </sequential> + </for> + <var name="j" unset="true" /> + </sequential> + </for> + <var name="i" unset="true" /> + <var name="temprm.all" unset="true" /> + <var name="temprr.all" unset="true" /> + </then> + </if> + </then> + <elseif> + <available file="${svnrevTXT}" type="file" /> + <then> +  + <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" /> + <propertycopy from="${prefix}.SVN_REVISION" property="temp" /> + <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," /> + <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" /> + +  + <for list="${temp}" delimiter="," param="pair"> + <sequential> + <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" /> + <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" /> + <if> + <isset property="${prefix}.revision.module" /> + <then> + <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> + <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> + <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" /> + <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" /> + <var name="temprm.all" unset="true" /> + <var name="temprr.all" unset="true" /> + </then> + <else> + <var name="${prefix}.revision.module" value="${temprm}" /> + <var name="${prefix}.revision.revision" value="${temprr}" /> + </else> + </if> + <var name="temprm" unset="true" /> + <var name="temprr" unset="true" /> + </sequential> + </for> + <var name="temp" unset="true" /> + </then> + </elseif> + </if> + + <var name="prefix" unset="true" /> + </sequential> + + </for> + <for param="svnrevfile"> + <path> + <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" /> + </path> + <sequential> +  + <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> + <echo level="verbose">Read ${prefix} from @{propsfile}</echo> + + <property file="@{propsfile}" prefix="${prefix}" /> + + <var name="prefix" unset="true" /> + </sequential> + + </for> +  + <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml"> + <propertyset> + <propertyref regex=".*\.build\.properties" /> + </propertyset> + </echoproperties> + + </target> + + <target name="test.collect.metadata" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.metadata"> + </antcall> + </target> + +  + <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job"> + </target> + + <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata"> + <property name="isTest" value="true" /> + <antcall target="create.summary.file"> + </antcall> + </target> + +</project> Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index-template.html =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index-template.html (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index-template.html 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,134 @@ +<html> +<head> +<title>JBoss Tools - Bot Tests - ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools - Bot Tests - ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for JBoss Tools - Bot Tests. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> + +Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. + </p> + + <ul> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0/">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li> + <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google Plugin for Eclipse 3.7 (Indigo)</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index.html =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index.html (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/index.html 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,134 @@ +<html> +<head> +<title>JBoss Tools - Bot Tests - Nightly Build Update Site</title> +<style> +@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>Nightly Build</b> + Update Site for JBoss Tools - Bot Tests. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> + +Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. + </p> + + <ul> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0/">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li> + <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google Plugin for Eclipse 3.7 (Indigo)</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Modified: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml 2011-08-31 06:36:21 UTC (rev 34428) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/pom.xml 2011-08-31 06:39:13 UTC (rev 34429) @@ -8,6 +8,111 @@ </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.site</artifactId> + <name>JBoss Tools - Bot Tests - Aggregate Site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> + +  + <properties> +  +  + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1> + <inputRepos>1</inputRepos> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + <executions> + <execution> + <id>install</id> + <phase>install</phase> + <configuration> + <quiet>true</quiet> + <tasks> + <property name="inputRepo1" value="${inputRepo1}"/> + <property name="inputRepos" value="${inputRepos}"/> + +  + <ant antfile="build.xml"/> + </tasks> + + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-commons-net</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-apache-regexp</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <repositories> +  + <repository> + <id>inputRepo1</id> + <url>${inputRepo1}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>jbosstools-requirements-composite-mirror</id> + <url>http://download.jboss.org/jbosstools/updates/indigo/SR0/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> </project> Added: branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/remove-uncategorized.xsl =================================================================== --- branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/remove-uncategorized.xsl (rev 0) +++ branches/jbosstools-3.3.0.M3/build/aggregate/bottests-site/site/remove-uncategorized.xsl 2011-08-31 06:39:13 UTC (rev 34429) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> + +<xsl:template match="/"> + <xsl:apply-templates select="*"/> +</xsl:template> + + +<xsl:template match="*"> + <xsl:copy > + <xsl:for-each select="@*"> + <xsl:copy /> + </xsl:for-each> + <xsl:apply-templates /> + </xsl:copy> +</xsl:template> + +<xsl:template match="unit[contains(@id,'site.xml.Default')]" /> + +</xsl:stylesheet> \ No newline at end of file

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34428 - trunk/build/aggregate/bottests-site/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 02:36:21 -0400 (Wed, 31 Aug 2011) New Revision: 34428 Added: trunk/build/aggregate/bottests-site/site/README.installation.txt trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/bottests-site/site/index-template.html trunk/build/aggregate/bottests-site/site/index.html trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl Modified: trunk/build/aggregate/bottests-site/site/pom.xml Log: add missing files to make bottests site work Added: trunk/build/aggregate/bottests-site/site/README.installation.txt =================================================================== --- trunk/build/aggregate/bottests-site/site/README.installation.txt (rev 0) +++ trunk/build/aggregate/bottests-site/site/README.installation.txt 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,10 @@ +This file is an Eclipse update zip to be used from within an Eclipse installations update manager. + +Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work. + +In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager +( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from +this zip file. + +For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip + Added: trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties (rev 0) +++ trunk/build/aggregate/bottests-site/site/aggregateSite.jbosstools.properties 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,7 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/ Added: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml (rev 0) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,704 @@ +<project default="custom.build" name="jbosstools aggregate site build.xml"> + +  + +  + <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + + <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${COMMON_TOOLS}" /> + + <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> + <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build/build.xml"> + <available file="${basedir}/../../build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build.xml"> + <available file="${basedir}/../../build.xml" type="file" /> + </condition> +  + + <property name="update.site.source.dir" value="${output.dir}/target/site" /> + +  + <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> + <property file="${aggregateSite.properties}" /> + + <target name="init"> + <ant antfile="${build.xml}" target="init" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> + </classpath> + </taskdef> + </target> + + <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" /> + +  + <macrodef name="fetchZipsFromList"> + <attribute name="repo" default="" /> + <sequential> + + <var name="location.cleaned" value="@{repo}" /> + <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> + <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> + + <echo level="verbose">repo = ${location.cleaned}</echo> +  + <var unset="true" name="ALL_ZIPS" /> + <var unset="true" name="wget.return" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" /> + </else> + </if> + + <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo> + <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" /> + </else> + </if> + + <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo> + <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" /> + </else> + </if> + + <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo> + <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" /> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" /> + </exec> + </then> + <else> + <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" /> + </else> + </if> + + <if> + <or> + <and> + <contains string="${location.cleaned}" substring=":/" /> + <equals arg1="${wget.return}" arg2="0" /> + <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> + </and> + <and> + <not> + <contains string="${location.cleaned}" substring=":/" /> + </not> + <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> + </and> + </or> + <then> +  + <var unset="true" name="ALL_ZIPS" /> + <property file="${aggregate.zips.dir}/zip.list.txt" /> + <if> + <isset property="ALL_ZIPS" /> + <then> + <var name="relativePath" unset="true" /> + <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> + <sequential> + <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" /> + + <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" /> + <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" /> + + <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" /> + <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> + + <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> + + <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> +  + <echo level="verbose">repoNum = @{repoNum} +relativePath = ${relativePath} +svnrevPath = ${svnrevPath} +buildPropertiesPath = ${buildPropertiesPath} +zipPath = @{zipPath} +DEST = ${aggregate.zips.dir}/@{zipPath} +</echo> + <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo> + <if> + <isset property="isTest" /> + <then> +  + <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo> + </then> + <else> + <if> + <contains string="${location.cleaned}" substring=":/" /> + <then> + + <var name="wget.return" unset="true" /> + <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" /> + </exec> + <if> + <not> + <equals arg1="${wget.return}" arg2="0" /> + </not> + <then> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo> + </then> + </if> + </then> + <else> + <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" /> + </else> + </if> + </else> + </if> + + <if> + <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> + <then> +  + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} +</echo> +  + <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> +  +  +  + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b} +</echo> + <var name="fs.length.b" unset="true" /> + <var name="fs.length.kb" unset="true" /> + +  + <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> + <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} +</echo> + <var name="${filePrefix}.filemd5" unset="true" /> + <var name="tempmd5" unset="true" /> + </then> + </if> + +  + <if> + <available file="${svnRevTXT}" type="file" /> + <then> + <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" /> + </then> + </if> + <if> + <available file="${svnRevXML}" type="file" /> + <then> + <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" /> + </then> + </if> + <if> + <available file="${buildProperties}" type="file" /> + <then> + <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" /> + </then> + </if> + </sequential> + </for> + <var name="relativePath" unset="true" /> + <var name="svnrevPath" unset="true" /> + <var name="buildPropertiesPath" unset="true" /> + </then> + </if> + <var unset="true" name="ALL_ZIPS" /> + </then> + <else> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo> + </else> + </if> + <var name="location.cleaned" unset="true" /> + <delete quiet="true"> + <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" /> + </delete> + <var name="svnRevFile" unset="true" /> + </sequential> + </macrodef> + +  + <macrodef name="fetchZipsFromMetadata"> + <attribute name="repo" default="" /> + <sequential> + <var name="location.cleaned" value="@{repo}" /> + <echo level="verbose">repo = ${location.cleaned}</echo> +  + <var name="wget.return" unset="true" /> + <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> + <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" /> + </exec> + <if> + <and> + <equals arg1="${wget.return}" arg2="0" /> + <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" /> + </and> + <then> + <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> + +  + <var name="counter" value="" /> +  + <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> + <not> + <contains string="@{location}" substring="/staging.previous/"/> + </not> + <then> + <if> + <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/" /> + </else> + </if> + <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> + <fetchZipsFromList repo="${location.cleaned}" /> + </then> + <else> + <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> + </else> + </if> + </sequential> + </for> + <var name="counter" unset="true" /> + <var name="i" unset="true"/> + + <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> + </then> + <else> + <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo> + </else> + </if> + </sequential> + </macrodef> + + <target name="add.associate.sites" if="associate.sites"> + <if> + <and> +  + <isset property="associate.sites" /> + <not> + <equals arg1="${associate.sites}" arg2="" /> + </not> + </and> + <then> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> +  + <var name="associate.sites.0" value="" /> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> + <var name="associate.sites.0" value="${associate.sites.0}00" /> + </sequential> + </for> + <length property="associate.sites.length" string="${associate.sites.0}" /> + + <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> + <filterchain> + <tailfilter lines="-1" skip="1" /> + </filterchain> + </loadfile> + <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> + <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> +</echo> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> +  + <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> + <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> +</echo> + </sequential> + </for> + <echo file="${update.site.source.dir}/content.xml" append="true"> </references> +</repository> +</echo> + <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> + <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> + <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> + <delete file="${update.site.source.dir}/content.xml" /> + <delete file="${update.site.source.dir}/content.old.xml" /> + </then> + </if> + </target> + + <target name="unpack.zip"> + <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> + </target> + + <target name="pack.zip"> + <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" /> + </target> + + <target name="check.target"> + <if> + <or> + <not> + <available file="${output.dir}/target/site" type="dir" /> + </not> + <not> + <available file="${output.dir}/target/site_assembly.zip" type="file" /> + </not> + </or> + <then> + <fail> +-- +This script must ONLY be called via the pom.xml in this directory, not run directly. +Cannot adjust an update site w/o first building it! +-- +To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` +</fail> + </then> + </if> + </target> + + <target name="add.web.content"> +  + <property name="update.site.description" value="Nightly Build" /> + <if> + <and> + <not> + <isset property="update.site.version" /> + </not> + <isset property="JOB_NAME" /> + <isset property="BUILD_ID" /> + <isset property="BUILD_NUMBER" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <property name="update.site.version" value="" /> + </else> + </if> + + <copy todir="${output.dir}" overwrite="true"> + <fileset file="index-template.html" /> + <mapper type="merge" to="index.html" /> + <filterchain> + <expandproperties /> + </filterchain> + </copy> + + <copy todir="${update.site.source.dir}"> + <fileset dir="${output.dir}" includes="index.html, **/*.css, README*" /> + </copy> + </target> + +  + <target name="collect.zips" description="collect zips from the sites we aggregated"> + <property name="aggregate.zips.dir" value="${output.dir}/zips" /> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + <mkdir dir="${aggregate.zips.dir}" /> + <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum"> + <sequential> + <var name="repo" value="${inputRepo@{repoNum}}" /> + <if> + <contains string="${repo}" substring="composite" /> + <then> + <fetchZipsFromMetadata repo="${repo}" /> + </then> + <else> + <fetchZipsFromList repo="${repo}" /> + </else> + </if> + </sequential> + </for> + </target> + + <target name="test.collect.zips.from.metadata" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" /> + </antcall> + </target> + + <target name="test.collect.zips.from.metadata.with.errors" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.xml" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2,3,4" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.txt" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2,3,4,5" /> + <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> + <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." /> + </antcall> + </target> + + <target name="test.collect.zips.from.list.with.errors" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.zips"> + <param name="inputRepos" value="1,2" /> + <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." /> + </antcall> + </target> + + <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml"> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + </target> + + <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors"> + <delete dir="${aggregate.zips.dir}" quiet="true" /> + </target> + + <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums"> + <property name="aggregate.zips.dir" value="${output.dir}/zips" /> + +  + <if> + <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> + <then> + <property file="${aggregate.zips.dir}/build.properties.file.txt" /> + </then> + </if> + +  + <for param="propsfile"> + <path> + <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> + </path> + <sequential> +  + <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> + <echo level="verbose">Read ${prefix} from @{propsfile}</echo> + + <property file="@{propsfile}" prefix="${prefix}" /> + +  + <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" /> + <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" /> + <if> + <available file="${svnrevXML}" type="file" /> + <then> +  + <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> +  + <if> + <isset property="${prefix}.kind" /> + <then> + <var name="${prefix}.kind" unset="true" /> + </then> + </if> + +  + <if> + <and> + <isset property="${prefix}.revision.module" /> + <isset property="${prefix}.revision.revision" /> + </and> + <then> + <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> + <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> + <var name="i" value="0" /> + <for list="${temprm.all}" delimiter=", " param="module"> + <sequential> + <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" /> + <var name="j" value="0" /> + <for list="${temprr.all}" delimiter=", " param="revision"> + <sequential> + <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" /> + <if> + <equals arg1="${i}" arg2="${j}" /> + <then> + <var name="temprr" value="@{revision}" /> + <if> + <isset property="${prefix}.SVN_REVISION" /> + <then> + <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" /> + <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" /> + <var name="temp.all" unset="true" /> + </then> + <else> + <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" /> + </else> + </if> + <var name="temprr" unset="true" /> + </then> + </if> + </sequential> + </for> + <var name="j" unset="true" /> + </sequential> + </for> + <var name="i" unset="true" /> + <var name="temprm.all" unset="true" /> + <var name="temprr.all" unset="true" /> + </then> + </if> + </then> + <elseif> + <available file="${svnrevTXT}" type="file" /> + <then> +  + <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" /> + <propertycopy from="${prefix}.SVN_REVISION" property="temp" /> + <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," /> + <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" /> + +  + <for list="${temp}" delimiter="," param="pair"> + <sequential> + <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" /> + <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" /> + <if> + <isset property="${prefix}.revision.module" /> + <then> + <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> + <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> + <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" /> + <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" /> + <var name="temprm.all" unset="true" /> + <var name="temprr.all" unset="true" /> + </then> + <else> + <var name="${prefix}.revision.module" value="${temprm}" /> + <var name="${prefix}.revision.revision" value="${temprr}" /> + </else> + </if> + <var name="temprm" unset="true" /> + <var name="temprr" unset="true" /> + </sequential> + </for> + <var name="temp" unset="true" /> + </then> + </elseif> + </if> + + <var name="prefix" unset="true" /> + </sequential> + + </for> + <for param="svnrevfile"> + <path> + <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" /> + </path> + <sequential> +  + <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> + <echo level="verbose">Read ${prefix} from @{propsfile}</echo> + + <property file="@{propsfile}" prefix="${prefix}" /> + + <var name="prefix" unset="true" /> + </sequential> + + </for> +  + <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml"> + <propertyset> + <propertyref regex=".*\.build\.properties" /> + </propertyset> + </echoproperties> + + </target> + + <target name="test.collect.metadata" depends="init"> + <property name="isTest" value="true" /> + <antcall target="collect.metadata"> + </antcall> + </target> + +  + <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job"> + </target> + + <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata"> + <property name="isTest" value="true" /> + <antcall target="create.summary.file"> + </antcall> + </target> + +</project> Added: trunk/build/aggregate/bottests-site/site/index-template.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index-template.html (rev 0) +++ trunk/build/aggregate/bottests-site/site/index-template.html 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,134 @@ +<html> +<head> +<title>JBoss Tools - Bot Tests - ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools - Bot Tests - ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for JBoss Tools - Bot Tests. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> + +Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. + </p> + + <ul> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0/">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li> + <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google Plugin for Eclipse 3.7 (Indigo)</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Added: trunk/build/aggregate/bottests-site/site/index.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index.html (rev 0) +++ trunk/build/aggregate/bottests-site/site/index.html 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,134 @@ +<html> +<head> +<title>JBoss Tools - Bot Tests - Nightly Build Update Site</title> +<style> +@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>Nightly Build</b> + Update Site for JBoss Tools - Bot Tests. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> + +Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed. + </p> + + <ul> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0/">JBoss Tools Requirements - Composite Mirror - Indigo SR0</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/development/indigo/">JBoss Tools Core Updates - Stable Milestone - Indigo</a></li> + <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google Plugin for Eclipse 3.7 (Indigo)</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-08-31 06:12:07 UTC (rev 34427) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-08-31 06:36:21 UTC (rev 34428) @@ -8,6 +8,111 @@ </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.site</artifactId> + <name>JBoss Tools - Bot Tests - Aggregate Site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> + +  + <properties> +  +  + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1> + <inputRepos>1</inputRepos> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + <executions> + <execution> + <id>install</id> + <phase>install</phase> + <configuration> + <quiet>true</quiet> + <tasks> + <property name="inputRepo1" value="${inputRepo1}"/> + <property name="inputRepos" value="${inputRepos}"/> + +  + <ant antfile="build.xml"/> + </tasks> + + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-commons-net</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-apache-regexp</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <repositories> +  + <repository> + <id>inputRepo1</id> + <url>${inputRepo1}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>jbosstools-requirements-composite-mirror</id> + <url>http://download.jboss.org/jbosstools/updates/indigo/SR0/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> </project> Added: trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl (rev 0) +++ trunk/build/aggregate/bottests-site/site/remove-uncategorized.xsl 2011-08-31 06:36:21 UTC (rev 34428) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> + +<xsl:template match="/"> + <xsl:apply-templates select="*"/> +</xsl:template> + + +<xsl:template match="*"> + <xsl:copy > + <xsl:for-each select="@*"> + <xsl:copy /> + </xsl:for-each> + <xsl:apply-templates /> + </xsl:copy> +</xsl:template> + +<xsl:template match="unit[contains(@id,'site.xml.Default')]" /> + +</xsl:stylesheet> \ No newline at end of file

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34427 - branches/jbosstools-3.3.0.M3.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 02:12:07 -0400 (Wed, 31 Aug 2011) New Revision: 34427 Modified: branches/jbosstools-3.3.0.M3/.project Log: .project file Modified: branches/jbosstools-3.3.0.M3/.project =================================================================== --- branches/jbosstools-3.3.0.M3/.project 2011-08-31 05:51:42 UTC (rev 34426) +++ branches/jbosstools-3.3.0.M3/.project 2011-08-31 06:12:07 UTC (rev 34427) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbosstools_trunk</name> + <name>jbosstools_33x</name> <comment></comment> <projects> </projects>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34426 - branches/jbosstools-3.2.x/build/aggregate/webtools-site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 01:51:42 -0400 (Wed, 31 Aug 2011) New Revision: 34426 Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml Log: remove org.jboss.ide.eclipse.as.archives.integration - not avail in 32x Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-31 05:38:49 UTC (rev 34425) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-31 05:51:42 UTC (rev 34426) @@ -11,9 +11,6 @@ <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"> <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> </feature> - <feature url="features/org.jboss.ide.eclipse.as.archives.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.archives.integration" version="0.0.0"> - <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> - </feature> <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0"> <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> </feature>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34425 - branches/jbosstools-3.2.x/build/aggregate/webtools-site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-08-31 01:38:49 -0400 (Wed, 31 Aug 2011) New Revision: 34425 Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml Log: remove org.jboss.ide.eclipse.as.jmx.integration and org.jboss.ide.eclipse.as.serverAdapter.wtp features; not present in 32x stream Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-31 00:29:29 UTC (rev 34424) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-31 05:38:49 UTC (rev 34425) @@ -14,13 +14,7 @@ <feature url="features/org.jboss.ide.eclipse.as.archives.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.archives.integration" version="0.0.0"> <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> </feature> - <feature url="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_0.0.0.jar" id="org.jboss.ide.eclipse.as.serverAdapter.wtp" version="0.0.0"> - <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> - </feature> <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0"> <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> </feature> - <feature url="features/org.jboss.ide.eclipse.as.jmx.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.jmx.integration" version="0.0.0"> - <category name="JBoss Tools - Web Tools Nightly Build Update Site"/> - </feature> </site>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34424 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-30 20:29:29 -0400 (Tue, 30 Aug 2011) New Revision: 34424 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java Log: JBIDE-9608 https://issues.jboss.org/browse/JBIDE-9608 Prevented multiple invocation of update for dependent cdi projects. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-31 00:29:08 UTC (rev 34423) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-31 00:29:29 UTC (rev 34424) @@ -13,9 +13,12 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.eclipse.core.resources.ICommand; @@ -178,7 +181,7 @@ public List<AnnotationDefinition> getAllAnnotations() { Set<CDICoreNature> ps = getCDIProjects(false); - if(ps == null || ps.isEmpty()) { + if(ps == null || ps.isEmpty() || getCDIProjects(true).contains(this)) { return getDefinitions().getAllAnnotations(); } List<AnnotationDefinition> result = new ArrayList<AnnotationDefinition>(); @@ -236,6 +239,35 @@ return usedBy; } + public CDICoreNature[] getAllDependentProjects() { + Map<CDICoreNature, Integer> set = new HashMap<CDICoreNature, Integer>(); + getAllDependentProjects(set, 0); + CDICoreNature[] result = set.keySet().toArray(new CDICoreNature[set.size()]); + Arrays.sort(result, new D(set)); + return result; + } + private void getAllDependentProjects(Map<CDICoreNature, Integer> result, int level) { + if(level > 10) return; + for (CDICoreNature n:usedBy) { + if(!result.containsKey(n) || result.get(n).intValue() < level) { + result.put(n, level); + n.getAllDependentProjects(result, level + 1); + } + } + } + private static class D implements Comparator<CDICoreNature> { + Map<CDICoreNature, Integer> set; + D(Map<CDICoreNature, Integer> set) { + this.set = set; + } + @Override + public int compare(CDICoreNature o1, CDICoreNature o2) { + return set.get(o1).intValue() - set.get(o2).intValue(); + } + + } + + public void addCDIProject(final CDICoreNature p) { if(dependsOn.contains(p)) return; addUsedCDIProject(p); @@ -246,7 +278,7 @@ public void run() { p.resolve(); if(p.getDelegate() != null) { - p.getDelegate().update(); + p.getDelegate().update(true); } } @@ -361,7 +393,7 @@ definitions.clean(); if(cdiProjectDelegate != null) { - cdiProjectDelegate.update(); + cdiProjectDelegate.update(true); } // IPath[] ps = sourcePaths2.keySet().toArray(new IPath[0]); // for (int i = 0; i < ps.length; i++) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java 2011-08-31 00:29:08 UTC (rev 34423) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java 2011-08-31 00:29:29 UTC (rev 34424) @@ -17,5 +17,5 @@ public CDICoreNature getNature(); public void setNature(CDICoreNature n); - public void update(); + public void update(boolean updateDependent); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 00:29:08 UTC (rev 34423) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 00:29:29 UTC (rev 34424) @@ -973,7 +973,7 @@ return scopesByPath.get(path); } - public void update() { + public void update(boolean updateDependent) { rebuildXML(); rebuildAnnotationTypes(); rebuildBeans(); @@ -988,13 +988,15 @@ bp.buildBeans(this); } } - - CDICoreNature[] ps = n.getDependentProjects().toArray(new CDICoreNature[0]); - for (CDICoreNature p: ps) { - if(p.getProject() != null && p.getProject().isAccessible() && p.getDelegate() != null) { - p.getDelegate().update(); + + if(updateDependent) { + CDICoreNature[] ps = n.getAllDependentProjects(); + for (CDICoreNature p: ps) { + if(p.getProject() != null && p.getProject().isAccessible() && p.getDelegate() != null) { + p.getDelegate().update(false); + } } - } + } CDICorePlugin.fire(new CDIProjectChangeEvent(this)); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-31 00:29:08 UTC (rev 34423) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-31 00:29:29 UTC (rev 34424) @@ -380,7 +380,7 @@ //extensions may add to dependencies while they change dependencies = workingCopy.dependencies; - project.getDelegate().update(); + project.getDelegate().update(true); workingCopy = null; } @@ -414,9 +414,15 @@ || (result.getType().getResource() != null && result.getType().getResource().getProject() != project.getProject()) ) { //3. Look in annotations loaded by used projects - Set<CDICoreNature> ns = project.getCDIProjects(true); + Set<CDICoreNature> ns = project.getCDIProjects(false); + Set<CDICoreNature> ns2 = project.getCDIProjects(true); + boolean cyclic = ns2.contains(project); + if(cyclic) { + ns = ns2; + } for (CDICoreNature n: ns) { - AnnotationDefinition r = n.getDefinitions().getAnnotation(fullyQualifiedName); + DefinitionContext d = n.getDefinitions(); + AnnotationDefinition r = (!cyclic) ? d.getAnnotation(fullyQualifiedName) : d.annotations.get(fullyQualifiedName); if(r != null) { result = r; //4. Store result for the case if used project is cleaned. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-31 00:29:08 UTC (rev 34423) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-31 00:29:29 UTC (rev 34424) @@ -104,14 +104,14 @@ private Set<CDICoreNature> getRootProjects(CDICoreNature project) { Set<CDICoreNature> result = new HashSet<CDICoreNature>(); - Set<CDICoreNature> dependentProjects = project.getDependentProjects(); - if(dependentProjects.isEmpty()) { + CDICoreNature[] dependentProjects = project.getAllDependentProjects(); + if(dependentProjects.length == 0) { result.add(project); } else { for (CDICoreNature nature : dependentProjects) { if(!nature.getProject().isAccessible()) continue; - if(!result.contains(nature)) { - result.addAll(getRootProjects(nature)); + if(nature.getDependentProjects().isEmpty()) { + result.add(nature); } } }

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34423 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-08-30 20:29:08 -0400 (Tue, 30 Aug 2011) New Revision: 34423 Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java Log: JBIDE-9608 https://issues.jboss.org/browse/JBIDE-9608 Prevented multiple invocation of update for dependent cdi projects. Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2011-08-30 23:26:12 UTC (rev 34422) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2011-08-31 00:29:08 UTC (rev 34423) @@ -297,7 +297,7 @@ } @Override - public void update() { + public void update(boolean updateDependent) { } }

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r34422 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-08-30 19:26:12 -0400 (Tue, 30 Aug 2011) New Revision: 34422 Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml Log: updated to include new fixed issues for JBDS 4.1.1 Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml =================================================================== --- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-08-30 22:36:56 UTC (rev 34421) +++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-08-30 23:26:12 UTC (rev 34422) @@ -157,18 +157,23 @@ </para> </formalpara> --> -  + </formalpara> <!-- <formalpara> <title>RichFaces</title> <para> @@ -320,6 +325,21 @@ <ulink url="http://jira.jboss.com/jira/browse/JBIDE-9344">JBIDE-9344</ulink>: When a user would import a project ZIP file using the project example framework, an empty sub-folder would appear that was unnecessary. This issue has been corrected in this release by modifying the <filename>NewProjectExamplesWizard.java</filename> file to check the files being imported and ensure the empty sub-folder no longer appears. </para> </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-9009">JBIDE-9009</ulink>: The option to create a WAR archive would produce an error and the archive would not be created. The user interface menu item to auto-create a WAR archive has been removed from this release. + </para> + </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-8919">JBIDE-8919</ulink>: A new feature has been added that allows for the ESB Runtime within the JBoss Service Oriented Architecture Platform to be separately identified and defined for individual use. + </para> + </listitem> + <listitem> + <para> + <ulink url="http://jira.jboss.com/jira/browse/JBIDE-7052">JBIDE-7052</ulink>: An error existed where the optional dependency of <filename>org.hibernate.eclipse<filename> would not be resolved correctly within the BIRT component file <filename>ConsoleConfigurationOdaFactory.java</filename>. This caused any import of the plug-in to fail. The issue has been corrected by setting the <filename>org.hibernate.eclipse<filename> plug-in as reguired within the BIRT plug-ins <filename>MANIFEST.MF<filename> file. + </para> + </listitem> </itemizedlist> </para> </formalpara> Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml =================================================================== --- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-08-30 22:36:56 UTC (rev 34421) +++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-08-30 23:26:12 UTC (rev 34422) @@ -5,74 +5,14 @@ JBoss Developer Studio 4.1 is a major release of the Eclipse based IDE developed and supported by Red Hat (the visual tooling components are supported for 3 years, and the runtime platform for 5 years). The IDE, which is available for Windows, Linux and OS X, provides tooling that allows for rapid Web 2.0 application development on the JBoss Enterprise Application Platform. This release also improves support for SOA application development with the JBoss Enterprise SOA Platform. </para> <para> - JBoss Developer Studio 4.1 contains many new features, including: + JBoss Developer Studio 4.1.1 contains the following new features: </para> <itemizedlist> <listitem> <para> - Scriptable install of JBoss Developer Studio 4.1. When installing JBoss Developer Studio 4.1, you can now pass the installation a <filename>InstallConfigRecord.xml</filename> file to install with pre-defined settings, ensuring no user interaction is required. For further details see the release note for JBDS-1268 in the new and fixed issues section of this document, or the <emphasis>Getting Started Guide</emphasis> for this release. + The ESB Runtime within the JBoss Service Oriented Architecture Platform is now separately identified and defined for individual use. </para> </listitem> - <listitem> - <para> - Full BPEL Editor support is included with installation of JBoss Developer Studio 4.1, and through the Update site for upgrading from previous releases. To access this plug-in when upgrading from a previous version of JBoss Developer Studio, add the JBoss Developer Studio Update site to your installation; see the Getting Started Guide for further information. - </para> - </listitem> - <listitem> - <para> - Certified third-party components. JBoss Developer Studio 4.1 is released with numerous third-party components that have been tested to work with JBoss Developer Studio and JBoss technologies. The components are as follows: - </para> - <itemizedlist> - <listitem> - <para> - JBoss BPEL Editor (also available with the core installation of JBoss Developer Studio 4.1) - </para> - </listitem> - <listitem> - <para> - Spring - </para> - </listitem> - <listitem> - <para> - TestNG - </para> - </listitem> - <listitem> - <para> - m2eclipse (m2e) - </para> - </listitem> - <listitem> - <para> - Mylyn - </para> - </listitem> - <listitem> - <para> - eGit - </para> - </listitem> - <listitem> - <para> - Subclipse - </para> - </listitem> - <listitem> - <para> - PMD - </para> - </listitem> - <listitem> - <para> - FindBugs - </para> - </listitem> - </itemizedlist> - <para> - These components are available through the extras site; see the Getting Started Guide for further information. - </para> - </listitem> </itemizedlist> <important> <para>

12 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2011