[jbosstools-commits] JBoss Tools SVN: r23510 - in branches/jbosstools-3.2.0.M1/build: aggregate/site and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 16 18:48:12 EDT 2010
Author: nickboldt
Date: 2010-07-16 18:48:12 -0400 (Fri, 16 Jul 2010)
New Revision: 23510
Added:
branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties
branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml
branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html
branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html
branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch
branches/jbosstools-3.2.0.M1/build/aggregate/site/web/
branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css
Modified:
branches/jbosstools-3.2.0.M1/build/aggregate/site/
branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml
branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml
branches/jbosstools-3.2.0.M1/build/publish.sh
Log:
port changes from trunk
Property changes on: branches/jbosstools-3.2.0.M1/build/aggregate/site
___________________________________________________________________
Name: svn:ignore
+ target
Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties 2010-07-16 22:48:12 UTC (rev 23510)
@@ -0,0 +1,17 @@
+# 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.eclipse.org/eclipse/updates/3.6/,\
+http://download.eclipse.org/birt/update-site/2.6/,\
+http://download.eclipse.org/tptp/updates/galileo/,\
+http://m2eclipse.sonatype.org/sites/m2e/,\
+http://m2eclipse.sonatype.org/sites/m2e-extras/,\
+http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\
+http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2,\
+http://subclipse.tigris.org/update_1.6.x/,\
+http://download.eclipse.org/technology/subversive/0.7/update-site/,\
+http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/
Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml 2010-07-16 22:48:12 UTC (rev 23510)
@@ -0,0 +1,185 @@
+<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="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>
+ <zip destfile="${update.site.source.dir}/content.jar"
+ basedir="${update.site.source.dir}"
+ includes="content.xml" />
+ <delete file="${update.site.source.dir}/content.xml" />
+ </then>
+ </if>
+ </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" />
+ </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" />
+ </copy>
+ </target>
+
+ <target name="custom.build"
+ description="aggregate update site extras"
+ depends="init,check.target,add.associate.sites,add.web.content,pack.zip" />
+
+</project>
Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html 2010-07-16 22:48:12 UTC (rev 23510)
@@ -0,0 +1,135 @@
+<html>
+<head>
+<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title>
+<style>
+ at import url("web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>${update.site.description}</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some
+ features (such as BIRT and Maven) require additional third-party
+ prerequisites not available from Eclipse.org or JBoss.org. These can
+ be installed from the following update sites, which may already be
+ listed - but not enabled - in your Eclipse's list of Available
+ Software Sites:</p>
+ <ul>
+ <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">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.0.M1/build/aggregate/site/index.html
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html 2010-07-16 22:48:12 UTC (rev 23510)
@@ -0,0 +1,135 @@
+<html>
+<head>
+<title>JBoss Tools Nightly Build Update Site: 3.2.0.M1.2010-07-16_17-40-51-H69</title>
+<style>
+ at import url("web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Nightly Build Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.M1.2010-07-16_17-40-51-H69</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Nightly Build</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some
+ features (such as BIRT and Maven) require additional third-party
+ prerequisites not available from Eclipse.org or JBoss.org. These can
+ be installed from the following update sites, which may already be
+ listed - but not enabled - in your Eclipse's list of Available
+ Software Sites:</p>
+ <ul>
+ <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">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.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch 2010-07-16 22:48:12 UTC (rev 23510)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.maven.ide.eclipse.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean install"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/nboldt/workspace36/jbosstools-trunk/build/aggregate/site"/>
+</launchConfiguration>
Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml 2010-07-16 22:33:14 UTC (rev 23509)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml 2010-07-16 22:48:12 UTC (rev 23510)
@@ -9,14 +9,63 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>site</artifactId>
+ <artifactId>org.jboss.tools.site.aggregate</artifactId>
+ <name>org.jboss.tools.site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <!-- called AFTER generating update site + zip to add in extra content -->
+ <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-commons-net</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
<repositories>
<repository>
<id>jbosstools-continuous-snapshot</id>
- <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1.continuous/all/repo/</url>
+ <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M2.continuous/all/repo/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -24,7 +73,7 @@
</repository>
<repository>
<id>jbosstools-snapshot</id>
- <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1/all/repo/</url>
+ <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M2/all/repo/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -38,7 +87,116 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!-- <repository> <id>jbosstools-teiid-designer-snapshot</id> <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer/</url>
- <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> -->
+ <repository>
+ <id>jbosstools-teiid-designer-snapshot</id>
+ <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer/all/repo/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
+
+ <profiles>
+ <profile>
+ <id>helios-no-target</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>helios</id>
+ <url>http://download.eclipse.org/releases/helios/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>webtools32</id>
+ <url>http://download.eclipse.org/webtools/repository/helios</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>eclipse36</id>
+ <url>http://download.eclipse.org/eclipse/updates/3.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>birt26</id>
+ <url>http://download.eclipse.org/birt/update-site/2.6/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>swtbot-helios</id>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>m2eclipse-extras</id>
+ <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/
+ </url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</project>
Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-16 22:33:14 UTC (rev 23509)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-16 22:48:12 UTC (rev 23510)
@@ -102,7 +102,8 @@
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
- <feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0">
+
+ <!-- <feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0">
<category name="AllTools" />
<category name="SOATools" />
<category name="GeneralTools" />
@@ -117,7 +118,8 @@
<feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0">
<category name="AllTools" />
<category name="SOATools" />
- </feature>
+ </feature> -->
+
<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar"
id="org.jboss.tools.project.examples.feature"
version="0.0.0"
@@ -294,6 +296,7 @@
<feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0">
<category name="AllTools" />
</feature>
+
<!-- removed temporarily because pi4soa doesn't work w/ Eclipse 3.6. yet.
<feature url="features/org.teiid.datatools.connectivity.feature_0.0.0.jar" id="org.teiid.datatools.connectivity.feature" version="0.0.0">
<category name="AllTools" />
@@ -307,5 +310,5 @@
<category name="AllTools" />
<category name="DataTools" />
</feature>
- -->
+ -->
</site>
Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css
===================================================================
--- branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css (rev 0)
+++ branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css 2010-07-16 22:48:12 UTC (rev 23510)
@@ -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
Modified: branches/jbosstools-3.2.0.M1/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-16 22:33:14 UTC (rev 23509)
+++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-16 22:48:12 UTC (rev 23510)
@@ -20,7 +20,7 @@
# define suffix to use for additional update sites
SUFFNAME="-Update-${ZIPSUFFIX}.zip"
-if [[ $DESTINATION == "" ]]; then DESTINATION="tools at filemgmt.jboss.org:/downloads_htdocs/tools/builds/nightly/3.2.helios"; fi
+if [[ $DESTINATION == "" ]]; then DESTINATION="tools at filemgmt.jboss.org:/downloads_htdocs/tools"; fi
# cleanup from last time
rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR}
@@ -48,11 +48,15 @@
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
if [[ ${SVN_REVISION} ]]; then
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
+ echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
+ else
+ echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
fi
- echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
+ echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE}
+ echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
# unzip into workspace for publishing as unpacked site
mkdir -p ${STAGINGDIR}/all/repo
@@ -97,7 +101,7 @@
# generate HTML snippet, download-snippet.txt, for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
- ANT_PARAMS="-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs"
+ ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
@@ -131,15 +135,23 @@
# publish to download.jboss.org, unless errors found - avoid destroying last-good update site
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
-date
# publish update site dir
if [[ -d ${STAGINGDIR} ]]; then
- rsync -arzq --delete ${STAGINGDIR} $DESTINATION/
+ date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/
fi
# publish update site zip
if [[ -f ${WORKSPACE}/results/${SNAPNAME} ]]; then
- rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/
+ date; rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
fi
+
+ # extra publish step for aggregate update sites ONLY
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ $1 == "trunk" ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
+ else
+ date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOB_NAME/.aggregate}/
+ fi
+ fi
fi
date
More information about the jbosstools-commits
mailing list