Author: nickboldt
Date: 2011-09-27 19:56:57 -0400 (Tue, 27 Sep 2011)
New Revision: 35097
Modified:
trunk/build/aggregate/soa-site/build.xml
trunk/build/aggregate/soa-site/index.html
trunk/build/aggregate/soa-site/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9721 no longer need to update parameter/variable in
pom.xml - just inherit from parent pom.xml
Modified: trunk/build/aggregate/soa-site/build.xml
===================================================================
--- trunk/build/aggregate/soa-site/build.xml 2011-09-27 23:52:51 UTC (rev 35096)
+++ trunk/build/aggregate/soa-site/build.xml 2011-09-27 23:56:57 UTC (rev 35097)
@@ -498,6 +498,13 @@
<property name="aggregate.zips.dir" value="${output.dir}/zips"
/>
<delete dir="${aggregate.zips.dir}" quiet="true" />
<mkdir dir="${aggregate.zips.dir}" />
+ <if>
+ <isset property="inputRepo" />
+ <then>
+ <var name="inputRepos" value="1" />
+ <var name="inputRepo1" value="${inputRepo}" />
+ </then>
+ </if>
<for list="${inputRepos}" delimiter=", "
keepgoing="true" param="repoNum">
<sequential>
<var name="repo" value="${inputRepo@{repoNum}}" />
Modified: trunk/build/aggregate/soa-site/index.html
===================================================================
--- trunk/build/aggregate/soa-site/index.html 2011-09-27 23:52:51 UTC (rev 35096)
+++ trunk/build/aggregate/soa-site/index.html 2011-09-27 23:56:57 UTC (rev 35097)
@@ -78,22 +78,22 @@
</th>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.savara.tools.feature_2.0.0.v20110920-1746-H216-M4.jar"
style="font-size:x-small">org.jboss.savara.tools.feature</a></td>
- <td><span
style="font-size:x-small">2.0.0.v20110920-1746-H216-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.savara.tools.feature_2.0.0.v20110927-1613-H225-M5.jar"
style="font-size:x-small">org.jboss.savara.tools.feature</a></td>
+ <td><span
style="font-size:x-small">2.0.0.v20110927-1613-H225-M5</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.bpel.feature_1.1.0.v20110920-1643-H417-M4.jar"
style="font-size:x-small">org.jboss.tools.bpel.feature</a></td>
- <td><span
style="font-size:x-small">1.1.0.v20110920-1643-H417-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.bpel.feature_1.1.0.v20110927-1621-H432-M4.jar"
style="font-size:x-small">org.jboss.tools.bpel.feature</a></td>
+ <td><span
style="font-size:x-small">1.1.0.v20110927-1621-H432-M4</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.esb.feature_1.5.0.v20110920-1844-M4.jar"
style="font-size:x-small">org.jboss.tools.esb.feature</a></td>
- <td><span
style="font-size:x-small">1.5.0.v20110920-1844-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.esb.feature_1.5.0.v20110922-1429-H457-M4.jar"
style="font-size:x-small">org.jboss.tools.esb.feature</a></td>
+ <td><span
style="font-size:x-small">1.5.0.v20110922-1429-H457-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -101,8 +101,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20110920-1732-H425-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm.common.feature</a></td>
- <td><span
style="font-size:x-small">4.4.0.v20110920-1732-H425-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20110927-1636-H436-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm.common.feature</a></td>
+ <td><span
style="font-size:x-small">4.4.0.v20110927-1636-H436-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -110,8 +110,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20110920-1732-H425-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm.convert.feature</a></td>
- <td><span
style="font-size:x-small">1.0.0.v20110920-1732-H425-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20110927-1636-H436-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm.convert.feature</a></td>
+ <td><span
style="font-size:x-small">1.0.0.v20110927-1636-H436-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -119,8 +119,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20110920-1732-H425-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm3.feature</a></td>
- <td><span
style="font-size:x-small">3.2.1.v20110920-1732-H425-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20110927-1636-H436-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm3.feature</a></td>
+ <td><span
style="font-size:x-small">3.2.1.v20110927-1636-H436-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -128,8 +128,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.jbpm4.feature_4.0.0.v20110920-1732-H425-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm4.feature</a></td>
- <td><span
style="font-size:x-small">4.0.0.v20110920-1732-H425-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.jbpm4.feature_4.0.0.v20110927-1636-H436-M4.jar"
style="font-size:x-small">org.jboss.tools.jbpm4.feature</a></td>
+ <td><span
style="font-size:x-small">4.0.0.v20110927-1636-H436-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -137,8 +137,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20110920-1620-H349-M4.jar"
style="font-size:x-small">org.jboss.tools.modeshape.rest.feature</a></td>
- <td><span
style="font-size:x-small">1.1.0.v20110920-1620-H349-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20110927-1544-H360-M4.jar"
style="font-size:x-small">org.jboss.tools.modeshape.rest.feature</a></td>
+ <td><span
style="font-size:x-small">1.1.0.v20110927-1544-H360-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -146,43 +146,43 @@
GeneralTools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20110920-1914-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1914-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.runtime.core.feature_1.3.0.v20110927-1545-H397-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.core.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1545-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.runtime.drools.detector.feature_1.3.0.v20110920-1914-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.drools.detector.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1914-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.runtime.drools.detector.feature_1.3.0.v20110927-1545-H397-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.drools.detector.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1545-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.runtime.esb.detector.feature_1.3.0.v20110920-1914-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.esb.detector.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1914-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.runtime.esb.detector.feature_1.3.0.v20110927-1545-H397-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.esb.detector.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1545-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.runtime.feature_1.3.0.v20110920-1914-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1914-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.runtime.feature_1.3.0.v20110927-1545-H397-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1545-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.3.0.v20110920-1914-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.jbpm.detector.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1914-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.3.0.v20110927-1545-H397-M4.jar"
style="font-size:x-small">org.jboss.tools.runtime.jbpm.detector.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1545-H397-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.smooks.feature_1.3.0.v20110920-1704-H394-M4.jar"
style="font-size:x-small">org.jboss.tools.smooks.feature</a></td>
- <td><span
style="font-size:x-small">1.3.0.v20110920-1704-H394-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.smooks.feature_1.3.0.v20110927-1543-H407-M4.jar"
style="font-size:x-small">org.jboss.tools.smooks.feature</a></td>
+ <td><span
style="font-size:x-small">1.3.0.v20110927-1543-H407-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -194,8 +194,8 @@
GeneralTools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.jboss.tools.usage.feature_1.1.0.v20110920-1920-M4.jar"
style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
- <td><span
style="font-size:x-small">1.1.0.v20110920-1920-M4</span></td>
+ <td class="rowLine"><a
href="features/org.jboss.tools.usage.feature_1.1.0.v20110927-1355-H374-M4.jar"
style="font-size:x-small">org.jboss.tools.usage.feature</a></td>
+ <td><span
style="font-size:x-small">1.1.0.v20110927-1355-H374-M4</span></td>
<td><span style="font-size:x-small">
|
AllTools</span></td>
@@ -209,8 +209,8 @@
</th>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.drools.eclipse.feature_5.2.0.Final.jar"
style="font-size:x-small">org.drools.eclipse.feature</a></td>
- <td><span
style="font-size:x-small">5.2.0.Final</span></td>
+ <td class="rowLine"><a
href="features/org.drools.eclipse.feature_5.2.1.Final.jar"
style="font-size:x-small">org.drools.eclipse.feature</a></td>
+ <td><span
style="font-size:x-small">5.2.1.Final</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -220,8 +220,8 @@
GeneralTools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.drools.eclipse.task.feature_5.2.0.Final.jar"
style="font-size:x-small">org.drools.eclipse.task.feature</a></td>
- <td><span
style="font-size:x-small">5.2.0.Final</span></td>
+ <td class="rowLine"><a
href="features/org.drools.eclipse.task.feature_5.2.1.Final.jar"
style="font-size:x-small">org.drools.eclipse.task.feature</a></td>
+ <td><span
style="font-size:x-small">5.2.1.Final</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -229,8 +229,8 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.guvnor.tools.feature_5.2.0.Final.jar"
style="font-size:x-small">org.guvnor.tools.feature</a></td>
- <td><span
style="font-size:x-small">5.2.0.Final</span></td>
+ <td class="rowLine"><a
href="features/org.guvnor.tools.feature_5.2.1.Final.jar"
style="font-size:x-small">org.guvnor.tools.feature</a></td>
+ <td><span
style="font-size:x-small">5.2.1.Final</span></td>
<td><span style="font-size:x-small">
|
AllTools</span><span
style="font-size:x-small">
@@ -238,36 +238,36 @@
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.pi4soa.core.feature_3.1.1.v20110920-1627-H123-M4.jar"
style="font-size:x-small">org.pi4soa.core.feature</a></td>
- <td><span
style="font-size:x-small">3.1.1.v20110920-1627-H123-M4</span></td>
+ <td class="rowLine"><a
href="features/org.pi4soa.core.feature_3.1.1.v20110927-1548-H129-M4.jar"
style="font-size:x-small">org.pi4soa.core.feature</a></td>
+ <td><span
style="font-size:x-small">3.1.1.v20110927-1548-H129-M4</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.savara.tools.feature_2.0.0.v20110920-1746-H216-M4.jar"
style="font-size:x-small">org.savara.tools.feature</a></td>
- <td><span
style="font-size:x-small">2.0.0.v20110920-1746-H216-M4</span></td>
+ <td class="rowLine"><a
href="features/org.savara.tools.feature_2.0.0.v20110927-1613-H225-M5.jar"
style="font-size:x-small">org.savara.tools.feature</a></td>
+ <td><span
style="font-size:x-small">2.0.0.v20110927-1613-H225-M5</span></td>
<td><span style="font-size:x-small">
|
SOATools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.teiid.datatools.connectivity.feature_7.6.0.v20110920-0758-H648-M4.jar"
style="font-size:x-small">org.teiid.datatools.connectivity.feature</a></td>
- <td><span
style="font-size:x-small">7.6.0.v20110920-0758-H648-M4</span></td>
+ <td class="rowLine"><a
href="features/org.teiid.datatools.connectivity.feature_7.6.0.v20110927-1719-H666-M4.jar"
style="font-size:x-small">org.teiid.datatools.connectivity.feature</a></td>
+ <td><span
style="font-size:x-small">7.6.0.v20110927-1719-H666-M4</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
</tr>
<tr
style="background-color:
							#EEEEEE
						">
