JBoss Tools SVN: r34886 - in branches/jbosstools-3.2.x/build/aggregate: webtools-site and 1 other directory.
12:30 p.m.
Author: nickboldt
Date: 2011-09-20 13:30:11 -0400 (Tue, 20 Sep 2011)
New Revision: 34886
Modified:
branches/jbosstools-3.2.x/build/aggregate/site/index.html
branches/jbosstools-3.2.x/build/aggregate/site/site.xsl
branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html
branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl
Log:
backport trunk changes for https://issues.jboss.org/browse/JBIDE-9721 and
https://issues.jboss.org/browse/JBIDE-9743 to 32x branch
Modified: branches/jbosstools-3.2.x/build/aggregate/site/index.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 17:21:43 UTC (rev
34885)
+++ branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 17:30:11 UTC (rev
34886)
@@ -8,7 +8,7 @@
<body marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0">
<center>
<table marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0"
- cellspacing="0" cellpadding="0" width="920">
+ cellspacing="0" cellpadding="0" width="920"
class="bodyText">
<tr>
<td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png"
/></td>
@@ -465,10 +465,10 @@
</tr>
<tr style="background-color:#EEEEEE">
<td class="rowLine"><a href="site.xml"
style="font-size:x-small">site.xml</a>
- ::
- <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
- ::
- <a href="content.jar"
style="font-size:x-small">content.jar</a></td>
+ ::
+ <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar"
style="font-size:x-small">content.jar</a></td>
<td class="rowLine"></td>
<td class="rowLine"></td>
</tr>
Modified: branches/jbosstools-3.2.x/build/aggregate/site/site.xsl
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/site/site.xsl 2011-09-20 17:21:43 UTC (rev
34885)
+++ branches/jbosstools-3.2.x/build/aggregate/site/site.xsl 2011-09-20 17:30:11 UTC (rev
34886)
@@ -5,7 +5,8 @@
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
<br />
- <table cellspacing="2" cellpadding="0"
border="0">
+ <table cellspacing="2" cellpadding="0" border="0">
+ <xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -50,6 +51,8 @@
</td>
</tr>
</xsl:for-each>
+ </xsl:if>
+ <xsl:if
test="count(feature[not(contains(@id,'jboss'))])>0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -94,25 +97,27 @@
</td>
</tr>
</xsl:for-each>
- <tr style="background-color:#DDDDDD">
- <th colspan="1"
style="font-size:small">Metadata</th>
- <th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
- </tr>
- <tr style="background-color:#EEEEEE">
- <td class="rowLine">
- <a href="site.xml"
style="font-size:x-small">site.xml</a>
- ::
- <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
- ::
- <a href="content.jar"
style="font-size:x-small">content.jar</a>
- </td>
- <td class="rowLine">
- </td>
- <td class="rowLine">
- </td>
- </tr>
- </table>
+ </xsl:if>
+
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1"
style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml"
style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar"
style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
<br />
</xsl:template>
</xsl:stylesheet>
Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 17:21:43
UTC (rev 34885)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 17:30:11
UTC (rev 34886)
@@ -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.2_stable_branch.webtools.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969
+ or
+ $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate
-DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.2.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: branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html 2011-09-20 17:21:43
UTC (rev 34885)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html 2011-09-20 17:30:11
UTC (rev 34886)
@@ -1,34 +1,37 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Nightly Build Update Site</title>
+<title>JBoss Tools - Web Tools - Stable Milestone Update Site:
3.3.99.M7.webtools.2011-09-19_19-10-45-H6969</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0">
+<center>
<table marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0"
- cellspacing="0" cellpadding="0">
+ cellspacing="0" cellpadding="0" width="920"
class="bodyText">
<tr>
- <td colspan="2"><img
+ <td colspan="3"><img
src="https://www.jboss.org/dms/tools/images/tools-banner.png"
/></td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
</tr>
<tr>
- <td>  </td>
+ <td>      </td>
<td>
- <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update
Site</h2>
+ <h2 class="title">JBoss Tools - Web Tools - Stable Milestone 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.99.M7.webtools.2011-09-19_19-10-45-H6969</span></td>
</tr>
<tr class="light-row" style="height: 30px">
<td class="bodyText">
- <p class="bodyText">This is the <b>Nightly Build</b>
+ <p class="bodyText">This is the <b>Stable Milestone</b>
Update Site for JBoss Tools - Web Tools. See <a class="link"
- href="http://www.jboss.org/tools/download/update">Installation
+ href="http://www.jboss.org/tools/download/installation/update_3_2&qu...
Instructions</a>.</p>
</td>
</tr>
@@ -52,29 +55,70 @@
<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
+ Downloads</a>.<br/>
+ If you downloaded this site as a zip, see <a
href="README.installation.txt">Installation README</a>. See also <a
href="http://www.jboss.org/tools/download/installation">Inst...
methods</a>.</p>
</td>
</tr>
- <tr>
- <td class="spacer"><br />
- </td>
- <td class="spacer"><br />
- </td>
- </tr>
</table>
</td>
+ <td>      </td>
</tr>
<tr>
<td></td>
<td>
+ <br xmlns="http://www.w3.org/1999/xhtml"
xmlns:xalan="http://xml.apache.org/xalan"></br><table
xmlns="http://www.w3.org/1999/xhtml"
xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2"
cellpadding="0" border="0">
+ <tr style="background-color:#DDDDDD">
+ <th style="font-size:small">Feature</th>
+ <th style="font-size:small">Version</th>
+ <th style="font-size:small">
+ Feature Categor(ies)
+
+ </th>
+ </tr>
+ <tr
style="background-color:
							#EEEEEE
						">
