JBoss Tools SVN: r34401 - in trunk/vpe/features: org.jboss.tools.vpe.test.feature and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:18:04 -0400 (Tue, 30 Aug 2011)
New Revision: 34401
Added:
trunk/vpe/features/org.jboss.tools.vpe.feature/license.html
Modified:
trunk/vpe/features/org.jboss.tools.vpe.feature/build.properties
trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties
trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml
trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
Log:
https://issues.jboss.org/browse/JBIDE-9596 ./vpe/features/org.jboss.tools.vpe.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed vpe.feature as well
Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/build.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/build.properties 2011-08-30 18:16:17 UTC (rev 34400)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/build.properties 2011-08-30 18:18:04 UTC (rev 34401)
@@ -1,2 +1,3 @@
bin.includes = feature.xml,\
- feature.properties
+ feature.properties,\
+ license.html
Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties 2011-08-30 18:16:17 UTC (rev 34400)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.properties 2011-08-30 18:18:04 UTC (rev 34401)
@@ -35,4 +35,11 @@
and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
Contributors\:\n\
Exadel, Inc. and Red Hat, Inc. - initial API and implementation
-
+licenseURL=license.html
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2011-08-30 18:16:17 UTC (rev 34400)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2011-08-30 18:18:04 UTC (rev 34401)
@@ -12,14 +12,8 @@
%copyright
</copyright>
- <license>
- Red Hat, Inc. licenses these features and plugins to you under
-certain open source licenses (or aggregations of such licenses), which
-in a particular case may include the Eclipse Public License, the GNU
-Lesser General Public License, and/or certain other open source
-licenses. For precise licensing details, consult the corresponding
-source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
-Raleigh NC 27606 USA.
+ <license url="%licenseURL">
+ %license
</license>
<plugin
Added: trunk/vpe/features/org.jboss.tools.vpe.feature/license.html
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.feature/license.html (rev 0)
+++ trunk/vpe/features/org.jboss.tools.vpe.feature/license.html 2011-08-30 18:18:04 UTC (rev 34401)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/vpe/features/org.jboss.tools.vpe.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Modified: trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties 2011-08-30 18:16:17 UTC (rev 34400)
+++ trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties 2011-08-30 18:18:04 UTC (rev 34401)
@@ -37,7 +37,6 @@
Red Hat, Inc. - initial API and implementation
licenseURL=license.html
-updateSiteName=JBossTools Update Site
license=Red Hat, Inc. licenses these features and plugins to you under \
certain open source licenses (or aggregations of such licenses), which \
in a particular case may include the Eclipse Public License, the GNU \
14 years, 3 months
JBoss Tools SVN: r34400 - in branches/jbosstools-3.2.x/build/aggregate: webtools-site and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-08-30 14:16:17 -0400 (Tue, 30 Aug 2011)
New Revision: 34400
Added:
branches/jbosstools-3.2.x/build/aggregate/webtools-site/
branches/jbosstools-3.2.x/build/aggregate/webtools-site/.gitignore
branches/jbosstools-3.2.x/build/aggregate/webtools-site/README.installation.txt
branches/jbosstools-3.2.x/build/aggregate/webtools-site/aggregateSite.jbosstools.properties
branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html
branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html
branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml
branches/jbosstools-3.2.x/build/aggregate/webtools-site/remove-uncategorized.xsl
branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml
branches/jbosstools-3.2.x/build/aggregate/webtools-site/web/
branches/jbosstools-3.2.x/build/aggregate/webtools-site/web/site.css
Log:
JBIDE-8460 new helios webtools site builder for rawbdor
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/.gitignore
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/.gitignore (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/.gitignore 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,2 @@
+target
+zips
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/README.installation.txt
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/README.installation.txt (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/README.installation.txt 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,10 @@
+This file is an Eclipse update zip to be used from within an Eclipse installations update manager.
+
+Do not unzip this zip into Eclipse directly nor into its dropins folder - it will not work.
+
+In fact, you do not need to unzip this zip at all - you can simply use the Eclipse Update Manager
+( Help > Install New Software... > Add... > Archive... ) to perform the installation directly from
+this zip file.
+
+For more information, see https://www.jboss.org/tools/download/installation/update_3_3.html#fromzip
+
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/aggregateSite.jbosstools.properties
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/aggregateSite.jbosstools.properties (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/aggregateSite.jbosstools.properties 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,7 @@
+# options: Nightly Build (default), Development Milestone, Stable Release
+#update.site.description=Nightly Build
+#update.site.description=Development Milestone
+#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
+
+# associate sites to add to the resulting repo
+associate.sites=http://download.jboss.org/jbosstools/updates/helios/,http://download.jboss.org/jbosstools/updates/stable/helios/
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,704 @@
+<project default="custom.build" name="jbosstools aggregate site build.xml">
+
+ <!-- pass in properties to Maven/Ant via Hudson job:
+ -DJOB_NAME=${JOB_NAME}
+ -DBUILD_ID=${BUILD_ID}
+ -DBUILD_NUMBER=${BUILD_NUMBER}
+ -->
+
+ <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
+ <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
+ <available file="${WORKSPACE}/results" />
+ </condition>
+
+ <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}">
+ <available file="/home/hudson/static_build_env/jbds" type="dir" />
+ </condition>
+ <mkdir dir="${COMMON_TOOLS}" />
+
+ <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
+ <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../../build/build.xml">
+ <available file="${basedir}/../../build/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../../build.xml">
+ <available file="${basedir}/../../build.xml" type="file" />
+ </condition>
+ <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
+
+ <property name="update.site.source.dir" value="${output.dir}/target/site" />
+
+ <!-- load properties from default (or alternate) properties file -->
+ <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" />
+ <property file="${aggregateSite.properties}" />
+
+ <target name="init">
+ <ant antfile="${build.xml}" target="init" />
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" />
+
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: fetchZipsFromList - given a list of zips in zip.list.txt, fetch those zips
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="fetchZipsFromList">
+ <attribute name="repo" default="" />
+ <sequential>
+
+ <var name="location.cleaned" value="@{repo}" />
+ <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/all/repo/*$" replace="" casesensitive="true" override="true" property="location.cleaned" />
+ <propertyregex defaultvalue="${location.cleaned}" input="${location.cleaned}" regexp="/tools/*$" replace="" casesensitive="true" override="true" property="location.cleaned" />
+
+ <echo level="verbose">repo = ${location.cleaned}</echo>
+ <!-- fetch zip.list.txt file, if available -->
+ <var unset="true" name="ALL_ZIPS" />
+ <var unset="true" name="wget.return" />
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/zip.list.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/zip.list.txt" />
+ </else>
+ </if>
+
+ <echo level="verbose">Fetch SVN_REVISION.txt if it exists (return 8 if not found)</echo>
+ <var name="svnRevTXT" value="${aggregate.zips.dir}/SVN_REVISION.txt" />
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.txt -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.txt" />
+ </else>
+ </if>
+
+ <echo level="verbose">Fetch SVN_REVISION.xml if it exists (return 8 if not found)</echo>
+ <var name="svnRevXML" value="${aggregate.zips.dir}/SVN_REVISION.xml" />
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/SVN_REVISION.xml -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/SVN_REVISION.xml" />
+ </else>
+ </if>
+
+ <echo level="verbose">Fetch build.properties if it exists (return 8 if not found)</echo>
+ <var name="buildProperties" value="${aggregate.zips.dir}/build.properties" />
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/logs/build.properties -q --no-clobber --tries=3" />
+ </exec>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}" failonerror="false" file="${location.cleaned}/logs/build.properties" />
+ </else>
+ </if>
+
+ <if>
+ <or>
+ <and>
+ <contains string="${location.cleaned}" substring=":/" />
+ <equals arg1="${wget.return}" arg2="0" />
+ <available file="${aggregate.zips.dir}/zip.list.txt" type="file" />
+ </and>
+ <and>
+ <not>
+ <contains string="${location.cleaned}" substring=":/" />
+ </not>
+ <available file="${aggregate.zips.dir}/zip.list.txt" type="file" />
+ </and>
+ </or>
+ <then>
+ <!-- load zip.list.txt file, get ALL_ZIPS list -->
+ <var unset="true" name="ALL_ZIPS" />
+ <property file="${aggregate.zips.dir}/zip.list.txt" />
+ <if>
+ <isset property="ALL_ZIPS" />
+ <then>
+ <var name="relativePath" unset="true" />
+ <for list="${ALL_ZIPS}" delimiter=", " keepgoing="true" param="zipPath">
+ <sequential>
+ <propertyregex override="true" property="relativePath" defaultvalue="" input="@{zipPath}" regexp="(.+)/([^/]+\.zip)" replace="\1" />
+
+ <propertyregex override="true" property="svnrevPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".SVN_REVISION" />
+ <propertyregex override="true" property="svnrevPath" defaultvalue="${svnrevPath}" input="${svnrevPath}" regexp="-Sources-|-Update-" replace="-" />
+
+ <propertyregex override="true" property="buildPropertiesPath" defaultvalue="" input="@{zipPath}" regexp=".zip" replace=".build.properties" />
+ <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" />
+
+ <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" />
+
+ <mkdir dir="${aggregate.zips.dir}/${relativePath}" />
+ <!-- fetch zips to local dir -->
+ <echo level="verbose">repoNum = @{repoNum}
+relativePath = ${relativePath}
+svnrevPath = ${svnrevPath}
+buildPropertiesPath = ${buildPropertiesPath}
+zipPath = @{zipPath}
+DEST = ${aggregate.zips.dir}/@{zipPath}
+</echo>
+ <echo level="verbose"> Zip URL = ${location.cleaned}/@{zipPath}</echo>
+ <if>
+ <isset property="isTest" />
+ <then>
+ <!-- create a fake file of variable length (rather than using touch for zero-length one) -->
+ <echo file="${aggregate.zips.dir}/@{zipPath}">${aggregate.zips.dir}/@{zipPath}</echo>
+ </then>
+ <else>
+ <if>
+ <contains string="${location.cleaned}" substring=":/" />
+ <then>
+
+ <var name="wget.return" unset="true" />
+ <exec executable="wget" dir="${aggregate.zips.dir}/${relativePath}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/@{zipPath} -q --no-clobber --tries=3" />
+ </exec>
+ <if>
+ <not>
+ <equals arg1="${wget.return}" arg2="0" />
+ </not>
+ <then>
+ <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/@{zipPath}</echo>
+ </then>
+ </if>
+ </then>
+ <else>
+ <copy todir="${aggregate.zips.dir}/${relativePath}" failonerror="false" file="${location.cleaned}/@{zipPath}" />
+ </else>
+ </if>
+ </else>
+ </if>
+
+ <if>
+ <available file="${aggregate.zips.dir}/@{zipPath}" type="file" />
+ <then>
+ <!-- set variable for filename -->
+ <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath}
+</echo>
+ <!-- set variable for filesize in Kb -->
+ <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" />
+ <!-- <math operand2="${fs.length.b}" operation="/" operand1="1024" result="fs.length.kb" datatype="float" /> -->
+ <!-- <math operand2="${fs.length.b}" operation="/" operand1="1048576" result="fs.length.mb" datatype="float"/> -->
+ <!-- <echo level="verbose">${aggregate.zips.dir}/@{zipPath}: ${fs.length.kb} Kb, ${fs.length.mb} Mb</echo> -->
+ <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.b}
+</echo>
+ <var name="fs.length.b" unset="true" />
+ <var name="fs.length.kb" unset="true" />
+
+ <!-- set variable for filemd5 -->
+ <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" />
+ <propertycopy from="${filePrefix}.filemd5" property="tempmd5" />
+ <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5}
+</echo>
+ <var name="${filePrefix}.filemd5" unset="true" />
+ <var name="tempmd5" unset="true" />
+ </then>
+ </if>
+
+ <!-- rename the svn and build properties files so they align with the zip names -->
+ <if>
+ <available file="${svnRevTXT}" type="file" />
+ <then>
+ <copy file="${svnRevTXT}" tofile="${aggregate.zips.dir}/${svnrevPath}.txt" />
+ </then>
+ </if>
+ <if>
+ <available file="${svnRevXML}" type="file" />
+ <then>
+ <copy file="${svnRevXML}" tofile="${aggregate.zips.dir}/${svnrevPath}.xml" />
+ </then>
+ </if>
+ <if>
+ <available file="${buildProperties}" type="file" />
+ <then>
+ <copy file="${buildProperties}" tofile="${aggregate.zips.dir}/${buildPropertiesPath}.txt" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <var name="relativePath" unset="true" />
+ <var name="svnrevPath" unset="true" />
+ <var name="buildPropertiesPath" unset="true" />
+ </then>
+ </if>
+ <var unset="true" name="ALL_ZIPS" />
+ </then>
+ <else>
+ <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/logs/zip.list.txt</echo>
+ </else>
+ </if>
+ <var name="location.cleaned" unset="true" />
+ <delete quiet="true">
+ <fileset dir="${aggregate.zips.dir}" includes="zip.list.txt, SVN_REVISION.txt, SVN_REVISION.xml, build.properties" />
+ </delete>
+ <var name="svnRevFile" unset="true" />
+ </sequential>
+ </macrodef>
+
+ <!-- = = = = = = = = = = = = = = = = =
+ macrodef: fetchZipsFromMetadata - look for compositeArtifacts.xml and parse results
+ = = = = = = = = = = = = = = = = = -->
+ <macrodef name="fetchZipsFromMetadata">
+ <attribute name="repo" default="" />
+ <sequential>
+ <var name="location.cleaned" value="@{repo}" />
+ <echo level="verbose">repo = ${location.cleaned}</echo>
+ <!-- if no zip.list.txt from the inputRepo, then fetch from ${location.cleaned}/compositeArtifacts.xml instead -->
+ <var name="wget.return" unset="true" />
+ <exec executable="wget" dir="${aggregate.zips.dir}" failonerror="false" failifexecutionfails="false" resultproperty="wget.return" outputproperty="null">
+ <arg line="${location.cleaned}/compositeArtifacts.xml -q --no-clobber --tries=3" />
+ </exec>
+ <if>
+ <and>
+ <equals arg1="${wget.return}" arg2="0" />
+ <available file="${aggregate.zips.dir}/compositeArtifacts.xml" type="file" />
+ </and>
+ <then>
+ <echo level="verbose">Got ${aggregate.zips.dir}/compositeArtifacts.xml</echo>
+ <xmlproperty file="${aggregate.zips.dir}/compositeArtifacts.xml" validate="false" collapseAttributes="true" />
+ <echo level="verbose">Found ${repository.children.size} contained repos to search</echo>
+
+ <!-- counter variable -->
+ <var name="counter" value="" />
+ <!-- foreach entry repository.children.child.location -->
+ <for param="location" list="${repository.children.child.location}">
+ <sequential>
+ <var name="counter" value="${counter}0" />
+ <var name="i" unset="true"/>
+ <length property="i" string="${counter}" />
+ <if>
+ <not>
+ <contains string="@{location}" substring="/staging.previous/"/>
+ </not>
+ <then>
+ <if>
+ <available file="/home/hudson/static_build_env/jbds/builds/staging" type="dir" />
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="/home/hudson/static_build_env/jbds/builds/staging/" />
+ <if>
+ <not>
+ <available file="${location.cleaned}" />
+ </not>
+ <then>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </then>
+ </if>
+ </then>
+ <else>
+ <propertyregex override="true" property="location.cleaned" defaultvalue="@{location}" input="@{location}" regexp="../../" replace="http://download.jboss.org/jbosstools/builds/staging/" />
+ </else>
+ </if>
+ <echo level="error">[${i}/${repository.children.size}] Site URL = ${location.cleaned} (@{location})</echo>
+ <fetchZipsFromList repo="${location.cleaned}" />
+ </then>
+ <else>
+ <echo level="error">[${i}/${repository.children.size}] Skip @{location}</echo>
+ </else>
+ </if>
+ </sequential>
+ </for>
+ <var name="counter" unset="true" />
+ <var name="i" unset="true"/>
+
+ <delete file="${aggregate.zips.dir}/compositeArtifacts.xml" quiet="true" />
+ </then>
+ <else>
+ <echo> ** Error [${wget.return}] ** Could not wget ${location.cleaned}/compositeArtifacts.xml</echo>
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
+
+ <target name="add.associate.sites" if="associate.sites">
+ <if>
+ <and>
+ <!-- Defined in aggregateSite.properties -->
+ <isset property="associate.sites" />
+ <not>
+ <equals arg1="${associate.sites}" arg2="" />
+ </not>
+ </and>
+ <then>
+ <if>
+ <available file="${update.site.source.dir}/content.jar" type="file" />
+ <then>
+ <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" />
+ <delete file="${update.site.source.dir}/content.jar" />
+ </then>
+ </if>
+ <!-- counter variable -->
+ <var name="associate.sites.0" value="" />
+ <for param="associate.site" list="${associate.sites}" delimiter=",
+ ">
+ <sequential>
+ <var name="associate.sites.0" value="${associate.sites.0}00" />
+ </sequential>
+ </for>
+ <length property="associate.sites.length" string="${associate.sites.0}" />
+
+ <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml">
+ <filterchain>
+ <tailfilter lines="-1" skip="1" />
+ </filterchain>
+ </loadfile>
+ <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" />
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'>
+</echo>
+ <for param="associate.site" list="${associate.sites}" delimiter=",
+ ">
+ <sequential>
+ <!-- insert into content.xml -->
+ <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/>
+ <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/>
+</echo>
+ </sequential>
+ </for>
+ <echo file="${update.site.source.dir}/content.xml" append="true"> </references>
+</repository>
+</echo>
+ <copy file="${update.site.source.dir}/content.xml" tofile="${update.site.source.dir}/content.old.xml" overwrite="true" />
+ <xslt style="remove-uncategorized.xsl" in="${update.site.source.dir}/content.old.xml" out="${update.site.source.dir}/content.xml" />
+ <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" />
+ <delete file="${update.site.source.dir}/content.xml" />
+ <delete file="${update.site.source.dir}/content.old.xml" />
+ </then>
+ </if>
+ </target>
+
+ <target name="unpack.zip">
+ <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" />
+ </target>
+
+ <target name="pack.zip">
+ <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css, README*" />
+ </target>
+
+ <target name="check.target">
+ <if>
+ <or>
+ <not>
+ <available file="${output.dir}/target/site" type="dir" />
+ </not>
+ <not>
+ <available file="${output.dir}/target/site_assembly.zip" type="file" />
+ </not>
+ </or>
+ <then>
+ <fail>
+--
+This script must ONLY be called via the pom.xml in this directory, not run directly.
+Cannot adjust an update site w/o first building it!
+--
+To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e`
+</fail>
+ </then>
+ </if>
+ </target>
+
+ <target name="add.web.content">
+ <!--
+ Properties needed for index.html are defined in aggregateSite.properties
+ update.site.description=Nightly Build
+ update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
+
+ or calculated here
+ from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1
+ from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER}
+ default update.site.description=Nightly Build
+ default update.site.version=(null)
+ -->
+ <property name="update.site.description" value="Nightly Build" />
+ <if>
+ <and>
+ <not>
+ <isset property="update.site.version" />
+ </not>
+ <isset property="JOB_NAME" />
+ <isset property="BUILD_ID" />
+ <isset property="BUILD_NUMBER" />
+ </and>
+ <then>
+ <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" />
+ </then>
+ <else>
+ <property name="update.site.version" value="" />
+ </else>
+ </if>
+
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="index-template.html" />
+ <mapper type="merge" to="index.html" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+
+ <copy todir="${update.site.source.dir}">
+ <fileset dir="${output.dir}" includes="index.html, **/*.css, README*" />
+ </copy>
+ </target>
+
+ <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
+ if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch -->
+ <target name="collect.zips" description="collect zips from the sites we aggregated">
+ <property name="aggregate.zips.dir" value="${output.dir}/zips" />
+ <delete dir="${aggregate.zips.dir}" quiet="true" />
+ <mkdir dir="${aggregate.zips.dir}" />
+ <for list="${inputRepos}" delimiter=", " keepgoing="true" param="repoNum">
+ <sequential>
+ <var name="repo" value="${inputRepo@{repoNum}}" />
+ <if>
+ <contains string="${repo}" substring="composite" />
+ <then>
+ <fetchZipsFromMetadata repo="${repo}" />
+ </then>
+ <else>
+ <fetchZipsFromList repo="${repo}" />
+ </else>
+ </if>
+ </sequential>
+ </for>
+ </target>
+
+ <target name="test.collect.zips.from.metadata" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk" />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.metadata.with.errors" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/NO_SUCH_B..." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.xml" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2,3,4" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/xulrunner-1.9.1.2" />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.txt" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2,3,4,5" />
+ <param name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo3" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ <param name="inputRepo4" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
+ <param name="inputRepo5" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1..." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips.from.list.with.errors" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.zips">
+ <param name="inputRepos" value="1,2" />
+ <param name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_trunk...." />
+ </antcall>
+ </target>
+
+ <target name="test.collect.zips" depends="test.collect.zips.from.metadata,test.collect.zips.from.list.txt,test.collect.zips.from.list.xml">
+ <delete dir="${aggregate.zips.dir}" quiet="true" />
+ </target>
+
+ <target name="test.collect.zips.with.error" depends="test.collect.zips.from.metadata.with.errors,test.collect.zips.from.list.with.errors">
+ <delete dir="${aggregate.zips.dir}" quiet="true" />
+ </target>
+
+ <target name="collect.metadata" description="collect svn revision info + other metadata (JOB_NAME, BUILD_ID, BUILD_NUMBER, WORKSPACE, HUDSON_SLAVE), zip file names+sizes+md5sums">
+ <property name="aggregate.zips.dir" value="${output.dir}/zips" />
+
+ <!-- load file properties (name, size, md5sum) -->
+ <if>
+ <available file="${aggregate.zips.dir}/build.properties.file.txt" type="file" />
+ <then>
+ <property file="${aggregate.zips.dir}/build.properties.file.txt" />
+ </then>
+ </if>
+
+ <!-- for all build.properties.txt files in zips/ folder -->
+ <for param="propsfile">
+ <path>
+ <fileset dir="${aggregate.zips.dir}" includes="*.build.properties.txt, **/*.build.properties.txt" />
+ </path>
+ <sequential>
+ <!-- load properties file using a prefix which relates to the associated prop file -->
+ <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" />
+ <echo level="verbose">Read ${prefix} from @{propsfile}</echo>
+
+ <property file="@{propsfile}" prefix="${prefix}" />
+
+ <!-- now load SVN revs -->
+ <propertyregex override="true" property="svnrevTXT" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.txt" />
+ <propertyregex override="true" property="svnrevXML" defaultvalue="" input="@{propsfile}" regexp="\.build\.properties\.txt" replace=".SVN_REVISION.xml" />
+ <if>
+ <available file="${svnrevXML}" type="file" />
+ <then>
+ <!-- XML way: load into .revision.module and .revision.revision -->
+ <xmlproperty file="${svnrevXML}" collapseAttributes="true" prefix="${prefix}" keeproot="false" />
+ <!-- purge the "<changeSet><kind>" entry if present -->
+ <if>
+ <isset property="${prefix}.kind" />
+ <then>
+ <var name="${prefix}.kind" unset="true" />
+ </then>
+ </if>
+
+ <!-- TXT way: load into .SVN_REVISION -->
+ <if>
+ <and>
+ <isset property="${prefix}.revision.module" />
+ <isset property="${prefix}.revision.revision" />
+ </and>
+ <then>
+ <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
+ <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
+ <var name="i" value="0" />
+ <for list="${temprm.all}" delimiter=", " param="module">
+ <sequential>
+ <math result="i" operand1="1" operation="+" operand2="${i}" datatype="int" />
+ <var name="j" value="0" />
+ <for list="${temprr.all}" delimiter=", " param="revision">
+ <sequential>
+ <math result="j" operand1="1" operation="+" operand2="${j}" datatype="int" />
+ <if>
+ <equals arg1="${i}" arg2="${j}" />
+ <then>
+ <var name="temprr" value="@{revision}" />
+ <if>
+ <isset property="${prefix}.SVN_REVISION" />
+ <then>
+ <propertycopy from="${prefix}.SVN_REVISION" property="temp.all" override="true" />
+ <var name="${prefix}.SVN_REVISION" value="${temp.all},@{module}@${temprr}" />
+ <var name="temp.all" unset="true" />
+ </then>
+ <else>
+ <var name="${prefix}.SVN_REVISION" value="@{module}@${temprr}" />
+ </else>
+ </if>
+ <var name="temprr" unset="true" />
+ </then>
+ </if>
+ </sequential>
+ </for>
+ <var name="j" unset="true" />
+ </sequential>
+ </for>
+ <var name="i" unset="true" />
+ <var name="temprm.all" unset="true" />
+ <var name="temprr.all" unset="true" />
+ </then>
+ </if>
+ </then>
+ <elseif>
+ <available file="${svnrevTXT}" type="file" />
+ <then>
+ <!-- TXT way: load into .SVN_REVISION -->
+ <loadfile property="${prefix}.SVN_REVISION" srcFile="${svnrevTXT}" />
+ <propertycopy from="${prefix}.SVN_REVISION" property="temp" />
+ <propertyregex override="true" property="temp" defaultvalue="${temp}" input="${temp}" regexp="[ \n\t]+" replace="," />
+ <propertyregex override="true" property="${prefix}.SVN_REVISION" defaultvalue="${temp}" input="${temp}" regexp=",$" replace="" />
+
+ <!-- XML way: load into .revision.module and .revision.revision -->
+ <for list="${temp}" delimiter="," param="pair">
+ <sequential>
+ <propertyregex override="true" property="temprm" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\1" />
+ <propertyregex override="true" property="temprr" defaultvalue="@{pair}" input="@{pair}" regexp="(.+)(a)(.+)" replace="\2" />
+ <if>
+ <isset property="${prefix}.revision.module" />
+ <then>
+ <propertycopy from="${prefix}.revision.module" property="temprm.all" override="true" />
+ <propertycopy from="${prefix}.revision.revision" property="temprr.all" override="true" />
+ <var name="${prefix}.revision.module" value="${temprm.all},${temprm}" />
+ <var name="${prefix}.revision.revision" value="${temprr.all},${temprr}" />
+ <var name="temprm.all" unset="true" />
+ <var name="temprr.all" unset="true" />
+ </then>
+ <else>
+ <var name="${prefix}.revision.module" value="${temprm}" />
+ <var name="${prefix}.revision.revision" value="${temprr}" />
+ </else>
+ </if>
+ <var name="temprm" unset="true" />
+ <var name="temprr" unset="true" />
+ </sequential>
+ </for>
+ <var name="temp" unset="true" />
+ </then>
+ </elseif>
+ </if>
+
+ <var name="prefix" unset="true" />
+ </sequential>
+
+ </for>
+ <for param="svnrevfile">
+ <path>
+ <fileset dir="${aggregate.zips.dir}" includes="*.SVN_REVISION.txt, **/*.SVN_REVISION.txt" />
+ </path>
+ <sequential>
+ <!-- load properties file using a prefix which relates to the associated prop file -->
+ <propertyregex override="true" property="prefix" defaultvalue="" input="@{propsfile}" regexp=".+/([^/]+\.build\.properties)\.txt" replace="\1" />
+ <echo level="verbose">Read ${prefix} from @{propsfile}</echo>
+
+ <property file="@{propsfile}" prefix="${prefix}" />
+
+ <var name="prefix" unset="true" />
+ </sequential>
+
+ </for>
+ <!-- dump properties to an XML file, filtering for only those properties we care about -->
+ <echoproperties format="xml" destfile="${aggregate.zips.dir}/build.properties.all.xml">
+ <propertyset>
+ <propertyref regex=".*\.build\.properties" />
+ </propertyset>
+ </echoproperties>
+
+ </target>
+
+ <target name="test.collect.metadata" depends="init">
+ <property name="isTest" value="true" />
+ <antcall target="collect.metadata">
+ </antcall>
+ </target>
+
+ <!-- TODO: write this method -->
+ <target name="create.summary.file" description="create summary file with list of generated files, sizes, and SVN revisions all linked and ordered by source build job">
+ </target>
+
+ <target name="test.create.summary.file" depends="test.collect.zips,test.collect.metadata">
+ <property name="isTest" value="true" />
+ <antcall target="create.summary.file">
+ </antcall>
+ </target>
+
+</project>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/index-template.html 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,133 @@
+<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">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools - 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. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
+<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/helios/">JBoss Tools Requirements - Composite Mirror - Helios</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/stable/helios/">JBoss Tools Core Updates - Stable Milestone - Helios</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,133 @@
+<html>
+<head>
+<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">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools - 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. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
+<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/helios/">JBoss Tools Requirements - Composite Mirror - Helios</a></li>
+ <li><a href="http://download.jboss.org/jbosstools/updates/stable/helios/">JBoss Tools Core Updates - Stable Milestone - Helios</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/pom.xml 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,117 @@
+<?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.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.webtools</groupId>
+ <artifactId>org.jboss.tools.webtools.site</artifactId>
+ <name>JBoss Tools - Web Tools Site</name>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+
+ <!-- to build against locally built sources, use:
+ mvn clean install
+ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use:
+ mvn clean install -Pjbosstools-nightly-staging-composite
+ -->
+ <properties>
+ <!-- add more inputRepos into the composite metadata at the URL below. Therefore need not edit this file and add dozens of URLs
+ which need to be called by Ant script later -->
+ <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl...</inputRepo1>
+ <inputRepos>1</inputRepos>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <property name="inputRepo1" value="${inputRepo1}"/>
+ <property name="inputRepos" value="${inputRepos}"/>
+
+ <!-- called AFTER generating update site + zip to add in extra content -->
+ <ant antfile="build.xml"/>
+ </tasks>
+
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <!-- add more inputRepo# here, ref'd above; need variables so that these
+ can be referred to in Ant script later -->
+ <repository>
+ <id>inputRepo1</id>
+ <url>${inputRepo1}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jbosstools-requirements-composite-mirror</id>
+ <url>http://download.jboss.org/jbosstools/updates/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+</project>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/remove-uncategorized.xsl
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/remove-uncategorized.xsl (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/remove-uncategorized.xsl 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+
+<xsl:template match="/">
+ <xsl:apply-templates select="*"/>
+</xsl:template>
+
+
+<xsl:template match="*">
+ <xsl:copy >
+ <xsl:for-each select="@*">
+ <xsl:copy />
+ </xsl:for-each>
+ <xsl:apply-templates />
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="unit[contains(@id,'site.xml.Default')]" />
+
+</xsl:stylesheet>
\ No newline at end of file
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xml 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- JBoss Tools - Web Tools Nightly Build Update Site -->
+ <category-def label="JBoss Tools - Web Tools Nightly Build Update Site" name="JBoss Tools - Web Tools Nightly Build Update Site">
+ <description>JBoss Tools - Web Tools Nightly Build Update Site: contains all features in this build.</description>
+ </category-def>
+ <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.archives.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.archives.integration" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_0.0.0.jar" id="org.jboss.ide.eclipse.as.serverAdapter.wtp" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.server.rse.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.rse.integration" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+ <feature url="features/org.jboss.ide.eclipse.as.jmx.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.jmx.integration" version="0.0.0">
+ <category name="JBoss Tools - Web Tools Nightly Build Update Site"/>
+ </feature>
+</site>
Added: branches/jbosstools-3.2.x/build/aggregate/webtools-site/web/site.css
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/web/site.css (rev 0)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/web/site.css 2011-08-30 18:16:17 UTC (rev 34400)
@@ -0,0 +1,66 @@
+<
+STYLE type ="text/css">td.spacer {
+ padding-bottom: 10px;
+ padding-top: 10px;
+}
+
+.title {
+ font-family: sans-serif;
+ color: #1778be;
+}
+
+.bodyText {
+ font-family: sans-serif;
+ font-size: 9pt;
+ color: #000000;
+}
+
+.sub-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 9pt;
+ color: white;
+}
+
+.log-text {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: lighter;
+ font-size: 8pt;
+ color: black;
+}
+
+.big-header {
+ font-family: sans-serif;
+ font-style: normal;
+ font-weight: bold;
+ font-size: 9pt;
+ color: white;
+ border-top: 10px solid white;
+}
+
+.light-row {
+ background: #FFFFFF
+}
+
+.dark-row {
+ background: #EEEEEE
+}
+
+.header {
+ background: #445562
+}
+
+#indent {
+ word-wrap: break-word;
+ width: 300px;
+ text-indent: 10px;
+}
+
+.link {
+ color: #187dc6;
+}
+</
+STYLE
+>
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r34399 - trunk/vpe/features/org.jboss.tools.vpe.test.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:15:32 -0400 (Tue, 30 Aug 2011)
New Revision: 34399
Added:
trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
trunk/vpe/features/org.jboss.tools.vpe.test.feature/license.html
Log:
https://issues.jboss.org/browse/JBIDE-9596 ./vpe/features/org.jboss.tools.vpe.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
added new files which werent added by default
Copied: trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties (from rev 34398, branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties)
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties (rev 0)
+++ trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties 2011-08-30 18:15:32 UTC (rev 34399)
@@ -0,0 +1,47 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools VPE Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Tools VPE.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+updateSiteName=JBossTools Update Site
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
\ No newline at end of file
Copied: trunk/vpe/features/org.jboss.tools.vpe.test.feature/license.html (from rev 34398, branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html)
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.test.feature/license.html (rev 0)
+++ trunk/vpe/features/org.jboss.tools.vpe.test.feature/license.html 2011-08-30 18:15:32 UTC (rev 34399)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
14 years, 3 months
JBoss Tools SVN: r34398 - branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:13:01 -0400 (Tue, 30 Aug 2011)
New Revision: 34398
Added:
branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html
Modified:
branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/build.properties
branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9596 ./vpe/features/org.jboss.tools.vpe.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed in 3.3.0.M3 branch
Modified: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/build.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/build.properties 2011-08-30 18:11:00 UTC (rev 34397)
+++ branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/build.properties 2011-08-30 18:13:01 UTC (rev 34398)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ feature.properties,\
+ build.properties,\
+ .project
Added: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties (rev 0)
+++ branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties 2011-08-30 18:13:01 UTC (rev 34398)
@@ -0,0 +1,47 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools VPE Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Tools VPE.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+updateSiteName=JBossTools Update Site
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml 2011-08-30 18:11:00 UTC (rev 34397)
+++ branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml 2011-08-30 18:13:01 UTC (rev 34398)
@@ -1,25 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.vpe.test.feature" label="JBoss Tools - Tests - Visual Page Editor" version="3.3.0.qualifier" provider-name="JBoss by RedHat">
+<feature
+ id="org.jboss.tools.vpe.test.feature"
+ label="%featureName"
+ version="3.3.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
- <plugin id="org.jboss.tools.vpe.base.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.docbook.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.html.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.jsp.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.spring.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.ui.bot.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.ui.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.xulrunner.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.tools.vpe.base.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.docbook.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.html.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.jsp.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.spring.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.bot.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Added: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html
===================================================================
--- branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html (rev 0)
+++ branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html 2011-08-30 18:13:01 UTC (rev 34398)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: branches/jbosstools-3.3.0.M3/vpe/features/org.jboss.tools.vpe.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r34397 - trunk/vpe/features/org.jboss.tools.vpe.test.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-08-30 14:11:00 -0400 (Tue, 30 Aug 2011)
New Revision: 34397
Modified:
trunk/vpe/features/org.jboss.tools.vpe.test.feature/build.properties
trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9596 ./vpe/features/org.jboss.tools.vpe.test.feature/feature.xml :: add license/copyright/description in feature.properties and ref from feature.xml; fix build.properties to include license.html & feature.*
fixed
Modified: trunk/vpe/features/org.jboss.tools.vpe.test.feature/build.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.test.feature/build.properties 2011-08-30 17:51:39 UTC (rev 34396)
+++ trunk/vpe/features/org.jboss.tools.vpe.test.feature/build.properties 2011-08-30 18:11:00 UTC (rev 34397)
@@ -1 +1,9 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
+src.includes = pom.xml,\
+ license.html,\
+ feature.xml,\
+ feature.properties,\
+ build.properties,\
+ .project
Modified: trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml 2011-08-30 17:51:39 UTC (rev 34396)
+++ trunk/vpe/features/org.jboss.tools.vpe.test.feature/feature.xml 2011-08-30 18:11:00 UTC (rev 34397)
@@ -1,25 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.vpe.test.feature" label="JBoss Tools - Tests - Visual Page Editor" version="3.3.0.qualifier" provider-name="JBoss by RedHat">
+<feature
+ id="org.jboss.tools.vpe.test.feature"
+ label="%featureName"
+ version="3.3.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
- <plugin id="org.jboss.tools.vpe.base.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.docbook.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.html.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.jsp.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.spring.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.ui.bot.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
- <plugin id="org.jboss.tools.vpe.ui.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.vpe.xulrunner.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin
+ id="org.jboss.tools.vpe.base.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.docbook.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.html.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.jsp.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.spring.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.bot.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.vpe.xulrunner.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
14 years, 3 months
JBoss Tools SVN: r34396 - trunk/jst/features/org.jboss.tools.jst.test.feature.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-08-30 13:51:39 -0400 (Tue, 30 Aug 2011)
New Revision: 34396
Added:
trunk/jst/features/org.jboss.tools.jst.test.feature/feature.properties
trunk/jst/features/org.jboss.tools.jst.test.feature/license.html
Modified:
trunk/jst/features/org.jboss.tools.jst.test.feature/build.properties
trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9604 added license/copyright/description in feature.properties and ref from feature.xml; fixed build.properties to include license.html & feature.*
Modified: trunk/jst/features/org.jboss.tools.jst.test.feature/build.properties
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.test.feature/build.properties 2011-08-30 17:38:41 UTC (rev 34395)
+++ trunk/jst/features/org.jboss.tools.jst.test.feature/build.properties 2011-08-30 17:51:39 UTC (rev 34396)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Added: trunk/jst/features/org.jboss.tools.jst.test.feature/feature.properties
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.test.feature/feature.properties (rev 0)
+++ trunk/jst/features/org.jboss.tools.jst.test.feature/feature.properties 2011-08-30 17:51:39 UTC (rev 34396)
@@ -0,0 +1,47 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Java Standard Tools Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=JBoss Tools Java Standard Tools Tests
+
+copyright=Copyright (c) 2007 Exadel, Inc and Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+updateSiteName=JBossTools Update Site
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
Property changes on: trunk/jst/features/org.jboss.tools.jst.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml 2011-08-30 17:38:41 UTC (rev 34395)
+++ trunk/jst/features/org.jboss.tools.jst.test.feature/feature.xml 2011-08-30 17:51:39 UTC (rev 34396)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.jboss.tools.jst.test.feature" label="JBoss Tools - Tests - JST" version="3.3.0.qualifier" provider-name="JBoss by RedHat">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
<plugin id="org.jboss.tools.jst.css.test" download-size="0" install-size="0" version="0.0.0" />
Added: trunk/jst/features/org.jboss.tools.jst.test.feature/license.html
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.test.feature/license.html (rev 0)
+++ trunk/jst/features/org.jboss.tools.jst.test.feature/license.html 2011-08-30 17:51:39 UTC (rev 34396)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/features/org.jboss.tools.jst.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r34395 - trunk/seam/features/org.jboss.tools.seam.test.feature.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-08-30 13:38:41 -0400 (Tue, 30 Aug 2011)
New Revision: 34395
Added:
trunk/seam/features/org.jboss.tools.seam.test.feature/feature.properties
trunk/seam/features/org.jboss.tools.seam.test.feature/license.html
Modified:
trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
Log:
https://issues.jboss.org/browse/JBIDE-9603 added license/copyright/description in feature.properties and ref from feature.xml; fixed build.properties to include license.html & feature.*
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties 2011-08-30 17:12:57 UTC (rev 34394)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties 2011-08-30 17:38:41 UTC (rev 34395)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.properties
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/feature.properties (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/feature.properties 2011-08-30 17:38:41 UTC (rev 34395)
@@ -0,0 +1,48 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Seam Tools Tests
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides tests for for JBoss Seam Tools.
+
+copyright=Copyright 2007-2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
+
+licenseURL=license.html
+updateSiteName=JBossTools Update Site
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
+
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2011-08-30 17:12:57 UTC (rev 34394)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2011-08-30 17:38:41 UTC (rev 34395)
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.seam.test.feature" label="JBoss Tools - Tests - Seam" version="3.3.0.qualifier" provider-name="JBoss by RedHat">
+<feature id="org.jboss.tools.seam.test.feature"
+ label="%featureName"
+ version="3.3.0.qualifier"
+ provider-name="%providerName">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
<plugin id="org.jboss.tools.seam.core.test" download-size="0" install-size="0" version="0.0.0" />
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/license.html
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/license.html (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/license.html 2011-08-30 17:38:41 UTC (rev 34395)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
14 years, 3 months
JBoss Tools SVN: r34394 - branches/jbosstools-3.2.x/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-08-30 13:12:57 -0400 (Tue, 30 Aug 2011)
New Revision: 34394
Modified:
branches/jbosstools-3.2.x/build/publish.sh
branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh
branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh
Log:
merge changes from trunk re: symlinks and protocol=28
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-08-30 17:12:45 UTC (rev 34393)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-08-30 17:12:57 UTC (rev 34394)
@@ -266,36 +266,40 @@
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
- echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
+ # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
- echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
+ # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
+ pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
#else
# COMMENTED OUT as this uses too much disk space
# if a release build, create a named dir
#if [[ ${RELEASE} == "Yes" ]]; then
- # date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
+ # date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
#fi
fi
# and create/replace a snapshot dir outside Hudson which is file:// accessible
- date; rsync -arzq --delete ${STAGINGDIR} $INTRNALDEST/builds/staging/
+ date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${JOB_NAME}.next
# and create/replace a snapshot dir w/ static URL
- date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/staging/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
fi
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
fi
fi
@@ -309,6 +313,6 @@
# publish updated log
bl=${STAGINGDIR}/logs/BUILDLOG.txt
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
-date; rsync -arzq --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
+date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
Modified: branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393)
+++ branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh 2011-08-30 17:12:57 UTC (rev 34394)
@@ -34,12 +34,12 @@
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+ date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sums for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
+ date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
done
Modified: branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393)
+++ branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:57 UTC (rev 34394)
@@ -20,11 +20,11 @@
targetZip="${JOBNAMEREDUX}-Update.zip"
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sum for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
+date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
14 years, 3 months
JBoss Tools SVN: r34393 - branches/jbosstools-3.3.0.M3/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-08-30 13:12:45 -0400 (Tue, 30 Aug 2011)
New Revision: 34393
Modified:
branches/jbosstools-3.3.0.M3/build/publish.sh
branches/jbosstools-3.3.0.M3/build/publishComponentZipToStaging.sh
branches/jbosstools-3.3.0.M3/build/publishUpdateZipToStaging.sh
Log:
add --protocol=28 to fix rsync from old slaves
Modified: branches/jbosstools-3.3.0.M3/build/publish.sh
===================================================================
--- branches/jbosstools-3.3.0.M3/build/publish.sh 2011-08-30 17:12:38 UTC (rev 34392)
+++ branches/jbosstools-3.3.0.M3/build/publish.sh 2011-08-30 17:12:45 UTC (rev 34393)
@@ -266,24 +266,24 @@
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
#else
# COMMENTED OUT as this uses too much disk space
# if a release build, create a named dir
#if [[ ${RELEASE} == "Yes" ]]; then
- # date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
+ # date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
#fi
fi
@@ -291,7 +291,7 @@
date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${JOB_NAME}.next
# and create/replace a snapshot dir w/ static URL
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
# 1. To recursively purge contents of .../staging.previous/foobar/ folder:
# mkdir -p /tmp/foobar;
@@ -309,13 +309,13 @@
# IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
# NOTE: comment out next section - should only purge one staging.previous/* folder
#mkdir -p /tmp/${JOB_NAME}.2
- #rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #rsync -arzq --delete --protocol=28 /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
#echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
#rmdir /tmp/${JOB_NAME}.2
# OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
mkdir -p /tmp/${JOB_NAME}
- rsync -arzq --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
rmdir /tmp/${JOB_NAME}
@@ -370,15 +370,15 @@
"
echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml
- date; rsync -arzq ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
+ date; rsync -arzq --protocol=28 ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
fi
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
fi
fi
@@ -392,6 +392,6 @@
# publish updated log
bl=${STAGINGDIR}/logs/BUILDLOG.txt
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
-date; rsync -arzq --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
+date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
Modified: branches/jbosstools-3.3.0.M3/build/publishComponentZipToStaging.sh
===================================================================
--- branches/jbosstools-3.3.0.M3/build/publishComponentZipToStaging.sh 2011-08-30 17:12:38 UTC (rev 34392)
+++ branches/jbosstools-3.3.0.M3/build/publishComponentZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393)
@@ -34,12 +34,12 @@
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+ date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sums for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
+ date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
done
Modified: branches/jbosstools-3.3.0.M3/build/publishUpdateZipToStaging.sh
===================================================================
--- branches/jbosstools-3.3.0.M3/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:38 UTC (rev 34392)
+++ branches/jbosstools-3.3.0.M3/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393)
@@ -20,11 +20,11 @@
targetZip="${JOBNAMEREDUX}-Update.zip"
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sum for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
+date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
14 years, 3 months
JBoss Tools SVN: r34392 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-08-30 13:12:38 -0400 (Tue, 30 Aug 2011)
New Revision: 34392
Modified:
trunk/build/publish.sh
Log:
add --protocol=28 to fix rsync from old slaves
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-08-30 17:12:24 UTC (rev 34391)
+++ trunk/build/publish.sh 2011-08-30 17:12:38 UTC (rev 34392)
@@ -283,7 +283,7 @@
# COMMENTED OUT as this uses too much disk space
# if a release build, create a named dir
#if [[ ${RELEASE} == "Yes" ]]; then
- # date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
+ # date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/
#fi
fi
@@ -309,7 +309,7 @@
# IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
# NOTE: comment out next section - should only purge one staging.previous/* folder
#mkdir -p /tmp/${JOB_NAME}.2
- #rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #rsync -arzq --delete --protocol=28 /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
#echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
#rmdir /tmp/${JOB_NAME}.2
@@ -393,5 +393,5 @@
bl=${STAGINGDIR}/logs/BUILDLOG.txt
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
-date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
+date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
14 years, 3 months