Author: nickboldt Date: 2011-05-11 12:42:21 -0400 (Wed, 11 May 2011) New Revision: 31213 Added: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml Log: add missing org.eclipse.mylyn.versions.feature.group to mylyn site; split M6 and M7 versions Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-11 16:21:41 UTC (rev 31212) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-11 16:42:21 UTC (rev 31213) @@ -21,6 +21,7 @@ <child location='../../requirements/emf/2.7M6/'/> <child location='../../requirements/webtools/3.3M6/'/> <child location='../../requirements/m2eclipse/0.13.0.201103291237/'/> +<child location='../../requirements/mylyn/3.6-I20110415-0655/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -28,7 +29,6 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/mylyn/3.6/'/> <child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-11 16:21:41 UTC (rev 31212) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-11 16:42:21 UTC (rev 31213) @@ -21,6 +21,7 @@ <child location='../../requirements/emf/2.7M6/'/> <child location='../../requirements/webtools/3.3M6/'/> <child location='../../requirements/m2eclipse/0.13.0.201103291237/'/> +<child location='../../requirements/mylyn/3.6-I20110415-0655/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -28,7 +29,6 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/mylyn/3.6/'/> <child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-11 16:21:41 UTC (rev 31212) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-11 16:42:21 UTC (rev 31213) @@ -21,6 +21,7 @@ <child location='../../requirements/emf/2.7M7/'/> <child location='../../requirements/webtools/3.3M7/'/> <child location='../../requirements/m2eclipse/0.13.0.201105091504/'/> +<child location='../../requirements/mylyn/3.6-I20110504-0744/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -28,7 +29,6 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/mylyn/3.6/'/> <child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-11 16:21:41 UTC (rev 31212) +++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-11 16:42:21 UTC (rev 31213) @@ -21,6 +21,7 @@ <child location='../../requirements/emf/2.7M7/'/> <child location='../../requirements/webtools/3.3M7/'/> <child location='../../requirements/m2eclipse/0.13.0.201105091504/'/> +<child location='../../requirements/mylyn/3.6-I20110504-0744/'/> <child location='../../requirements/ecf/3.5/'/> <child location='../../requirements/egit/0.11/'/> @@ -28,7 +29,6 @@ <child location='../../requirements/gwt/201102111811/'/> <child location='../../requirements/jslint/1.5/'/> -<child location='../../requirements/mylyn/3.6/'/> <child location='../../requirements/orbit/S20110124210048/'/> <child location='../../requirements/pmd/3.2.6/'/> <child location='../../requirements/springide/2.6.0.201103160035/'/> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... (from rev 31212, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... 2011-05-11 16:42:21 UTC (rev 31213) @@ -0,0 +1,63 @@ +<?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/mylyn/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 \ + <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \ + -application org.eclipse.ant.core.antRunner \ + -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo + --> + <target name="mirror"> + <!-- core mylyn, if not on Indigo site; includes Bugzilla --> + <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> --> + <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/I20110415-065... /> + <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ --> + <!--<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.6/" /> --> + <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e... /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requir... /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/3.6-I20110415-0655" name="mylyn plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL1}" /> + <repository location="${URL2}" /> + </source> + + <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" /> + + <iu id="org.eclipse.mylyn_feature.feature.group" /> + <iu id="org.eclipse.mylyn.commons.feature.group" /> + <iu id="org.eclipse.mylyn.context_feature.feature.group" /> + <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" /> + + <iu id="org.eclipse.mylyn.ide_feature.feature.group" /> + <iu id="org.eclipse.mylyn.java_feature.feature.group" /> + <iu id="org.eclipse.mylyn.pde_feature.feature.group" /> + <iu id="org.eclipse.mylyn.team_feature.feature.group" /> + + <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" /> + <iu id="org.eclipse.mylyn.jira_feature.feature.group" /> + <iu id="org.eclipse.mylyn.git.feature.group" /> + <iu id="org.eclipse.mylyn.cvs.feature.group" /> + <iu id="org.eclipse.mylyn.versions.feature.group" /> + + <iu id="com.atlassian.connector.eclipse.feature.group" /> + <iu id="com.atlassian.connector.eclipse.cvs.feature.group" /> + <iu id="com.atlassian.connector.eclipse.jira.feature.group" /> + <!-- these last two are described as "obsolete" on the update site --> + <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" /> + <iu id="com.atlassian.connector.eclipse.subversive.feature.group" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6-I20110415-0655/" artifactRepository="file:${destination}/3.6-I20110415-0655/" publishartifacts="true" source="${destination}/3.6-I20110415-0655/" compress="${compress}" /> + </target> +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-05-11 16:21:41 UTC (rev 31212) +++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-05-11 16:42:21 UTC (rev 31213) @@ -17,7 +17,8 @@ --> <target name="mirror"> <!-- core mylyn, if not on Indigo site; includes Bugzilla --> - <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> + <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> --> + <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/I20110504-074... /> <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ --> <!--<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.6/" /> --> <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e... /> @@ -25,7 +26,7 @@ <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/3.6/" name="mylyn plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/3.6-I20110504-0744" name="mylyn plugins for Eclipse 3.6 - 3.7" /> <source> <repository location="${URL1}" /> <repository location="${URL2}" /> @@ -47,6 +48,7 @@ <iu id="org.eclipse.mylyn.jira_feature.feature.group" /> <iu id="org.eclipse.mylyn.git.feature.group" /> <iu id="org.eclipse.mylyn.cvs.feature.group" /> + <iu id="org.eclipse.mylyn.versions.feature.group" /> <iu id="com.atlassian.connector.eclipse.feature.group" /> <iu id="com.atlassian.connector.eclipse.cvs.feature.group" /> @@ -56,6 +58,6 @@ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6/" artifactRepository="file:${destination}/3.6/" publishartifacts="true" source="${destination}/3.6/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6-I20110504-0744/" artifactRepository="file:${destination}/3.6-I20110504-0744/" publishartifacts="true" source="${destination}/3.6-I20110504-0744/" compress="${compress}" /> </target> </project>