[jbosstools-commits] JBoss Tools SVN: r38101 - branches/jbosstools-3.2.x/build/target-platform.

Author: nickboldt Date: 2012-01-24 10:03:15 -0500 (Tue, 24 Jan 2012) New Revision: 38101 Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml branches/jbosstools-3.2.x/build/target-platform/multiple.target branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml branches/jbosstools-3.2.x/build/target-platform/unified.target branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml Log: JBDS-1648 fix patched feature inclusions so that JBDS agg build can find the patched plugins on its TP; also, include plugins instead of features Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:03:15 UTC (rev 38101) @@ -178,9 +178,9 @@ <unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/> <unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/> - <!-- JBDS-1648 SWT patches --> - <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/> - <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/> + <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... --> + <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/> + <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/> </location> </locations> </target> Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101) @@ -168,6 +168,8 @@ <iu id="org.eclipse.tm.terminal.view.feature.group" version=""/> <iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/> <iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/> </p2.mirror> </target> </project> Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2012-01-24 15:03:15 UTC (rev 38101) @@ -223,9 +223,9 @@ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/> <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/> - <!-- JBDS-1648 SWT patches --> - <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/> - <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/> + <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... --> + <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/> + <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/> </location> </locations> <includeBundles> Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101) @@ -206,8 +206,8 @@ <iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/> <iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> <iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/> -<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/> -<iu id="org.eclipse.rcp.patch64333360.feature.group" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/> <iu id="org.drools.eclipse.feature.feature.group" version=""/> <iu id="org.drools.eclipse.task.feature.feature.group" version=""/> <iu id="org.guvnor.tools.feature.feature.group" version=""/> Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/unified.target 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2012-01-24 15:03:15 UTC (rev 38101) @@ -223,9 +223,9 @@ <unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/> <unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/> - <!-- JBDS-1648 SWT patches --> - <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/> - <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/> + <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... --> + <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/> + <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/> </location> </locations> <includeBundles> Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml =================================================================== --- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100) +++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101) @@ -205,8 +205,8 @@ <iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/> <iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/> <iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/> -<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/> -<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86" version=""/> +<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/> <iu id="org.drools.eclipse.feature.feature.group" version=""/> <iu id="org.drools.eclipse.task.feature.feature.group" version=""/> <iu id="org.guvnor.tools.feature.feature.group" version=""/>