Author: nickboldt Date: 2012-09-03 01:36:34 -0400 (Mon, 03 Sep 2012) New Revision: 43380 Modified: branches/jbosstools-4.0.0.Alpha1/build/aggregate/build.xml branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/index.html branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/pom.xml Log: JBDS-2251 Modified: branches/jbosstools-4.0.0.Alpha1/build/aggregate/build.xml =================================================================== --- branches/jbosstools-4.0.0.Alpha1/build/aggregate/build.xml 2012-09-02 14:01:52 UTC (rev 43379) +++ branches/jbosstools-4.0.0.Alpha1/build/aggregate/build.xml 2012-09-03 05:36:34 UTC (rev 43380) @@ -504,7 +504,7 @@ <!-- Properties calculated here from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1 - from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} + from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-B${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) --> @@ -528,10 +528,10 @@ <isset property="BUILD_ALIAS" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}-${BUILD_TS}-B${BUILD_NUMBER}.\4" /> </then> <else> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" /> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-B${BUILD_NUMBER}.\3" /> </else> </if> </then> Modified: branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/index.html =================================================================== --- branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/index.html 2012-09-02 14:01:52 UTC (rev 43379) +++ branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/index.html 2012-09-03 05:36:34 UTC (rev 43380) @@ -31,12 +31,11 @@ <td class="bodyText"> <p class="bodyText">This is the <b>Nightly Build</b> Update Site for JBoss Tools - Web Tools. - <p align="center"><span style="padding:4px;color:white;background-color:red;font-weight:bold">NOTE:This site was built using Indigo (Eclipse 3.7.2), but SHOULD work with Juno (Eclipse 4.2M6+) too.</span></p> <blockquote style="border: 1px dashed #1778be; padding: 2px"> <ol> <li>To <a class="link" href="http://www.jboss.org/tools/download/installation/update_4_0&qu... - from this site, start up Eclipse 3.7 (or 4.2), then do: + from this site, start up Eclipse 4.2, then do: <ul> <code><strong>Help > Install New Software... ></strong></code> </ul> Modified: branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/pom.xml =================================================================== --- branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/pom.xml 2012-09-02 14:01:52 UTC (rev 43379) +++ branches/jbosstools-4.0.0.Alpha1/build/aggregate/webtools-site/pom.xml 2012-09-03 05:36:34 UTC (rev 43380) @@ -11,6 +11,12 @@ <artifactId>org.jboss.tools.site.webtools</artifactId> <name>JBoss Tools - Web Tools Site</name> <packaging>eclipse-update-site</packaging> + <!-- to test output, use: + mvn install \ + -DJOB_NAME=jbosstools-4.0_stable_branch.webtools.aggregate \ + -DBUILD_ID=2012-12-12_01-02-03 -DBUILD_NUMBER=69 -DJBT_VERSION=4.0.99 \ + -DBUILD_ALIAS=Alpha7 -Dupdate.site.description="Stable Milestone" + --> <build> <plugins> <plugin>