12:17 p.m.
Author: nickboldt
Date: 2011-09-20 13:17:27 -0400 (Tue, 20 Sep 2011)
New Revision: 34883
Modified:
trunk/build/aggregate/bottests-site/site/build.xml
trunk/build/aggregate/bottests-site/site/index.html
trunk/build/aggregate/bottests-site/site/pom.xml
trunk/build/aggregate/webtools-site/build.xml
trunk/build/aggregate/webtools-site/index.html
trunk/build/aggregate/webtools-site/pom.xml
Log:
remove unnecessary cruft https://issues.jboss.org/browse/JBIDE-9721,
https://issues.jboss.org/browse/JBIDE-9743
Modified: trunk/build/aggregate/bottests-site/site/build.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 16:55:15 UTC (rev
34882)
+++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 17:17:27 UTC (rev
34883)
@@ -45,7 +45,8 @@
<antcall target="get.saxon" />
</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"
/>
+ <!-- don't do collect.zips,collect.metadata,create.summary.file -->
+ <target name="custom.build" description="aggregate update site
extras"
depends="init,check.target,add.associate.sites,add.web.content,pack.zip" />
<target name="get.saxon" unless="saxon.jar.exists">
<!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
@@ -438,6 +439,11 @@
from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER}
default update.site.description=Nightly Build
default update.site.version=(null)
+
+ To test output, run in parent folder (bottests-site/):
+ $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969
+ or
+ $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7
-Dupdate.site.description="Stable Milestone"
-->
<property name="update.site.description" value="Nightly Build"
/>
<if>
@@ -450,7 +456,18 @@
<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}" />
+ <if>
+ <and>
+ <isset property="JBT_VERSION" />
+ <isset property="BUILD_ALIAS" />
+ </and>
+ <then>
+ <propertyregex override="true"
property="update.site.version" defaultvalue="${JOB_NAME}"
input="${JOB_NAME}"
regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate"
replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" />
+ </then>
+ <else>
+ <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}" />
+ </else>
+ </if>
</then>
<else>
<property name="update.site.version" value="" />
@@ -485,7 +502,7 @@
<delete file="${update.site.source.dir}/site.html" quiet="true"
/>
</target>
- <!-- look for
http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
+ <!-- look for
http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch
-->
<target name="collect.zips" description="collect zips from the sites
we aggregated">
<property name="aggregate.zips.dir" value="${output.dir}/zips"
/>
Modified: trunk/build/aggregate/bottests-site/site/index.html
===================================================================
--- trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 16:55:15 UTC (rev
34882)
+++ trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 17:17:27 UTC (rev
34883)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Bot Tests - Nightly Build Update Site</title>
+<title>JBoss Tools - Bot Tests - Nightly Build Update Site:
3.3_trunk.bottests.2011-12-12_19-10-45-H6970</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,7 +24,7 @@
<h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update
Site</h2>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span>Latest
Build</span></td>
+ <td class="sub-header" width="100%"><span>Latest
Build: 3.3_trunk.bottests.2011-12-12_19-10-45-H6970</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -79,15 +79,15 @@
</th>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110831-0309-M3.jar"
style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td>
- <td><span
style="font-size:x-small">3.1.0.v20110831-0309-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110920-1309-H6970-M4.jar"
style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td>
+ <td><span
style="font-size:x-small">3.1.0.v20110920-1309-H6970-M4</span></td>
<td><span style="font-size:x-small">
|
JBoss Tools bot.tests Nightly Build Update
Site</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.test.feature_3.2.0.v20110831-0220-M3.jar"
style="font-size:x-small">org.jboss.tools.test.feature</a></td>
- <td><span
style="font-size:x-small">3.2.0.v20110831-0220-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.test.feature_3.2.0.v20110916-0001-M4.jar"
style="font-size:x-small">org.jboss.tools.test.feature</a></td>
+ <td><span
style="font-size:x-small">3.2.0.v20110916-0001-M4</span></td>
<td><span style="font-size:x-small">
|
JBoss Tools bot.tests Nightly Build Update
Site</span></td>
Modified: trunk/build/aggregate/bottests-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-20 16:55:15 UTC (rev 34882)
+++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-20 17:17:27 UTC (rev 34883)
@@ -1,5 +1,5 @@
-<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">
+<?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>
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.bot.tests</groupId>
<artifactId>org.jboss.tools.bot.tests.site</artifactId>
- <name>JBoss Tools - Bot Tests - Aggregate Site</name>
+ <name>JBoss Tools - Bot Tests Site</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
@@ -17,14 +17,6 @@
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 -->
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos...
- <inputRepos>1</inputRepos>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -38,9 +30,6 @@
<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>
@@ -96,14 +85,6 @@
<!-- 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/indigo/SR0/</url>
<layout>p2</layout>
Modified: trunk/build/aggregate/webtools-site/build.xml
===================================================================
--- trunk/build/aggregate/webtools-site/build.xml 2011-09-20 16:55:15 UTC (rev 34882)
+++ trunk/build/aggregate/webtools-site/build.xml 2011-09-20 17:17:27 UTC (rev 34883)
@@ -45,7 +45,8 @@
<antcall target="get.saxon" />
</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"
/>
+ <!-- don't do collect.zips,collect.metadata,create.summary.file -->
+ <target name="custom.build" description="aggregate update site
extras"
depends="init,check.target,add.associate.sites,add.web.content,pack.zip" />
<target name="get.saxon" unless="saxon.jar.exists">
<!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
@@ -438,6 +439,11 @@
from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER}
default update.site.description=Nightly Build
default update.site.version=(null)
+
+ To test output, run in parent folder (bottests-site/):
+ $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969
+ or
+ $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7
-Dupdate.site.description="Stable Milestone"
-->
<property name="update.site.description" value="Nightly Build"
/>
<if>
@@ -450,7 +456,18 @@
<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}" />
+ <if>
+ <and>
+ <isset property="JBT_VERSION" />
+ <isset property="BUILD_ALIAS" />
+ </and>
+ <then>
+ <propertyregex override="true"
property="update.site.version" defaultvalue="${JOB_NAME}"
input="${JOB_NAME}"
regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate"
replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" />
+ </then>
+ <else>
+ <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}" />
+ </else>
+ </if>
</then>
<else>
<property name="update.site.version" value="" />
@@ -485,7 +502,7 @@
<delete file="${update.site.source.dir}/site.html" quiet="true"
/>
</target>
- <!-- look for
http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...;
+ <!-- look for
http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.*/logs/z...;
if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch
-->
<target name="collect.zips" description="collect zips from the sites
we aggregated">
<property name="aggregate.zips.dir" value="${output.dir}/zips"
/>
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2011-09-20 16:55:15 UTC (rev 34882)
+++ trunk/build/aggregate/webtools-site/index.html 2011-09-20 17:17:27 UTC (rev 34883)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Nightly Build Update Site</title>
+<title>JBoss Tools - Web Tools - Nightly Build Update Site:
3.3_trunk.webtools.2011-12-12_19-10-45-H6970</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -24,7 +24,7 @@
<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>
+ <td class="sub-header" width="100%"><span>Latest
Build: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -78,53 +78,53 @@
</th>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110826-0931-H394-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
- <td><span
style="font-size:x-small">3.2.1.v20110826-0931-H394-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110916-0117-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span
style="font-size:x-small">3.2.1.v20110916-0117-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110827-1450-H672-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td>
- <td><span
style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110919-1521-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td>
+ <td><span
style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110827-1450-H672-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
- <td><span
style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110919-1521-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span
style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110827-1450-H672-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td>
- <td><span
style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110919-1521-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td>
+ <td><span
style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110827-1450-H672-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td>
- <td><span
style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110919-1521-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td>
+ <td><span
style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110827-1450-H672-M3.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td>
- <td><span
style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110919-1521-M4.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td>
+ <td><span
style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.jmx.feature_1.2.0.v20110826-0930-H377-M3.jar"
style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
- <td><span
style="font-size:x-small">1.2.0.v20110826-0930-H377-M3</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.jmx.feature_1.2.0.v20110916-0116-M4.jar"
style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span
style="font-size:x-small">1.2.0.v20110916-0116-M4</span></td>
<td><span style="font-size:x-small">
|
- JBoss Tools - Web Tools Nightly Build Update
Site</span></td>
+ org.eclipse.wst.server.core.serverAdapter</span></td>
</tr>
<tr style="background-color:#DDDDDD">
<th colspan="1"
style="font-size:small">Metadata</th>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-09-20 16:55:15 UTC (rev 34882)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-20 17:17:27 UTC (rev 34883)
@@ -17,14 +17,6 @@
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 -->
- <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use
_composite_/3.3.indigo -->
- <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_compos...
- <inputRepos>1</inputRepos>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -38,9 +30,6 @@
<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>
@@ -96,14 +85,6 @@
<!-- 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/indigo/SR0/</url>
<layout>p2</layout>
5319
days inactive
5319
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org