Author: nickboldt
Date: 2011-09-22 19:04:49 -0400 (Thu, 22 Sep 2011)
New Revision: 34979
Modified:
trunk/build/aggregate/webtools-site/index.html
trunk/build/aggregate/webtools-site/pom.xml
Log:
nest ant properties in the <ant> call so they get passed through to ant; doesn't
work to declare them outside the <ant> call (JBIDE-9743)
Modified: trunk/build/aggregate/webtools-site/index.html
===================================================================
--- trunk/build/aggregate/webtools-site/index.html 2011-09-22 22:49:23 UTC (rev 34978)
+++ trunk/build/aggregate/webtools-site/index.html 2011-09-22 23:04:49 UTC (rev 34979)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - Web Tools - Nightly Build Update Site:
3.3_trunk.webtools.2011-12-12_19-10-45-H6970</title>
+<title>JBoss Tools - Web Tools - Nightly Build Update Site:
3.3.0.v20110919-1910-H6969-M4.webtools</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: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</span></td>
+ <td class="sub-header" width="100%"><span>Latest
Build: 3.3.0.v20110919-1910-H6969-M4.webtools</span></td>
</tr>
<tr class="light-row" style="height: 30px">
@@ -78,50 +78,50 @@
</th>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110922-1517-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.v20110922-1517-M4</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.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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110922-1752-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.v20110922-1752-M4</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.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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110922-1752-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.v20110922-1752-M4</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.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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110922-1752-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.v20110922-1752-M4</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.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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110922-1752-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.v20110922-1752-M4</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.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 class="rowLine"><a
href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110922-1752-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.v20110922-1752-M4</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.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 class="rowLine"><a
href="features/org.jboss.tools.jmx.feature_1.2.0.v20110922-1517-M4.jar"
style="font-size:x-small">org.jboss.tools.jmx.feature</a></td>
+ <td><span
style="font-size:x-small">1.2.0.v20110922-1517-M4</span></td>
<td><span style="font-size:x-small">
|
org.eclipse.wst.server.core.serverAdapter</span></td>
Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 22:49:23 UTC (rev 34978)
+++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-22 23:04:49 UTC (rev 34979)
@@ -1,5 +1,6 @@
<?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">
+<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>
@@ -12,11 +13,9 @@
<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
- -->
+ <!-- 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 -->
<build>
<plugins>
<plugin>
@@ -31,9 +30,10 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <!-- <property name="JBT_VERSION"
value="${JBT_VERSION}"/>
- <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
-->
- <ant antfile="build.xml"/>
+ <ant antfile="build.xml">
+ <property name="JBT_VERSION" value="${JBT_VERSION}"
/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"
/>
+ </ant>
</tasks>
</configuration>
<goals>