Author: nickboldt Date: 2010-07-16 18:33:14 -0400 (Fri, 16 Jul 2010) New Revision: 23509 Added: trunk/build/aggregate/site/index-template.html trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch Removed: trunk/build/aggregate/TODO.txt trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED trunk/build/aggregate/aggregateRepos.jbosstools.properties trunk/build/aggregate/aggregateRepos.m2eclipse.properties trunk/build/aggregate/aggregateRepos.xml Modified: trunk/build/aggregate/site/ trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/index.html trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/web/site.css Log: enable generation of index.html from Hudson properties; delete old deprecated/broken aggregateRepos stuff (b3 aggregator); add .launch config for use w/ m2eclipse Deleted: trunk/build/aggregate/TODO.txt =================================================================== --- trunk/build/aggregate/TODO.txt 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/TODO.txt 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,2 +0,0 @@ -TODO: for b3 script to work, fix or work around "The copies of profile SDKProfile are not in sync" ---> https://bugs.eclipse.org/bugs/show_bug.cgi?id=317656 \ No newline at end of file Deleted: trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED =================================================================== --- trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,61 +0,0 @@ -# aggregateRepos.xml properties file - -# basic config when used in JBT/JBDS build -eclipse.home=${clean.eclipse.home} -working.dir=${product.build.directory}/b3.aggregator - -# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip -#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse -#working.dir=/tmp/build.b3.aggregator -# optional config when testing on local -#requirement.build.root=${working.dir} -#update.site.product.name=JBoss Tools -#update.site.description=Nightly -#product.versionTag=3.1.0.v201002111546N-H238-CR2 - -# descriptions and labels used to name the resulting repo or to name categories -repoName=${update.site.product.name} ${update.site.description} Update Site -#product.versionTag=3.1.0.v200910281633N-RC1 - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive -#jar:file:${product.build.directory}/all/${updateZip}!/,\ -#jar:file:${working.dir}/JBossTools-Update-3.1.0.v201002111546N-H238-CR2.zip!/,\ -# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... -repos=\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\ - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ -http://download.eclipse.org/eclipse/updates/3.6milestones/,\ -http://download.eclipse.org/eclipse/updates/3.6/,\ -http://download.eclipse.org/birt/update-site/2.6-interim/,\ -http://download.eclipse.org/birt/update-site/2.6/,\ -http://download.eclipse.org/tptp/updates/galileo/,\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/ - -# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category -categories=SDKTools2,AllTools2,SOATools2 -SDKTools2.features=org.jboss.tools.jbpm3.sdk.feature -#,org.jboss.tools.jmx.sdk.feature -AllTools2.features=org.jbpm.gd.jpdl.feature -#,org.jboss.tools.jmx.feature -SOATools2.features=org.jbpm.gd.jpdl.feature -#,org.jboss.tools.jmx.feature - -# for each repo zip input, list features to collect and assign to existing/new custom categories -jbpm3-Update-N-SNAPSHOT.zip.features=org.jbpm.gd.jpdl.feature,org.jboss.tools.jbpm3.sdk.feature -#JMX-Update-N-SNAPSHOT.zip.features=org.jboss.tools.jmx.feature,org.jboss.tools.jmx.sdk.feature - -# descriptions and labels for existing/new custom categories -custom.category.label.SDKTools2=JBoss Developer Studio SDK -custom.category.description.SDKTools2=JBoss Developer Studio SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Developer Studio plugins. -custom.category.label.AllTools2=All JBoss Developer Studio Tools - ${product.versionTag} -custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. -custom.category.label.SOATools2=SOA Development -custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. Deleted: trunk/build/aggregate/aggregateRepos.jbosstools.properties =================================================================== --- trunk/build/aggregate/aggregateRepos.jbosstools.properties 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.jbosstools.properties 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,67 +0,0 @@ -# aggregateRepos.xml properties file - -# basic config when used in JBT/JBDS aggregation build -# if eclipse.home not set, fetch + unpack Eclipse Helios Java bundle for 32- or 64-bit linux -#eclipse.home=${clean.eclipse.home} -working.dir=${WORKSPACE}/b3aggr - -# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip -#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse -#working.dir=/tmp/build.b3.aggregator -# optional config when testing on local -#requirement.build.root=${working.dir} -#update.site.product.name=JBoss Tools -#update.site.description=Nightly -#product.versionTag=3.1.0.v201002111546N-H238-CR2 - -# descriptions and labels used to name the resulting repo or to name categories -repoName=JBoss Tools Nightly Aggregate Update Site -#product.versionTag=${JOB_NAME}-H${BUILD_NUMBER} - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive -# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... -repos=\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-cbi-pi4soa-Update-SNAPSHOT.zip,\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer-Update-SNAPSHOT.zip - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ -http://download.eclipse.org/eclipse/updates/3.6/,\ -http://download.eclipse.org/birt/update-site/2.6/,\ -http://download.eclipse.org/tptp/updates/galileo/,\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/,\ -http://subclipse.tigris.org/update_1.6.x/,\ -http://download.eclipse.org/technology/subversive/0.7/update-site/,\ -http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/,\ -http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\ -http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2 - -#http://download.eclipse.org/birt/update-site/2.6-interim/,\ -#http://download.eclipse.org/eclipse/updates/3.6milestones/,\ - -# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category -categories=AllTools2,DataTools2 -AllTools2.features=org.pi4soa.core.feature,\ -org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature -DataTools2.features=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature - -# for each repo zip input, list features to collect and assign to existing/new custom categories -pi4soa-Update-N-SNAPSHOT.zip.features=org.pi4soa.core.feature,org.pi4soa.sdk.feature -jbosstools-teiid-designer-Update-SNAPSHOT.zip=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature - -# descriptions and labels for existing/new custom categories -custom.category.label.SDKTools2=JBoss Tools SDK -custom.category.description.SDKTools2=JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Tools plugins. -custom.category.label.AllTools2=All JBoss Tools - ${product.versionTag} -custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. -custom.category.label.SOATools2=SOA Development -custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. -custom.category.label.DataTools2=Data Services -custom.category.description.DataTools2=Tools related to data services such as persistence and transformation. Deleted: trunk/build/aggregate/aggregateRepos.m2eclipse.properties =================================================================== --- trunk/build/aggregate/aggregateRepos.m2eclipse.properties 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.m2eclipse.properties 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,24 +0,0 @@ -# aggregateRepos.xml properties file - -# basic configuration -eclipse.home=/home/nboldt/eclipse/36clean/eclipse -working.dir=/tmp/build.b3.aggregator - -# descriptions and labels used to name the resulting repo or to name categories -repoName=m2eclipse 0.10.0.20100209-0800 Updates -product.versionTag=0.10.0.20100209-0800 - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -repos=\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/ - -associate.sites=http://download.eclipse.org/releases/galileo/,\ -http://download.eclipse.org/eclipse/updates/3.5/,\ -http://subclipse.tigris.org/update_1.6.x - -categories= Deleted: trunk/build/aggregate/aggregateRepos.xml =================================================================== --- trunk/build/aggregate/aggregateRepos.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,704 +0,0 @@ -<project default="run" name="aggregateRepos"> - - <target name="get.ant-contrib" unless="ant-contrib.jar.exists"> - <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" /> - <get usetimestamp="true" - dest="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" - src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" - /> - <touch file="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" /> - <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" /> - <unzip src="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" - dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" - overwrite="true" - /> - <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" - tofile="${requirement.build.root}/ant-contrib.jar" - failonerror="true" - /> - <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" /> - </target> - - <!-- Complete set of steps: init,prefetch.repo.zips,install.b3.aggregator,generate.build.file,run.build.file,add.associate.sites,zip.repo,cleanup --> - <target name="run" - depends="init,prefetch.repo.zips,install.b3.aggregator,generate.build.file,run.build.file,add.associate.sites,zip.repo,cleanup" - /> - - <target name="init"> - <!-- set these properties in aggregateRepos.properties file: - # if eclipse.home not set, fetch + unpack Eclipse Helios Java bundle for 32- or 64-bit linux - #eclipse.home=/home/nboldt/eclipse/35clean/eclipse - working.dir=${java.io.tmpdir}/b3aggr - repoName=JBoss Tools Nightly Aggregate Update Site - product.versionTag=3.1.0.v200910281633N-RC1 - repos=\ - http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... - http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... - http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... - associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ - ... - --> - - <property name="WORKSPACE" value="${java.io.tmpdir}" /> - - <property name="aggregateRepos.properties" value="aggregateRepos.jbosstools.properties" /> - <property file="${aggregateRepos.properties}" /> - - <!-- if not set by Hudson (or in properties file), define defaults --> - <property name="working.dir" value="${WORKSPACE}/b3aggr" /> - <property name="requirement.build.root" value="${working.dir}" /> - - <!-- create required dirs --> - <mkdir dir="${working.dir}" /> - <mkdir dir="${requirement.build.root}" /> - - <!-- get Ant-Contrib --> - <available file="${requirement.build.root}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" /> - <antcall target="get.ant-contrib" /> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${requirement.build.root}/ant-contrib.jar" /> - </classpath> - </taskdef> - - <!-- get Eclipse for 32 or 64-bit linux --> - <if> - <not> - <isset property="eclipse.home" /> - </not> - <then> - <if> - <os family="unix" /> - <then> - <!-- Ant thinks that ${os.arch} == i386 for x86_64, so use `uname` instead --> - <exec executable="bash" outputproperty="arch"> - <arg line="../util/getArch.sh" /> - </exec> - </then> - <else> - <condition property="arch" value="x86_64" else=""> - <os arch="amd64" /> - </condition> - </else> - </if> - <property name="eclipse.home" value="${WORKSPACE}/eclipse" /> - <delete dir="${eclipse.home}" includeemptydirs="true" quiet="true" /> - <echo>Fetch + unpack fresh Eclipse into eclipse.home = ${eclipse.home}</echo> - <if> - <equals arg1="${arch}" arg2="x86_64" /> - <then> - <get src="http://www.eclipse.org/downloads/download.php?file=/eclipse/dow... - dest="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz" - usetimestamp="true" - /> - <untar compression="gzip" - dest="${WORKSPACE}" - src="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz" - /> - </then> - <else> - <get src="http://www.eclipse.org/downloads/download.php?file=/eclipse/dow... - dest="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk.tar.gz" - usetimestamp="true" - /> - <untar compression="gzip" - dest="${WORKSPACE}" - src="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk.tar.gz" - /> - </else> - </if> - </then> - <else> - <echo>Use pre-existing eclipse.home = ${eclipse.home}</echo> - </else> - </if> - </target> - - <!-- prefetch remote update site zips as local archive repos --> - <target name="prefetch.repo.zips" description="prefetch repo zips and convert remote repo zips to local"> - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${repos}" /> - </antcallback> - <var name="repos" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${associate.sites}" /> - </antcallback> - <var name="associate.sites" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - </then> - </if> - </target> - - <target name="install.b3.aggregator" description="b3 Aggregator requires Eclipse 3.6"> - <!-- set these properties in aggregateRepos.properties file: - b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/heli... - b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones... - --> - - <!-- prefetch remote update site zips as local archive repos --> - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${b3.aggregator.repo}" /> - </antcallback> - <var name="b3.aggregator.repo" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${b3.backup.repos}" /> - </antcallback> - <var name="b3.backup.repos" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <chmod perm="+x" file="${eclipse.home}/eclipse" /> - <exec executable="${eclipse.home}/eclipse" - failonerror="true" - dir="${eclipse.home}" - timeout="900000" - taskname="p2.dir" - > - <arg line=" -vm ${java.home}/bin/java" /> - <!-- If using Eclipse 3.4, " -application org.eclipse.equinox.p2.director.app.application" --> - <arg line=" -application org.eclipse.equinox.p2.director" /> - <arg line=" -nosplash --launcher.suppressErrors -consoleLog -flavor tooling -roaming -profile SDKProfile" /> - <arg line=" -installIU org.eclipse.b3.aggregator.engine.feature.feature.group" /> - <!-- optional for UI --> - <!-- <arg line=" -installIU org.eclipse.b3.aggregator.editor.feature.feature.group" /> --> - <arg line=" -destination ${eclipse.home} -bundlepool ${eclipse.home}" /> - <arg line=" -metadataRepository ${b3.aggregator.repo},${b3.backup.repos}" /> - <arg line=" -artifactRepository ${b3.aggregator.repo},${b3.backup.repos}" /> - <arg line=" -profileProperties org.eclipse.update.install.features=true" /> - <arg line=" -vmargs -Declipse.p2.data.area=${eclipse.home}/p2 -Declipse.p2.MD5Check=false" /> - </exec> - </target> - - <target name="prefetchRepoZips" - description="Support remote update site zips: if repoURL contains http: or ftp: and .zip, get then switch it to a jar:file: URL" - > - <property name="theList" value="" /> - <property name="theTargetDir" value="${requirement.build.root}/p2repos" /> - <mkdir dir="${theTargetDir}" /> - <var name="prefetchRepoZips.return" value="${theList}" /> - <for param="repoURL" list="${theList}" delimiter=", - "> - <sequential> - <if> - <and> - <contains string="@{repoURL}" substring=".zip" /> - <or> - <contains string="@{repoURL}" substring="http://" /> - <contains string="@{repoURL}" substring="https://" /> - <contains string="@{repoURL}" substring="ftp://" /> - <contains string="@{repoURL}" substring="file://" /> - </or> - </and> - - <then> - <var name="repoFile" unset="true" /> - <propertyregex property="repoFile" - input="@{repoURL}" - defaultvalue="@{repoURL}" - regexp=".+/([^/]+.zip)" - replace="\1" - casesensitive="false" - override="true" - /> - <propertyregex property="prefetchRepoZips.return" - input="${prefetchRepoZips.return}" - defaultvalue="${prefetchRepoZips.return}" - regexp="@{repoURL}" - replace="jar:file:${theTargetDir}/${repoFile}!/" - casesensitive="false" - override="true" - /> - <get dest="${theTargetDir}/${repoFile}" src="@{repoURL}" usetimestamp="true" /> - <var name="repoFile" unset="true" /> - <!-- <echo>repoURL = ${prefetchRepoZips.return}</echo> --> - </then> - </if> - </sequential> - </for> - </target> - - <target name="generate.build.file"> - <property name="repoName" value="JBoss Tools Aggregate Update Site" /> - <property name="platform.names" value="linux-gtk,linux-gtk-x86_64,win32,macosx-carbon,macosx-cocoa" /> - <!-- packedStrategy = {SKIP, UNPACK, UNPACK_AS_SIBLING, COPY, VERIFY} --> - <!-- mavenResult="{true,false}" --> - <echo file="${working.dir}/repo.b3aggr">&lt;?xml version="1.0" encoding="UTF-8"?> -&lt;aggregator:Aggregator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:aggregator="http://www.eclipse.org/b3/2010/aggregator/1.0.0" - buildmaster=&quot;//@contacts[email=&#39;nickboldt(a)gmail.com&#39;]&quot; - label="${repoName}" buildRoot="${working.dir}/output" - packedStrategy="COPY" type="N" mavenResult="false"> - &lt;contacts name="Nick Boldt" email=&quot;nickboldt(a)gmail.com&quot;/&gt; -</echo> - <for param="platform" list="${platform.names}" delimiter=","> - <sequential> - <if> - <equals arg1="@{platform}" arg2="linux-gtk" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;configurations operatingSystem="linux" windowSystem="gtk"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="win32" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;configurations operatingSystem="win32" windowSystem="win32"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="linux-gtk-x86_64" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="macosx-carbon" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="macosx-cocoa" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86"/> -</echo> - </then> - </if> - </sequential> - </for> - - <!-- store an array of ${featureID}_${featureVersion} values against which to check when echoing to repo.b3aggr file --> - <var name="unique.installableUnits" value="" /> - - <echo file="${working.dir}/repo.b3aggr" append="true"> - &lt;contributions label="repos" contacts=&quot;//@contacts[email=&#39;nickboldt(a)gmail.com&#39;]&quot;&gt;&lt;/echo&gt; - <!-- counter variable; repoID.string stores a series of R; repoID stores the string length --> - <var name="repoID.string" value="" /> - <var name="repoID" value="0" /> - <for param="repo" list="${repos}" delimiter=", - "> - <sequential> - <!-- get list of features+plugins in the repo --> - <var name="repoFile" unset="true" /> - <var name="repoFilename" unset="true" /> - <propertyregex property="repoFile" - input="@{repo}" - defaultvalue="@{repo}" - override="true" - regexp="jar:file:(.+)!/" - replace="\1" - /> - <propertyregex property="repoFilename" - input="${repoFile}" - defaultvalue="${repoFile}" - override="true" - regexp=".+/([^/]+.zip)" - replace="\1" - /> - <echo file="${working.dir}/repo.b3aggr" append="true"> - &lt;repositories location="@{repo}"> -</echo> - <!-- collect features into custom categories, if defined. See aggregateRepos.properties for how to define these mappings --> - <if> - <and> - <isset property="${repoFilename}.features" /> - <isset property="categories" /> - </and> - <then> - <!-- eg., pi4soa-Update-N-SNAPSHOT.zip.features=org.pi4soa.sdk.feature,org.pi4soa.core.feature --> - <propertycopy from="${repoFilename}.features" - property="repo.features" - override="true" - silent="true" - /> - <var name="featureID.num" value="0" /> - <for param="repo.feature" list="${repo.features}" delimiter=", "> - <sequential> - <!-- find the category to which this feature must be assigned --> - <!-- eg., categories=JBossToolsSDK,JBossTools,jBPMTools --> - <for param="categoryID" list="${categories}" delimiter=", "> - <sequential> - <if> - <not> - <isset property="custom.category.features.@{categoryID}" /> - </not> - <then> - <var name="custom.category.features.@{categoryID}" value="" /> - </then> - </if> - - <if> - <and> - <!-- eg., JBossToolsSDK.features=org.pi4soa.sdk.feature,org.jboss.tools.jbpm3.sdk.feature,org.jboss.tools.jbpm4.sdk.feature - JBossTools.features=org.pi4soa.core.feature,org.pi4soa.core.source.feature --> - <isset property=&quot;(a){categoryID}.features&quot; /> - <contains string=&quot;${(a){categoryID}.features}&quot; - substring=&quot;(a){repo.feature}&quot; - /> - </and> - <then> - <antcallback target="getIndex" return="getIndex.return"> - <param name="entry" value=&quot;(a){repo.feature}&quot; /> - <param name="list" value="${repo.features}" /> - </antcallback> - <var name="featureID.num" value="${getIndex.return}" /> - <var name="getIndex.return" unset="true" /> - - <!-- eg., custom.category.label.JBossToolsSDK=JBoss Tools SDK - ${product.versionTag} - custom.category.description.JBossToolsSDK=JBoss Tools SDK helps JBoss and J2EE developers develop their applications quickly and painlessly. Contains runtimes and sources. --> - <antcallback target="addFeatureToCategories" - return="addFeatureToCategories.return, unique.installableUnits" - > - <param name="repoID" value="${repoID}" /> - <param name="featureID.num" value="${featureID.num}" /> - <param name="include" - value=&quot;features/(a){repo.feature}_*, **/features/(a){repo.feature}_*&quot; - /> - <param name="repoFile" value="${repoFile}" /> - <param name="categories" value="${categories}" /> - </antcallback> - <var name="custom.category.features.@{categoryID}" - value=&quot;${custom.category.features.(a){categoryID}}${addFeatureToCategories.return}&quot; - /> - </then> - </if> - </sequential> - </for> - </sequential> - </for> - </then> - </if> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;/repositories> -</echo> - <var name="repoID.string" value="${repoID.string}R" /> - <var name="repoID" unset="true" /> - <length property="repoID" string="${repoID.string}" /> - <!-- <echo>repoID = ${repoID}, repoID.string = ${repoID.string}</echo> --> - </sequential> - </for> - - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;/contributions> - -</echo> - <!-- create custom categories to collect the features --> - <for param="custom.category.id" list="${categories}" delimiter=", - "> - <sequential> - <!-- trim prefix " " --> - <propertyregex property=&quot;custom.category.features.(a){custom.category.id}&quot; - defaultvalue=&quot;${custom.category.features.(a){custom.category.id}}&quot; - input=&quot;${custom.category.features.(a){custom.category.id}}&quot; - regexp=" (.+)" - replace="\1" - override="true" - /> - - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;customCategories - identifier=&quot;(a){custom.category.id}&quot; - label=&quot;${custom.category.label.(a){custom.category.id}}&quot; - description=&quot;${custom.category.description.(a){custom.category.id}}&quot; - features=&quot;${custom.category.features.(a){custom.category.id}}&quot; /> -</echo> - </sequential> - </for> - - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <echo file="${working.dir}/repo.b3aggr" append="true"> - &lt;validationRepositories location=&quot;(a){associate.site}&quot; /> -</echo> - </sequential> - </for> - </then> - </if> - - <echo file="${working.dir}/repo.b3aggr" append="true">&lt;/aggregator:Aggregator> -</echo> - </target> - - <target name="addFeatureToCategories"> - <var name="addFeatureToCategories.return" value="" /> - <property name="repoID" value="9" /> - <property name="include" value="features/org.pi4soa.core.feature_*, **/features/org.pi4soa.core.feature_*" /> - <property name="repoFile" value="${working.dir}/pi4soa-Update-N-SNAPSHOT.zip" /> - <property name="categories" value="SDKTools2,SOATools2,AllTools2" /> - <propertyregex property="repoFilename" - input="${repoFile}" - defaultvalue="${repoFile}" - regexp=".+/([^/]+.zip)" - replace="\1" - casesensitive="false" - override="true" - /> - - <if> - <and> - <!-- haven't already unzipped this --> - <not> - <available file="${repoFile}_" type="dir" /> - </not> - </and> - <then> - <if> - <available file="${repoFile}" type="file" /> - <then> - <unzip src="${repoFile}" dest="${repoFile}_" /> - </then> - <else> - <fail>Error! - Cannot find ${repoFile} to unpack! - </fail> - </else> - </if> - </then> - </if> - - <property name="featureID.num" value="0" /> - <for param="entry" delimiter=", - "> - <fileset dir="${repoFile}_" includes="${include}" /> - <sequential> - <!-- get featureID and featureVersion --> - <var name="featureID" unset="true" /> - <var name="featureVersion" unset="true" /> - <propertyregex property="featureID" - input="@{entry}" - defaultvalue="@{entry}" - regexp=".+/([^/_]+)_.+" - replace="\1" - /> - <propertyregex property="featureVersion" - input="@{entry}" - defaultvalue="@{entry}" - regexp=".+/${featureID}_(.+).jar" - replace="\1" - /> - - <!-- for a given featureID, check each of the available ${categories}; for each @{category}, check if featureID in list of ${(a){category}.features} --> - <var name="featureID.categories" value="" /> - <for param="category" list="${categories}" delimiter=", "> - <sequential> - <if> - <isset property=&quot;(a){category}.features&quot; /> - <then> - <for param="featureID" list=&quot;${(a){category}.features}&quot; delimiter=", -"> - <sequential> - <if> - <equals arg1="${featureID}" arg2="@{featureID}" /> - <then> - <!-- given: SDKTools2,SOATools2,AllTools2 - return: - //@customCategories[identifier='${category1}'] //@customCategories[identifier='${category2}'] //@customCategories[identifier='${categoryID3}'] - eg., - //@customCategories[identifier='SDKTools2'] //@customCategories[identifier='SOATools2'] //@customCategories[identifier='AllTools2'] --> - <var name="featureID.categories" - value="${featureID.categories} //@customCategories[identifier='@{category}']" - /> - </then> - </if> - </sequential> - </for> - </then> - </if> - </sequential> - </for> - <!-- trim prefix " " --> - <propertyregex property="featureID.categories" - defaultvalue="${featureID.categories}" - input="${featureID.categories}" - regexp=" (.+)" - replace="\1" - override="true" - /> - - <var name="isNewInstallableUnit" value="true" /> - <for param="installableUnit" list="${unique.installableUnits}" delimiter=", "> - <sequential> - <if> - <equals arg1="@{installableUnit}" arg2="${featureID}_${featureVersion}" /> - <then> - <var name="isNewInstallableUnit" value="false" /> - </then> - </if> - </sequential> - </for> - <if> - <!-- cannot echo the same <features> twice - must be ; store ${featureID}_${featureVersion} in an array and check if in array before echoing again --> - <istrue value="${isNewInstallableUnit}" /> - <then> - <var name="unique.installableUnits" - value="${unique.installableUnits}, ${featureID}_${featureVersion}" - /> - <echo file="${working.dir}/repo.b3aggr" append="true"> &lt;features categories="${featureID.categories}" name="${featureID}.feature.group" versionRange="${featureVersion}" /> -</echo> - <echo level="info">${featureID}_${featureVersion}: add @repositories.${repoID}/(a)features.${featureID.num} to ${featureID.categories}</echo> - </then> - <else> - <echo level="info">${featureID}_${featureVersion} already added.</echo> - </else> - </if> - <var name="addFeatureToCategories.return" - value="${addFeatureToCategories.return} //@contributions[label=&#39;repos&#39;]/@repositories.${repoID}/(a)features.${featureID.num}&quot; - /> - - </sequential> - </for> - <var name="featureID.categories" unset="true" /> - <var name="isNewInstallableUnit" unset="true" /> - </target> - - <target name="run.build.file"> - <chmod perm="+x" file="${eclipse.home}/eclipse" /> - <exec executable="${eclipse.home}/eclipse" - failonerror="true" - dir="${eclipse.home}" - timeout="900000" - taskname="b3aggr" - > - <arg line=" -vm ${java.home}/bin/java" /> - <arg line=" -application org.eclipse.b3.cli.headless" /> - <arg line=" -nosplash --launcher.suppressErrors -consoleLog aggregate" /> - <arg line=" --buildModel ${working.dir}/repo.b3aggr --action BUILD" /> - <!-- To verify w/o actually doing the aggregation, use - -action VERIFY --> - </exec> - </target> - - <!-- until https://bugs.eclipse.org/bugs/show_bug.cgi?id=303244 is fixed, do it manually --> - <target name="add.associate.sites"> - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <if> - <available file="${working.dir}/output/final/content.jar" type="file" /> - <then> - <unzip src="${working.dir}/output/final/content.jar" dest="${working.dir}/output/final" /> - <delete file="${working.dir}/output/final/content.jar" /> - </then> - </if> - <!-- counter variable --> - <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="${working.dir}/output/final/content.xml" property="content.xml"> - <filterchain> - <tailfilter lines="-1" skip="1" /> - </filterchain> - </loadfile> - <echo file="${working.dir}/output/final/content.xml" message="${content.xml}" /> - <echo file="${working.dir}/output/final/content.xml" append="true"> &lt;references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <!-- insert into content.xml --> - <echo file="${working.dir}/output/final/content.xml" append="true"> &lt;repository uri=&#39;(a){associate.site}&#39; url=&#39;(a){associate.site}&#39; type='0' options='1'/> - &lt;repository uri=&#39;(a){associate.site}&#39; url=&#39;(a){associate.site}&#39; type='1' options='1'/> -</echo> - </sequential> - </for> - <echo file="${working.dir}/output/final/content.xml" append="true"> &lt;/references> -&lt;/repository> -</echo> - <zip destfile="${working.dir}/output/final/content.jar" - basedir="${working.dir}/output/final" - includes="content.xml" - /> - <delete file="${working.dir}/output/final/content.xml" /> - </then> - </if> - </target> - - <!-- zip up the generated repo --> - <target name="zip.repo"> - <zip destfile="${working.dir}/aggregate-Update-SNAPSHOT.zip" - basedir="${working.dir}/output/final" - update="false" - /> - </target> - - <target name="cleanup"> - <delete quiet="true" dir="${working.dir}/output" includeemptydirs="true" /> - <!-- <delete quiet="true" file="${working.dir}/repo.b3aggr" /> --> - <for param="theZip" list="${repos}" delimiter=", - "> - <sequential> - <var name="zipFile" unset="true" /> - <propertyregex property="zipFile" - input="@{theZip}" - defaultvalue="@{theZip}" - regexp=".+/([^/]+.zip).*" - replace="\1" - casesensitive="false" - override="true" - /> - <if> - <available file="${working.dir}/${zipFile}_" type="dir" /> - <then> - <delete dir="${working.dir}/${zipFile}_" quiet="true" includeemptydirs="true" /> - </then> - </if> - </sequential> - </for> - </target> - - <target name="getIndex"> - <property name="getIndex.string" value="" /> - <var name="getIndex.return" value="0" /> - <property name="entry" value="" /> - <property name="list" value="" /> - <for param="this.entry" list="${list}" delimiter=", "> - <sequential> - <if> - <not> - <equals arg1=&quot;(a){this.entry}&quot; arg2="${entry}" /> - </not> - <then> - <var name="getIndex.string" value="${getIndex.string}L" /> - </then> - <else> - <var name="getIndex.return" unset="true" /> - <length property="getIndex.return" string="${getIndex.string}" /> - </else> - </if> - - </sequential> - </for> - <!-- <echo> getIndex = ${getIndex.return} for ${entry} in ${list}</echo> --> - </target> - -</project> Property changes on: trunk/build/aggregate/site ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/build.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,11 +1,11 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> - <!-- should be set by script or in Hudson --> - <property name="ZIPSUFFIX" value="SNAPSHOT" /> + <!-- pass in properties to Maven/Ant via Hudson job: + -DJOB_NAME=${JOB_NAME} + -DBUILD_ID=${BUILD_ID} + -DBUILD_NUMBER=${BUILD_NUMBER} + --> - <!-- should be set by Hudson --> - <!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> --> - <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> <available file="${WORKSPACE}/results" /> @@ -29,6 +29,10 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> + <!-- load properties from default (or alternate) properties file --> + <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"> @@ -38,22 +42,10 @@ </taskdef> </target> - <target name="add.associate.sites"> + <target name="add.associate.sites" if="associate.sites"> <if> <and> - <not> - <isset property="associate.sites" /> - </not> - </and> - <then> - <!-- load associate sites from default (or alternate) properties file --> - <property name="associate.sites.properties" value="associate.sites.jbosstools.properties" /> - <property file="${associate.sites.properties}" /> - </then> - </if> - - <if> - <and> + <!-- Defined in aggregateSite.properties --> <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> @@ -97,7 +89,9 @@ <echo file="${update.site.source.dir}/content.xml" append="true"> &lt;/references> &lt;/repository> </echo> - <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="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" /> </then> </if> @@ -108,17 +102,84 @@ </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" /> + <zip destfile="${output.dir}/target/site_assembly.zip" + update="true" + basedir="${update.site.source.dir}" + includes="content.* index.html, web/*.css" /> </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"> - <!-- TODO generate correct variables in index.html --> + <!-- + Properties needed for index.html are defined in aggregateSite.properties + update.site.description=Nightly Build + update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + + or calculated here + from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 + from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} + default update.site.description=Nightly Build + default update.site.version=(null) + --> + <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" /> </copy> </target> - <!-- <target name="custom.build" description="aggregate update site extras" depends="init,unpack.zip,add.associate.sites,add.web.content,pack.zip,cleanup" /> --> - <target name="custom.build" description="aggregate update site extras" depends="init,add.associate.sites,add.web.content,pack.zip" /> + <target name="custom.build" + description="aggregate update site extras" + depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> </project> Copied: trunk/build/aggregate/site/index-template.html (from rev 23507, trunk/build/aggregate/site/index.html) =================================================================== --- trunk/build/aggregate/site/index-template.html (rev 0) +++ trunk/build/aggregate/site/index-template.html 2010-07-16 22:33:14 UTC (rev 23509) @@ -0,0 +1,135 @@ +<html> +<head> +<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("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>&#160;&#160;</td> + </tr> + <tr> + <td>&#160;&#160;</td> + <td> + <h2 class="title">JBoss Tools ${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. 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 and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2ecl... Extras 0.10 Release</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">Inst... + 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">Develop... + 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">ble... + 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> Property changes on: trunk/build/aggregate/site/index-template.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/index.html 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,136 +1,135 @@ -<html> -<head> -<title>JBoss Tools ${update.site.description} Update Site: ${product.versionTag}</title> +<html> +<head> +<title>JBoss Tools Nightly Build Update Site: 3.2.0.M1.2010-07-16_17-40-51-H69</title> <style> @import url("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>&#160;&#160;</td> - </tr> - <tr> - <td>&#160;&#160;</td> - <td> - <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build: - ${product.versionTag}</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. 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 and Maven) require additional third-party - prerequisites not available from Eclipse.org or JBoss.org. These can - be installed from the following update sites, which may already be - listed - but not enabled - in your Eclipse's list of Available - Software Sites:</p> - <ul> - <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2ecl... Extras 0.10 Release</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">Inst... - 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">Develop... - 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">ble... - 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> +</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>&#160;&#160;</td> + </tr> + <tr> + <td>&#160;&#160;</td> + <td> + <h2 class="title">JBoss Tools Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.M1.2010-07-16_17-40-51-H69</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. 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 and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2ecl... Extras 0.10 Release</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">Inst... + 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">Develop... + 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">ble... + 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/site/jbosstools trunk aggregate site build.launch =================================================================== --- trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch (rev 0) +++ trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch 2010-07-16 22:33:14 UTC (rev 23509) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.maven.ide.eclipse.Maven2LaunchConfigurationType"> +<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> +<stringAttribute key="M2_GOALS" value="clean install"/> +<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> +<booleanAttribute key="M2_OFFLINE" value="false"/> +<stringAttribute key="M2_PROFILES" value=""/> +<listAttribute key="M2_PROPERTIES"/> +<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> +<booleanAttribute key="M2_SKIP_TESTS" value="false"/> +<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> +<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/nboldt/workspace36/jbosstools-trunk/build/aggregate/site"/> +</launchConfiguration> Property changes on: trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/pom.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -9,7 +9,8 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site</artifactId> + <artifactId>org.jboss.tools.site.aggregate</artifactId> + <name>org.jboss.tools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> @@ -21,10 +22,12 @@ <version>1.3</version> <executions> <execution> - <id>clean</id> - <phase>clean</phase> + <id>install</id> + <phase>install</phase> <configuration> + <quiet>true</quiet> <tasks> + <!-- called AFTER generating update site + zip to add in extra content --> <ant antfile="build.xml" /> </tasks> </configuration> @@ -84,7 +87,116 @@ <enabled>true</enabled> </snapshots> </repository> - <!-- <repository> <id>jbosstools-teiid-designer-snapshot</id> <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... - <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> --> + <repository> + <id>jbosstools-teiid-designer-snapshot</id> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> </repositories> + + <profiles> + <profile> + <id>helios-no-target</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>webtools32</id> + <url>http://download.eclipse.org/webtools/repository/helios</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/upd... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R201005192... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + </profiles> </project> Modified: trunk/build/aggregate/site/web/site.css =================================================================== --- trunk/build/aggregate/site/web/site.css 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/web/site.css 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,66 +1,66 @@ -< -STYLE type ="text/css">td.spacer { - padding-bottom: 10px; - padding-top: 10px; -} - -.title { - font-family: sans-serif; - color: #1778be; -} - -.bodyText { - font-family: sans-serif; - font-size: 9pt; - color: #000000; -} - -.sub-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; -} - -.log-text { - font-family: sans-serif; - font-style: normal; - font-weight: lighter; - font-size: 8pt; - color: black; -} - -.big-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; - border-top: 10px solid white; -} - -.light-row { - background: #FFFFFF -} - -.dark-row { - background: #EEEEEE -} - -.header { - background: #445562 -} - -#indent { - word-wrap: break-word; - width: 300px; - text-indent: 10px; -} - -.link { - color: #187dc6; -} -</ -STYLE +< +STYLE type ="text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} +</ +STYLE \ No newline at end of file