JBoss Tools SVN: r37382 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-12-15 19:10:51 -0500 (Thu, 15 Dec 2011)
New Revision: 37382
Modified:
trunk/build/parent/pom.xml
Log:
update parent pom w/ new SR1-M URLs (JBIDE-10239)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-12-16 00:10:44 UTC (rev 37381)
+++ trunk/build/parent/pom.xml 2011-12-16 00:10:51 UTC (rev 37382)
@@ -33,11 +33,11 @@
</target.platform.classifier.local>
<!-- 1a. URL of latest JBT target platform site -->
- <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>
+ <jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</jbosstools-target-site>
<!-- 1b. or use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
- <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e371-wtp331.target/</local.site>
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M/e372M-wtp332M.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
@@ -49,7 +49,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/jbosstools/updates/indigo/SR1/</jboss-requirements-composite-mirror>
+ <jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1-M/</jboss-requirements-composite-mirror>
<!-- 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>
14 years
JBoss Tools SVN: r37381 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-12-15 19:10:44 -0500 (Thu, 15 Dec 2011)
New Revision: 37381
Modified:
trunk/build/target-platform/jbds.target
Log:
updated versions in JBDS target platform for SR1-M
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-12-15 23:31:44 UTC (rev 37380)
+++ trunk/build/target-platform/jbds.target 2011-12-16 00:10:44 UTC (rev 37381)
@@ -16,10 +16,10 @@
<!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1-M/"/> -->
<!-- m2e, m2e-wtp + deps -->
- <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.0.201106061504"/>
- <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.13.1.20110728-1800"/>
- <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.14.0.201107260131"/>
+ <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
+ <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.14.0.20110928-2045"/>
+ <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/>
<unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>
<unit id="ch.qos.logback.slf4j" version="0.9.27.v20110224-1110"/>
@@ -58,200 +58,200 @@
<unit id="org.eclipse.bpel.feature.feature.group" version="0.8.0.v20111120-0746-H98-CI"/>
<!-- EMF, XSD -->
- <unit id="org.eclipse.emf.feature.group" version="2.7.1.v20111003-1135"/>
- <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.0.v20110502-1600-36-8s734C367E3CBC7"/>
+ <unit id="org.eclipse.emf.feature.group" version="2.7.2.v20111031-1121"/>
+ <unit id="org.eclipse.emf.workspace.feature.group" version="1.5.1.v20110823-1800-37708s734D3C7D3CCC1"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.5.0.v20110502-1600-479-9oB56N5BBR6LCA6"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.5.0.v20110502-1600-377-8s734C3E7D15D6B"/>
- <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20110530-1010"/>
- <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20111003-1135"/>
- <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20111003-1135"/>
- <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20111003-1135"/>
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20111031-1121"/>
+ <unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20111031-1121"/>
+ <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20111031-1121"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20111031-1121"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20111031-1121"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.7.0.v20111031-1121"/>
<!-- GEF, Draw2D, Graphiti, Zest -->
- <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.0.v20110524-0815"/>
+ <unit id="org.eclipse.graphiti.feature.feature.group" version="0.8.1.v20110907-0857"/>
<unit id="org.eclipse.draw2d.feature.group" version="3.7.1.v20110830-1143-4607w3122194102254"/>
- <unit id="org.eclipse.gef.feature.group" version="3.7.0.v20110425-2050-777D-81B2Bz0685C3A6E34272"/>
- <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20101213-1100-67A-8yF4F09A9H4D6O54272"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.7.1.v20110830-1143-777D181B3Bz06C853D8863365"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.3.0.v20110425-2050-67A08yF5F18CBD4I9G53365"/>
<!-- UML2 -->
<unit id="org.eclipse.uml2.feature.group" version="3.2.1.v201109082252"/>
<unit id="org.eclipse.uml2.doc.feature.group" version="3.2.0.v201103291514"/>
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
- <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7VAH5AYC5"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bj9JXOeQxOURYC-l9BL7rDEQO7"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYtj_9RfO7"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110121-7i7uFCaFFt6Zqif0tNYDdt"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP4FwFgX4mz08w1sX-SEbD1FlAIfSLZz0eE"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHl90GF5k1L9A7CREE01911"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcrFML8IX_Sc-SMI_tUADB7D"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.R37x_v20111117-1330-7P7NFUFFIbaUcR7JrhHHBBe5HZTZ"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0pz-UdWr1z0jQHRlY7"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFp7LSV-BR-oRkFtx15C44"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVvFEt3dpKWimo06rz0w"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDp7rPz-2"/>
<!-- DTP -->
- <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.0.v201010181130-77078CcNBHCBYKYEbNV"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.0.v201010181130-7C7e8hEt1ZwmrIjglSM8CoR_Bu4"/>
- <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.0.v201010181130-7H7C7GCcNBHHBcIeEcQb"/>
+ <unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.1.v201108301820-77078CcNBHCBYKYEbNV"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.9.1.v201108301820-7C7e8mEt1_wmuQjYnXQ6Zj5dM17"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.9.1.v201108301820-7H7C7ICcNBHHBnJWDjSd"/>
<unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.9.1.v201108301820-4117w312219371456"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.0.v201010181130-7B7C7BCcNBGMDPHiDYRL"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.9.1.v201108301820-7B7C7DCcNBGNChHSFaYT"/>
<unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.9.1.v201108301820-7J9B7FBWwVN7-2z-kZU_tJy1aR1t"/>
- <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.0.v201010181130-77788eBmKDOGMeK0J2Ok7QBR"/>
- <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.0.v201010181130-67D0AqGBJVKbHlH1GU7QBR"/>
- <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.0.v201010181130-7F47SFC7sRbrSZope9vW"/>
- <unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.0.v201010181130-4-29oB56N5N7L6PAQ"/>
- <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.0.v201010181130-2-07w31211518181A"/>
- <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.0.v201010181130-542AkF79P7QCP9SDB"/>
- <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.0.v201010181130-546AkF78Y7R9PAX77"/>
+ <unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.9.1.v201108301820-77788gBmKDOGMhKwJ4Rn7QBR"/>
+ <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.9.1.v201108301820-67D1AqGBKNKdIlGz0GU7QBR"/>
+ <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.9.1.v201108301820-7F47SFC7sRbvSkkxaPvW"/>
+ <unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.9.1.v201108301820-4-29oB56N5N7L6PAQ"/>
+ <unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.9.1.v201108301820-2-07w31211518181A"/>
+ <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.9.1.v201108301820-542AkF79P7QCP9SDB"/>
+ <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.9.1.v201108301820-546AkF78Z7Y9NBZ9A"/>
<unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.9.1.v201108301820-7A7T78DZRDKGEeHnGlLP"/>
- <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.0.v201010181130-3328s735357795A8D"/>
+ <unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.9.1.v201108301820-3328s73553C655B63"/>
<unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.9.1.v201108301820-548dAkF79Q7RAN9UFJ"/>
- <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.0.v201010181130-542AkF77g7V9N9e77"/>
- <unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.0.v201010181130-540AkF77g7V9N9e77"/>
+ <unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.9.1.v201108301820-542AkF77g7V9N9e77"/>
+ <unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.9.1.v201108301820-540AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.9.1.v201108301820-7E45F9NiNZVR6a1PMVn"/>
- <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.0.v201010181130-540AkF78Y7VCOCQDB"/>
- <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.0.v201010181130-541AkF79P7N8NAQ77"/>
- <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.0.v201010181130-7N845FDsn0TdrPUJvPRskDVIMJ0T"/>
+ <unit id="org.eclipse.datatools.enablement.ingres.feature.feature.group" version="1.9.1.v201108301820-540AkF78Z7UCRAQDB"/>
+ <unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.9.1.v201108301820-541AkF79P7N8NAQ77"/>
+ <unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.9.1.v201108301820-7N847CFDsn0VdrPUJvPUshDWIPJ0"/>
<unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.9.1.v201108301820-57B4AkF7AJ7NCBBMBL"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.9.1.v201108301820-7A-3F7RZHLz-Hz-OlPz0Qf"/>
- <unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.0.v201010181130-278-78B04G8S_IMz00Iz00PmQz01"/>
- <unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.0.v201010181130-642BgJ9DJAQGVCaIQ"/>
- <unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.0.v201010181130-622BgJ9CR9XFcEWLP"/>
+ <unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.9.1.v201108301820-278078B04G8S_IMz00Iz00PmQz01"/>
+ <unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.9.1.v201108301820-642BgJ9DJAQGVCaIQ"/>
+ <unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.9.1.v201108301820-622BgJ9CR9XFcEWLP"/>
<unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.9.1.v201108301820-79-4EVVFJoFwKcN-L_"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.9.1.v201108301820-4208375LG5BJ93413"/>
- <unit id="org.eclipse.datatools.intro.feature.group" version="1.9.0.v201010181130-26-7w312116392911"/>
- <unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.0.v201010181130-47C08w95ENAK6AFDFK7"/>
+ <unit id="org.eclipse.datatools.intro.feature.group" version="1.9.1.v201108301820-26-7w312116392911"/>
+ <unit id="org.eclipse.datatools.doc.user.feature.group" version="1.9.1.v201108301820-47C08w95ENAK6AFDFK7"/>
<unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.9.1.v201108301820-26-311A16321A3557"/>
- <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
- <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.0.v201010181130-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.9.1.v201108301820-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.9.1.v201108301820-37D-7733L3D753L7BBF"/>
<!-- RSE, TM -->
- <unit id="org.eclipse.rse.feature.group" version="3.3.0.v201105231230-7L7CFGB8wqio7ppp-b5xwz-6LVIZ"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.3.2.R33x_v201110030150-7L7CFGH8wqio8s-qYtkPgn8qWd4T"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.300.v201103142315-31F8N8s7355353B75DD"/>
- <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.0.v201105231230-40-7w312216342341"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.1.1.R33x_v201106281309-4007S44yaw312218292641"/>
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
<!-- WTP -->
- <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.1.v201108080010-6-0AkF7BB7S9N7788"/>
- <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.0.v201104050000-3--8s73553C4G3333"/>
- <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.1.v201108303011-7J7F78F7RZHQPJBNCKbSR7FB"/>
- <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.0.v201105020000-7R7F78FC7sRdiSRbwTQlYJ7"/>
- <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.0.v20110521-r9438"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.0.v201103022146-7E7IBvF9JgLWUM3U8Shak"/>
- <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543C6F6AAD"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.0.v201102200555-52FO2AkF7B87SBU7X98"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.0.v201102200555-7b7IHuQFSK2WE_U389ncrWY7PpMf"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.0.v201102200555-62FSgBgJ9E99aEkFGAV"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.200.v201103051547-208_7w31211A17"/>
- <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.1.v20110729_1216-777HFHyCcNBDjBfJa4BA8"/>
+ <unit id="org.eclipse.jpt.common.feature.feature.group" version="1.0.2.v201111103010-6-2AkF7BB9HAED797"/>
+ <unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.0.1.v201108080010-3-08s73553F3G3343"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.0.2.v201111103010-7J7F79F7RZHQPNXOyKbSRFJV"/>
+ <unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.0.2.v201110193010-7S7B7GFC7sRdiX8afbQZR79F"/>
+ <unit id="org.eclipse.persistence.jpa.feature.group" version="2.3.1.v20110908-r10021"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.3.1.v201109030441-7E7IDUF9JgLWUM6WBSgXp"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.3.0.v201102200555-377DF8s73543E5I5768"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.3.2.v201111030500-52FPfAkF7B99L8P7U98"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.3.2.v201111030500-7b7II1TFSK2WIoRmHKjP-IV4RxTn"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.100.v201105122000-62FUGBgJ9EA9aEeHRHc"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.200.v201105111126-20A77w312215172822"/>
+ <unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.3.2.v20111010_1242-777HFHzCcNBDjCbIUfEEE3"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.100.v20110303-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.3.0.v201102200555-31FD58s7354495L"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.3.0.v201102200555-7A6FHr9xFcAVCFLZBBJLIR43A"/>
<unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.100.v20110303-2-Eo7w3121162A3329"/>
- <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.3.0.v201102200555-7Q7DGHqFE9Le9JFQxpaxSuqjn2ps"/>
+ <unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.3.1.v201108102009-7Q7DGL7FE9LeACIaxj_z-Kmuitz01z01sRxi3877"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.5.v201109051528-46AA9oB5875L5K4I77"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.1.v201108102009-7F7AFO3C25TohHcojh0Zyz-B7FyifIcGz-xuz-_W"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-2107w31211938"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.3.1.v201108102009-7F7AFO4C25TohIbnlgy_0z-Hn73eiw4W7mpuYjlq"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.3.1.v201108102009-2107w31211938"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.200.v201103022333-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201102200555-7H78AKFAKlZgiH3jFfA3z0E6I6I"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.100.v201105171845-7H77DRFAKlZgjHCaHg65uE6I6I"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.100.v201102200555-5-A7AkF7B97HDVDRJZ"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.1.0.v201105171845-7E78BsF8NcJSWKvN1Rjcv"/>
<unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.100.v201102200555-3-A78s73533L3D5H5H"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.0.v201102150115-7B7DFO0F7RZHOdJnS2RvQJ"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355397B4B9B"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.0.v201102150115-7C79FUJEdhO_pfmgAnVhkeKoT3SwRK"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.0.v201103031824-7F78FXPFBBoPbXRIcIgs0z0"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.3.2.v201111030500-7B7DFO8F7RZHOeKpPz0Oz-NJ"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.3.0.v201102150115-377DF8s7355533F3C7C"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.3.2.v201111030500-7C79FVrEdhO_qgug4nWekfLqQz01Pz00OK"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.3.2.v201111090634-7F78FXSFBBoPbXSIbLewwz0"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.100.v20110303-51EoAkF77g8HBSc"/>
- <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.0.v201102200555-30FA18s734D3A4Cc"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.1.v20110714_1706-7B77FGPAtJceyEUOhPIXVJNjBF39"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.1.110.v20110303-20Bg7w3121162A3236"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.0.v201102200555-7E7EFMRAJun8Zsu50NSIthQz0YNBBGnk"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.0.v201102200555-7O7IFhJEMi9DwZ0CPsbmPPpz-VRW"/>
+ <unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.2.v20111026_1748-30FBd8s7355476Ia2859"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.2.v20111026_1748-7B77FGRAtJcez-FNOnPIXRONjBF6A"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.3.0.v20110512-20DF7w312215222664"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.3.2.v201111030500-7E7EFMaAJun8av44z-PFIqjTeVfDSLfQK"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.3.2.v201111030500-7O7IFj4EMiB5wRKYse0-f8Yl5tgfNIObauH0Gi5L"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.3.0.v201102200555-31Eo8s734B3E4H7799"/>
- <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.3.0.v201102200555-7L7RFi7FGtGd-thnz0ysWug2766"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.1.v201108102025-7I7AFg0EtEoVFjv98J1itfLE0uwVWklmuBTjEJM2"/>
+ <unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.3.1.v201108230355-7L7RFi8FGtGd-thsz0z0rQwh2766"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.3.1.v201108102025-7I7AFg0EtEoVFjy98J1itihC0uuVeln_oKQjBMNs"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.300.v201102200555-44FR79oB5855Q8IBD7G"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeKF7RZHQNI3R-OuRb"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.0.v201102071641-7H7EFZ-DxumTlXt4mjdXgE-eiy04"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeMF7RZHQNJtN8NuOe"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.1.v201108102009-7H7EFZ6DxumTlde4nhcRmIprjAHaALMrRz012Qz0"/>
<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.3.0.v201102071641-50FYwAkF7B77UBZFDBL"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.2.0.v201102200555-67K8ZBgJ9DKANEPBTGT"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.2.0.v201102200555-7S7ZFT0FIpS-8NuhBrBnS9FQCUHU"/>
+ <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.0.v201103310043-7A7J-CcNBGOCUIWFYMf"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.1.v201109012200-7T7YFRTFIqUoIrvbEtBlSIJXGZNg"/>
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.300.I20110511-0800"/>
- <unit id="org.eclipse.jsch.core" version="1.1.300.I20110118-0800"/>
- <unit id="com.jcraft.jsch" version="0.1.41.v201101211617"/>
- <unit id="org.eclipse.jgit.feature.group" version="1.1.0.201109151100-r"/>
- <unit id="org.eclipse.egit.feature.group" version="1.1.0.201109151100-r"/>
- <unit id="org.eclipse.egit.mylyn.feature.group" version="1.1.0.201109151100-r"/>
- <unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.1.0.201109151100-r"/>
+ <unit id="org.eclipse.jsch.core" version="1.1.300.I20110514-0800"/>
+ <unit id="com.jcraft.jsch" version="0.1.44.v201101211721"/>
+ <unit id="org.eclipse.jgit.feature.group" version="1.2.0.201112121111"/>
+ <unit id="org.eclipse.egit.feature.group" version="1.2.0.201112121913"/>
+ <unit id="org.eclipse.egit.mylyn.feature.group" version="1.2.0.201112121913"/>
+ <unit id="org.eclipse.mylyn.github.feature.feature.group" version="1.2.0.201112131611"/>
<!-- needed for JBoss Central -->
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
- <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.1.v20110819-0100"/>
+ <unit id="org.eclipse.mylyn.commons.core" version="3.6.0.v20110608-1400"/>
+ <unit id="org.eclipse.mylyn.discovery.ui" version="3.6.2.v20111116-0100"/>
<unit id="org.eclipse.mylyn.discovery.core" version="3.6.1.v20110817-0100"/>
- <unit id="org.eclipse.mylyn.commons.ui" version="3.6.0.I20110523-2039"/>
- <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.I20110523-2039"/>
+ <unit id="org.eclipse.mylyn.commons.ui" version="3.6.1.v20110720-0100"/>
+ <unit id="org.eclipse.mylyn.commons.net" version="3.6.0.v20110608-1400"/>
<unit id="org.eclipse.mylyn.commons.screenshots" version="3.6.0.v20110608-1400"/>
<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<!-- JBDS-1904, JBIDE-9351, JBIDE-10094 add mylyn and jira to JBT/JBDS TP -->
- <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.2.v20110908-0706"/>
- <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.2.v20110826-0100"/>
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.commons.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="3.6.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.5.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.cvs.feature.group" version="0.8.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.git.feature.group" version="0.8.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.versions.feature.group" version="0.8.4.v20111118-0100"/>
+ <unit id="org.eclipse.mylyn.tasks.ui" version="3.6.4.v20111117-0100"/>
<unit id="org.eclipse.mylyn.tasks.core" version="3.6.0.v20110608-1400"/>
<unit id="org.eclipse.mylyn.tasks.bugs" version="3.6.1.v20110825-0100"/>
- <unit id="com.atlassian.connector.commons" version="4.0.0.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.help" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.1.v20110812"/>
- <unit id="com.atlassian.connector.eclipse.ui" version="3.0.1.v20110812"/>
+ <unit id="com.atlassian.connector.commons" version="4.0.0.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.bamboo.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.branding.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.commons.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.commons.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.crucible.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.cvs.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.directclickthrough.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.fisheye.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.help" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.2.v20111010"/>
+ <unit id="com.atlassian.connector.eclipse.ui" version="3.0.2.v20111010"/>
<unit id="com.thoughtworks.xstream" version="1.3.0.v20100826-1640"/>
- <unit id="org.eclipse.ui" version="3.7.0.I20110310-1100"/>
+ <unit id="org.eclipse.ui" version="3.7.0.v20110928-1505"/>
<unit id="org.eclipse.core.runtime" version="3.7.0.v20110110"/>
- <unit id="org.eclipse.core.resources" version="3.7.100.v20110125b"/>
- <unit id="org.eclipse.ui.ide" version="3.7.0.I20110519-0100"/>
- <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110124-0100"/>
- <unit id="org.eclipse.jface.text" version="3.7.0.v20110505-0800"/>
- <unit id="org.eclipse.osgi" version="3.7.0.v20110613"/>
- <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110117"/>
- <unit id="org.eclipse.ui.forms" version="3.5.100.v20101220"/>
- <unit id="org.eclipse.ui.editors" version="3.7.0.v20110517-0800"/>
- <unit id="org.eclipse.team.core" version="3.6.0.I20110125-0640"/>
- <unit id="org.eclipse.team.ui" version="3.6.100.I20110525-0800"/>
- <unit id="org.eclipse.jface" version="3.7.0.I20110522-1430"/>
- <unit id="org.eclipse.compare" version="3.5.200.I20101206-1300"/>
+ <unit id="org.eclipse.core.resources" version="3.7.101.v20111129-1555"/>
+ <unit id="org.eclipse.ui.ide" version="3.7.0.v20110928-1505"/>
+ <unit id="org.eclipse.ui.workbench.texteditor" version="3.7.0.v20110928-1504"/>
+ <unit id="org.eclipse.jface.text" version="3.7.1.v20110928-1504"/>
+ <unit id="org.eclipse.osgi" version="3.7.2.R37x_v20111121-1300"/>
+ <unit id="org.eclipse.core.filesystem" version="1.3.100.v20110423-0524"/>
+ <unit id="org.eclipse.ui.forms" version="3.5.101.v20111011-1919"/>
+ <unit id="org.eclipse.ui.editors" version="3.7.0.v20110928-1504"/>
+ <unit id="org.eclipse.team.core" version="3.6.0.I20110525-0800"/>
+ <unit id="org.eclipse.team.ui" version="3.6.101.R37x_v20111109-0800"/>
+ <unit id="org.eclipse.jface" version="3.7.0.v20110928-1505"/>
+ <unit id="org.eclipse.compare" version="3.5.202.R37x_v20111109-0800"/>
<unit id="org.apache.axis" version="1.4.0.v201005080400"/>
<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
@@ -263,10 +263,10 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="5.5.17.v201101211617"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201103241727"/>
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201105051105"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
14 years
JBoss Tools SVN: r37380 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-15 18:31:44 -0500 (Thu, 15 Dec 2011)
New Revision: 37380
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-15 23:15:55 UTC (rev 37379)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2011-12-15 23:31:44 UTC (rev 37380)
@@ -54,8 +54,8 @@
if(parameter != null){
resolutions.add(new AddSuppressWarningsMarkerResolution(file, parameter, preferenceKey));
}
- resolutions.add(new AddSuppressWarningsMarkerResolution(file, element, preferenceKey));
}
+ resolutions.add(new AddSuppressWarningsMarkerResolution(file, element, preferenceKey));
}
}
}
14 years
JBoss Tools SVN: r37379 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-12-15 18:15:55 -0500 (Thu, 15 Dec 2011)
New Revision: 37379
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
Log:
JBIDE-10496
https://issues.jboss.org/browse/JBIDE-10496
CDIUtil.convertToSourceReference should return instance of IJavaSourceReference when Java element is available.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-12-15 23:15:41 UTC (rev 37378)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-12-15 23:15:55 UTC (rev 37379)
@@ -89,7 +89,7 @@
Map<AbstractMemberDefinition, List<IQualifierDeclaration>> bs = c.getGenericConfigurationPoints();
for (AbstractMemberDefinition d: bs.keySet()) {
if(d.getResource() != null && d.getResource().equals(file) && !d.getTypeDefinition().isVetoed()) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(((IMember)d.getMember()).getNameRange(), file);
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(((IMember)d.getMember()).getNameRange(), file, (IMember)d.getMember());
/*
* If several generic configuration points have the same set of qualifiers,
14 years
JBoss Tools SVN: r37378 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/validation and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-12-15 18:15:41 -0500 (Thu, 15 Dec 2011)
New Revision: 37378
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
JBIDE-10496
https://issues.jboss.org/browse/JBIDE-10496
CDIUtil.convertToSourceReference should return instance of IJavaSourceReference when Java element is available.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-12-15 21:30:08 UTC (rev 37377)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-12-15 23:15:41 UTC (rev 37378)
@@ -39,6 +39,7 @@
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
+import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
@@ -64,6 +65,7 @@
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IAnnotationType;
import org.jboss.tools.common.java.IJavaReference;
+import org.jboss.tools.common.java.IJavaSourceReference;
import org.jboss.tools.common.java.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -904,8 +906,9 @@
* @param range
* @return
*/
- public static ITextSourceReference convertToSourceReference(final ISourceRange range, final IResource resource) {
- return new ITextSourceReference() {
+ public static ITextSourceReference convertToSourceReference(final ISourceRange range, final IResource resource, final IMember javaElement) {
+ if(javaElement == null || javaElement.getResource() == null || !javaElement.getResource().equals(resource)) {
+ return new ITextSourceReference() {
public int getStartPosition() {
return range.getOffset();
@@ -918,7 +921,26 @@
public IResource getResource() {
return resource;
}
- };
+ };
+ } else {
+ return new IJavaSourceReference() {
+ public IMember getSourceMember() {
+ return javaElement;
+ }
+ public IJavaElement getSourceElement() {
+ return javaElement;
+ }
+ public int getStartPosition() {
+ return range.getOffset();
+ }
+ public IResource getResource() {
+ return resource;
+ }
+ public int getLength() {
+ return range.getLength();
+ }
+ };
+ }
}
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-12-15 21:30:08 UTC (rev 37377)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/AnnotationValidationDelegate.java 2011-12-15 23:15:41 UTC (rev 37378)
@@ -189,7 +189,7 @@
void validateRetentionAnnotation(ICDIAnnotation type, String message, IResource resource, int message_id) throws JavaModelException {
IAnnotationDeclaration retention = type.getAnnotationDeclaration(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
if(retention == null) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange(), resource), resource, message_id);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(type.getSourceType().getNameRange(), resource, type.getSourceType()), resource, message_id);
} else {
Object o = retention.getMemberValue(null);
if(o == null || !CDIConstants.RETENTION_POLICY_RUNTIME_TYPE_NAME.equals(o.toString())) {
@@ -214,7 +214,7 @@
private void validateTargetAnnotation(ICDIAnnotation annotationType, String[][] variants, String message, IResource resource, int message_id) throws JavaModelException {
IAnnotationDeclaration target = annotationType.getAnnotationDeclaration(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
if(target==null) {
- validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange(), resource), resource, message_id);
+ validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIUtil.convertToSourceReference(annotationType.getSourceType().getNameRange(), resource, annotationType.getSourceType()), resource, message_id);
} else if(!CDIUtil.checkTargetAnnotation(target, variants)) {
validator.addError(message, CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, target, resource, message_id);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-12-15 21:30:08 UTC (rev 37377)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-12-15 23:15:41 UTC (rev 37378)
@@ -793,14 +793,14 @@
try {
if(hasConflictedInterceptorBindings(bean)) {
//TODO consider putting markers to interceptor bindings/stereotype declarations.
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource(), bean.getBeanClass());
addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, reference, bean.getResource());
}
Set<IBeanMethod> methods = bean.getAllMethods();
for (IBeanMethod method : methods) {
if(hasConflictedInterceptorBindings(method)) {
//TODO consider putting markers to interceptor bindings/stereotype declarations.
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getMethod().getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getMethod().getNameRange(), bean.getResource(), method.getMethod());
addError(CDIValidationMessages.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, reference, bean.getResource());
}
}
@@ -1873,7 +1873,7 @@
IField[] fields = type.getFields();
for (IField field : fields) {
if (Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlags())) {
- ITextSourceReference fieldReference = CDIUtil.convertToSourceReference(field.getNameRange(), bean.getResource());
+ ITextSourceReference fieldReference = CDIUtil.convertToSourceReference(field.getNameRange(), bean.getResource(), field);
addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_BEAN,
fieldReference, bean.getResource(), ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID);
}
@@ -1941,14 +1941,14 @@
Set<IInterceptorBinding> bindings = bean.getInterceptorBindings();
if(!bindings.isEmpty()) {
if(Flags.isFinal(bean.getBeanClass().getFlags())) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource(), bean.getBeanClass());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_CLASS, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
} else {
IMethod[] methods = bean.getBeanClass().getMethods();
for (int i = 0; i < methods.length; i++) {
int flags = methods[i].getFlags();
if(Flags.isFinal(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(methods[i].getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(methods[i].getNameRange(), bean.getResource(), methods[i]);
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
}
}
@@ -1958,13 +1958,13 @@
for (IBeanMethod method : beanMethods) {
if(!method.getInterceptorBindings().isEmpty()) {
if(Flags.isFinal(bean.getBeanClass().getFlags())) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource(), bean.getBeanClass());
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_CLASS, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
} else {
IMethod sourceMethod = method.getMethod();
int flags = sourceMethod.getFlags();
if(Flags.isFinal(flags) && !Flags.isStatic(flags) && !Flags.isPrivate(flags)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(sourceMethod.getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(sourceMethod.getNameRange(), bean.getResource(), sourceMethod);
addError(CDIValidationMessages.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, reference, bean.getResource());
}
}
@@ -1991,7 +1991,7 @@
}
}
if(!passivatingCapable) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(bean.getBeanClass().getNameRange(), bean.getResource(), bean.getBeanClass());
addError(MessageFormat.format(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, bean.getElementName(), scope.getSourceType().getElementName()), CDIPreferences.NOT_PASSIVATION_CAPABLE_BEAN, reference, bean.getResource(), NOT_PASSIVATION_CAPABLE_BEAN_ID);
}
}
@@ -2492,7 +2492,7 @@
int kind = Signature.getTypeSignatureKind(returnTypeSignature);
if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
if(!annotation.getNonBindingMethods().contains(method)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource(), method);
addError(arrayMessageErrorKey, preferencesKey, reference, annotation.getResource(), arrayMessageId);
}
} else if(kind == Signature.CLASS_TYPE_SIGNATURE) {
@@ -2507,7 +2507,7 @@
IType memberType = type.getJavaProject().findType(typeName);
if(memberType!=null && memberType.isAnnotation()) {
if(!annotation.getNonBindingMethods().contains(method)) {
- ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource());
+ ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource(), method);
addError(annotationValueErrorKey, preferencesKey, reference, annotation.getResource(), annotationValueId);
}
}
14 years
JBoss Tools SVN: r37377 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-15 16:30:08 -0500 (Thu, 15 Dec 2011)
New Revision: 37377
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2011-12-15 21:28:29 UTC (rev 37376)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2011-12-15 21:30:08 UTC (rev 37377)
@@ -59,8 +59,9 @@
fail("Configure Problem Severity marker resolution not found");
}
- private void checkForAddSuppressWarnings(IFile file, IMarkerResolution[] resolutions){
- if(file.getFileExtension().equals("java")){
+ private void checkForAddSuppressWarnings(IFile file, IMarker marker, IMarkerResolution[] resolutions){
+ int severity = marker.getAttribute(IMarker.SEVERITY, 0);
+ if(file.getFileExtension().equals("java") && severity == IMarker.SEVERITY_WARNING){
for(IMarkerResolution resolution : resolutions){
if(resolution.getClass().equals(AddSuppressWarningsMarkerResolution.class))
return;
@@ -346,7 +347,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof DeleteAnnotationMarkerResolution) {
@@ -380,7 +381,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof AddAnnotatedMethodMarkerResolution) {
@@ -410,7 +411,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof AddAnnotatedMethodMarkerResolution) {
@@ -440,7 +441,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof ChangeScopeMarkerResolution) {
@@ -466,7 +467,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof ChangeScopeMarkerResolution) {
@@ -500,7 +501,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof AddSetterMarkerResolution) {
14 years
JBoss Tools SVN: r37376 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-15 16:28:29 -0500 (Thu, 15 Dec 2011)
New Revision: 37376
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-12-15 21:05:29 UTC (rev 37375)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-12-15 21:28:29 UTC (rev 37376)
@@ -61,8 +61,9 @@
fail("Configure Problem Severity marker resolution not found");
}
- private void checkForAddSuppressWarnings(IFile file, IMarkerResolution[] resolutions){
- if(file.getFileExtension().equals("java")){
+ private void checkForAddSuppressWarnings(IFile file, IMarker marker, IMarkerResolution[] resolutions){
+ int severity = marker.getAttribute(IMarker.SEVERITY, 0);
+ if(file.getFileExtension().equals("java") && severity == IMarker.SEVERITY_WARNING){
for(IMarkerResolution resolution : resolutions){
if(resolution.getClass().equals(AddSuppressWarningsMarkerResolution.class))
return;
@@ -97,7 +98,7 @@
IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry()
.getResolutions(marker);
checkForConfigureProblemSeverity(resolutions);
- checkForAddSuppressWarnings(file, resolutions);
+ checkForAddSuppressWarnings(file, marker, resolutions);
for (int j = 0; j < resolutions.length; j++) {
IMarkerResolution resolution = resolutions[j];
if (resolution.getClass().equals(resolutionClass)) {
14 years
JBoss Tools SVN: r37375 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-12-15 16:05:29 -0500 (Thu, 15 Dec 2011)
New Revision: 37375
Modified:
trunk/build/target-platform/build.xml
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
trunk/build/target-platform/targetUpdateFromRepo.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
JBIDE-10289 new TP using Indigo SR1-M (maintenance and nightly builds AFTER SR1 toward SR2)
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/build.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -145,8 +145,9 @@
<!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts -->
<!-- don't forget to increment these files when moving up a version:
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
- <property name="eclipse.version" value="3.7.1" />
- <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
+ <!-- http://download.eclipse.org/eclipse/downloads/drops/M20111201-1437/downlo... -->
+ <property name="eclipse.version" value="M20111201-1437" />
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
<if>
<equals arg1="${arch}" arg2="x86" />
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/jbds.target 2011-12-15 21:05:29 UTC (rev 37375)
@@ -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/SR1/"/>
- <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1/"/> -->
- <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1/"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
+ <!-- <repository location="file:///qa/services/http/binaries/RHDS/updates/indigo/SR1-M/"/> -->
+ <!-- <repository location="http://www.qa.jboss.com/binaries/RHDS/updates/indigo/SR1-M/"/> -->
<!-- m2e, m2e-wtp + 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-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -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/SR1/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
</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/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/multiple.target 2011-12-15 21:05:29 UTC (rev 37375)
@@ -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/SR1/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -29,7 +29,7 @@
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR1-M/"/>
</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-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/publish.sh 2011-12-15 21:05:29 UTC (rev 37375)
@@ -4,10 +4,10 @@
# defaults for JBoss Tools
# don't forget to increment these files when moving up a version:
# build.xml, *.target*, publish.sh, target2p2mirror.xml; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties
-targetZipFile=e371-wtp331.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
+targetZipFile=e372M-wtp332M.target
+repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M
+destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M
+DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
@@ -21,39 +21,41 @@
'-DESTINATION') DESTINATION="$2"; shift 2;;
'-include') include="$2"; shift 2;;
'-exclude') exclude="$2"; shift 2;;
- '-jbt_3.3.indigo')
+
+ '-jbt_3.3.indigo.SR1-M')
# defaults for JBT (trunk)
- targetZipFile=e371-wtp331.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
+ targetZipFile=e372M-wtp332M.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo.SR1-M
+ destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo.SR1-M
+ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo.SR1-M
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbt')
+ '-jbt_3.3.indigo')
# defaults for JBT (stable branch)
targetZipFile=e371-wtp331.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
+ 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
include="*"
exclude="--exclude '.blobstore'" # exclude the .blobstore
shift 1;;
- '-jbds_3.3.indigo')
+
+ '-jbds_3.3.indigo.SR1-M')
# defaults for JBDS (trunk)
- targetZipFile=jbds500-e371-wtp331.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
+ targetZipFile=jbds500-e372M-wtp332M.target
+ repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo.SR1-M
+ destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo.SR1-M
+ DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo.SR1-M
include=".blobstore *" # include the .blobstore
exclude=""
shift 1;;
- '-jbds')
+ '-jbds_3.3.indigo')
# defaults for JBDS (stable branch)
targetZipFile=jbds500-e371-wtp331.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
+ 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
include=".blobstore *" # include the .blobstore
exclude=""
shift 1;;
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/target2p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -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; also jbds/trunk/releng/org.jboss.ide.eclipse.releng/requirements/jbds-target-platform/build.properties -->
- <property name="targetFile" value="e371-wtp331.target" />
+ <property name="targetFile" value="e372M-wtp332M.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. -->
Modified: trunk/build/target-platform/targetUpdateFromRepo.xml
===================================================================
--- trunk/build/target-platform/targetUpdateFromRepo.xml 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/targetUpdateFromRepo.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -12,7 +12,7 @@
<!-- create a second .target file which replaces all URLs with a single unified (published) one
(eg., for jbosstools target platform site), set these properties too -->
<property name="unified.targetFile" value="unified.target" />
- <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..." />
+ <property name="unified.URL" value="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..." />
<property name="local.targetFile" value="local.target" />
<property name="local.URL" value="file://${repoDir}" />
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/unified.target 2011-12-15 21:05:29 UTC (rev 37375)
@@ -9,13 +9,13 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
</location>
<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/target-platform_3.3.indigo/l..."/>
+ <repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.0.201106061504"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-12-15 20:29:30 UTC (rev 37374)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-12-15 21:05:29 UTC (rev 37375)
@@ -28,8 +28,8 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
-<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l..."/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
+<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S..."/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
14 years
JBoss Tools SVN: r37374 - trunk/common/plugins/org.jboss.tools.common.ui/META-INF.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-15 15:29:30 -0500 (Thu, 15 Dec 2011)
New Revision: 37374
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-15 20:29:15 UTC (rev 37373)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2011-12-15 20:29:30 UTC (rev 37374)
@@ -25,7 +25,9 @@
org.eclipse.ui.navigator.resources;bundle-version="3.4.300",
org.eclipse.debug.ui;bundle-version="3.7.0",
org.jboss.tools.common.validation;bundle-version="3.3.0",
- org.eclipse.ui.cheatsheets;bundle-version="3.4.0"
+ org.eclipse.ui.cheatsheets;bundle-version="3.4.0",
+ org.eclipse.jdt.core.manipulation;bundle-version="1.4.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="3.5.201"
Export-Package: org.jboss.tools.common.ui,
org.jboss.tools.common.ui.databinding,
org.jboss.tools.common.ui.marker,
14 years
JBoss Tools SVN: r37373 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-12-15 15:29:15 -0500 (Thu, 15 Dec 2011)
New Revision: 37373
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
Log:
Add @SuppressWarnings quick fix https://issues.jboss.org/browse/JBIDE-10187
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-15 20:14:46 UTC (rev 37372)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2011-12-15 20:29:15 UTC (rev 37373)
@@ -28,12 +28,15 @@
import org.eclipse.jdt.core.ISourceReference;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.text.edits.InsertEdit;
+import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
@@ -63,9 +66,8 @@
public AddSuppressWarningsMarkerResolution(IFile file, IJavaElement element, String preferenceKey){
this.file = file;
this.element = getAnnatatableElement(element);
- this.preferenceKey = preferenceKey;
- String shortName = getShortName(preferenceKey);
- label = NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS_TITLE, shortName, element.getElementName());
+ this.preferenceKey = getShortName(preferenceKey);;
+ label = NLS.bind(CommonUIMessages.ADD_SUPPRESS_WARNINGS_TITLE, this.preferenceKey, element.getElementName());
if(element instanceof IMethod){
label += "()";
}
@@ -98,15 +100,15 @@
IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, (IJavaElement)element);
IAnnotation annotation = findAnnotation(workingCopyElement);
- boolean status = false;
+ CompilationUnitChange change = null;
if(annotation != null){
- status = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
+ change = updateAnnotation(SUPPRESS_WARNINGS_ANNOTATION, preferenceKey, compilationUnit, annotation);
}else{
- status = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement);
+ change = addAnnotation(SUPPRESS_WARNINGS_ANNOTATION+"(\""+preferenceKey+"\")", compilationUnit, workingCopyElement);
}
- if(status){
- compilationUnit.commitWorkingCopy(true, new NullProgressMonitor());
+ if(change != null){
+ change.perform(new NullProgressMonitor());
}
compilationUnit.discardWorkingCopy();
} catch (JavaModelException e) {
@@ -215,9 +217,7 @@
return JavaPlugin.getImageDescriptorRegistry().get(JavaPluginImages.DESC_OBJS_ANNOTATION);
}
- private boolean updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{
- IBuffer buffer = compilationUnit.getBuffer();
-
+ private CompilationUnitChange updateAnnotation(String name, String parameter, ICompilationUnit compilationUnit, IAnnotation annotation) throws JavaModelException{
String str = AT+name;
str += "({";
@@ -227,7 +227,7 @@
Object value = pair.getValue();
if(value instanceof String){
if(value.toString().equals(parameter)){
- return false;
+ return null;
}
str += "\""+value+"\", ";
}else if(value instanceof Object[]){
@@ -235,12 +235,24 @@
for(Object a : array){
if(a instanceof String){
if(a.toString().equals(parameter)){
- return false;
+ return null;
}
str += "\""+a+"\", ";
}
}
}
+ } else if(pair.getValueKind() == IMemberValuePair.K_QUALIFIED_NAME || pair.getValueKind() == IMemberValuePair.K_SIMPLE_NAME){
+ Object value = pair.getValue();
+ if(value instanceof String){
+ str += value+", ";
+ }else if(value instanceof Object[]){
+ Object[] array = (Object[])value;
+ for(Object a : array){
+ if(a instanceof String){
+ str += a+", ";
+ }
+ }
+ }
}
}
@@ -248,30 +260,49 @@
str += "})";
- buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str);
+ CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
- return true;
+ ReplaceEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), str);
+ change.setEdit(edit);
+
+ return change;
}
- private boolean addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
+ private CompilationUnitChange addAnnotation(String name, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{
if(!(element instanceof ISourceReference))
- return false;
+ return null;
ISourceReference workingCopySourceReference = (ISourceReference) element;
- IBuffer buffer = compilationUnit.getBuffer();
-
String str = AT+name;
if(!(workingCopySourceReference instanceof ILocalVariable)){
str += compilationUnit.findRecommendedLineSeparator();
+ IBuffer buffer = compilationUnit.getBuffer();
+ int index = workingCopySourceReference.getSourceRange().getOffset();
+ while(index >= 0){
+ char c = buffer.getChar(index);
+ if(c == '\r' || c == '\n')
+ break;
+ index--;
+ }
+ index++;
+ if(index != workingCopySourceReference.getSourceRange().getOffset()){
+ String spaces = buffer.getText(index, workingCopySourceReference.getSourceRange().getOffset()-index);
+ str += spaces;
+ }
+
}else{
str += SPACE;
}
- buffer.replace(workingCopySourceReference.getSourceRange().getOffset(), 0, str);
+ CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
- return true;
+ InsertEdit edit = new InsertEdit(workingCopySourceReference.getSourceRange().getOffset(), str);
+
+ change.setEdit(edit);
+
+ return change;
}
@SuppressWarnings("unchecked")
14 years