JBoss Tools SVN: r36570 - in trunk/build/aggregate: site and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-23 12:57:02 -0500 (Wed, 23 Nov 2011)
New Revision: 36570
Added:
trunk/build/aggregate/README.installation.txt
trunk/build/aggregate/build.xml
trunk/build/aggregate/remove-references.xsl
trunk/build/aggregate/remove-uncategorized.xsl
trunk/build/aggregate/site.xsl
trunk/build/aggregate/site/sources/
trunk/build/aggregate/site/sources/associate.properties
trunk/build/aggregate/site/sources/index-template.html
trunk/build/aggregate/site/sources/index.html
trunk/build/aggregate/site/sources/pom.xml
trunk/build/aggregate/site/sources/site.xml
trunk/build/aggregate/web/
trunk/build/aggregate/web/site.css
Removed:
trunk/build/aggregate/site/README.installation.txt
trunk/build/aggregate/site/build.xml
trunk/build/aggregate/site/remove-references.xsl
trunk/build/aggregate/site/remove-uncategorized.xsl
trunk/build/aggregate/site/site.xsl
trunk/build/aggregate/site/web/site.css
Modified:
trunk/build/aggregate/site/index.html
trunk/build/aggregate/site/pom.xml
Log:
refactor for reuse - can now build both JBT Agg and JBT Sources Agg sites from single build.xml (+ 3 xsl scripts). Next step: repeat for soa, webtools, bottests.
Copied: trunk/build/aggregate/README.installation.txt (from rev 36569, trunk/build/aggregate/site/README.installation.txt)
===================================================================
--- trunk/build/aggregate/README.installation.txt (rev 0)
+++ trunk/build/aggregate/README.installation.txt 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,10 @@
+This file is an Eclipse update zip to be used from within an Eclipse installations update manager.
+
+Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work.
+
+In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager
+( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from
+this zip file.
+
+For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip
+
Copied: trunk/build/aggregate/build.xml (from rev 36569, trunk/build/aggregate/site/build.xml)
===================================================================
--- trunk/build/aggregate/build.xml (rev 0)
+++ trunk/build/aggregate/build.xml 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,803 @@
+<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.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 -->
+ <condition property="associate.properties" value="${output.dir}/associate.properties">
+ <available file="${output.dir}/associate.properties" type="file" />
+ </condition>
+ <condition property="associate.properties" value="associate.properties">
+ <available file="associate.properties" type="file" />
+ </condition>
+ <property file="${associate.properties}" />
+ <property name="web.content.files" value="index.html, web/*.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>
+
+ <target name="basic.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="custom.build" description="JBT aggregate update site extra processing steps" depends="basic.build,collect.zips,collect.metadata,create.summary.file" />
+
+ <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/saxonhe9-3-0-..." />
+ <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="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo>
+ </then>
+ <else>
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+
+ <var name="wget.return" unset="true" />
+ <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" />
+ </exec>
+ <if>
+ <not>
+ <equals arg1="${wget.return}" arg2="0" />
+ </not>
+ <then>
+ <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo>
+ </then>
+ </if>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" />
+ </else>
+ </if>
+ </else>
+ </if>
+
+ <if>
+ <available file="${aggregate.zips.dir}/@{zipPath}" type="file" />
+ <then>
+ <!-- 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"> <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"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+ <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+ </sequential>
+ </for>
+ <echo file="${update.site.source.dir}/content.xml" append="true"> </references>
+</repository>
+</echo>
+ </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>
+--
+Could not find ${output.dir}/target/site or ${output.dir}/target/site_assembly.zip
+--
+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" />
+
+ <antcallback target="generate.directory.xml" return="directory.xml.html"/>
+
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="${output.dir}/index-template.html" />
+ <mapper type="merge" to="index.html" />
+ <filterchain>
+ <expandproperties />
+ <replacetokens>
+ <token key="DIRECTORY.XML" value="${directory.xml.html}"/>
+ </replacetokens>
+ </filterchain>
+ </copy>
+
+ <copy todir="${update.site.source.dir}" overwrite="true">
+ <fileset dir="${basedir}" includes="${web.content.files}" />
+ </copy>
+ <copy todir="${update.site.source.dir}" overwrite="true">
+ <fileset dir="${output.dir}" includes="${web.content.files}" />
+ </copy>
+ </target>
+
+ <target name="generate.directory.xml">
+ <!-- get filename matching org.jboss.tools.central.discovery_1.0.0.v20111013-0511-M4.jar, then generate replacement directory.xml file -->
+ <path id="central.discovery.jar.id">
+ <fileset dir="${update.site.source.dir}/plugins">
+ <include name="org.jboss.tools.central.discovery_*.jar" />
+ </fileset>
+ </path>
+ <property name="central.discovery.path" refid="central.discovery.jar.id" />
+ <basename property="central.discovery.jar" file="${central.discovery.path}" />
+ <var name="directory.xml.html" value=""/>
+ <if>
+ <not>
+ <equals arg1="${central.discovery.path}" arg2="" trim="true" />
+ </not>
+ <then>
+ <echo level="verbose">Generate ${output.dir}/jbosstools-directory.xml pointing at discovery jar: plugins/${central.discovery.jar}</echo>
+ <echo file="${output.dir}/jbosstools-directory.xml"><?xml version='1.0' encoding='UTF-8'?>
+<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
+<entry url="plugins/${central.discovery.jar}" permitCategories="true"/>
+</directory>
+</echo>
+ <var name="directory.xml.html" value=":: <a href="jbosstools-directory.xml" style="font-size:x-small">jbosstools-directory.xml</a>"/>
+ </then>
+ </if>
+ </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/_composite_/trunk" />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.metadata.with.errors" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.xml" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2,3,4" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.txt" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2,3,4,5" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
+ <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.with.errors" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2" />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml">
+ <delete dir="${aggregate.zips.dir}" quiet="true" />
+ </target>
+
+ <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors">
+ <delete dir="${aggregate.zips.dir}" quiet="true" />
+ </target>
+
+ <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
+ <property name="aggregate.zips.dir" value="${output.dir}/zips" />
+ <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="(.+)(a)(.+)" replace="\1" />
+ <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" />
+ <if>
+ <isset property="${prefix}.revision.module" />
+ <then>
+ <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
+ <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
+ <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" />
+ <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" />
+ <var name="temprm.all" unset="true" />
+ <var name="temprr.all" unset="true" />
+ </then>
+ <else>
+ <var name="${prefix}.revision.module" value="${temprm}" />
+ <var name="${prefix}.revision.revision" value="${temprr}" />
+ </else>
+ </if>
+ <var name="temprm" unset="true" />
+ <var name="temprr" unset="true" />
+ </sequential>
+ </for>
+ <var name="temp" unset="true" />
+ </then>
+ </elseif>
+ </if>
+
+ <var name="prefix" unset="true" />
+ </sequential>
+
+ </for>
+ <for param="svnrevfile">
+ <path>
+ <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" />
+ </path>
+ <sequential>
+ <!-- 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>
Copied: trunk/build/aggregate/remove-references.xsl (from rev 36569, trunk/build/aggregate/site/remove-references.xsl)
===================================================================
--- trunk/build/aggregate/remove-references.xsl (rev 0)
+++ trunk/build/aggregate/remove-references.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:template match="/">
+ <xsl:apply-templates select="*"/>
+</xsl:template>
+
+
+<xsl:template match="*">
+ <xsl:copy >
+ <xsl:for-each select="@*">
+ <xsl:copy />
+ </xsl:for-each>
+ <xsl:apply-templates />
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="references" />
+
+</xsl:stylesheet>
\ No newline at end of file
Copied: trunk/build/aggregate/remove-uncategorized.xsl (from rev 36569, trunk/build/aggregate/site/remove-uncategorized.xsl)
===================================================================
--- trunk/build/aggregate/remove-uncategorized.xsl (rev 0)
+++ trunk/build/aggregate/remove-uncategorized.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:template match="/">
+ <xsl:apply-templates select="*"/>
+</xsl:template>
+
+
+<xsl:template match="*">
+ <xsl:copy >
+ <xsl:for-each select="@*">
+ <xsl:copy />
+ </xsl:for-each>
+ <xsl:apply-templates />
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="unit[contains(@id,'site.xml.Default')]" />
+
+</xsl:stylesheet>
\ No newline at end of file
Deleted: trunk/build/aggregate/site/README.installation.txt
===================================================================
--- trunk/build/aggregate/site/README.installation.txt 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/README.installation.txt 2011-11-23 17:57:02 UTC (rev 36570)
@@ -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/site/build.xml
===================================================================
--- trunk/build/aggregate/site/build.xml 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/build.xml 2011-11-23 17:57:02 UTC (rev 36570)
@@ -1,774 +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.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>
-
- <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,collect.zips,collect.metadata,create.summary.file" />
-
- <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/saxonhe9-3-0-..." />
- <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="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo>
- </then>
- <else>
- <if>
- <contains string="${location.cleaned}" substring=":/" />
- <then>
-
- <var name="wget.return" unset="true" />
- <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
- <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" />
- </exec>
- <if>
- <not>
- <equals arg1="${wget.return}" arg2="0" />
- </not>
- <then>
- <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo>
- </then>
- </if>
- </then>
- <else>
- <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" />
- </else>
- </if>
- </else>
- </if>
-
- <if>
- <available file="${aggregate.zips.dir}/@{zipPath}" type="file" />
- <then>
- <!-- 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"> <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"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
- <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
-</echo>
- </sequential>
- </for>
- <echo file="${update.site.source.dir}/content.xml" append="true"> </references>
-</repository>
-</echo>
- </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>
-
- <!-- get filename matching org.jboss.tools.central.discovery_1.0.0.v20111013-0511-M4.jar, then generate replacement directory.xml file -->
- <path id="central.discovery.jar.id">
- <fileset dir="${update.site.source.dir}/plugins">
- <include name="org.jboss.tools.central.discovery_*.jar" />
- </fileset>
- </path>
- <property name="central.discovery.path" refid="central.discovery.jar.id" />
- <basename property="central.discovery.jar" file="${central.discovery.path}" />
- <echo file="${output.dir}/jbosstools-directory.xml"><?xml version='1.0' encoding='UTF-8'?>
-<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="plugins/${central.discovery.jar}" permitCategories="true"/>
-</directory>
-</echo>
- <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/_composite_/trunk" />
- </antcall>
- </target>
-
- <target name="test.collect.zips.from.metadata.with.errors" depends="init">
- <property name="isTest" value="true" />
- <antcall target="collect.zips">
- <param name="inputRepos" value="1,2" />
- <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." />
- </antcall>
- </target>
-
- <target name="test.collect.zips.from.list.xml" depends="init">
- <property name="isTest" value="true" />
- <antcall target="collect.zips">
- <param name="inputRepos" value="1,2,3,4" />
- <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" />
- </antcall>
- </target>
-
- <target name="test.collect.zips.from.list.txt" depends="init">
- <property name="isTest" value="true" />
- <antcall target="collect.zips">
- <param name="inputRepos" value="1,2,3,4,5" />
- <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
- <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
- </antcall>
- </target>
-
- <target name="test.collect.zips.from.list.with.errors" depends="init">
- <property name="isTest" value="true" />
- <antcall target="collect.zips">
- <param name="inputRepos" value="1,2" />
- <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
- </antcall>
- </target>
-
- <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml">
- <delete dir="${aggregate.zips.dir}" quiet="true" />
- </target>
-
- <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors">
- <delete dir="${aggregate.zips.dir}" quiet="true" />
- </target>
-
- <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
- <property name="aggregate.zips.dir" value="${output.dir}/zips" />
- <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="(.+)(a)(.+)" replace="\1" />
- <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" />
- <if>
- <isset property="${prefix}.revision.module" />
- <then>
- <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
- <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
- <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" />
- <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" />
- <var name="temprm.all" unset="true" />
- <var name="temprr.all" unset="true" />
- </then>
- <else>
- <var name="${prefix}.revision.module" value="${temprm}" />
- <var name="${prefix}.revision.revision" value="${temprr}" />
- </else>
- </if>
- <var name="temprm" unset="true" />
- <var name="temprr" unset="true" />
- </sequential>
- </for>
- <var name="temp" unset="true" />
- </then>
- </elseif>
- </if>
-
- <var name="prefix" unset="true" />
- </sequential>
-
- </for>
- <for param="svnrevfile">
- <path>
- <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" />
- </path>
- <sequential>
- <!-- 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>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/index.html 2011-11-23 17:57:02 UTC (rev 36570)
@@ -96,8 +96,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111117-2059-H532-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span style="font-size:x-small">3.2.1.v20111117-2059-H532-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20111123-1056-H540-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20111123-1056-H540-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -105,8 +105,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <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">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -114,8 +114,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111117-2101-H499-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111117-2101-H499-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.freemarker.feature_1.2.0.v20111123-1107-H507-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.freemarker.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111123-1107-H507-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -123,15 +123,15 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111117-2104-H531-M5.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111117-2104-H531-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.birt.feature_1.3.0.v20111123-1103-H539-M5.jar" style="font-size:x-small">org.jboss.tools.birt.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111123-1103-H539-M5</span></td>
<td><span style="font-size:x-small">
|
ReportTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111121-1401-H692-M5.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111121-1401-H692-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.feature_1.2.0.v20111123-1202-H698-M5.jar" style="font-size:x-small">org.jboss.tools.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111123-1202-H698-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -141,8 +141,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111121-1401-H692-M5.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111121-1401-H692-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.cdi.seam.feature_1.2.0.v20111123-1202-H698-M5.jar" style="font-size:x-small">org.jboss.tools.cdi.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111123-1202-H698-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -164,42 +164,42 @@
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.core.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.core.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.jdt.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.mylyn.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.mylyn.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.mylyn.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.mylyn.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.text.ext.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.text.ext.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.ui.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.ui.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111119-0318-H569-M5.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0318-H569-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.common.verification.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.verification.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
<td></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
@@ -212,29 +212,29 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111118-0818-H751-M5.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
- <td><span style="font-size:x-small">1.0.1.v20111118-0818-H751-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.deltacloud.feature_1.0.1.v20111123-1135-H760-M5.jar" style="font-size:x-small">org.jboss.tools.deltacloud.feature</a></td>
+ <td><span style="font-size:x-small">1.0.1.v20111123-1135-H760-M5</span></td>
<td><span style="font-size:x-small">
|
CloudTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111117-2108-H362-M5.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
- <td><span style="font-size:x-small">1.0.0.v20111117-2108-H362-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.forge.feature_1.0.0.v20111123-1050-H369-M5.jar" style="font-size:x-small">org.jboss.tools.forge.feature</a></td>
+ <td><span style="font-size:x-small">1.0.0.v20111123-1050-H369-M5</span></td>
<td><span style="font-size:x-small">
|
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111117-2059-H316-M5.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
- <td><span style="font-size:x-small">1.0.2.v20111117-2059-H316-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.gwt.feature_1.0.2.v20111122-1931-H322-M5.jar" style="font-size:x-small">org.jboss.tools.gwt.feature</a></td>
+ <td><span style="font-size:x-small">1.0.2.v20111122-1931-H322-M5</span></td>
<td><span style="font-size:x-small">
|
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111117-2058-H493-M5.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111117-2058-H493-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20111123-1105-H499-M5.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111123-1105-H499-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -242,8 +242,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111119-0708-H526-M5.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0708-H526-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jsf.feature_3.3.0.v20111123-1249-H532-M5.jar" style="font-size:x-small">org.jboss.tools.jsf.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1249-H532-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -251,8 +251,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111118-1850-H640-M5.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111118-1850-H640-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.jst.feature_3.3.0.v20111123-1128-H647-M5.jar" style="font-size:x-small">org.jboss.tools.jst.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1128-H647-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -260,15 +260,15 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.cdi.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.cdi.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -276,57 +276,57 @@
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.hibernate.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.hibernate.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jaxrs.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jbosspackaging.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jbosspackaging.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.jsf.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.jsf.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.portlet.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.project.examples.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.project.examples.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111121-1523-H478-M5.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
- <td><span style="font-size:x-small">1.3.0.v20111121-1523-H478-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.maven.seam.feature_1.3.0.v20111122-1616-H479-M5.jar" style="font-size:x-small">org.jboss.tools.maven.seam.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111122-1616-H479-M5</span></td>
<td><span style="font-size:x-small">
|
MavenTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.openshift.egit.integration.feature_2.3.0.v20111118-2002-H54-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111118-2002-H54-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.egit.integration.feature_2.3.0.v20111123-1141-H62-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.egit.integration.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111123-1141-H62-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -334,8 +334,8 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111118-2002-H54-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
- <td><span style="font-size:x-small">2.3.0.v20111118-2002-H54-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.feature_2.3.0.v20111123-1141-H62-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.express.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111123-1141-H62-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -343,8 +343,8 @@
CloudTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111121-1708-H414-M5.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
- <td><span style="font-size:x-small">1.2.0.v20111121-1708-H414-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.portlet.feature_1.2.0.v20111122-1559-H416-M5.jar" style="font-size:x-small">org.jboss.tools.portlet.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111122-1559-H416-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -361,8 +361,8 @@
GeneralTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111119-0708-H526-M5.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0708-H526-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.richfaces.feature_3.3.0.v20111123-1249-H532-M5.jar" style="font-size:x-small">org.jboss.tools.richfaces.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1249-H532-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -398,8 +398,8 @@
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111119-0659-H670-M5.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111119-0659-H670-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.seam.feature_3.3.0.v20111122-1926-H674-M5.jar" style="font-size:x-small">org.jboss.tools.seam.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111122-1926-H674-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -407,8 +407,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111121-1740-H434-M5.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111121-1740-H434-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.struts.feature_3.3.0.v20111122-1825-H439-M5.jar" style="font-size:x-small">org.jboss.tools.struts.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111122-1825-H439-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -416,15 +416,15 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111117-2053-H456-M5.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
- <td><span style="font-size:x-small">1.1.0.v20111117-2053-H456-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.usage.feature_1.1.0.v20111123-1038-H459-M5.jar" style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span style="font-size:x-small">1.1.0.v20111123-1038-H459-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111118-1909-H606-M5.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111118-1909-H606-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.vpe.feature_3.3.0.v20111123-1152-H615-M5.jar" style="font-size:x-small">org.jboss.tools.vpe.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1152-H615-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -432,8 +432,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111118-0830-H618-M5.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111118-0830-H618-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.feature_1.2.2.v20111122-1538-H623-M5.jar" style="font-size:x-small">org.jboss.tools.ws.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111122-1538-H623-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -441,8 +441,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111118-0830-H618-M5.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
- <td><span style="font-size:x-small">1.2.2.v20111118-0830-H618-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.ws.jaxrs.feature_1.2.2.v20111122-1538-H623-M5.jar" style="font-size:x-small">org.jboss.tools.ws.jaxrs.feature</a></td>
+ <td><span style="font-size:x-small">1.2.2.v20111122-1538-H623-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -450,8 +450,8 @@
WebTools</span></td>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111118-1909-H606-M5.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
- <td><span style="font-size:x-small">3.3.0.v20111118-1909-H606-M5</span></td>
+ <td class="rowLine"><a href="features/org.jboss.tools.xulrunner.feature_3.3.0.v20111123-1152-H615-M5.jar" style="font-size:x-small">org.jboss.tools.xulrunner.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1152-H615-M5</span></td>
<td></td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -463,8 +463,8 @@
</th>
</tr>
<tr style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111117-2115-H559-M5.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
- <td><span style="font-size:x-small">3.4.0.v20111117-2115-H559-M5</span></td>
+ <td class="rowLine"><a href="features/org.hibernate.eclipse.feature_3.4.0.v20111123-1130-H568-M5.jar" style="font-size:x-small">org.hibernate.eclipse.feature</a></td>
+ <td><span style="font-size:x-small">3.4.0.v20111123-1130-H568-M5</span></td>
<td><span style="font-size:x-small">
|
AbridgedTools</span><span style="font-size:x-small">
@@ -497,8 +497,9 @@
::
<a href="features/" style="font-size:x-small">features</a></td>
<td class="rowLine" colspan="1">
- ::
- <a href="jbosstools-directory.xml" style="font-size:x-small">jbosstools-directory.xml</a></td>
+ :: <a href="jbosstools-directory.xml" style="font-size:x-small">jbosstools-directory.xml</a>
+
+ </td>
</tr>
</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br>
</td>
Modified: trunk/build/aggregate/site/pom.xml
===================================================================
--- trunk/build/aggregate/site/pom.xml 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/pom.xml 2011-11-23 17:57:02 UTC (rev 36570)
@@ -6,6 +6,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.aggregate.site</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.aggregate</artifactId>
@@ -26,7 +27,12 @@
<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" dir="../">
+ <property name="output.dir" value="${output.dir}" />
<property name="inputRepo"
value="${jbosstools-nightly-staging-composite}" />
<property name="JBT_VERSION" value="${JBT_VERSION}" />
Deleted: trunk/build/aggregate/site/remove-references.xsl
===================================================================
--- trunk/build/aggregate/site/remove-references.xsl 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/remove-references.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -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/site/remove-uncategorized.xsl
===================================================================
--- trunk/build/aggregate/site/remove-uncategorized.xsl 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/remove-uncategorized.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -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="unit[contains(@id,'site.xml.Default')]" />
-
-</xsl:stylesheet>
\ No newline at end of file
Deleted: trunk/build/aggregate/site/site.xsl
===================================================================
--- trunk/build/aggregate/site/site.xsl 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/site.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -1,128 +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">
- ::
- <a href="jbosstools-directory.xml" style="font-size:x-small">jbosstools-directory.xml</a>
- </td>
- </tr>
- </table>
- <br />
- </xsl:template>
-</xsl:stylesheet>
Added: trunk/build/aggregate/site/sources/associate.properties
===================================================================
--- trunk/build/aggregate/site/sources/associate.properties (rev 0)
+++ trunk/build/aggregate/site/sources/associate.properties 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,7 @@
+# options: Nightly Build (default), Development Milestone, Stable Release
+#update.site.description=Nightly Build
+#update.site.description=Development Milestone
+#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
+
+# associate sites to add to the resulting repo
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Added: trunk/build/aggregate/site/sources/index-template.html
===================================================================
--- trunk/build/aggregate/site/sources/index-template.html (rev 0)
+++ trunk/build/aggregate/site/sources/index-template.html 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,136 @@
+<html>
+<head>
+<title>JBoss Tools ${update.site.description} Update Site${update.site.version} [Sources]</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>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">JBoss Tools ${update.site.description} Update Site [Sources]</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.
+ <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">install</a>
+ 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">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </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">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
Added: trunk/build/aggregate/site/sources/index.html
===================================================================
--- trunk/build/aggregate/site/sources/index.html (rev 0)
+++ trunk/build/aggregate/site/sources/index.html 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,229 @@
+<html>
+<head>
+<title>JBoss Tools Nightly Build Update Site [Sources]</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>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">JBoss Tools Nightly Build Update Site [Sources]</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.
+ <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">install</a>
+ 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">Installation
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </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">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+
+ </th>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.source.feature_3.2.1.v20111123-1056-H540-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.source.feature</a></td>
+ <td><span style="font-size:x-small">3.2.1.v20111123-1056-H540-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.source.feature_2.3.0.v20111123-1119-H853-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.source.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">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.birt.source.feature_1.3.0.v20111123-1103-H539-M5.jar" style="font-size:x-small">org.jboss.tools.birt.source.feature</a></td>
+ <td><span style="font-size:x-small">1.3.0.v20111123-1103-H539-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.all.source.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.all.source.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.jdt.source.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.jdt.source.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.common.mylyn.source.feature_3.3.0.v20111123-1023-H573-M5.jar" style="font-size:x-small">org.jboss.tools.common.mylyn.source.feature</a></td>
+ <td><span style="font-size:x-small">3.3.0.v20111123-1023-H573-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.jmx.source.feature_1.2.0.v20111123-1105-H499-M5.jar" style="font-size:x-small">org.jboss.tools.jmx.source.feature</a></td>
+ <td><span style="font-size:x-small">1.2.0.v20111123-1105-H499-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#FFFFFF
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.egit.integration.source.feature_2.3.0.v20111123-1141-H62-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.egit.integration.source.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111123-1141-H62-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <tr style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a href="features/org.jboss.tools.openshift.express.source.feature_2.3.0.v20111123-1141-H62-M5.jar" style="font-size:x-small">org.jboss.tools.openshift.express.source.feature</a></td>
+ <td><span style="font-size:x-small">2.3.0.v20111123-1141-H62-M5</span></td>
+ <td><span style="font-size:x-small">
+ |
+ AllSources</span></td>
+ </tr>
+ <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 xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br>
+ </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">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
Copied: trunk/build/aggregate/site/sources/pom.xml (from rev 36569, trunk/build/aggregate/site/pom.xml)
===================================================================
--- trunk/build/aggregate/site/sources/pom.xml (rev 0)
+++ trunk/build/aggregate/site/sources/pom.xml 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.aggregate.site</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.site.aggregate</artifactId>
+ <name>JBoss Tools Aggregate Site [Sources]</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <!-- called AFTER generating update site + zip to add in extra content -->
+ <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="JBT_VERSION" value="${JBT_VERSION}" />
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>${jbosstools-nightly-staging-composite}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>${jboss-requirements-composite-mirror}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+</project>
Added: trunk/build/aggregate/site/sources/site.xml
===================================================================
--- trunk/build/aggregate/site/sources/site.xml (rev 0)
+++ trunk/build/aggregate/site/sources/site.xml 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>JBoss Tools 3.3 Updates</description>
+
+ <!-- only in JBDS
+ <feature url="features/com.jboss.jbds.product.source.feature_0.0.0.jar" id="com.jboss.jbds.product.source.feature" version="0.0.0" patch="false">
+ <category name="AllSources" />
+ </feature>
+ -->
+
+ <!--
+ <feature url="features/org.jboss.tools.central.source.feature_0.0.0.jar" id="org.jboss.tools.central.source.feature" version="0.0.0">
+ <category name="AllSources"/>
+ </feature>
+ <feature url="features/org.jboss.tools.central.discovery.source.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.source.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.richfaces.source.feature_0.0.0.jar" id="org.jboss.tools.richfaces.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+ <!-- include and categorize in JBT -->
+ <!--
+ <feature url="features/org.jboss.tools.jst.source.feature_0.0.0.jar" id="org.jboss.tools.jst.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.vpe.source.feature_0.0.0.jar" id="org.jboss.tools.vpe.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.jsf.source.feature_0.0.0.jar" id="org.jboss.tools.jsf.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+ <!-- include but do not categorize -->
+ <!--
+ <feature url="features/org.jboss.tools.xulrunner.source.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.source.feature" version="0.0.0"></feature>
+ <feature url="features/org.mozilla.xulrunner.source.feature_0.0.0.jar" id="org.mozilla.xulrunner.source.feature" version="0.0.0"></feature>
+
+ <feature url="features/org.jboss.tools.seam.source.feature_0.0.0.jar" id="org.jboss.tools.seam.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.cdi.source.feature_0.0.0.jar" id="org.jboss.tools.cdi.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.cdi.seam.source.feature_0.0.0.jar" id="org.jboss.tools.cdi.seam.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+ <feature url="features/org.jboss.tools.jmx.source.feature_0.0.0.jar" id="org.jboss.tools.jmx.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.source.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <!-- only in JBT -->
+ <feature url="features/org.jboss.tools.openshift.express.source.feature_0.0.0.jar" id="org.jboss.tools.openshift.express.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.openshift.egit.integration.source.feature_0.0.0.jar" id="org.jboss.tools.openshift.egit.integration.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.archives.source.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <!--
+ <feature url="features/org.hibernate.eclipse.source.feature_0.0.0.jar" id="org.hibernate.eclipse.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.freemarker.source.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.struts.source.feature_0.0.0.jar" id="org.jboss.tools.struts.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.ws.source.feature_0.0.0.jar" id="org.jboss.tools.ws.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+ <!-- only in JBT -->
+ <!--
+ <feature url="features/org.jboss.tools.ws.jaxrs.source.feature_0.0.0.jar" id="org.jboss.tools.ws.jaxrs.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.portlet.source.feature_0.0.0.jar" id="org.jboss.tools.portlet.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.project.examples.source.feature_0.0.0.jar" id="org.jboss.tools.project.examples.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.forge.source.feature_0.0.0.jar" id="org.jboss.tools.forge.source.feature" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.community.project.examples.source.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+ <feature url="features/org.jboss.tools.birt.source.feature_0.0.0.jar" id="org.jboss.tools.birt.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <!--
+ <feature url="features/org.jboss.tools.maven.source.feature_0.0.0.jar" id="org.jboss.tools.maven.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.seam.source.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.jsf.source.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.cdi.source.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.hibernate.source.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.portlet.source.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.jaxrs.source.feature_0.0.0.jar" id="org.jboss.tools.maven.jaxrs.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.jbosspackaging.source.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.maven.project.examples.source.feature_0.0.0.jar" id="org.jboss.tools.maven.project.examples.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.deltacloud.source.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.gwt.source.feature_0.0.0.jar" id="org.jboss.tools.gwt.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+
+ -->
+ <feature url="features/org.jboss.tools.common.all.source.feature_0.0.0.jar" id="org.jboss.tools.common.all.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.common.jdt.source.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.common.mylyn.source.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <!--
+ <feature url="features/org.jboss.tools.runtime.source.feature_0.0.0.jar" id="org.jboss.tools.runtime.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+
+ <feature url="features/org.jboss.tools.runtime.core.source.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+
+ <feature url="features/org.jboss.tools.runtime.as.detector.source.feature_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+
+ <feature url="features/org.jboss.tools.runtime.seam.detector.source.feature_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+
+ <feature url="features/org.jboss.tools.usage.source.feature_0.0.0.jar" id="org.jboss.tools.usage.source.feature" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ -->
+
+ <category-def name="AllSources" label="JBoss Tools 3.3 [Sources]">
+ <description>[Sources] Contains JBoss Tools feature sources.</description>
+ </category-def>
+</site>
Deleted: trunk/build/aggregate/site/web/site.css
===================================================================
--- trunk/build/aggregate/site/web/site.css 2011-11-23 16:25:49 UTC (rev 36569)
+++ trunk/build/aggregate/site/web/site.css 2011-11-23 17:57:02 UTC (rev 36570)
@@ -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
Copied: trunk/build/aggregate/site.xsl (from rev 36569, trunk/build/aggregate/site/site.xsl)
===================================================================
--- trunk/build/aggregate/site.xsl (rev 0)
+++ trunk/build/aggregate/site.xsl 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +1,127 @@
+<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">
+ @DIRECTORY.XML@
+ </td>
+ </tr>
+ </table>
+ <br />
+ </xsl:template>
+</xsl:stylesheet>
Copied: trunk/build/aggregate/web/site.css (from rev 36569, trunk/build/aggregate/site/web/site.css)
===================================================================
--- trunk/build/aggregate/web/site.css (rev 0)
+++ trunk/build/aggregate/web/site.css 2011-11-23 17:57:02 UTC (rev 36570)
@@ -0,0 +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
+>
\ No newline at end of file
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36569 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: create and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-23 11:25:49 -0500 (Wed, 23 Nov 2011)
New Revision: 36569
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/web/jboss/JBossJSFPortletCapabilitiesWizardPageFillingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/WorkspaceMatchersFactory.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/AssociatedPerspectiveDialogClosingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/WizardFillingTask.java
Log:
Refactored Java portlet project test (created abstraction) and added test for jsf portlet project
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -1,5 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test;
+import org.jboss.tools.portlet.ui.bot.test.create.CreateJSFPortletProject;
import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortlet;
import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject;
import org.jboss.tools.portlet.ui.bot.test.create.RunJavaPortletOnServer;
@@ -10,7 +11,8 @@
@Suite.SuiteClasses({
CreateJavaPortletProject.class,
CreateJavaPortlet.class,
- RunJavaPortletOnServer.class
+ RunJavaPortletOnServer.class,
+ CreateJSFPortletProject.class
})
public class AllTestsSuite {
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -0,0 +1,13 @@
+package org.jboss.tools.portlet.ui.bot.test;
+
+import org.jboss.tools.portlet.ui.bot.test.create.CreateJSFPortletProject;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareUsageWindowClosingSuite.class)
+(a)Suite.SuiteClasses({
+ CreateJSFPortletProject.class,
+ })
+public class JSFPortletTestSuite {
+
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JavaPortletTestSuite.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -0,0 +1,17 @@
+package org.jboss.tools.portlet.ui.bot.test;
+
+import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortlet;
+import org.jboss.tools.portlet.ui.bot.test.create.CreateJavaPortletProject;
+import org.jboss.tools.portlet.ui.bot.test.create.RunJavaPortletOnServer;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareUsageWindowClosingSuite.class)
+(a)Suite.SuiteClasses({
+ CreateJavaPortletProject.class,
+ CreateJavaPortlet.class,
+ RunJavaPortletOnServer.class
+ })
+public class JavaPortletTestSuite {
+
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJSFPortletProject.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -0,0 +1,53 @@
+package org.jboss.tools.portlet.ui.bot.test.create;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate;
+
+
+/**
+ * Creates a new Dynamic Web Project with the specific JBoss JSF Portlet facet.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class CreateJSFPortletProject extends CreatePortletProjectTemplate{
+
+ public static final String PROJECT_NAME = "jsf-portlet";
+
+ protected static final FacetDefinition JSF_PORTLET_FACET = new FacetDefinition("JBoss JSF Portlet", JBOSS_FACET_CATEGORY);
+
+ protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces");
+
+ @Override
+ public String getProjectName() {
+ return PROJECT_NAME;
+ }
+
+ @Override
+ public List<FacetDefinition> getRequiredFacets() {
+ List<FacetDefinition> facets = new ArrayList<FacetDefinition>();
+ facets.add(JAVA_FACET);
+ facets.add(JSF_FACET);
+ facets.add(CORE_PORTLET_FACET);
+ facets.add(JSF_PORTLET_FACET);
+ return facets;
+ }
+
+ @Override
+ public List<WizardPageFillingTask> getAdditionalWizardPages() {
+ List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>();
+ tasks.add(new WizardPageDefaultsFillingTask());
+ tasks.add(new WizardPageDefaultsFillingTask());
+ tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
+ tasks.add(new WizardPageDefaultsFillingTask());
+ tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
+ return tasks;
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -1,24 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.create;
-import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.hasFacets;
-import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
+import java.util.ArrayList;
+import java.util.List;
import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
-import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
-import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetsSelectionTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageDefaultsFillingTask;
-import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.DynamicWebProjectCreationTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask;
-import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.junit.Test;
+import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate;
/**
* Creates a new Dynamic Web Project with the specific JBoss Core Portlet facet.
@@ -26,42 +15,29 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP))
-public class CreateJavaPortletProject extends SWTTaskBasedTestCase{
+public class CreateJavaPortletProject extends CreatePortletProjectTemplate {
public static final String PROJECT_NAME = "java-portlet";
- private static final String FACET_CATEGORY = "JBoss Portlets";
-
- private static final String FACET_NAME = "JBoss Core Portlet";
-
- @Test
- public void testcreate(){
- doPerform(getCreateDynamicWebProjectTask());
-
- doAssertThat(0, isNumberOfErrors());
- doAssertThat(PROJECT_NAME, isExistingProject());
- doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), exists());
- doAssertThat(file(PROJECT_NAME, "JBoss Portlet Libraries"), exists());
- doAssertThat(PROJECT_NAME, hasFacets(new FacetDefinition(FACET_NAME, FACET_CATEGORY)));
+ @Override
+ public String getProjectName() {
+ return PROJECT_NAME;
}
- private AbstractSWTTask getCreateDynamicWebProjectTask() {
- DynamicWebProjectCreationTask task = new DynamicWebProjectCreationTask();
- task.setProjectName(PROJECT_NAME);
- task.setWebModuleVersion("2.5");
- task.setServerName(SWTTestExt.configuredState.getServer().name);
- task.setSelectFacetsTask(getSelectFacetsTask());
- task.addWizardPage(new WizardPageDefaultsFillingTask());
- task.addWizardPage(new WizardPageDefaultsFillingTask());
- task.addWizardPage(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
- return task;
+ @Override
+ public List<FacetDefinition> getRequiredFacets() {
+ List<FacetDefinition> facets = new ArrayList<FacetDefinition>();
+ facets.add(JAVA_FACET);
+ facets.add(CORE_PORTLET_FACET);
+ return facets;
}
- private FacetsSelectionTask getSelectFacetsTask() {
- FacetsSelectionTask task = new FacetsSelectionTask();
- task.addFacet(new FacetDefinition("Java", null, "1.6"));
- task.addFacet(new FacetDefinition(FACET_NAME, FACET_CATEGORY));
- return task;
+ @Override
+ public List<WizardPageFillingTask> getAdditionalWizardPages() {
+ List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>();
+ tasks.add(new WizardPageDefaultsFillingTask());
+ tasks.add(new WizardPageDefaultsFillingTask());
+ tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
+ return tasks;
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/WorkspaceMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/WorkspaceMatchersFactory.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/factory/WorkspaceMatchersFactory.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -1,6 +1,7 @@
package org.jboss.tools.portlet.ui.bot.test.matcher.factory;
import java.util.Arrays;
+import java.util.List;
import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.test.entity.WorkspaceFile;
@@ -35,6 +36,10 @@
return new ProjectFacetsMatcher(facets);
}
+ public static SWTMatcher<String> hasFacets(List<FacetDefinition> facets){
+ return new ProjectFacetsMatcher(facets.toArray(new FacetDefinition[facets.size()]));
+ }
+
public static SWTMatcher<WorkspaceFile> containsNodes(XMLNode... nodes){
return new XMLFileNodeContentMatcher(Arrays.asList(nodes));
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/AssociatedPerspectiveDialogClosingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/AssociatedPerspectiveDialogClosingTask.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/AssociatedPerspectiveDialogClosingTask.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -1,7 +1,10 @@
package org.jboss.tools.portlet.ui.bot.test.task.dialog;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
/**
@@ -26,6 +29,16 @@
SWTBot bot;
try {
+ for (final Shell s : getBot().getFinder().getShells()){
+ UIThreadRunnable.asyncExec(getBot().getDisplay(), new VoidResult(){
+
+ @Override
+ public void run() {
+ System.out.println(s.getText());
+ System.out.println(s);
+ }
+ });
+ }
bot = getBot().shell("Open Associated Perspective?").activate().bot();
} catch (WidgetNotFoundException e) {
// dialog is not open, skip the rest
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/dialog/ProjectPropertyDialogOpenTask.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -2,7 +2,6 @@
import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -62,6 +62,10 @@
facets.add(facet);
}
+ public void addAllFacets(List<FacetDefinition> f){
+ facets.addAll(f);
+ }
+
/**
* Matcher for locating the facet selection tree on the screen.
*
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/WizardFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/WizardFillingTask.java 2011-11-23 16:17:23 UTC (rev 36568)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/WizardFillingTask.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -4,6 +4,7 @@
import java.util.List;
import org.jboss.tools.portlet.ui.bot.test.task.CompositeSWTTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
/**
*
@@ -27,12 +28,18 @@
super.setTasks(wizardPages);
super.perform();
getBot().button("Finish").click();
+
+ SWTBotFactory.getUtil().waitForAll();
}
public void addWizardPage(WizardPageFillingTask task){
wizardPages.add(task);
}
+ public void addAllWizardPages(List<WizardPageFillingTask> tasks){
+ wizardPages.addAll(tasks);
+ }
+
@Override
protected void beforeTask(WizardPageFillingTask task) {
if (!isFirst(task)){
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/web/jboss/JBossJSFPortletCapabilitiesWizardPageFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/web/jboss/JBossJSFPortletCapabilitiesWizardPageFillingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/wizard/web/jboss/JBossJSFPortletCapabilitiesWizardPageFillingTask.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -0,0 +1,44 @@
+package org.jboss.tools.portlet.ui.bot.test.task.wizard.web.jboss;
+
+import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask;
+
+/**
+ * Fills the JBoss JSF portlet specific wizard page (for selection of
+ * how the portlet libraries should be configured)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class JBossJSFPortletCapabilitiesWizardPageFillingTask extends
+ AbstractSWTTask implements WizardPageFillingTask {
+
+ public enum Type {
+ DISABLED("Disable Library Configuration"),
+ USER("User library"),
+ RUNTIME_PROVIDER("JSF Portletbridge Runtime Provider");
+
+ private String desc;
+
+ private Type(String s) {
+ desc = s;
+ }
+
+ @Override
+ public String toString() {
+ return desc;
+ }
+ }
+
+ private Type type;
+
+ public JBossJSFPortletCapabilitiesWizardPageFillingTask(Type type) {
+ super();
+ this.type = type;
+ }
+
+ @Override
+ public void perform() {
+ getBot().comboBoxWithLabel("Type:").setSelection(type.toString());
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-23 16:25:49 UTC (rev 36569)
@@ -0,0 +1,72 @@
+package org.jboss.tools.portlet.ui.bot.test.template;
+
+import static org.jboss.tools.portlet.ui.bot.test.entity.EntityFactory.file;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.exists;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.hasFacets;
+import static org.jboss.tools.portlet.ui.bot.test.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
+
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.test.task.facet.FacetsSelectionTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.WizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.task.wizard.web.DynamicWebProjectCreationTask;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.junit.Test;
+
+/**
+ * Template test that creates a new dynamic web project with facets specified by
+ * concrete implementaions.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP))
+public abstract class CreatePortletProjectTemplate extends SWTTaskBasedTestCase {
+
+ protected static final String JBOSS_FACET_CATEGORY = "JBoss Portlets";
+
+ protected static final FacetDefinition CORE_PORTLET_FACET = new FacetDefinition("JBoss Core Portlet", JBOSS_FACET_CATEGORY);
+
+ protected static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6");
+
+ public abstract String getProjectName();
+
+ public abstract List<FacetDefinition> getRequiredFacets();
+
+ public abstract List<WizardPageFillingTask> getAdditionalWizardPages();
+
+ @Test
+ public void testcreate(){
+ doPerform(getCreateDynamicWebProjectTask());
+
+ doAssertThat(0, isNumberOfErrors());
+ doAssertThat(getProjectName(), isExistingProject());
+ doAssertThat(file(getProjectName(), "WebContent/WEB-INF/portlet.xml"), exists());
+ doAssertThat(file(getProjectName(), "JBoss Portlet Libraries"), exists());
+ doAssertThat(getProjectName(), hasFacets(getRequiredFacets()));
+ }
+
+ protected AbstractSWTTask getCreateDynamicWebProjectTask() {
+ DynamicWebProjectCreationTask task = new DynamicWebProjectCreationTask();
+ task.setProjectName(getProjectName());
+ task.setWebModuleVersion("2.5");
+ task.setServerName(SWTTestExt.configuredState.getServer().name);
+ task.setSelectFacetsTask(getSelectFacetsTask());
+ task.addAllWizardPages(getAdditionalWizardPages());
+ return task;
+ }
+
+ protected FacetsSelectionTask getSelectFacetsTask() {
+ FacetsSelectionTask task = new FacetsSelectionTask();
+ task.addAllFacets(getRequiredFacets());
+ return task;
+ }
+}
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36568 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-23 11:17:23 -0500 (Wed, 23 Nov 2011)
New Revision: 36568
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
Log:
[JBIDE-9927] switched to latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-11-23 16:15:44 UTC (rev 36567)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-11-23 16:17:23 UTC (rev 36568)
@@ -10,8 +10,8 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
-import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.client.IApplication;
@@ -75,7 +75,7 @@
setDomain(getUser().getDomain());
}
- public Collection<IApplication> loadApplications() throws OpenShiftException {
+ public List<IApplication> loadApplications() throws OpenShiftException {
IUser user = getUser();
if (user == null) {
return Collections.emptyList();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-11-23 16:15:44 UTC (rev 36567)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-11-23 16:17:23 UTC (rev 36568)
@@ -37,9 +37,9 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.openshift.express.client.Cartridge;
import org.jboss.tools.openshift.express.client.ICartridge;
import org.jboss.tools.openshift.express.client.OpenShiftException;
+import org.jboss.tools.openshift.express.internal.client.Cartridge;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
/**
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36567 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-23 11:15:44 -0500 (Wed, 23 Nov 2011)
New Revision: 36567
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-9927] switched to latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36566 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-11-23 09:17:26 -0500 (Wed, 23 Nov 2011)
New Revision: 36566
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
Log:
https://issues.jboss.org/browse/JBIDE-10221 /
https://issues.jboss.org/browse/JBIDE-10202 : VPE resource leak in TextFormattingToolBar
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2011-11-23 13:56:47 UTC (rev 36565)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2011-11-23 14:17:26 UTC (rev 36566)
@@ -177,7 +177,7 @@
* CSSStyleDialog should be on the Formatting toolbar.
*/
item = createToolItem(toolBar, SWT.PUSH,
- CSSPlugin.getImageDescriptor(Util.IMAGE_COLORLARGE_FILE_LOCATION).createImage(),
+ createImage(CSSPlugin.getImageDescriptor(Util.IMAGE_COLORLARGE_FILE_LOCATION)),
VpeUIMessages.EDIT_STYLE_ATTRIBUTE);
listener = new StyleFormatController(formatControllerManager, item);
item.addListener(SWT.Selection, listener);
@@ -208,10 +208,13 @@
}
private Image createImage(String path) {
- Image image = ImageDescriptor.createFromFile(MozillaEditor.class, path)
- .createImage();
+ ImageDescriptor imageDescriptor = ImageDescriptor.createFromFile(MozillaEditor.class, path);
+ return createImage(imageDescriptor);
+ }
+
+ private Image createImage(ImageDescriptor imageDescriptor) {
+ Image image = imageDescriptor.createImage();
imagesList.add(image);
-
return image;
}
-}
\ No newline at end of file
+}
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36565 - trunk/vpe/plugins/org.jboss.tools.vpe.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-11-23 08:56:47 -0500 (Wed, 23 Nov 2011)
New Revision: 36565
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-10020 - "F5" and "Ctrl+R" were added as Hot keys for VPE refresh
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2011-11-23 11:07:33 UTC (rev 36564)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2011-11-23 13:56:47 UTC (rev 36565)
@@ -13,12 +13,6 @@
<keys path="help/keys-vpe-menu.properties"/>
<keys path="help/keys-vpe-lists.properties"/>
</extension>
- <!-- extension
- point="org.jboss.tools.vpe.templates">
- <templates
- name="JSF Reference Implementation"
- path="templates/vpe-templates-jsf.xml"/>
- </extension -->
<extension
point="org.jboss.tools.common.model.resourceMapping">
<mapping
@@ -117,6 +111,14 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
contextId="org.jboss.tools.vpe.editorContext"
sequence="M1+M2+Tab"/>
+ <key commandId="org.jboss.tools.vpe.commands.refreshCommand"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ contextId="org.jboss.tools.vpe.editorContext"
+ sequence="M1+R"/>
+ <key commandId="org.jboss.tools.vpe.commands.refreshCommand"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ contextId="org.jboss.tools.vpe.editorContext"
+ sequence="F5"/>
</extension>
<extension
point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory">
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36564 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: resources/jsf and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-11-23 06:07:33 -0500 (Wed, 23 Nov 2011)
New Revision: 36564
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt
Log:
XHTML action and XHTML wizard added
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml 2011-11-23 11:07:33 UTC (rev 36564)
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
-<h:head></h:head>
-<body>
- <h:form>
- <h:commandButton action="#{bean.submit()}" value="Submit" />
- </h:form>
-
-</body>
-</html>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi 2011-11-23 11:07:33 UTC (rev 36564)
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<h:head></h:head>
+<body>
+ <h:form>
+ <h:commandButton action="#{bean.submit()}" value="Submit" />
+ </h:form>
+
+</body>
+</html>
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -12,7 +12,7 @@
import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLValidationTest;
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
-import org.jboss.tools.cdi.bot.test.jsf.ELNamedRefactoring;
+import org.jboss.tools.cdi.bot.test.jsf.NamedRefactoringTest;
import org.jboss.tools.cdi.bot.test.openon.FindObserverForEventTest;
import org.jboss.tools.cdi.bot.test.openon.OpenOnTest;
import org.jboss.tools.cdi.bot.test.quickfix.BeanValidationQuickFixTest;
@@ -57,23 +57,23 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
// PerspectiveTest.class,
- ConfigurationPresetTest.class,
- FacetTest.class,
- WizardTest.class,
- BeansEditorTest.class,
- ELNamedRefactoring.class,
- BeansXMLValidationTest.class,
+// ConfigurationPresetTest.class,
+// FacetTest.class,
+// WizardTest.class,
+// BeansEditorTest.class,
+ NamedRefactoringTest.class,
+// BeansXMLValidationTest.class,
// BeansXMLCompletionTest.class,
- StereotypeValidationQuickFixTest.class,
- QualifierValidationQuickFixTest.class,
- ScopeValidationQuickFixTest.class,
- BeanValidationQuickFixTest.class,
- InterceptorValidationQuickFixTest.class,
- DecoratorValidationQuickFixTest.class,
- IBindingValidationQuickFixTest.class,
- OpenOnTest.class,
- FindObserverForEventTest.class,
- Seam3Test.class
+// StereotypeValidationQuickFixTest.class,
+// QualifierValidationQuickFixTest.class,
+// ScopeValidationQuickFixTest.class,
+// BeanValidationQuickFixTest.class,
+// InterceptorValidationQuickFixTest.class,
+// DecoratorValidationQuickFixTest.class,
+// IBindingValidationQuickFixTest.class,
+// OpenOnTest.class,
+// FindObserverForEventTest.class,
+// Seam3Test.class
})
public class CDIAllBotTests extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -2,13 +2,20 @@
public enum JSFTemplate {
- BLANK, KICKSTART;
+ BLANK_LIBS, BLANK_NO_LIBS,
+ KICKSTART_LIBS, KICKSTART_RI_LIBS, KICKSTART_NO_LIBS;
public String getName() {
switch (this) {
- case BLANK:
+ case BLANK_LIBS:
+ return "JSFBlankWithLibs";
+ case BLANK_NO_LIBS:
return "JSFBlankWithoutLibs";
- case KICKSTART:
+ case KICKSTART_LIBS:
+ return "JSFKickStartWithLibs";
+ case KICKSTART_RI_LIBS:
+ return "JSFKickStartWithRILibs";
+ case KICKSTART_NO_LIBS:
return "JSFKickStartWithoutLibs";
default:
throw new AssertionError("Unknown type");
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -36,7 +36,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLCompletionTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -32,7 +32,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLValidationTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -48,7 +48,9 @@
* @author Lukas Jungmann
* @author jjankovi
*/
-@Require(clearProjects = false, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansEditorTest extends CDITestBase {
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.cdi.bot.test.jsf;
-
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Test operates on EL named refactoring
- *
- * @author Jaroslav Jankovic
- *
- */
-
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
-public class ELNamedRefactoring extends JSFTestBase {
-
- @Override
- public String getProjectName() {
- return "CDIRefactoring";
- }
-
- @Test
- public void testCreateJSFBlankProject() {
-
- assertTrue(projectHelper.projectExists(getProjectName()));
- assertTrue(projectHelper.checkCDISupport(getProjectName()));
-
- }
-
-}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -15,11 +15,14 @@
import org.jboss.tools.cdi.bot.test.annotations.JSFEnvironment;
import org.jboss.tools.cdi.bot.test.annotations.JSFTemplate;
import org.jboss.tools.cdi.bot.test.uiutils.actions.NewJSFProjectWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.actions.NewXHTMLFileWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.XHTMLDialogWizard;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.junit.Before;
public class JSFTestBase extends CDITestBase {
- private JSFEnvironment env = JSFEnvironment.JSF_11;
+ private JSFEnvironment env = JSFEnvironment.JSF_20;
public JSFEnvironment getEnv() {
return env;
@@ -33,6 +36,14 @@
}
}
+
+ protected void createXHTMLPage(String pageName) {
+ XHTMLDialogWizard xhtmlWizard = new NewXHTMLFileWizard().run();
+ xhtmlWizard.setName(pageName).finish();
+ bot.sleep(Timing.time3S());
+ util.waitForNonIgnoredJobs();
+ setEd(bot.activeEditor().toTextEditor());
+ }
private void createJSFProjectWithCDISupport(String projectName, JSFEnvironment env) {
@@ -45,7 +56,7 @@
new NewJSFProjectWizard().run().
setName(getProjectName()).
setEnvironment(env).
- setJSFTemplate(JSFTemplate.KICKSTART).finish();
+ setJSFTemplate(JSFTemplate.BLANK_LIBS).finish();
util.waitForNonIgnoredJobs();
}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.jsf;
+
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Test operates on EL named refactoring
+ *
+ * @author Jaroslav Jankovic
+ *
+ */
+
+@Require(clearProjects = true, perspective = "Web Development",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class })
+public class NamedRefactoringTest extends JSFTestBase {
+
+ @Override
+ public String getProjectName() {
+ return "CDIRefactoring";
+ }
+
+ @Test
+ public void testNamedAnnotation() {
+
+ wizard.createCDIComponent(CDIWizardType.BEAN, "ManagedBean", getPackageName(), null);
+ editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class.
+ getResourceAsStream("/resources/jsf/ManagedBean.java.cdi"), false);
+
+ createXHTMLPage("index.xhtml");
+ editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class.
+ getResourceAsStream("/resources/jsf/index.xhtml.cdi"), false);
+
+
+
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -31,7 +31,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class FindObserverForEventTest extends OpenOnBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -32,7 +32,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class OpenOnTest extends OpenOnBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeanValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class DecoratorValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class IBindingValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class InterceptorValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class QualifierValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class ScopeValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class StereotypeValidationQuickFixTest extends QuickFixTestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -35,7 +35,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class Seam3Test extends CDITestBase {
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -0,0 +1,20 @@
+package org.jboss.tools.cdi.bot.test.uiutils.actions;
+
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.Wizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.XHTMLDialogWizard;
+
+public class NewXHTMLFileWizard extends NewFileWizardAction{
+
+ public NewXHTMLFileWizard() {
+ super();
+ }
+
+ @Override
+ public XHTMLDialogWizard run() {
+ Wizard w = super.run();
+ w.selectTemplate("JBoss Tools Web", "XHTML Page");
+ w.next();
+ return new XHTMLDialogWizard();
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -62,6 +62,16 @@
return canClick("Finish");
}
+ protected void checkCheckbox(String text) {
+ bot().checkBoxWithLabel(text).select();
+ bot().sleep(Timing.time500MS());
+ }
+
+ protected void uncheckCheckbox(String text) {
+ bot().checkBoxWithLabel(text).deselect();
+ bot().sleep(Timing.time500MS());
+ }
+
protected void clickButton(String text) {
bot().button(text).click();
bot().sleep(Timing.time500MS());
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -0,0 +1,38 @@
+package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
+
+public class XHTMLDialogWizard extends Wizard {
+
+ public XHTMLDialogWizard() {
+ super(new SWTBot().activeShell().widget);
+ assert ("New XHTML Page").equals(getText());
+ }
+
+ public XHTMLDialogWizard setName(String nameOfPage) {
+ setText("File name:", nameOfPage);
+ return this;
+ }
+
+ public XHTMLDialogWizard checkXHTMLTemplate() {
+ checkCheckbox("Use XHTML Template");
+ return this;
+ }
+
+ public XHTMLDialogWizard setXHTMLTemplate(SWTBotTableItem template) {
+ template.select();
+ return this;
+ }
+
+ public SWTBotTableItem[] getTemplates() {
+ SWTBotTable templateTable = bot().table(0);
+ SWTBotTableItem[] templates = new SWTBotTableItem[templateTable.rowCount()];
+ for (int i = 0; i < templateTable.rowCount(); i++) {
+ templates[i] = templateTable.getTableItem(i);
+ }
+ return templates;
+ }
+
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -31,7 +31,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class ConfigurationPresetTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -30,7 +30,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class FacetTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -38,7 +38,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class PerspectiveTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2011-11-23 11:07:33 UTC (rev 36564)
@@ -35,7 +35,9 @@
* @author Lukas Jungmann
* @author jjankovi
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state = ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class WizardTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt 2011-11-23 09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt 2011-11-23 11:07:33 UTC (rev 36564)
@@ -1,31 +1,32 @@
-/**
- * what tests have to be done(JBDS50_0010):
- * 1. Validations works good for Inconsistent specialization,
- Ambiguous EL names, Unproxyable bean types, Decorator resolution
- * 2. Code completion works in beans.xml
- * 3. Complex test from Weld is working in JBDS and CDI functionality works without errors
- * 4. CDI @Named beans are renamed via refactoring and shows up correctly
- * when using Find References for EL Expressions
- * 5. Create new decorator from existing Web Bean
- * 6. EL refactoring for @Named beans works
- *
- *
- * what tests have to be done(JBDS50_0015):
- * 1. OpenOn works for injected classes
- * 2. OpenOn works in Seam Config for given beans
- * 3. OpenOn works for Bean injected into java source files declard in seam-config.xml can be navigated
- * 4. Seam-beans.xml validation works
- * 5. Seam3 not-trivial example works with JBDS without errors and as expected
- * 6. Wel extension(beans_1_1.xsd) is now supported by beans.xml editor
- * 7. Non-serializable passivating-scoped beans are now validated correctly
- * 8. Code completion and validation works in seam config for annotated CDI beans
- * 9. Seam3 features is enabled automatically for CDI support enabled project containing corresponding Seam module
- * 10.CDI supports Seam3 annotations (@Veto,@Requires,@Exact,@MessageLogger,@MessageBundle
- * @DefaultBean,@Unwraps,@ServiceHandlerType,@FullyQualified,@Resource)
- * 11.CDI tools can work with generic beans and validation, code completion, hyperlinks,
- * refactoring is working as expected
- */
+ what tests have to be done(JBDS50_0010):
+ * Validations works good for Inconsistent specialization,
+ Ambiguous EL names, Unproxyable bean types, Decorator resolution
+ * Code completion works in beans.xml
+ * Quick fixes for problem markers in beans.xml(https://issues.jboss.org/browse/JBIDE-9833)
+ * Complex test from Weld is working in JBDS and CDI functionality works without errors
+ * CDI @Named beans are renamed via refactoring and shows up correctly
+ when using Find References for EL Expressions
+ * Create new decorator from existing Web Bean
+ * EL refactoring for @Named beans works
+
+
+ what tests have to be done(JBDS50_0015):
+ * OpenOn works for injected classes
+ * OpenOn works in Seam Config for given beans
+ * OpenOn works for Bean injected into java source files declard in seam-config.xml can be navigated
+ * Seam-beans.xml validation works
+ * Seam3 not-trivial example works with JBDS without errors and as expected
+ * Wel extension(beans_1_1.xsd) is now supported by beans.xml editor
+ * Non-serializable passivating-scoped beans are now validated correctly
+ * Code completion and validation works in seam config for annotated CDI beans
+ * Seam3 features is enabled automatically for CDI support enabled project containing corresponding Seam module
+ * CDI supports Seam3 annotations (@Veto,@Requires,@Exact,@MessageLogger,@MessageBundle
+ @DefaultBean,@Unwraps,@ServiceHandlerType,@FullyQualified,@Resource)
+ * CDI tools can work with generic beans and validation, code completion, hyperlinks,
+ refactoring is working as expected
+
+
UI tests to implement for CDI (based on F2F meeting)
hyperlinks (...open ons etc)
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36563 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: entity and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-23 04:41:50 -0500 (Wed, 23 Nov 2011)
New Revision: 36563
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetsSelectionTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/server/RunninngProjectOnServerTask.java
Log:
added facet version selection
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/create/CreateJavaPortletProject.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -60,6 +60,7 @@
private FacetsSelectionTask getSelectFacetsTask() {
FacetsSelectionTask task = new FacetsSelectionTask();
+ task.addFacet(new FacetDefinition("Java", null, "1.6"));
task.addFacet(new FacetDefinition(FACET_NAME, FACET_CATEGORY));
return task;
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/entity/FacetDefinition.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -6,6 +6,8 @@
private String name;
+ private String version;
+
public FacetDefinition(String name) {
super();
this.name = name;
@@ -16,6 +18,13 @@
this.category = category;
this.name = name;
}
+
+ public FacetDefinition(String name, String category, String version) {
+ super();
+ this.category = category;
+ this.name = name;
+ this.version = version;
+ }
public String getCategory() {
return category;
@@ -32,4 +41,12 @@
public void setName(String name) {
this.name = name;
}
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
}
\ No newline at end of file
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/matcher/workspace/ProjectFacetsMatcher.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -59,7 +59,7 @@
private boolean allChecked = true;
@Override
- protected void processFacet(SWTBotTreeItem facetItem) {
+ protected void processFacet(FacetDefinition facet, SWTBotTreeItem facetItem) {
allChecked = allChecked && facetItem.isChecked();
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/AbstractFacetTask.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -28,13 +28,13 @@
facets = new ArrayList<FacetDefinition>();
}
- protected abstract void processFacet(SWTBotTreeItem facetItem);
+ protected abstract void processFacet(FacetDefinition facet, SWTBotTreeItem facetTreewItem);
@Override
public void perform() {
SWTBotTree tree = getTree();
for (FacetDefinition facet : facets){
- processFacet(getTreeItem(tree, facet));
+ processFacet(facet, getTreeItem(tree, facet));
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetsSelectionTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetsSelectionTask.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/facet/FacetsSelectionTask.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -1,9 +1,11 @@
package org.jboss.tools.portlet.ui.bot.test.task.facet;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.portlet.ui.bot.test.entity.FacetDefinition;
/**
- * Selects the given facets in the Project facetss tree.
+ * Selects the given facets in the Project facetss tree and optionaly also its version.
*
* @author ljelinko
*
@@ -11,7 +13,16 @@
public class FacetsSelectionTask extends AbstractFacetTask {
@Override
- protected void processFacet(SWTBotTreeItem facetItem) {
- facetItem.check();
+ protected void processFacet(FacetDefinition facet, SWTBotTreeItem facetTreeItem) {
+ facetTreeItem.check();
+
+ if (facet.getVersion() != null){
+ SWTBotMenu menu = facetTreeItem.contextMenu("Change Version...");
+ menu.click();
+
+ getBot().shell("Change Version").activate();
+ getBot().comboBoxWithLabel("Version:").setSelection(facet.getVersion());
+ getBot().button("OK").click();
+ }
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/server/RunninngProjectOnServerTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/server/RunninngProjectOnServerTask.java 2011-11-23 09:22:17 UTC (rev 36562)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/task/server/RunninngProjectOnServerTask.java 2011-11-23 09:41:50 UTC (rev 36563)
@@ -2,10 +2,6 @@
import org.jboss.tools.portlet.ui.bot.test.task.AbstractSWTTask;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
/**
* Performs Run on Server on the specified project.
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36562 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: quickfix and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-11-23 04:22:17 -0500 (Wed, 23 Nov 2011)
New Revision: 36562
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
Log:
New QuickFix Dialog Wizard + editing quickfixbase to use the new wizard
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-23 07:10:31 UTC (rev 36561)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-23 09:22:17 UTC (rev 36562)
@@ -45,7 +45,7 @@
new NewJSFProjectWizard().run().
setName(getProjectName()).
setEnvironment(env).
- setJSFTemplate(JSFTemplate.BLANK).finish();
+ setJSFTemplate(JSFTemplate.KICKSTART).finish();
util.waitForNonIgnoredJobs();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java 2011-11-23 07:10:31 UTC (rev 36561)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QuickFixTestBase.java 2011-11-23 09:22:17 UTC (rev 36562)
@@ -14,6 +14,7 @@
import java.util.ArrayList;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
@@ -26,6 +27,7 @@
import org.jboss.tools.cdi.bot.test.quickfix.validators.ScopeValidationProvider;
import org.jboss.tools.cdi.bot.test.quickfix.validators.StereotypeValidationProvider;
import org.jboss.tools.cdi.bot.test.uiutils.QuickFixHelper;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.QuickFixDialogWizard;
import org.jboss.tools.ui.bot.ext.Timing;
import org.junit.BeforeClass;
@@ -126,10 +128,14 @@
*/
private void resolveQuickFix(SWTBotTreeItem ti) {
openQuickFix(ti);
- bot.table(0).click(0, 0);
- bot.table(1).getTableItem(0).check();
- bot.clickButton("Finish");
- bot.sleep(Timing.time1S());
+
+ QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
+
+ SWTBotTableItem firstFix = qfWizard.getFixes()[0];
+ SWTBotTableItem firstResource = qfWizard.getResources()[0];
+
+ qfWizard.setFix(firstFix).setResource(firstResource).finish();
+
util.waitForNonIgnoredJobs();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23 07:10:31 UTC (rev 36561)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23 09:22:17 UTC (rev 36562)
@@ -89,7 +89,7 @@
checkQuickFix(CDIAnnotationsType.NAMED, CDIWizardType.STEREOTYPE);
}
-
+
// https://issues.jboss.org/browse/JBIDE-7640
@Test
public void testTypedAnnotation() {
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-11-23 09:22:17 UTC (rev 36562)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
+
+public class QuickFixDialogWizard extends Wizard {
+
+ public QuickFixDialogWizard() {
+ super(new SWTBot().activeShell().widget);
+ assert ("Quick Fix").equals(getText());
+ }
+
+ public QuickFixDialogWizard setFix(SWTBotTableItem fix) {
+ fix.select();
+ return this;
+ }
+
+ public SWTBotTableItem[] getFixes() {
+ SWTBotTable fixTable = bot().table(0);
+ SWTBotTableItem[] fixes = new SWTBotTableItem[fixTable.rowCount()];
+ for (int i = 0; i < fixTable.rowCount(); i++) {
+ fixes[i] = fixTable.getTableItem(i);
+ }
+ return fixes;
+ }
+
+ public QuickFixDialogWizard setResource(SWTBotTableItem resource) {
+ resource.check();
+ return this;
+ }
+
+ public SWTBotTableItem[] getResources() {
+ SWTBotTable resourceTable = bot().table(1);
+ SWTBotTableItem[] resources = new SWTBotTableItem[resourceTable.rowCount()];
+ for (int i = 0; i < resourceTable.rowCount(); i++) {
+ resources[i] = resourceTable.getTableItem(i);
+ }
+ return resources;
+ }
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-11-23 09:22:17 UTC (rev 36562)
@@ -0,0 +1,23 @@
+package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+
+public class SpecifyBeanDialogWizard extends Wizard {
+
+ public SpecifyBeanDialogWizard() {
+ super(new SWTBot().activeShell().widget);
+ assert ("Specify CDI Bean for the Injection Point").equals(getText());
+ }
+
+
+ /**
+ * not finished yet, what should be implemented:
+ *
+ * 1. gets all qualifier
+ * 2. select proper qualifier
+ * 3. add qualifier
+ * 4. remove qualifier
+ * 5. create a new qualifier
+ *
+ */
+}
13 years, 1 month
- 1
- 0
JBoss Tools SVN: r36561 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-11-23 02:10:31 -0500 (Wed, 23 Nov 2011)
New Revision: 36561
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
update TPs to include latest eclipse bpel
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-11-23 07:10:23 UTC (rev 36560)
+++ trunk/build/target-platform/jbds.target 2011-11-23 07:10:31 UTC (rev 36561)
@@ -54,7 +54,7 @@
<!-- Eclipse BPEL -->
<unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
- <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
+ <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
<unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
<!-- EMF, XSD -->
@@ -269,4 +269,4 @@
<unit id="javax.el" version="2.2.0.v201105051105"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-11-23 07:10:23 UTC (rev 36560)
+++ trunk/build/target-platform/multiple.target 2011-11-23 07:10:31 UTC (rev 36561)
@@ -55,9 +55,9 @@
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
<!-- Eclipse BPEL -->
- <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111101-1551-H90-CI"/>
+ <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
+ <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-11-23 07:10:23 UTC (rev 36560)
+++ trunk/build/target-platform/unified.target 2011-11-23 07:10:31 UTC (rev 36561)
@@ -55,9 +55,9 @@
<unit id="org.apache.lucene.spellchecker" version="2.9.1.v20100421-0704"/>
<!-- Eclipse BPEL -->
- <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.5.0.v20110915-1141-H87-CI"/>
- <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111101-1551-H90-CI"/>
+ <unit id="org.eclipse.bpel.jboss.riftsaw.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
+ <unit id="org.eclipse.bpel.apache.ode.runtime.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
+ <unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
<!-- EMF, XSD -->
<unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
13 years, 1 month
- 1
- 0