Author: nickboldt Date: 2012-09-17 16:25:21 -0400 (Mon, 17 Sep 2012) New Revision: 43767 Added: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipsecs/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/README.... trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml Log: update req builders for findbugs, springIDE, eclipse-cs, testng (JBDS-2278) Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipsecs/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/eclipsecs/build.xml 2012-09-17 18:21:26 UTC (rev 43766) +++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipsecs/build.xml 2012-09-17 20:25:21 UTC (rev 43767) @@ -17,11 +17,11 @@ --> <target name="mirror"> <property name="URL" value="http://eclipse-cs.sf.net/update/" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/5.4.0.201109110000/" name="eclipsecs plugins for Eclipse 3.7" /> + <repository location="file:${destination}/5.5.0.201111092104/" name="eclipsecs plugins for Eclipse" /> <source> <repository location="${URL}" /> </source> @@ -29,6 +29,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/5.4.0.201109110000/" artifactRepository="file:${destination}/5.4.0.201109110000/" publishartifacts="true" source="${destination}/5.4.0.201109110000/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/5.5.0.201111092104/" artifactRepository="file:${destination}/5.5.0.201111092104/" publishartifacts="true" source="${destination}/5.5.0.201111092104/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/README.... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/README.... 2012-09-17 18:21:26 UTC (rev 43766) +++ trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/README.... 2012-09-17 20:25:21 UTC (rev 43767) @@ -28,6 +28,7 @@ Sources can be found here at sourceforge.net: <ul> +<li><a class="link" href="http://prdownloads.sourceforge.net/findbugs/eclipsePlugin-2.0.... Eclipse Plugin 2.0.1.20120712 Source Zip</a></li> <li><a class="link" href="http://prdownloads.sourceforge.net/findbugs/eclipsePlugin-1.3.... Eclipse Plugin 1.3.9.20090821 Source Zip</a></li> <li><a class="link" href="http://findbugs.sourceforge.net/downloads.html">FindBugs Downloads</a></li> </ul> @@ -37,24 +38,10 @@ <tr class="dark-row" style="height: 30px"> <td class="bodyText"> - <!-- <p class="bodyText"></p> --> - -<!-- to convert raw fish listing to links do this in vi - -:%s#^sftp://tools@filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/\(.\+\)$#<li><a class=link href=\1>\1<\/a></li>#g - -Then sftp file into - -tools(a)filemgmt.jboss.org/downloads_htdocs/tools/updates/requirements/ - -which becomes - -http://download.jboss.org/jbosstools/updates/requirements/ - ---> <p class="bodyText">FindBugs Update Site (local JBoss.org mirror)</p> <ul> -<li><a class=link href=1.3.9>1.3.9</a> </li> +<li><a class=link href=2.0.1.20120712>2.0.1.20120712</a> </li> +<li><a class=link href=1.3.9>1.3.9.20090821</a> </li> </ul> <br/> </td> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/build.xml (from rev 43766, trunk/download.jboss.org/jbosstools/updates/requirements/eclipsecs/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/build.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/findbugs/build.xml 2012-09-17 20:25:21 UTC (rev 43767) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> + <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options: + + -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} + -consoleLog -nosplash -data /tmp + -application org.eclipse.ant.core.antRunner + -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/findbugs/build.xml" + + or, run headless on qa01 server, where Eclipse is installed into ~/eclipse: + + export JAVA_HOME=/opt/jdk1.6.0; \ + ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \ + org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner \ + -f ~/RHDS/updates/requirements/findbugs/build.xml -Ddestination=/tmp/findbugs-repo + --> + <target name="mirror"> + <property name="URL" value="http://eclipse-cs.sf.net/update/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/2.0.1.20120712/" name="findbugs for Eclipse" /> + <source> + <repository location="${URL}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.0.1.20120712/" artifactRepository="file:${destination}/2.0.1.20120712/" publishartifacts="true" source="${destination}/2.0.1.20120712/" compress="${compress}" /> + </target> +</project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... (from rev 43766, trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build-... 2012-09-17 20:25:21 UTC (rev 43767) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="default"> + <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options: + + -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} + -consoleLog -nosplash -data /tmp + -application org.eclipse.ant.core.antRunner + -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/build.xml" + + or, run headless on qa01 server, where Eclipse is installed into ~/eclipse: + + export JAVA_HOME=/opt/jdk1.6.0; \ + ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \ + org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner \ + -f ~/RHDS/updates/requirements/springide/build.xml -Ddestination=/tmp/pmd-repo + + or, run local: + + export JAVA_HOME=/opt/jdk1.6.0; \ + java -cp ~/eclipse/eclipse371/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar \ + org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner -f build.xml \ + init copy.patched.jars regenerate.metadata + + --> + <target name="default" depends="init,mirror,apply.patch,copy.patched.jars,regenerate.metadata" /> + <target name="patch.and.regen" depends="init,apply.patch,copy.patched.jars,regenerate.metadata" /> + + <target name="init"> + <!-- Other URLs: + http://dist.springframework.org/release/IDE/ + http://dist.springframework.org/snapshot/IDE/weekly/ + http://dist.springsource.com/release/TOOLS/update/e3.7/ + --> + <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.7/" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="siteVersion" value="2.7.2.201109122348" /> + <property name="compress" value="true" /> + </target> + + <target name="mirror"> + <p2.mirror> + <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.7" /> + <source> + <repository location="${URL}" /> + </source> + + <iu id="org.springframework.ide.eclipse.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.aop.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.osgi.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.webflow.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.batch.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.integration.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.security.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.autowire.feature.feature.group" /> + <iu id="org.springframework.ide.eclipse.mylyn.feature.feature.group" /> + + <slicingoptions includefeatures="true" followstrict="true" latestversiononly="false" platformfilter="true" /> + </p2.mirror> + </target> + + <target name="apply.patch"> + <echo>JBDS-1838 :: Apply patch to disable SpringIDE welcome page</echo> + <!-- unzip jar + replace about.ini + replace MANIFEST.MF + delete welcome.xml META-INF/VMWARE.* + zip jar --> + <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE_ORIGINAL.jar" /> + <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> + <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/about.ini"> +aboutText=%title +featureImage=feature_image.png +</echo> + <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF/MANIFEST.MF">Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %providerName +Bundle-Version: ${siteVersion}-RELEASE +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.springframework.ide.eclipse +</echo> + <delete quiet="true"> + <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" includes="welcome.xml" /> + <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF" includes="eclipse.inf, VMWARE.RSA, VMWARE.SF" /> + </delete> + <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> + <delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" /> + </target> + + <target name="copy.patched.jars"> + <property name="patch.suffix" value="-patched_JBDS-1838"/> + <copy file="${destination}/${siteVersion}.patch/plugins/org.springframework.ide.eclipse_${siteVersion}${patch.suffix}.jar" todir="${destination}/${siteVersion}/plugins/" /> + <copy file="${destination}/${siteVersion}.patch/features/org.springframework.ide.eclipse.feature_${siteVersion}${patch.suffix}.jar" todir="${destination}/${siteVersion}/features/" /> + </target> + + <target name="regenerate.metadata"> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/${siteVersion}/" artifactRepository="file:${destination}/${siteVersion}/" publishartifacts="true" source="${destination}/${siteVersion}/" compress="${compress}" /> + </target> + +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2012-09-17 18:21:26 UTC (rev 43766) +++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2012-09-17 20:25:21 UTC (rev 43767) @@ -18,30 +18,28 @@ or, run local: export JAVA_HOME=/opt/jdk1.6.0; \ - java -cp ~/eclipse/eclipse371/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar \ + java -cp ~/eclipse/eclipse370/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar \ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ - -application org.eclipse.ant.core.antRunner -f build.xml \ - init copy.patched.jars regenerate.metadata - + -application org.eclipse.ant.core.antRunner -f build.xml --> - <target name="default" depends="init,mirror,apply.patch,copy.patched.jars,regenerate.metadata" /> + <target name="default" depends="init,mirror" /> <target name="patch.and.regen" depends="init,apply.patch,copy.patched.jars,regenerate.metadata" /> <target name="init"> <!-- Other URLs: http://dist.springframework.org/release/IDE/ http://dist.springframework.org/snapshot/IDE/weekly/ - http://dist.springsource.com/release/TOOLS/update/e3.7/ + http://dist.springsource.com/release/TOOLS/update/e4.2/ --> - <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.7/" /> + <property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e4.2/" /> <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> - <property name="siteVersion" value="2.7.2.201109122348" /> + <property name="siteVersion" value="3.0.0.201208090952-RELEASE" /> <property name="compress" value="true" /> </target> <target name="mirror"> <p2.mirror> - <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.7" /> + <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 4.2" /> <source> <repository location="${URL}" /> </source> @@ -67,8 +65,8 @@ replace MANIFEST.MF delete welcome.xml META-INF/VMWARE.* zip jar --> - <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE_ORIGINAL.jar" /> - <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> + <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}_ORIGINAL.jar" /> + <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" /> <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/about.ini"> aboutText=%title featureImage=feature_image.png @@ -78,7 +76,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Bundle-Version: ${siteVersion}-RELEASE +Bundle-Version: ${siteVersion} Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.ide.eclipse </echo> @@ -86,14 +84,12 @@ <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" includes="welcome.xml" /> <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF" includes="eclipse.inf, VMWARE.RSA, VMWARE.SF" /> </delete> - <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> + <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" /> <delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" /> </target> <target name="copy.patched.jars"> - <property name="patch.suffix" value="-patched_JBDS-1838"/> - <copy file="${destination}/${siteVersion}.patch/plugins/org.springframework.ide.eclipse_${siteVersion}${patch.suffix}.jar" todir="${destination}/${siteVersion}/plugins/" /> - <copy file="${destination}/${siteVersion}.patch/features/org.springframework.ide.eclipse.feature_${siteVersion}${patch.suffix}.jar" todir="${destination}/${siteVersion}/features/" /> + <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}_ORIGINAL.jar" /> </target> <target name="regenerate.metadata"> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2012-09-17 18:21:26 UTC (rev 43766) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2012-09-17 20:25:21 UTC (rev 43767) @@ -23,7 +23,7 @@ <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/1.8_1.7/" name="Subclipse 1.8 + SVNKit 1.7 plugins for Subversion 1.7 and Eclipse 3.7" /> + <repository location="file:${destination}/1.8.16_1.7.5.v1/" name="Subclipse 1.8 + SVNKit 1.7 plugins for Subversion 1.7 and Eclipse" /> <source> <repository location="${URL1}" /> <repository location="${URL2}" /> @@ -32,6 +32,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.8_1.7/" artifactRepository="file:${destination}/1.8_1.7/" publishartifacts="true" source="${destination}/1.8_1.7/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.8.16_1.7.5.v1/" artifactRepository="file:${destination}/1.8.16_1.7.5.v1/" publishartifacts="true" source="${destination}/1.8.16_1.7.5.v1/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml 2012-09-17 18:21:26 UTC (rev 43766) +++ trunk/download.jboss.org/jbosstools/updates/requirements/testng/build.xml 2012-09-17 20:25:21 UTC (rev 43767) @@ -17,11 +17,11 @@ --> <target name="mirror"> <property name="URL" value="http://beust.com/eclipse/" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/6.1.1.20110823_1537/" name="testng plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/6.7.0.20120825_1316/" name="testng plugins for Eclipse" /> <source> <repository location="${URL}" /> </source> @@ -29,6 +29,6 @@ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/6.1.1.20110823_1537/" artifactRepository="file:${destination}/6.1.1.20110823_1537/" publishartifacts="true" source="${destination}/6.1.1.20110823_1537/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/6.7.0.20120825_1316/" artifactRepository="file:${destination}/6.7.0.20120825_1316/" publishartifacts="true" source="${destination}/6.7.0.20120825_1316/" compress="${compress}" /> </target> </project>