Author: nickboldt Date: 2011-07-19 17:34:06 -0400 (Tue, 19 Jul 2011) New Revision: 33058 Modified: trunk/build/aggregate/site/aggregateSite.jbosstools.properties trunk/build/aggregate/site/index-template.html trunk/build/aggregate/site/index.html trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties trunk/build/aggregate/soa-site/index-template.html trunk/build/aggregate/soa-site/index.html trunk/build/parent/pom.xml trunk/build/results/buildResults.xsl trunk/build/target-platform/jbds.target trunk/build/target-platform/jbds.target.p2mirror.xml trunk/build/target-platform/multiple.target trunk/build/target-platform/multiple.target.p2mirror.xml trunk/build/target-platform/publish.sh trunk/build/target-platform/target2p2mirror.xml Log: refactor e37RC2-wtp33RC2 to e370-wtp330 and indigo/RC2/ to indigo/SR0/ in prep for new TP & updated reqs mirror (JBDS-1700, JBDS-1706) Modified: trunk/build/aggregate/site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/site/aggregateSite.jbosstools.properties 2011-07-19 21:34:06 UTC (rev 33058) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/RC2/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/ Modified: trunk/build/aggregate/site/index-template.html =================================================================== --- trunk/build/aggregate/site/index-template.html 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/site/index-template.html 2011-07-19 21:34:06 UTC (rev 33058) @@ -41,7 +41,7 @@ </p> <ul> - <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2"&... Tools Requirements - Composite Mirror - Indigo RC2</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0"&... Tools Requirements - Composite Mirror - Indigo SR0</a></li> </ul> </td> </tr> Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/site/index.html 2011-07-19 21:34:06 UTC (rev 33058) @@ -41,7 +41,7 @@ </p> <ul> - <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2"&... Tools Requirements - Composite Mirror - Indigo RC2</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0"&... Tools Requirements - Composite Mirror - Indigo SR0</a></li> </ul> </td> </tr> Modified: trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties =================================================================== --- trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/soa-site/aggregateSite.jbosstools.properties 2011-07-19 21:34:06 UTC (rev 33058) @@ -4,4 +4,4 @@ #update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 # associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/indigo/RC2/,http://download.jboss.org/jbosstools/updates/development/indigo/ +associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR0/,http://download.jboss.org/jbosstools/updates/development/indigo/ Modified: trunk/build/aggregate/soa-site/index-template.html =================================================================== --- trunk/build/aggregate/soa-site/index-template.html 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/soa-site/index-template.html 2011-07-19 21:34:06 UTC (rev 33058) @@ -41,7 +41,7 @@ </p> <ul> - <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2"&... Tools Requirements - Composite Mirror - Indigo RC2</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0"&... Tools Requirements - Composite Mirror - Indigo SR0</a></li> <li><a href="http://download.jboss.org/jbosstools/updates/development/indig... Tools Core Updates - Stable Milestone - Indigo</a></li> </ul> </td> Modified: trunk/build/aggregate/soa-site/index.html =================================================================== --- trunk/build/aggregate/soa-site/index.html 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/aggregate/soa-site/index.html 2011-07-19 21:34:06 UTC (rev 33058) @@ -41,7 +41,7 @@ </p> <ul> - <li><a href="http://download.jboss.org/jbosstools/updates/indigo/RC2"&... Tools Requirements - Composite Mirror - Indigo RC2</a></li> + <li><a href="http://download.jboss.org/jbosstools/updates/indigo/SR0"&... Tools Requirements - Composite Mirror - Indigo SR0</a></li> <li><a href="http://download.jboss.org/jbosstools/updates/development/indig... Tools Core Updates - Stable Milestone - Indigo</a></li> </ul> </td> Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/parent/pom.xml 2011-07-19 21:34:06 UTC (rev 33058) @@ -32,7 +32,7 @@ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/ta... <!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ --> - <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37RC2-wtp33RC2.target/</local.site> + <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e370-wtp330.target/</local.site> <!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) --> <!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo --> @@ -43,7 +43,7 @@ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite> <!-- 3a. URL of latest JBT requirements composite mirror --> - <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstoo... + <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstoo... <!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site --> <local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements> @@ -52,7 +52,7 @@ <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightl... <!-- 5. extra requirements (for 3rd party "Extras" site) --> - <jboss-requirements-composite-extras-mirror>http://download.jboss.org/j... + <jboss-requirements-composite-extras-mirror>http://download.jboss.org/j... </properties> <build> Modified: trunk/build/results/buildResults.xsl =================================================================== --- trunk/build/results/buildResults.xsl 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/results/buildResults.xsl 2011-07-19 21:34:06 UTC (rev 33058) @@ -238,7 +238,7 @@ <tr> <td> <a class="blue" - href="http://download.jboss.org/jbosstools/updates/target-platform_3... Platform Update Zip</a> + href="http://download.jboss.org/jbosstools/updates/target-platform_3... Platform Update Zip</a> </td> </tr> <tr> @@ -323,4 +323,4 @@ </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/jbds.target 2011-07-19 21:34:06 UTC (rev 33058) @@ -11,9 +11,9 @@ <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/&q... - <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/RC2/"/> --> - <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/RC2/&... --> + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/&q... + <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR0/"/> --> + <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR0/&... --> <!-- m2e 1.0 / m2e-wtp 0.13 + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/> Modified: trunk/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058) @@ -28,7 +28,7 @@ <p2.mirror destination="file://${repoDir}" verbose="${verbose}"> <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> -<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/&q... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/&q... </source> <iu id="javax.wsdl" version=""/> <iu id="org.jdom" version=""/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/multiple.target 2011-07-19 21:34:06 UTC (rev 33058) @@ -15,7 +15,7 @@ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/&q... + <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/&q... <!-- m2e 1.0 / m2e-wtp 0.13 + deps --> <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/> @@ -230,4 +230,4 @@ <feature id="org.mozilla.xpcom.feature"/> </includeBundles> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> -</target> \ No newline at end of file +</target> Modified: trunk/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058) @@ -29,7 +29,7 @@ <slicingOptions includeFeatures="true" followStrict="${followStrict}"/> <source> <repository location="http://download.jboss.org/jbosstools/builds/staging/_compo... -<repository location="http://download.jboss.org/jbosstools/updates/indigo/RC2/&q... +<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/&q... </source> <iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/> <iu id="org.eclipse.m2e.feature.feature.group" version=""/> Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/publish.sh 2011-07-19 21:34:06 UTC (rev 33058) @@ -4,7 +4,7 @@ # defaults for JBoss Tools # don't forget to increment these files when moving up a version: # build.xml, *.target*, publish.sh, target2p2mirror.xml -targetZipFile=e37RC2-wtp33RC2.target +targetZipFile=e370-wtp330.target repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO destinationPath=/home/hudson/static_build_env/jbds/target-platform DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform @@ -23,7 +23,7 @@ '-exclude') exclude="$2"; shift 2;; '-jbt_3.3.indigo') # defaults for JBT (trunk) - targetZipFile=e37RC2-wtp33RC2.target + targetZipFile=e370-wtp330.target repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo @@ -32,7 +32,7 @@ shift 1;; '-jbt') # defaults for JBT (stable branch) - targetZipFile=e37RC2-wtp33RC2.target + targetZipFile=e370-wtp330.target repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO destinationPath=/home/hudson/static_build_env/jbds/target-platform DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform @@ -41,7 +41,7 @@ shift 1;; '-jbds_3.3.indigo') # defaults for JBDS (trunk) - targetZipFile=jbds500-e37RC2-wtp33RC2.target + targetZipFile=jbds500-e370-wtp330.target repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo @@ -50,7 +50,7 @@ shift 1;; '-jbds') # defaults for JBDS (stable branch) - targetZipFile=jbds500-e37RC2-wtp33RC2.target + targetZipFile=jbds500-e370-wtp330.target repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform Modified: trunk/build/target-platform/target2p2mirror.xml =================================================================== --- trunk/build/target-platform/target2p2mirror.xml 2011-07-19 21:22:42 UTC (rev 33057) +++ trunk/build/target-platform/target2p2mirror.xml 2011-07-19 21:34:06 UTC (rev 33058) @@ -1,7 +1,7 @@ <project default="custom.build" name="jbosstools target platform p2.mirror generator"> <!-- don't forget to increment these files when moving up a version: build.xml, *.target*, publish.sh, target2p2mirror.xml --> - <property name="targetFile" value="e37RC2-wtp33RC2.target" /> + <property name="targetFile" value="e370-wtp330.target" /> <!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available; if useLatest = false, include versions and fetch specific versions requested. -->