Author: nickboldt Date: 2011-11-23 14:59:19 -0500 (Wed, 23 Nov 2011) New Revision: 36580 Removed: trunk/build/aggregate/webtools-site/README.installation.txt trunk/build/aggregate/webtools-site/build.xml trunk/build/aggregate/webtools-site/index-template.html trunk/build/aggregate/webtools-site/remove-references.xsl trunk/build/aggregate/webtools-site/remove-uncategorized.xsl trunk/build/aggregate/webtools-site/site.xsl trunk/build/aggregate/webtools-site/web/site.css Modified: trunk/build/aggregate/webtools-site/index.html trunk/build/aggregate/webtools-site/pom.xml Log: webtools builder should reuse common site builder scripts Deleted: trunk/build/aggregate/webtools-site/README.installation.txt =================================================================== --- trunk/build/aggregate/webtools-site/README.installation.txt 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/README.installation.txt 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,10 +0,0 @@ -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 - Deleted: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/build.xml 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,762 +0,0 @@ -<project default="custom.build" name="jbosstools aggregate site build.xml"> - <!-- - To test output, run maven in this folder: - $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" - --> - - <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. --> - <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> - <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script --> - - <property name="update.site.source.dir" value="${output.dir}/target/site" /> - - <!-- load properties from file --> - <property name="associate.properties" value="associate.properties" /> - <property file="${associate.properties}" /> - <property name="web.content.files" value="index.html, **/*.css, README*, *directory.xml" /> - - <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> - - <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" /> - <antcall target="get.saxon" /> - </target> - - <!-- don't do collect.zips,collect.metadata,create.summary.file --> - <target name="custom.build" description="JBT aggregate update site extra processing steps" depends="init,check.target,unpack.content.jar,remove.references,add.associate.sites,remove.uncategorized.category,add.web.content,pack.content.jar,pack.zip" /> - - <target name="get.saxon" unless="saxon.jar.exists"> - <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? --> - <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/s... /> - <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" /> - <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" /> - <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" /> - <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" /> - <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" /> - </target> - - <!-- = = = = = = = = = = = = = = = = = - macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips - = = = = = = = = = = = = = = = = = --> - <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> - <!-- fetch zip.list.txt file, if available --> - <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> - <!-- load zip.list.txt file, get ALL_ZIPS list --> - <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}" /> - <!-- fetch zips to local dir --> - <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> - <!-- create a fake file of variable length (rather than using touch for zero-length one) --> - <echo file=&quot;${aggregate.zips.dir}/@{zipPath}&quot;&gt;${aggregate.zips.dir}/(a){zipPath}&lt;/echo&gt; - </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> - <!-- set variable for filename --> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} -</echo> - <!-- set variable for filesize in Kb --> - <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> - <!-- <math operand2="${fs.length.b}" operation="/" operand1="1024" result="fs.length.kb" datatype="float" /> --> - <!-- <math operand2="${fs.length.b}" operation="/" operand1="1048576" result="fs.length.mb" datatype="float"/> --> - <!-- <echo level="verbose">${aggregate.zips.dir}/@{zipPath}: ${fs.length.kb} Kb, ${fs.length.mb} Mb</echo> --> - <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" /> - - <!-- set variable for filemd5 --> - <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> - - <!-- rename the svn and build properties files so they align with the zip names --> - <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: fetchZipsFromMetadata - look for compositeArtifacts.xml and parse results - = = = = = = = = = = = = = = = = = --> - <macrodef name="fetchZipsFromMetadata"> - <attribute name="repo" default="" /> - <sequential> - <var name="location.cleaned" value="@{repo}" /> - <echo level="verbose">repo = ${location.cleaned}</echo> - <!-- if no zip.list.txt from the inputRepo, then fetch from ${location.cleaned}/compositeArtifacts.xml instead --> - <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> - - <!-- counter variable --> - <var name="counter" value="" /> - <!-- foreach entry repository.children.child.location --> - <for param="location" list="${repository.children.child.location}"> - <sequential> - <var name="counter" value="${counter}0" /> - <var name="i" unset="true" /> - <length property="i" string="${counter}" /> - <if> - <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> - <!-- Defined in associate.sites --> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <!-- 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="${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"> &lt;references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <!-- insert into content.xml --> - <echo file="${update.site.source.dir}/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="${update.site.source.dir}/content.xml" append="true"> &lt;/references> -&lt;/repository> -</echo> - </then> - </if> - </target> - - <target name="remove.references"> - <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" /> - <xslt style="remove-references.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" /> - </target> - - <target name="remove.uncategorized.category"> - <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" /> - </target> - - <target name="unpack.content.jar"> - <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> - </target> - - <target name="pack.content.jar"> - <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" /> - </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.*, ${web.content.files}" /> - </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"> - <!-- - Properties 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> - <!-- from 2011-09-21_01-11-04 to 20110921-0111 --> - <propertyregex override="true" property="BUILD_TS" defaultvalue="${BUILD_ID}" input="${BUILD_ID}" regexp="([0-9]+)-([0-9]+)-([0-9]+)_([0-9]+)-([0-9]+)-([0-9]+)" replace="v\1\2\3-\4\5" /> - <if> - <and> - <isset property="JBT_VERSION" /> - <isset property="BUILD_ALIAS" /> - </and> - <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\3" /> - </then> - <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": \1.${BUILD_TS}-H${BUILD_NUMBER}\2\3" /> - </else> - </if> - </then> - <else> - <property name="update.site.version" value="" /> - </else> - </if> - - <!-- get site.xml as HTML, then load into ${site.contents} in order to merge into index.html --> - <antcallback target="transform.site.xml" return="site.contents" /> - - <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="${web.content.files}" /> - </copy> - </target> - - <target name="transform.site.xml"> - <!-- turn site.xml into site.html via site.xsl --> - <delete quiet="true" file="${update.site.source.dir}/site.html" /> - <xslt style="site.xsl" in="${update.site.source.dir}/site.xml" out="${update.site.source.dir}/site.html" force="true"> - <classpath location="${COMMON_TOOLS}/saxon.jar" /> - </xslt> - <!-- merge contents of site.html into index.html, then remove site.html --> - <loadfile property="site.contents" srcfile="${update.site.source.dir}/site.html" failonerror="false" /> - <property name="site.contents" value="" /> - <delete file="${update.site.source.dir}/site.html" quiet="true" /> - </target> - - <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...; - if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch --> - <target name="collect.zips" description="collect zips from the sites we aggregated" unless="collect.zips.skip"> - <property name="aggregate.zips.dir" value="${output.dir}/zips" /> - <delete dir="${aggregate.zips.dir}" quiet="true" /> - <mkdir dir="${aggregate.zips.dir}" /> - <if> - <isset property="inputRepo" /> - <then> - <var name="inputRepos" value="1" /> - <var name="inputRepo1" value="${inputRepo}" /> - </then> - </if> - <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/_composit... /> - </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/_composit... /> - </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/jbosstool... /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner... /> - </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/jbosstool... /> - <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstool... /> - </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/jbosstool... /> - </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" /> - <mkdir dir="${aggregate.zips.dir}" /> - <!-- load file properties (name, size, md5sum) --> - <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 all build.properties.txt files in zips/ folder --> - <for param="propsfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> - </path> - <sequential> - <!-- load properties file using a prefix which relates to the associated prop file --> - <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}" /> - - <!-- now load SVN revs --> - <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> - <!-- XML way: load into .revision.module and .revision.revision --> - <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> - <!-- purge the "<changeSet><kind>" entry if present --> - <if> - <isset property="${prefix}.kind" /> - <then> - <var name="${prefix}.kind" unset="true" /> - </then> - </if> - - <!-- TXT way: load into .SVN_REVISION --> - <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> - <!-- TXT way: load into .SVN_REVISION --> - <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="" /> - - <!-- XML way: load into .revision.module and .revision.revision --> - <for list="${temp}" delimiter="," param="pair"> - <sequential> - <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp=&quot;(.+)(a)(.+)&quot; replace="\1" /> - <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp=&quot;(.+)(a)(.+)&quot; 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> - <!-- load properties file using a prefix which relates to the associated prop file --> - <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> - <!-- dump properties to an XML file, filtering for only those properties we care about --> - <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> - - <!-- TODO: write this method --> - <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> Deleted: trunk/build/aggregate/webtools-site/index-template.html =================================================================== --- trunk/build/aggregate/webtools-site/index-template.html 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/index-template.html 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,168 +0,0 @@ -<html> -<head> -<title>JBoss Tools - Web Tools - ${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"> - <center> - <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - </tr> - <tr> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td> - <h2 class="title">JBoss Tools - Web 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 - Web Tools. - <blockquote style="border: 1px dashed #1778be; padding: 2px"> - <ol> - <li>To <a class="link" - href="http://www.jboss.org/tools/download/installation/update_3_3&qu... - from this site, start up Eclipse 3.7, then do: - <ul> - <code><strong>Help > Install New Software... ></strong></code> - </ul> - </li> - <li>Copy this site's URL into Eclipse, and hit Enter.</li> - <li>When the site loads, select the features to install, - or click the <code><strong>Select All</strong></code> button.</li> - <li>To properly resolve all dependencies, check - <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul> - - <li>Click <code><strong>Next</strong></code>, agree to the license - terms, and install.</li> - - <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>.<br /> If you downloaded this site as a zip, see - <a href="README.installation.txt">Installation README</a>. - See also <a - href="http://www.jboss.org/tools/download/installation">Inst... - methods</a>. - </p> - </ol> - </blockquote> - </td> - </tr> - - <!-- - <tr class="dark-row" style="height: 30px"> - <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 &gt;&nbsp;Preferences - &gt;&nbsp;Install/Update &gt;&nbsp;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/SR1"&... Tools Requirements - Composite Mirror - Indigo SR1</a></li> - <li><a href="http://download.jboss.org/jbosstools/updates/development/indig... Tools Core Updates - Stable Milestone - Indigo</a></li> - </ul> - </td> - </tr> - --> - </table> - </td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - </tr> - <tr> - <td></td> - <td> - ${site.contents} - </td> - <td></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> - </center> -</html> Modified: trunk/build/aggregate/webtools-site/index.html =================================================================== --- trunk/build/aggregate/webtools-site/index.html 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/index.html 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,36 +1,36 @@ <html> <head> -<title>JBoss Tools - Web Tools - Nightly Build Update Site</title> +<title>JBoss Tools - Web Tools 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"> - <center> - <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> +<center> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0" width="920" class="bodyText"> + <tr> + <td colspan="3"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> + <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> + <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> + </tr> + <tr> + <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> + <td> + <h2 class="title">JBoss Tools - Web Tools Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build</span></td> </tr> - <tr> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - </tr> - <tr> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - <td> - <h2 class="title">JBoss Tools - Web Tools - 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 - Web Tools. + <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 - Web Tools. <blockquote style="border: 1px dashed #1778be; padding: 2px"> <ol> <li>To <a class="link" @@ -63,44 +63,12 @@ </blockquote> </td> </tr> - - <!-- - <tr class="dark-row" style="height: 30px"> - <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 &gt;&nbsp;Preferences - &gt;&nbsp;Install/Update &gt;&nbsp;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/SR1"&... Tools Requirements - Composite Mirror - Indigo SR1</a></li> - <li><a href="http://download.jboss.org/jbosstools/updates/development/indig... Tools Core Updates - Stable Milestone - Indigo</a></li> - </ul> - </td> - </tr> - --> - </table> - </td> - <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> - </tr> - <tr> - <td></td> + </table> + </td> + <td>&#160;&#160;&#160;&#160;&#160;&#160;</td> + </tr> + <tr> + <td></td> <td> <table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0"> <tr style="background-color:#DDDDDD"> @@ -112,8 +80,8 @@ </th> </tr> <tr style="background-color:&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;#EEEEEE&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111118-0800-H846-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> - <td><span style="font-size:x-small">2.3.0.v20111118-0800-H846-M5</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111123-1119-H853-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> + <td><span style="font-size:x-small">2.3.0.v20111123-1119-H853-M5</span></td> <td><span style="font-size:x-small"> | org.eclipse.wst.server.core.serverAdapter</span></td> @@ -134,7 +102,10 @@ <a href="plugins/" style="font-size:x-small">plugins</a> :: <a href="features/" style="font-size:x-small">features</a></td> - <td class="rowLine" colspan="1"></td> + <td class="rowLine" colspan="1"> + + + </td> </tr> </table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> </td> @@ -196,7 +167,7 @@ </tr> </table> </td> - </tr> - </table> - </center> + </tr> +</table> +</center> </html> Modified: trunk/build/aggregate/webtools-site/pom.xml =================================================================== --- trunk/build/aggregate/webtools-site/pom.xml 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/pom.xml 2011-11-23 19:59:19 UTC (rev 36580) @@ -4,13 +4,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.webtools</groupId> - <artifactId>org.jboss.tools.webtools.site</artifactId> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.site.webtools</artifactId> <name>JBoss Tools - Web Tools Site</name> - <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -26,9 +25,15 @@ <quiet>true</quiet> <tasks> <!-- called AFTER generating update site + zip to add in extra content --> - <ant antfile="build.xml"> + <condition property="output.dir" value="${WORKSPACE}/results" + else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + <ant antfile="build.xml" target="basic.build" dir="../"> + <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools - Web Tools"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Deleted: trunk/build/aggregate/webtools-site/remove-references.xsl =================================================================== --- trunk/build/aggregate/webtools-site/remove-references.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/remove-references.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,20 +0,0 @@ -<?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="references" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/webtools-site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/webtools-site/remove-uncategorized.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/remove-uncategorized.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,20 +0,0 @@ -<?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=&quot;unit[contains((a)id,&#39;site.xml.Default&#39;)]&quot; /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/webtools-site/site.xsl =================================================================== --- trunk/build/aggregate/webtools-site/site.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/site.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,126 +0,0 @@ -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan" - xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml" - extension-element-prefixes="saxon"> - <xsl:output method="html" indent="yes" /> - <xsl:template match="/site"> - <table cellspacing="2" cellpadding="0" border="0"> - <xsl:if test="count(feature[contains(@id,'jboss')])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> - <!-- JBoss features --> - <xsl:for-each select="feature[contains(@id,'jboss')]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> - <!-- other features --> - <xsl:for-each select="feature[not(contains(@id,'jboss'))]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine" colspan="1"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine" colspan="1"> - :: - <a href="plugins/" style="font-size:x-small">plugins</a> - :: - <a href="features/" style="font-size:x-small">features</a> - </td> - <td class="rowLine" colspan="1"> - </td> - </tr> - </table> - <br /> - </xsl:template> -</xsl:stylesheet> Deleted: trunk/build/aggregate/webtools-site/web/site.css =================================================================== --- trunk/build/aggregate/webtools-site/web/site.css 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/web/site.css 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,66 +0,0 @@ -< -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