+ <td class="rowLine"><a
href="features/org.jboss.ide.eclipse.archives.feature_3.2.0.v20110920-0932-H182-CR1.jar"
style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td>
+ <td><span
style="font-size:x-small">3.2.0.v20110920-0932-H182-CR1</span></td>
+ <td><span style="font-size:x-small">
+ |
+ 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.feature_2.2.0.v20110920-0516-H242-CR1.jar"
style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td>
+ <td><span
style="font-size:x-small">2.2.0.v20110920-0516-H242-CR1</span></td>
+ <td><span style="font-size:x-small">
+ |
+ 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.1.0.v20110920-0921-H143-CR1.jar"
style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span
style="font-size:x-small">1.1.0.v20110920-0921-H143-CR1</span></td>
+ <td><span style="font-size:x-small">
+ |
+ org.eclipse.wst.server.core.serverAdapter</span></td>
+ </tr>
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1"
style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine"><a href="site.xml"
style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar"
style="font-size:x-small">content.jar</a></td>
+ <td class="rowLine"></td>
+ <td class="rowLine"></td>
+ </tr>
+</table><br xmlns="http://www.w3.org/1999/xhtml"
xmlns:xalan="http://xml.apache.org/xalan"></br>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>
Installation
@@ -130,4 +174,5 @@
</td>
</tr>
</table>
+</center>
</html>
Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl
===================================================================
--- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl 2011-09-20 17:21:43
UTC (rev 34885)
+++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl 2011-09-20 17:30:11
UTC (rev 34886)
@@ -5,7 +5,8 @@
<xsl:output method="html" indent="yes" />
<xsl:template match="/site">
<br />
- <table cellspacing="2" cellpadding="0"
border="0">
+ <table cellspacing="2" cellpadding="0" border="0">
+ <xsl:if test="count(feature[contains(@id,'jboss')])>0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -50,6 +51,8 @@
</td>
</tr>
</xsl:for-each>
+ </xsl:if>
+ <xsl:if
test="count(feature[not(contains(@id,'jboss'))])>0">
<tr style="background-color:#DDDDDD">
<th style="font-size:small">Feature</th>
<th style="font-size:small">Version</th>
@@ -94,25 +97,27 @@
</td>
</tr>
</xsl:for-each>
- <tr style="background-color:#DDDDDD">
- <th colspan="1"
style="font-size:small">Metadata</th>
- <th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
- </tr>
- <tr style="background-color:#EEEEEE">
- <td class="rowLine">
- <a href="site.xml"
style="font-size:x-small">site.xml</a>
- ::
- <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
- ::
- <a href="content.jar"
style="font-size:x-small">content.jar</a>
- </td>
- <td class="rowLine">
- </td>
- <td class="rowLine">
- </td>
- </tr>
- </table>
+ </xsl:if>
+
+ <tr style="background-color:#DDDDDD">
+ <th colspan="1"
style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small"></th>
+ <th colspan="1" style="font-size:small"></th>
+ </tr>
+ <tr style="background-color:#EEEEEE">
+ <td class="rowLine">
+ <a href="site.xml"
style="font-size:x-small">site.xml</a>
+ ::
+ <a href="artifacts.jar"
style="font-size:x-small">artifacts.jar</a>
+ ::
+ <a href="content.jar"
style="font-size:x-small">content.jar</a>
+ </td>
+ <td class="rowLine">
+ </td>
+ <td class="rowLine">
+ </td>
+ </tr>
+ </table>
<br />
</xsl:template>
</xsl:stylesheet>
![src="https://www.jboss.org/dms/tools/images/tools-banner.png"](http://src="https://www.jboss.org/dms/tools/images/tools-banner.png%22){kind=link}
5328
days inactive
5328
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org