November 2011 - jbosstools-commits

JBoss Tools SVN: r36580 - in trunk/build/aggregate/webtools-site: web and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:19 -0500 (Wed, 23 Nov 2011) New Revision: 36580 Removed: trunk/build/aggregate/webtools-site/README.installation.txt trunk/build/aggregate/webtools-site/build.xml trunk/build/aggregate/webtools-site/index-template.html trunk/build/aggregate/webtools-site/remove-references.xsl trunk/build/aggregate/webtools-site/remove-uncategorized.xsl trunk/build/aggregate/webtools-site/site.xsl trunk/build/aggregate/webtools-site/web/site.css Modified: trunk/build/aggregate/webtools-site/index.html trunk/build/aggregate/webtools-site/pom.xml Log: webtools builder should reuse common site builder scripts Deleted: trunk/build/aggregate/webtools-site/README.installation.txt =================================================================== --- trunk/build/aggregate/webtools-site/README.installation.txt 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/README.installation.txt 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,10 +0,0 @@ -This file is an Eclipse update zip to be used from within an Eclipse installations update manager. - -Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work. - -In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager -( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from -this zip file. - -For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip - Deleted: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/build.xml 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,762 +0,0 @@ -<project default="custom.build" name="jbosstools aggregate site build.xml"> -  - -  - <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> - <available file="${WORKSPACE}/results" /> - </condition> - - <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> - <available file="/home/hudson/static_build_env/jbds" type="dir" /> - </condition> - <mkdir dir="${COMMON_TOOLS}" /> - - <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> - <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../build/build.xml"> - <available file="${basedir}/../../build/build.xml" type="file" /> - </condition> - <condition property="build.xml" value="${basedir}/../../build.xml"> - <available file="${basedir}/../../build.xml" type="file" /> - </condition> -  - - <property name="update.site.source.dir" value="${output.dir}/target/site" /> - -  - <property name="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" /> - - <target name="get.saxon" unless="saxon.jar.exists"> -  - <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 name="fetchZipsFromList"> - <attribute name="repo" default="" /> - <sequential> - - <var name="location.cleaned" value="@{repo}" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" /> - - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var unset="true" name="ALL_ZIPS" /> - <var unset="true" name="wget.return" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo> - <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" /> - </else> - </if> - - <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo> - <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" /> - </else> - </if> - - <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo> - <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" /> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" /> - </exec> - </then> - <else> - <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" /> - </else> - </if> - - <if> - <or> - <and> - <contains string="${location.cleaned}" substring=":/" /> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - <and> - <not> - <contains string="${location.cleaned}" substring=":/" /> - </not> - <available file="${aggregate.zips.dir}/zip.list.txt" type="file" /> - </and> - </or> - <then> -  - <var unset="true" name="ALL_ZIPS" /> - <property file="${aggregate.zips.dir}/zip.list.txt" /> - <if> - <isset property="ALL_ZIPS" /> - <then> - <var name="relativePath" unset="true" /> - <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath"> - <sequential> - <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" /> - - <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" /> - <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" /> - <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> - - <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> - - <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> -  - <echo level="verbose">repoNum = @{repoNum} -relativePath = ${relativePath} -svnrevPath = ${svnrevPath} -buildPropertiesPath = ${buildPropertiesPath} -zipPath = @{zipPath} -DEST = ${aggregate.zips.dir}/@{zipPath} -</echo> - <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo> - <if> - <isset property="isTest" /> - <then> -  - <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo> - </then> - <else> - <if> - <contains string="${location.cleaned}" substring=":/" /> - <then> - - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" /> - </exec> - <if> - <not> - <equals arg1="${wget.return}" arg2="0" /> - </not> - <then> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo> - </then> - </if> - </then> - <else> - <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" /> - </else> - </if> - </else> - </if> - - <if> - <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> - <then> -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} -</echo> -  - <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> -  -  -  - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b} -</echo> - <var name="fs.length.b" unset="true" /> - <var name="fs.length.kb" unset="true" /> - -  - <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> - <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} -</echo> - <var name="${filePrefix}.filemd5" unset="true" /> - <var name="tempmd5" unset="true" /> - </then> - </if> - -  - <if> - <available file="${svnRevTXT}" type="file" /> - <then> - <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" /> - </then> - </if> - <if> - <available file="${svnRevXML}" type="file" /> - <then> - <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" /> - </then> - </if> - <if> - <available file="${buildProperties}" type="file" /> - <then> - <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" /> - </then> - </if> - </sequential> - </for> - <var name="relativePath" unset="true" /> - <var name="svnrevPath" unset="true" /> - <var name="buildPropertiesPath" unset="true" /> - </then> - </if> - <var unset="true" name="ALL_ZIPS" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo> - </else> - </if> - <var name="location.cleaned" unset="true" /> - <delete quiet="true"> - <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" /> - </delete> - <var name="svnRevFile" unset="true" /> - </sequential> - </macrodef> - -  - <macrodef name="fetchZipsFromMetadata"> - <attribute name="repo" default="" /> - <sequential> - <var name="location.cleaned" value="@{repo}" /> - <echo level="verbose">repo = ${location.cleaned}</echo> -  - <var name="wget.return" unset="true" /> - <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null"> - <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" /> - </exec> - <if> - <and> - <equals arg1="${wget.return}" arg2="0" /> - <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" /> - </and> - <then> - <echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo> - <xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" /> - <echo level="verbose">Found ${repository.children.size} contained repos to search</echo> - -  - <var name="counter" value="" /> -  - <for param="location" list="${repository.children.child.location}"> - <sequential> - <var name="counter" value="${counter}0" /> - <var name="i" unset="true" /> - <length property="i" string="${counter}" /> - <if> - <not> - <contains string="@{location}" substring="/staging.previous/" /> - </not> - <then> - <if> - <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" /> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" /> - <if> - <not> - <available file="${location.cleaned}" /> - </not> - <then> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </then> - </if> - </then> - <else> - <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" /> - </else> - </if> - <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo> - <fetchZipsFromList repo="${location.cleaned}" /> - </then> - <else> - <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo> - </else> - </if> - </sequential> - </for> - <var name="counter" unset="true" /> - <var name="i" unset="true" /> - - <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" /> - </then> - <else> - <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo> - </else> - </if> - </sequential> - </macrodef> - - <target name="add.associate.sites" if="associate.sites"> - <if> - <and> -  - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> -  - <var name="associate.sites.0" value="" /> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <var name="associate.sites.0" value="${associate.sites.0}00" /> - </sequential> - </for> - <length property="associate.sites.length" string="${associate.sites.0}" /> - - <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> - <filterchain> - <tailfilter lines="-1" skip="1" /> - </filterchain> - </loadfile> - <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> - <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> -  - <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> - <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> -</echo> - </sequential> - </for> - <echo file="${update.site.source.dir}/content.xml" append="true"> </references> -</repository> -</echo> - </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"> -  - <property name="update.site.description" value="Nightly Build" /> - <if> - <and> - <not> - <isset property="update.site.version" /> - </not> - <isset property="JOB_NAME" /> - <isset property="BUILD_ID" /> - <isset property="BUILD_NUMBER" /> - </and> - <then> -  - <propertyregex override="true" property="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> - -  - <antcallback target="transform.site.xml" return="site.contents" /> - - <copy todir="${output.dir}" overwrite="true"> - <fileset file="index-template.html" /> - <mapper type="merge" to="index.html" /> - <filterchain> - <expandproperties /> - </filterchain> - </copy> - - <copy todir="${update.site.source.dir}"> - <fileset dir="${output.dir}" includes="${web.content.files}" /> - </copy> - </target> - - <target name="transform.site.xml"> -  - <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> -  - <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> - -  - <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}" /> -  - <if> - <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" /> - <then> - <property file="${aggregate.zips.dir}/build.properties.file.txt" /> - </then> - </if> - -  - <for param="propsfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - -  - <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" /> - <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" /> - <if> - <available file="${svnrevXML}" type="file" /> - <then> -  - <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" /> -  - <if> - <isset property="${prefix}.kind" /> - <then> - <var name="${prefix}.kind" unset="true" /> - </then> - </if> - -  - <if> - <and> - <isset property="${prefix}.revision.module" /> - <isset property="${prefix}.revision.revision" /> - </and> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="i" value="0" /> - <for list="${temprm.all}" delimiter=", " param="module"> - <sequential> - <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" /> - <var name="j" value="0" /> - <for list="${temprr.all}" delimiter=", " param="revision"> - <sequential> - <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" /> - <if> - <equals arg1="${i}" arg2="${j}" /> - <then> - <var name="temprr" value="@{revision}" /> - <if> - <isset property="${prefix}.SVN_REVISION" /> - <then> - <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" /> - <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" /> - <var name="temp.all" unset="true" /> - </then> - <else> - <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" /> - </else> - </if> - <var name="temprr" unset="true" /> - </then> - </if> - </sequential> - </for> - <var name="j" unset="true" /> - </sequential> - </for> - <var name="i" unset="true" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - </if> - </then> - <elseif> - <available file="${svnrevTXT}" type="file" /> - <then> -  - <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" /> - <propertycopy from="${prefix}.SVN_REVISION" property="temp" /> - <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," /> - <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" /> - -  - <for list="${temp}" delimiter="," param="pair"> - <sequential> - <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" /> - <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" /> - <if> - <isset property="${prefix}.revision.module" /> - <then> - <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" /> - <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" /> - <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" /> - <var name="temprm.all" unset="true" /> - <var name="temprr.all" unset="true" /> - </then> - <else> - <var name="${prefix}.revision.module" value="${temprm}" /> - <var name="${prefix}.revision.revision" value="${temprr}" /> - </else> - </if> - <var name="temprm" unset="true" /> - <var name="temprr" unset="true" /> - </sequential> - </for> - <var name="temp" unset="true" /> - </then> - </elseif> - </if> - - <var name="prefix" unset="true" /> - </sequential> - - </for> - <for param="svnrevfile"> - <path> - <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" /> - </path> - <sequential> -  - <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" /> - <echo level="verbose">Read ${prefix} from @{propsfile}</echo> - - <property file="@{propsfile}" prefix="${prefix}" /> - - <var name="prefix" unset="true" /> - </sequential> - - </for> -  - <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml"> - <propertyset> - <propertyref regex=".*\.build\.properties" /> - </propertyset> - </echoproperties> - - </target> - - <target name="test.collect.metadata" depends="init"> - <property name="isTest" value="true" /> - <antcall target="collect.metadata"> - </antcall> - </target> - -  - <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job"> - </target> - - <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata"> - <property name="isTest" value="true" /> - <antcall target="create.summary.file"> - </antcall> - </target> - -</project> Deleted: trunk/build/aggregate/webtools-site/index-template.html =================================================================== --- trunk/build/aggregate/webtools-site/index-template.html 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/index-template.html 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,168 +0,0 @@ -<html> -<head> -<title>JBoss Tools - Web Tools - ${update.site.description} Update Site${update.site.version}</title> -<style> -@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); -</style> -</head> -<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> - <center> - <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>      </td> - <td>      </td> - <td>      </td> - </tr> - <tr> - <td>      </td> - <td> - <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>${update.site.description}</b> - Update Site for JBoss Tools - Web Tools. - <blockquote style="border: 1px dashed #1778be; padding: 2px"> - <ol> - <li>To <a class="link" - href="http://www.jboss.org/tools/download/installation/update_3_3">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> Modified: trunk/build/aggregate/webtools-site/index.html =================================================================== --- trunk/build/aggregate/webtools-site/index.html 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/index.html 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,36 +1,36 @@ <html> <head> -<title>JBoss Tools - Web Tools - Nightly Build Update Site</title> +<title>JBoss Tools - Web Tools Nightly Build Update Site</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> </head> <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> - <center> - <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> +<center> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0" width="920" class="bodyText"> + <tr> + <td colspan="3"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>      </td> + <td>      </td> + <td>      </td> + </tr> + <tr> + <td>      </td> + <td> + <h2 class="title">JBoss Tools - Web Tools Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build</span></td> </tr> - <tr> - <td>      </td> - <td>      </td> - <td>      </td> - </tr> - <tr> - <td>      </td> - <td> - <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build</span></td> - </tr> - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>Nightly Build</b> - Update Site for JBoss Tools - Web Tools. + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>Nightly Build</b> + Update Site for JBoss Tools - Web Tools. <blockquote style="border: 1px dashed #1778be; padding: 2px"> <ol> <li>To <a class="link" @@ -63,44 +63,12 @@ </blockquote> </td> </tr> - -  - </table> - </td> - <td>      </td> - </tr> - <tr> - <td></td> + </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"> @@ -112,8 +80,8 @@ </th> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111118-0800-H846-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> - <td><span style="font-size:x-small">2.3.0.v20111118-0800-H846-M5</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20111123-1119-H853-M5.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> + <td><span style="font-size:x-small">2.3.0.v20111123-1119-H853-M5</span></td> <td><span style="font-size:x-small"> | org.eclipse.wst.server.core.serverAdapter</span></td> @@ -134,7 +102,10 @@ <a href="plugins/" style="font-size:x-small">plugins</a> :: <a href="features/" style="font-size:x-small">features</a></td> - <td class="rowLine" colspan="1"></td> + <td class="rowLine" colspan="1"> + + + </td> </tr> </table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> </td> @@ -196,7 +167,7 @@ </tr> </table> </td> - </tr> - </table> - </center> + </tr> +</table> +</center> </html> Modified: trunk/build/aggregate/webtools-site/pom.xml =================================================================== --- trunk/build/aggregate/webtools-site/pom.xml 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/pom.xml 2011-11-23 19:59:19 UTC (rev 36580) @@ -4,13 +4,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.webtools</groupId> - <artifactId>org.jboss.tools.webtools.site</artifactId> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.site.webtools</artifactId> <name>JBoss Tools - Web Tools Site</name> - <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -26,9 +25,15 @@ <quiet>true</quiet> <tasks>  - <ant antfile="build.xml"> + <condition property="output.dir" value="${WORKSPACE}/results" + else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + <ant antfile="build.xml" target="basic.build" dir="../"> + <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools - Web Tools"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Deleted: trunk/build/aggregate/webtools-site/remove-references.xsl =================================================================== --- trunk/build/aggregate/webtools-site/remove-references.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/remove-references.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="references" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/webtools-site/remove-uncategorized.xsl =================================================================== --- trunk/build/aggregate/webtools-site/remove-uncategorized.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/remove-uncategorized.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"> - -<xsl:template match="/"> - <xsl:apply-templates select="*"/> -</xsl:template> - - -<xsl:template match="*"> - <xsl:copy > - <xsl:for-each select="@*"> - <xsl:copy /> - </xsl:for-each> - <xsl:apply-templates /> - </xsl:copy> -</xsl:template> - -<xsl:template match="unit[contains(@id,'site.xml.Default')]" /> - -</xsl:stylesheet> \ No newline at end of file Deleted: trunk/build/aggregate/webtools-site/site.xsl =================================================================== --- trunk/build/aggregate/webtools-site/site.xsl 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/site.xsl 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,126 +0,0 @@ -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan" - xmlns:saxon="http://saxon.sf.net/" xmlns="http://www.w3.org/1999/xhtml" - extension-element-prefixes="saxon"> - <xsl:output method="html" indent="yes" /> - <xsl:template match="/site"> - <table cellspacing="2" cellpadding="0" border="0"> - <xsl:if test="count(feature[contains(@id,'jboss')])>0"> - <tr style="background-color:#DDDDDD"> - <th style="font-size:small">Feature</th> - <th style="font-size:small">Version</th> - <th style="font-size:small"> - Feature Categor(ies) - </th> - </tr> -  - <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> -  - <xsl:for-each select="feature[not(contains(@id,'jboss'))]"> - <xsl:sort select="@id" /> - <xsl:variable name="rowCol"> - <xsl:if test="position() mod 2 = 1"> - #EEEEEE - </xsl:if> - <xsl:if test="position() mod 2 = 0"> - #FFFFFF - </xsl:if> - </xsl:variable> - - <tr style="background-color:{$rowCol}"> - <td class="rowLine"> - <a href="{@url}" style="font-size:x-small"> - <xsl:value-of select="@id" /> - </a> - </td> - <td> - <span style="font-size:x-small"> - <xsl:value-of select="@version" /> - </span> - </td> - <td> - <xsl:choose> - <xsl:when test="category"> - <xsl:for-each select="category"> - <span style="font-size:x-small"> - | - <xsl:value-of select="@name" /> - </span> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </td> - </tr> - </xsl:for-each> - </xsl:if> - - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine" colspan="1"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine" colspan="1"> - :: - <a href="plugins/" style="font-size:x-small">plugins</a> - :: - <a href="features/" style="font-size:x-small">features</a> - </td> - <td class="rowLine" colspan="1"> - </td> - </tr> - </table> - <br /> - </xsl:template> -</xsl:stylesheet> Deleted: trunk/build/aggregate/webtools-site/web/site.css =================================================================== --- trunk/build/aggregate/webtools-site/web/site.css 2011-11-23 19:59:09 UTC (rev 36579) +++ trunk/build/aggregate/webtools-site/web/site.css 2011-11-23 19:59:19 UTC (rev 36580) @@ -1,66 +0,0 @@ -< -STYLE type ="text/css">td.spacer { - padding-bottom: 10px; - padding-top: 10px; -} - -.title { - font-family: sans-serif; - color: #1778be; -} - -.bodyText { - font-family: sans-serif; - font-size: 9pt; - color: #000000; -} - -.sub-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; -} - -.log-text { - font-family: sans-serif; - font-style: normal; - font-weight: lighter; - font-size: 8pt; - color: black; -} - -.big-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; - border-top: 10px solid white; -} - -.light-row { - background: #FFFFFF -} - -.dark-row { - background: #EEEEEE -} - -.header { - background: #445562 -} - -#indent { - word-wrap: break-word; - width: 300px; - text-indent: 10px; -} - -.link { - color: #187dc6; -} -</ -STYLE -> \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36579 - trunk/build/results.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:09 -0500 (Wed, 23 Nov 2011) New Revision: 36579 Modified: trunk/build/results/build.xml Log: aggregate_site_build.xml script has been moved down one level for easier reuse Modified: trunk/build/results/build.xml =================================================================== --- trunk/build/results/build.xml 2011-11-23 19:59:01 UTC (rev 36578) +++ trunk/build/results/build.xml 2011-11-23 19:59:09 UTC (rev 36579) @@ -61,6 +61,9 @@ </classpath> </taskdef> + <condition property="aggregate_site_build.xml" value="${basedir}/../aggregate/build.xml"> + <available file="${basedir}/../aggregate/build.xml" type="file" /> + </condition> <condition property="aggregate_site_build.xml" value="${basedir}/../aggregate/site/build.xml"> <available file="${basedir}/../aggregate/site/build.xml" type="file" /> </condition>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36578 - in trunk/build/aggregate: site and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:59:01 -0500 (Wed, 23 Nov 2011) New Revision: 36578 Added: trunk/build/aggregate/pom-all.xml Modified: trunk/build/aggregate/pom.xml trunk/build/aggregate/site/index.html trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/sources/pom.xml Log: more refactoring & EOU tweaks Copied: trunk/build/aggregate/pom-all.xml (from rev 36576, trunk/build/aggregate/pom.xml) =================================================================== --- trunk/build/aggregate/pom-all.xml (rev 0) +++ trunk/build/aggregate/pom-all.xml 2011-11-23 19:59:01 UTC (rev 36578) @@ -0,0 +1,33 @@ +<?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.parent.pom</artifactId> + <version>0.0.3-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>../target-platform</module> + + <module>site</module> + <module>soa-site</module> + <module>webtools-site</module> + <module>bottests-site</module> + + <module>site/sources</module> + </modules> +  +</project> Modified: trunk/build/aggregate/pom.xml =================================================================== --- trunk/build/aggregate/pom.xml 2011-11-23 19:17:25 UTC (rev 36577) +++ trunk/build/aggregate/pom.xml 2011-11-23 19:59:01 UTC (rev 36578) @@ -8,9 +8,8 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <name>JBoss Tools Aggregate Site Build</name> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>../target-platform</module> Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2011-11-23 19:17:25 UTC (rev 36577) +++ trunk/build/aggregate/site/index.html 2011-11-23 19:59:01 UTC (rev 36578) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools Nightly Build Update Site</title> +<title>JBoss Tools - Core Nightly Build Update Site</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> @@ -21,7 +21,7 @@ <tr> <td>      </td> <td> - <h2 class="title">JBoss Tools Nightly Build Update Site</h2> + <h2 class="title">JBoss Tools - Core Nightly Build Update Site</h2> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span>Latest Build</span></td> @@ -30,7 +30,7 @@ <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. + Update Site for JBoss Tools - Core. <blockquote style="border: 1px dashed #1778be; padding: 2px"> <ol> <li>To <a class="link" Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-11-23 19:17:25 UTC (rev 36577) +++ trunk/build/aggregate/site/pom.xml 2011-11-23 19:59:01 UTC (rev 36578) @@ -4,14 +4,12 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.site.aggregate</artifactId> - <name>JBoss Tools Aggregate Site</name> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site.core</artifactId> + <name>JBoss Tools - Core Site</name> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -31,11 +29,11 @@ else="${basedir}"> <available file="${WORKSPACE}/results" /> </condition> - <ant antfile="build.xml" dir="../"> + <ant antfile="build.xml" target="custom.build" dir="../"> <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> - <property name="update.site.name" value="JBoss Tools"/> + <property name="update.site.name" value="JBoss Tools - Core"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Modified: trunk/build/aggregate/site/sources/pom.xml =================================================================== --- trunk/build/aggregate/site/sources/pom.xml 2011-11-23 19:17:25 UTC (rev 36577) +++ trunk/build/aggregate/site/sources/pom.xml 2011-11-23 19:59:01 UTC (rev 36578) @@ -4,14 +4,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.aggregate.site</artifactId> - <version>0.0.1-SNAPSHOT</version> + <artifactId>org.jboss.tools.site</artifactId> + <version>0.0.2-SNAPSHOT</version> <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> + <artifactId>org.jboss.tools.site.core.sources</artifactId> + <name>JBoss Tools - Core Sources Site</name> <packaging>eclipse-update-site</packaging> <build> <plugins> @@ -35,7 +34,7 @@ <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> - <property name="update.site.name" value="JBoss Tools [Sources]"/> + <property name="update.site.name" value="JBoss Tools - Core Sources"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36577 - in branches/hibernatetools-multiversion2/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2011-11-23 14:17:25 -0500 (Wed, 23 Nov 2011) New Revision: 36577 Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF Log: Fix compile errors Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-23 19:17:25 UTC (rev 36577) @@ -10,6 +10,7 @@ Export-Package: org.hibernate.console, org.hibernate.console.execution, org.hibernate.console.ext, + org.hibernate.console.ext.api, org.hibernate.console.node, org.hibernate.console.preferences, org.hibernate.eclipse, Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -106,7 +106,7 @@ protected ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration/*, final ReverseEngineeringStrategy strategy*/) { return ConsoleExtensionManager.getConsoleExtension(consoleConfiguration) - .readDatabaseSchema(monitor, consoleConfiguration); + .readDatabaseSchema(monitor); /*final Configuration configuration = consoleConfiguration.buildWith(null, false); return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -23,19 +23,19 @@ import java.util.List; -import org.hibernate.mapping.Table; +import org.hibernate.console.ext.api.ITable; public class TableContainer { - private final List<Table> tables; + private final List<ITable> tables; private final String name; - public TableContainer(String name, List<Table> tables) { + public TableContainer(String name, List<ITable> tables) { this.tables = tables; this.name = name; } - public List<Table> getTables() { + public List<ITable> getTables() { return tables; } Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -25,17 +25,17 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.hibernate.console.ImageConstants; +import org.hibernate.console.ext.api.ITable; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.mapping.Table; public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter { public Object[] getChildren(Object o) { TableContainer tc = getTableContainer( o ); - return toArray(tc.getTables().iterator(), Table.class, new Comparator<Table>() { + return toArray(tc.getTables().iterator(), ITable.class, new Comparator<ITable>() { - public int compare(Table arg0, Table arg1) { + public int compare(ITable arg0, ITable arg1) { return arg0.getName().compareTo(arg1.getName()); }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36576 - in trunk/build/aggregate/site: sources and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:13:14 -0500 (Wed, 23 Nov 2011) New Revision: 36576 Modified: trunk/build/aggregate/site/index.html trunk/build/aggregate/site/sources/index.html Log: regen index.html pages Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2011-11-23 19:13:05 UTC (rev 36575) +++ trunk/build/aggregate/site/index.html 2011-11-23 19:13:14 UTC (rev 36576) @@ -63,22 +63,6 @@ </blockquote> </td> </tr> - -  - </table> </td> <td>      </td> Modified: trunk/build/aggregate/site/sources/index.html =================================================================== --- trunk/build/aggregate/site/sources/index.html 2011-11-23 19:13:05 UTC (rev 36575) +++ trunk/build/aggregate/site/sources/index.html 2011-11-23 19:13:14 UTC (rev 36576) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools Nightly Build Update Site [Sources]</title> +<title>JBoss Tools [Sources] Nightly Build Update Site</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> @@ -21,7 +21,7 @@ <tr> <td>      </td> <td> - <h2 class="title">JBoss Tools Nightly Build Update Site [Sources]</h2> + <h2 class="title">JBoss Tools [Sources] Nightly Build Update Site</h2> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span>Latest Build</span></td> @@ -30,7 +30,7 @@ <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. + Update Site for JBoss Tools [Sources]. <blockquote style="border: 1px dashed #1778be; padding: 2px"> <ol> <li>To <a class="link"

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36575 - in trunk/build/aggregate/site: sources and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:13:05 -0500 (Wed, 23 Nov 2011) New Revision: 36575 Modified: trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/sources/pom.xml Log: parameterize update.site.name in pom.xml files Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2011-11-23 19:12:56 UTC (rev 36574) +++ trunk/build/aggregate/site/pom.xml 2011-11-23 19:13:05 UTC (rev 36575) @@ -35,6 +35,7 @@ <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant> Modified: trunk/build/aggregate/site/sources/pom.xml =================================================================== --- trunk/build/aggregate/site/sources/pom.xml 2011-11-23 19:12:56 UTC (rev 36574) +++ trunk/build/aggregate/site/sources/pom.xml 2011-11-23 19:13:05 UTC (rev 36575) @@ -35,6 +35,7 @@ <property name="output.dir" value="${output.dir}" /> <property name="inputRepo" value="${jbosstools-nightly-staging-composite}" /> + <property name="update.site.name" value="JBoss Tools [Sources]"/> <property name="JBT_VERSION" value="${JBT_VERSION}" /> <property name="BUILD_ALIAS" value="${BUILD_ALIAS}" /> </ant>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36574 - in trunk/build/aggregate: site and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:12:56 -0500 (Wed, 23 Nov 2011) New Revision: 36574 Added: trunk/build/aggregate/index-template.html Removed: trunk/build/aggregate/site/index-template.html trunk/build/aggregate/site/sources/index-template.html Modified: trunk/build/aggregate/build.xml Log: use {basedir}/index-template.htmlinstead of having multiple copies in the {output.dir} folders Modified: trunk/build/aggregate/build.xml =================================================================== --- trunk/build/aggregate/build.xml 2011-11-23 19:12:46 UTC (rev 36573) +++ trunk/build/aggregate/build.xml 2011-11-23 19:12:56 UTC (rev 36574) @@ -456,6 +456,7 @@ default update.site.description=Nightly Build default update.site.version=(null) --> + <property name="update.site.name" value="JBoss Tools" /> <property name="update.site.description" value="Nightly Build" /> <if> <and> @@ -493,7 +494,7 @@ <antcallback target="generate.directory.xml" return="directory.xml.html"/> <copy todir="${output.dir}" overwrite="true"> - <fileset file="${output.dir}/index-template.html" /> + <fileset file="${basedir}/index-template.html" /> <mapper type="merge" to="index.html" /> <filterchain> <expandproperties /> Copied: trunk/build/aggregate/index-template.html (from rev 36573, trunk/build/aggregate/site/sources/index-template.html) =================================================================== --- trunk/build/aggregate/index-template.html (rev 0) +++ trunk/build/aggregate/index-template.html 2011-11-23 19:12:56 UTC (rev 36574) @@ -0,0 +1,136 @@ +<html> +<head> +<title>${update.site.name} ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<center> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0" width="920" class="bodyText"> + <tr> + <td colspan="3"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>      </td> + <td>      </td> + <td>      </td> + </tr> + <tr> + <td>      </td> + <td> + <h2 class="title">${update.site.name} ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for ${update.site.name}. + <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> Deleted: trunk/build/aggregate/site/index-template.html =================================================================== --- trunk/build/aggregate/site/index-template.html 2011-11-23 19:12:46 UTC (rev 36573) +++ trunk/build/aggregate/site/index-template.html 2011-11-23 19:12:56 UTC (rev 36574) @@ -1,152 +0,0 @@ -<html> -<head> -<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title> -<style> -@import url("http://download.jboss.org/jbosstools/updates/web/site.css"); -</style> -</head> -<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<center> -<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920" class="bodyText"> - <tr> - <td colspan="3"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>      </td> - <td>      </td> - <td>      </td> - </tr> - <tr> - <td>      </td> - <td> - <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>${update.site.description}</b> - Update Site for JBoss Tools. - <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> Deleted: trunk/build/aggregate/site/sources/index-template.html =================================================================== --- trunk/build/aggregate/site/sources/index-template.html 2011-11-23 19:12:46 UTC (rev 36573) +++ trunk/build/aggregate/site/sources/index-template.html 2011-11-23 19:12:56 UTC (rev 36574) @@ -1,136 +0,0 @@ -<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>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36573 - trunk/build/aggregate.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-11-23 14:12:46 -0500 (Wed, 23 Nov 2011) New Revision: 36573 Modified: trunk/build/aggregate/pom.xml Log: add build instructions to root aggregate pom.xml Modified: trunk/build/aggregate/pom.xml =================================================================== --- trunk/build/aggregate/pom.xml 2011-11-23 18:38:42 UTC (rev 36572) +++ trunk/build/aggregate/pom.xml 2011-11-23 19:12:46 UTC (rev 36573) @@ -16,4 +16,13 @@ <module>../target-platform</module> <module>site</module> </modules> +  </project>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36572 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-23 13:38:42 -0500 (Wed, 23 Nov 2011) New Revision: 36572 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/StringUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java Log: [JBIDE-9927] added a dialog that reports credentials and urls for cartridges that were embedded / jenkins app that was created Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/StringUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/StringUtils.java 2011-11-23 18:18:45 UTC (rev 36571) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/StringUtils.java 2011-11-23 18:38:42 UTC (rev 36572) @@ -16,6 +16,8 @@ * @author André Dietisheim */ public class StringUtils { + + private static final String LINE_SEPARATOR_KEY = "line.separator"; public static String null2emptyString(String value) { if (value != null) { @@ -45,4 +47,9 @@ public String toString(T object); } + public static String getLineSeparator() { + return System.getProperty(LINE_SEPARATOR_KEY); + } + + } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2011-11-23 18:38:42 UTC (rev 36572) @@ -0,0 +1,143 @@ +/******************************************************************************* + * Copyright (c) 2011 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.openshift.express.internal.ui.wizard; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; +import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; + +/** + * @author André Dietisheim + */ +public class CreationLogDialog extends TitleAreaDialog { + + private LogEntry[] logEntries; + + public CreationLogDialog(Shell parentShell, LogEntry... logEntries) { + super(parentShell); + this.logEntries = logEntries; + } + + @Override + protected Control createContents(Composite parent) { + Control control = super.createContents(parent); + setupDialog(parent); + return control; + } + + private void setupDialog(Composite parent) { + parent.getShell().setText("Embedded Cartridges"); + setTitle("Please make note of the credentials and url that were reported when your cartridges were embedded / application was created. "); + setTitleImage(OpenShiftImages.OPENSHIFT_LOGO_WHITE_MEDIUM_IMG); + setDialogHelpAvailable(false); + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite container = new Composite(parent, SWT.NONE); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(container); + GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(container); + + Label separator = new Label(container, SWT.HORIZONTAL | SWT.SEPARATOR); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(separator); + + StyledText logText = new StyledText(container, SWT.BORDER | SWT.V_SCROLL); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(logText); + writeLogEntries(logEntries, logText); + return container; + } + + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); + } + + private void writeLogEntries(LogEntry[] logEntries, StyledText logText) { + List<StyleRange> styles = new ArrayList<StyleRange>(); + StringBuilder builder = new StringBuilder(); + + for (LogEntry logEntry : logEntries) { + writeLogEntry(logEntry, builder, styles); + } + + logText.setText(builder.toString()); + + setStyleRanges(logText, styles); + + } + + private void writeLogEntry(LogEntry logEntry, StringBuilder builder, List<StyleRange> styles) { + appendTitle(logEntry.getName(), builder, styles); + builder.append(logEntry.getLog()); + builder.append(StringUtils.getLineSeparator()); + } + + private void setStyleRanges(StyledText logText, List<StyleRange> styles) { + for (StyleRange style : styles) { + logText.setStyleRange(style); + } + } + + private void appendTitle(String title, StringBuilder builder, List<StyleRange> styles) { + StyleRange styleRange = startBoldStyleRange(builder); + builder.append(title) + .append(StringUtils.getLineSeparator()) + .append("---------------------------------") + .append(StringUtils.getLineSeparator()); + finishBoldStyleRange(builder, styleRange); + styles.add(styleRange); + } + + private StyleRange startBoldStyleRange(StringBuilder builder) { + StyleRange styleRange = new StyleRange(); + styleRange.start = builder.length(); + styleRange.fontStyle = SWT.BOLD; + return styleRange; + } + + private StyleRange finishBoldStyleRange(StringBuilder builder, StyleRange styleRange) { + styleRange.length = builder.length() - styleRange.start; + return styleRange; + } + + public static class LogEntry { + + private String name; + private String log; + + public LogEntry(String name, String log) { + this.name = name; + this.log = log; + } + + public String getName() { + return name; + } + + public String getLog() { + return log; + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-23 18:18:45 UTC (rev 36571) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-23 18:38:42 UTC (rev 36572) @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; @@ -49,11 +50,13 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.ICartridge; import org.jboss.tools.openshift.express.client.IEmbeddableCartridge; import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry; /** * @author André Dietisheim @@ -164,39 +167,45 @@ } else { final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell()); if (dialog.open() == Dialog.OK) { - try { - final String name = dialog.getValue(); - WizardUtils.runInWizard(new Job( - NLS.bind("Creating jenkins application \"{0}\"...", name)) { - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - model.createJenkinsApplication(name); - model.getSelectedEmbeddableCartridges().add(cartridge); - return Status.OK_STATUS; - } catch (Exception e) { - getShell().getDisplay().syncExec(new Runnable() { - @Override - public void run() { - viewer.setChecked(cartridge, false); - } - }); - return OpenShiftUIActivator - .createErrorStatus("Could not load embeddable cartridges", e); - } - } - - }, getContainer(), getDataBindingContext()); - } catch (Exception e) { - // ignore - } + createJenkinsApplication(cartridge, dialog.getValue()); } else { viewer.setChecked(cartridge, false); } } } + private void createJenkinsApplication(final IEmbeddableCartridge cartridge, final String name) { + try { + WizardUtils.runInWizard(new Job( + NLS.bind("Creating jenkins application \"{0}\"...", name)) { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + IApplication jenkinsApplication = model.createJenkinsApplication(name); + model.getSelectedEmbeddableCartridges().add(cartridge); + + openLogDialog(jenkinsApplication); + + return Status.OK_STATUS; + } catch (Exception e) { + getShell().getDisplay().syncExec(new Runnable() { + @Override + public void run() { + viewer.setChecked(cartridge, false); + } + }); + return OpenShiftUIActivator + .createErrorStatus("Could not load embeddable cartridges", e); + } + } + + }, getContainer(), getDataBindingContext()); + } catch (Exception e) { + // ignore + } + } + private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) { if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge", @@ -217,17 +226,18 @@ } private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { + List<IEmbeddableCartridge> checkedCartridges = model.getSelectedEmbeddableCartridges(); if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) { - model.getSelectedEmbeddableCartridges().remove(IEmbeddableCartridge.PHPMYADMIN_34); - model.getSelectedEmbeddableCartridges().remove(cartridge); + checkedCartridges.remove(IEmbeddableCartridge.PHPMYADMIN_34); + checkedCartridges.remove(cartridge); viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false); } else { viewer.setChecked(cartridge, true); } } else { - model.getSelectedEmbeddableCartridges().add(cartridge); + checkedCartridges.remove(cartridge); } } @@ -331,6 +341,66 @@ } } + public boolean processCartridges() { + final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); + try { + WizardUtils.runInWizard( + new Job(NLS.bind("Adding/Removing embedded cartridges for application {0}...", + model.getApplication().getName())) { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + List<IEmbeddableCartridge> addedCartridges = model.embedCartridges(); + openLogDialog(addedCartridges); + queue.offer(true); + } catch (OpenShiftException e) { + queue.offer(false); + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + NLS.bind("Could not embed cartridges to application {0}", + model.getApplication().getName()), e); + } + return Status.OK_STATUS; + } + }, getContainer()); + return queue.poll(10, TimeUnit.SECONDS); + } catch (Exception e) { + return false; + } + } + + private void openLogDialog(final List<IEmbeddableCartridge> cartridges) { + if (cartridges.size() == 0) { + return; + } + + final ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>(); + for (IEmbeddableCartridge cartridge : cartridges) { + logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog())); + } + + getShell().getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + new CreationLogDialog(getShell(), + logEntries.toArray(new LogEntry[logEntries.size()])).open(); + + } + }); + } + + private void openLogDialog(final IApplication application) { + getShell().getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + new CreationLogDialog(getShell(), + new LogEntry(application.getName(), application.getCreationLog())).open(); + } + }); + } + /** * Viewer element comparer based on #equals(). The default implementation in * CheckboxTableViewer compares elements based on instance identity. @@ -360,32 +430,4 @@ } } - - public boolean processCartridges() { - final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); - try { - WizardUtils.runInWizard( - new Job(NLS.bind("Adding/Removing embedded cartridges for application {0}...", - model.getApplication().getName())) { - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - model.embedCartridges(); - queue.offer(true); - } catch (OpenShiftException e) { - queue.offer(false); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - NLS.bind("Could not embed cartridges to application {0}", - model.getApplication().getName()), e); - } - return Status.OK_STATUS; - } - }, getContainer()); - return queue.poll(10, TimeUnit.SECONDS); - } catch (Exception e) { - return false; - } - } - } \ No newline at end of file Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-11-23 18:18:45 UTC (rev 36571) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-11-23 18:38:42 UTC (rev 36572) @@ -40,7 +40,7 @@ private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); private List<IEmbeddableCartridge> selectedCartridges; - + public EmbedCartridgeWizardPageModel(ApplicationWizardModel wizardModel) { this.wizardModel = wizardModel; } @@ -48,7 +48,7 @@ public void loadSelectedEmbeddableCartridges() throws OpenShiftException { selectedCartridges = new ArrayList<IEmbeddableCartridge>(); IApplication application = wizardModel.getApplication(); - if (application == null + if (application == null || application.getEmbeddedCartridges() == null) { return; } @@ -77,7 +77,7 @@ } return selectedCartridges; } - + public boolean hasApplication(ICartridge cartridge) { try { return wizardModel.getUser().hasApplication(cartridge); @@ -89,22 +89,31 @@ } public IApplication getApplication() { - return wizardModel.getApplication(); + return wizardModel.getApplication(); } - public void createJenkinsApplication(String name) throws OpenShiftException { - wizardModel.getUser().createApplication(name, ICartridge.JENKINS_14); + public IApplication createJenkinsApplication(String name) throws OpenShiftException { + IApplication application = wizardModel.getUser().createApplication(name, ICartridge.JENKINS_14); + return application; } - - public void embedCartridges() throws OpenShiftException { + + /** + * Embeds/removes the cartridges that were added/removed in this wizard + * page. + * + * @return the cartridges that were added. + * @throws OpenShiftException + */ + public List<IEmbeddableCartridge> embedCartridges() throws OpenShiftException { if (selectedCartridges == null) { - return; + return Collections.emptyList(); } List<IEmbeddableCartridge> addedCartridges = new ArrayList<IEmbeddableCartridge>(); List<IEmbeddableCartridge> removedCartridges = new ArrayList<IEmbeddableCartridge>(); computeAdditionsAndRemovals(addedCartridges, removedCartridges, selectedCartridges); addEmbeddedCartridges(addedCartridges); removeEmbeddedCartridges(removedCartridges); + return addedCartridges; } private void removeEmbeddedCartridges(List<IEmbeddableCartridge> removedCartridges) throws OpenShiftException {

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36571 - trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2011-11-23 13:18:45 -0500 (Wed, 23 Nov 2011) New Revision: 36571 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java Log: https://issues.jboss.org/browse/JBIDE-10221 / https://issues.jboss.org/browse/JBIDE-10222 : VpeController has resource leaks Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2011-11-23 17:57:02 UTC (rev 36570) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2011-11-23 18:18:45 UTC (rev 36571) @@ -20,8 +20,11 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -70,8 +73,14 @@ protected Control createDialogArea(Composite parent) { getShell().setText(Messages.VRD_DEFAULT_WINDOW_TITLE); setTitle(Messages.VRD_DEFAULT_TITLE); - setTitleImage(ModelUIImages.getImageDescriptor( - ModelUIImages.WIZARD_DEFAULT).createImage(null)); + final Image wizardDefaultImage = ModelUIImages.getImageDescriptor( + ModelUIImages.WIZARD_DEFAULT).createImage(null); + setTitleImage(wizardDefaultImage); + parent.addDisposeListener(new DisposeListener() { + public void widgetDisposed(DisposeEvent e) { + wizardDefaultImage.dispose(); + } + }); setMessage(Messages.VRD_PAGE_DESIGN_OPTIONS_ABOUT); Composite composite = new Composite(parent, SWT.NONE);

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2011