1:12 p.m.
Author: nickboldt
Date: 2011-11-23 14:12:56 -0500 (Wed, 23 Nov 2011)
New Revision: 36574
Added:
trunk/build/aggregate/index-template.html
Removed:
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/sources/index-template.html
Modified:
trunk/build/aggregate/build.xml
Log:
use {basedir}/index-template.htmlinstead of having multiple copies in the {output.dir}
folders
Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml 2011-11-23 19:12:46 UTC (rev 36573)
+++ trunk/build/aggregate/build.xml 2011-11-23 19:12:56 UTC (rev 36574)
@@ -456,6 +456,7 @@
default update.site.description=Nightly Build
default update.site.version=(null)
-->
+ <property name="update.site.name" value="JBoss Tools" />
<property name="update.site.description" value="Nightly Build"
/>
<if>
<and>
@@ -493,7 +494,7 @@
<antcallback target="generate.directory.xml"
return="directory.xml.html"/>
<copy todir="${output.dir}" overwrite="true">
- <fileset file="${output.dir}/index-template.html" />
+ <fileset file="${basedir}/index-template.html" />
<mapper type="merge" to="index.html" />
<filterchain>
<expandproperties />
Copied: trunk/build/aggregate/index-template.html (from rev 36573,
trunk/build/aggregate/site/sources/index-template.html)
===================================================================
--- trunk/build/aggregate/index-template.html (rev 0)
+++ trunk/build/aggregate/index-template.html 2011-11-23 19:12:56 UTC (rev 36574)
@@ -0,0 +1,136 @@
+<html>
+<head>
+<title>${update.site.name} ${update.site.description} Update
Site${update.site.version}</title>
+<style>
+@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0">
+<center>
+<table marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0"
+ cellspacing="0" cellpadding="0" width="920"
class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png"
/></td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>
+ <h2 class="title">${update.site.name} ${update.site.description} Update
Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest
Build${update.site.version}</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the
<b>${update.site.description}</b>
+ Update Site for ${update.site.name}.
+ <blockquote style="border: 1px dashed #1778be; padding: 2px">
+ <ol>
+ <li>To <a class="link"
+ href="http://www.jboss.org/tools/download/installation/update_3_3&qu...
+ from this site, start up Eclipse 3.7, then do:
+ <ul>
+ <code><strong>Help > Install New Software...
></strong></code>
+ </ul>
+ </li>
+ <li>Copy this site's URL into Eclipse, and hit Enter.</li>
+ <li>When the site loads, select the features to install,
+ or click the <code><strong>Select All</strong></code>
button.</li>
+ <li>To properly resolve all dependencies, check
+ <ul><code><strong>[x] Contact all update sites during install
to find required software</strong></code></ul>
+
+ <li>Click <code><strong>Next</strong></code>,
agree to the license
+ terms, and install.</li>
+
+ <p class="bodyText">
+ You can also download JBoss Tools as individual zips for
+ offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.<br /> If you downloaded this site as a zip, see
+ <a href="README.installation.txt">Installation
README</a>.
+ See also <a
+ href="http://www.jboss.org/tools/download/installation">Inst...
+ methods</a>.
+ </p>
+ </ol>
+ </blockquote>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>      </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ ${site.contents}
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>
Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a
href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a
href="https://www.jboss.org/tools/download/dev.html">Develop...
+ 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">ble...
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</center>
+</html>
Deleted: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2011-11-23 19:12:46 UTC (rev 36573)
+++ trunk/build/aggregate/site/index-template.html 2011-11-23 19:12:56 UTC (rev 36574)
@@ -1,152 +0,0 @@
-<html>
-<head>
-<title>JBoss Tools ${update.site.description} Update
Site${update.site.version}</title>
-<style>
-@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
-</style>
-</head>
-<body marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0">
-<center>
-<table marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0"
- cellspacing="0" cellpadding="0" width="920"
class="bodyText">
- <tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png"
/></td>
- </tr>
- <tr>
- <td>      </td>
- <td>      </td>
- <td>      </td>
- </tr>
- <tr>
- <td>      </td>
- <td>
- <h2 class="title">JBoss Tools ${update.site.description} Update
Site</h2>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>Latest
Build${update.site.version}</span></td>
- </tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">This is the
<b>${update.site.description}</b>
- Update Site for JBoss Tools.
- <blockquote style="border: 1px dashed #1778be; padding: 2px">
- <ol>
- <li>To <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3&qu...
- from this site, start up Eclipse 3.7, then do:
- <ul>
- <code><strong>Help > Install New Software...
></strong></code>
- </ul>
- </li>
- <li>Copy this site's URL into Eclipse, and hit Enter.</li>
- <li>When the site loads, select the features to install,
- or click the <code><strong>Select All</strong></code>
button.</li>
- <li>To properly resolve all dependencies, check
- <ul><code><strong>[x] Contact all update sites during install
to find required software</strong></code></ul>
-
- <li>Click <code><strong>Next</strong></code>,
agree to the license
- terms, and install.</li>
-
- <p class="bodyText">
- You can also download JBoss Tools as individual zips for
- offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br /> If you downloaded this site as a zip, see
- <a href="README.installation.txt">Installation
README</a>.
- See also <a
- href="http://www.jboss.org/tools/download/installation">Inst...
- methods</a>.
- </p>
- </ol>
- </blockquote>
- </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, 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/indigo/SR1/"... Tools
Requirements - Composite Mirror - Indigo SR1</a></li>
- <li><a href="http://dl.google.com/eclipse/plugin/3.7/">Google
Plugin for Eclipse 3.7 (Indigo)</a></li>
- </ul>
- </td>
- </tr>
- -->
-
- </table>
- </td>
- <td>      </td>
- </tr>
- <tr>
- <td></td>
- <td>
- ${site.contents}
- </td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>
Installation
- Types</span></td>
- </tr>
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">Depending on how close to the bleeding edge
- you like to be, there are several types of releases available.</p>
- <br />
-
- </td>
- </tr>
-
- <tr class="dark-row" style="height: 30px">
- <td class="bodyText">
- <h4>Stable Releases</h4>
-
- <p><a
href="https://www.jboss.org/tools/download/stable.html">Stable
- releases</a> are - as indicated by their name - stable.</p><br/>
-
- </td>
- </tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <h4>Development Milestones</h4>
-
- <p><a
href="https://www.jboss.org/tools/download/dev.html">Develop...
- 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">ble...
- edge</a> contains the latest and greatest new features, but nothing is
- stable or guaranteed - yet. If you're using a Milestone and need a
- fix, you can update to the latest Nightly, or wait for the next
- Milestone.</p><br/>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-</center>
-</html>
Deleted: trunk/build/aggregate/site/sources/index-template.html
===================================================================
--- trunk/build/aggregate/site/sources/index-template.html 2011-11-23 19:12:46 UTC (rev
36573)
+++ trunk/build/aggregate/site/sources/index-template.html 2011-11-23 19:12:56 UTC (rev
36574)
@@ -1,136 +0,0 @@
-<html>
-<head>
-<title>JBoss Tools ${update.site.description} Update Site${update.site.version}
[Sources]</title>
-<style>
-@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
-</style>
-</head>
-<body marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0">
-<center>
-<table marginheight="0" marginwidth="0" leftmargin="0"
topmargin="0"
- cellspacing="0" cellpadding="0" width="920"
class="bodyText">
- <tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png"
/></td>
- </tr>
- <tr>
- <td>      </td>
- <td>      </td>
- <td>      </td>
- </tr>
- <tr>
- <td>      </td>
- <td>
- <h2 class="title">JBoss Tools ${update.site.description} Update Site
[Sources]</h2>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>Latest
Build${update.site.version}</span></td>
- </tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">This is the
<b>${update.site.description}</b>
- Update Site for JBoss Tools.
- <blockquote style="border: 1px dashed #1778be; padding: 2px">
- <ol>
- <li>To <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3&qu...
- from this site, start up Eclipse 3.7, then do:
- <ul>
- <code><strong>Help > Install New Software...
></strong></code>
- </ul>
- </li>
- <li>Copy this site's URL into Eclipse, and hit Enter.</li>
- <li>When the site loads, select the features to install,
- or click the <code><strong>Select All</strong></code>
button.</li>
- <li>To properly resolve all dependencies, check
- <ul><code><strong>[x] Contact all update sites during install
to find required software</strong></code></ul>
-
- <li>Click <code><strong>Next</strong></code>,
agree to the license
- terms, and install.</li>
-
- <p class="bodyText">
- You can also download JBoss Tools as individual zips for
- offline installation. See <a class="link"
- href="http://www.jboss.org/tools/download">JBoss Tools
- Downloads</a>.<br /> If you downloaded this site as a zip, see
- <a href="README.installation.txt">Installation
README</a>.
- See also <a
- href="http://www.jboss.org/tools/download/installation">Inst...
- methods</a>.
- </p>
- </ol>
- </blockquote>
- </td>
- </tr>
- </table>
- </td>
- <td>      </td>
- </tr>
- <tr>
- <td></td>
- <td>
- ${site.contents}
- </td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <table width="100%">
- <tr class="header">
- <td class="sub-header" width="100%"><span>
Installation
- Types</span></td>
- </tr>
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">Depending on how close to the bleeding edge
- you like to be, there are several types of releases available.</p>
- <br />
-
- </td>
- </tr>
-
- <tr class="dark-row" style="height: 30px">
- <td class="bodyText">
- <h4>Stable Releases</h4>
-
- <p><a
href="https://www.jboss.org/tools/download/stable.html">Stable
- releases</a> are - as indicated by their name - stable.</p><br/>
-
- </td>
- </tr>
-
- <tr class="light-row" style="height: 30px">
- <td class="bodyText">
- <h4>Development Milestones</h4>
-
- <p><a
href="https://www.jboss.org/tools/download/dev.html">Develop...
- 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">ble...
- edge</a> contains the latest and greatest new features, but nothing is
- stable or guaranteed - yet. If you're using a Milestone and need a
- fix, you can update to the latest Nightly, or wait for the next
- Milestone.</p><br/>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-</center>
-</html>
![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}