- <td class="rowLine"><a
href="features/org.teiid.designer.feature_7.6.0.v20110920-0758-H648-M4.jar"
style="font-size:x-small">org.teiid.designer.feature</a></td>
- <td><span
style="font-size:x-small">7.6.0.v20110920-0758-H648-M4</span></td>
+ <td class="rowLine"><a
href="features/org.teiid.designer.feature_7.6.0.v20110927-1719-H666-M4.jar"
style="font-size:x-small">org.teiid.designer.feature</a></td>
+ <td><span
style="font-size:x-small">7.6.0.v20110927-1719-H666-M4</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
</tr>
<tr
style="background-color:
							#FFFFFF
						">
- <td class="rowLine"><a
href="features/org.teiid.designer.runtime.feature_7.6.0.v20110920-0758-H648-M4.jar"
style="font-size:x-small">org.teiid.designer.runtime.feature</a></td>
- <td><span
style="font-size:x-small">7.6.0.v20110920-0758-H648-M4</span></td>
+ <td class="rowLine"><a
href="features/org.teiid.designer.runtime.feature_7.6.0.v20110927-1719-H666-M4.jar"
style="font-size:x-small">org.teiid.designer.runtime.feature</a></td>
+ <td><span
style="font-size:x-small">7.6.0.v20110927-1719-H666-M4</span></td>
<td><span style="font-size:x-small">
|
DataTools</span></td>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2011-09-27 23:52:51 UTC (rev 35096)
+++ trunk/build/aggregate/soa-site/pom.xml 2011-09-27 23:56:57 UTC (rev 35097)
@@ -12,19 +12,6 @@
<name>JBoss Tools - SOA Tooling Site</name>
<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 -->
- <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>
@@ -39,9 +26,9 @@
<quiet>true</quiet>
<tasks>
<!-- called AFTER generating update site + zip to add in extra content -->
- <property name="inputRepo1" value="${inputRepo1}" />
- <property name="inputRepos" value="${inputRepos}" />
<ant antfile="build.xml">
+ <property name="inputRepo"
+ value="${jbosstools-nightly-staging-composite}" />
<property name="JBT_VERSION" value="${JBT_VERSION}"
/>
<property name="BUILD_ALIAS" value="${BUILD_ALIAS}"
/>
</ant>
@@ -94,19 +81,20 @@
</build>
<repositories>
- <!-- 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>
+ <id>jbosstools-nightly-staging-composite</id>
+ <url>${jbosstools-nightly-staging-composite}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
</snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</repository>
<repository>
- <id>jbosstools-requirements-composite-mirror</id>
- <
url>http://download.jboss.org/jbosstools/updates/indigo/SR1/</url>
+ <id>jboss-requirements-composite-mirror</id>
+ <url>${jboss-requirements-composite-mirror}</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>