JBoss Tools SVN: r37551 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-23 01:41:18 -0500 (Fri, 23 Dec 2011)
New Revision: 37551
Modified:
trunk/build/target-platform/jbds.target
Log:
update jbds.target w/ newer IUs
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-12-23 06:41:08 UTC (rev 37550)
+++ trunk/build/target-platform/jbds.target 2011-12-23 06:41:18 UTC (rev 37551)
@@ -85,9 +85,9 @@
<unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcrFML8IX_Scz0ZMIXuTADB7"/>
<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.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFpbKK_SJR0vPkGu102722"/>
<unit id="org.eclipse.pde.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVvFEt3dpKXiolsY319"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDp7rPz-2"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDqArPw1"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.1.v201108301820-77078CcNBHCBYKYEbNV"/>
@@ -244,7 +244,7 @@
<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.2.v20111213-1208"/>
- <unit id="org.eclipse.osgi" version="3.7.2.R37x_v20111121-1300"/>
+ <unit id="org.eclipse.osgi" version="3.7.2.v20111205-1537"/>
<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"/>
@@ -269,4 +269,4 @@
<unit id="javax.el" version="2.2.0.v201105051105"/>
</location>
</locations>
-</target>
+</target>
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r37550 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-23 01:41:08 -0500 (Fri, 23 Dec 2011)
New Revision: 37550
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
newer UI versions in SR2 TP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-12-23 02:59:06 UTC (rev 37549)
+++ trunk/build/target-platform/multiple.target 2011-12-23 06:41:08 UTC (rev 37550)
@@ -87,34 +87,34 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s73553J95"/>
- <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP4FwFgX4mz08w1sX-SEbD1FlAIfSLZz0eE"/>
- <unit id="org.eclipse.platform.ide" version="3.7.1.M20111201-1437"/>
- <unit id="org.eclipse.platform.sdk" version="3.7.1.M20111201-1437"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.7.1.r37x_v20110728-7Q7xAEDDePtVwCJ_TK0567QsU3yfIAL2osFwb_XRZt4aN"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP9FxGjd-Kt0u7FUjXrkGBRlAGhUKWvcC"/>
+ <unit id="org.eclipse.platform.ide" version="3.7.1.M20111214-1406"/>
+ <unit id="org.eclipse.platform.sdk" version="3.7.1.M20111214-1406"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.7.2.r37x_v20111213-7Q7xAEDDePtVwCPcUL0B0hMwoKb8FG5XWyjL_Z-weE2Rc"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.101.r37x_v20111117-4507s482aw31221929"/>
- <unit id="org.eclipse.sdk.ide" version="3.7.1.M20111201-1437"/>
+ <unit id="org.eclipse.sdk.ide" version="3.7.1.M20111214-1406"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.5.0.r37x_v20111117-817nFcfFE_dkPZMZfNRFqhh"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.5.0.r37x_v20111117"/>
- <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.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBZDzbeA3ysLc99RDH15C44"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHl90GF5k1LAD7CODE01911"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcrFML8IX_Scz0ZMIXuTADB7"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBZETaXFX4sLg79VEN02722"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.R37x_v20111117-1330-7P7NFUFFIbaUcR7JrhHHBBe5HZTZ"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA5FNKoMz-UVh-nB9L9B"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.v20110928-1809-7uF9LFpHFTsKsAm_LKoLQAZq5HTF"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.v20110928-1809-7uF9LFpHFUqIcLfpLKwHQIb03BJB"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.101.R37x_v20110909-4-8_9oB5885K5B28WKK"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0pz-UdWr1z0jQHRlY7"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.1.R37x_v20110907-9N7sHD_GHWyJ6-tc-e56RJl5FePP"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.1.R37x_v20110907-7u7PFvHFN5LiN7iQI1x2nX0wija1"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4Wrol08uSMTdDoTW4j"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.1.R37x_v20110907-7u7PFvHFN5LiN7iQIXvwsz-8winZ"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WrolW8kVZlXUMvV2H"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110502-7I77CPBgJ9ECBQ9V8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.1.R37x_v20110907-7z7UFVzFSW5PIAnhrvelMks02129"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110502-44Eo8s73553A4A2629"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFp7LSV-BR-oRkFtx15C44"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFpbKK_SJR0vPkGu102722"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
- <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"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVvFEt3dpKXiolsY319"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDqArPw1"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.1.v201108301820-77078CcNBHCBYKYEbNV"/>
@@ -208,7 +208,7 @@
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeMF7RZHQNJtN8NuOe"/>
<!-- 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.201112011741"/>
+ <unit id="org.eclipse.jsch.ui" version="1.1.300.R37x_v20111201-1600"/>
<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"/>
@@ -270,8 +270,8 @@
<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.jface.text" version="3.7.2.v20111213-1208"/>
+ <unit id="org.eclipse.osgi" version="3.7.2.v20111205-1537"/>
<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"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-12-23 02:59:06 UTC (rev 37549)
+++ trunk/build/target-platform/unified.target 2011-12-23 06:41:08 UTC (rev 37550)
@@ -87,34 +87,34 @@
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s73553J95"/>
- <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP4FwFgX4mz08w1sX-SEbD1FlAIfSLZz0eE"/>
- <unit id="org.eclipse.platform.ide" version="3.7.1.M20111201-1437"/>
- <unit id="org.eclipse.platform.sdk" version="3.7.1.M20111201-1437"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.7.1.r37x_v20110728-7Q7xAEDDePtVwCJ_TK0567QsU3yfIAL2osFwb_XRZt4aN"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP9FxGjd-Kt0u7FUjXrkGBRlAGhUKWvcC"/>
+ <unit id="org.eclipse.platform.ide" version="3.7.1.M20111214-1406"/>
+ <unit id="org.eclipse.platform.sdk" version="3.7.1.M20111214-1406"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.7.2.r37x_v20111213-7Q7xAEDDePtVwCPcUL0B0hMwoKb8FG5XWyjL_Z-weE2Rc"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.101.r37x_v20111117-4507s482aw31221929"/>
- <unit id="org.eclipse.sdk.ide" version="3.7.1.M20111201-1437"/>
+ <unit id="org.eclipse.sdk.ide" version="3.7.1.M20111214-1406"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.5.0.r37x_v20111117-817nFcfFE_dkPZMZfNRFqhh"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.5.0.r37x_v20111117"/>
- <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.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBZDzbeA3ysLc99RDH15C44"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHl90GF5k1LAD7CODE01911"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcrFML8IX_Scz0ZMIXuTADB7"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.1.R37x_v20110907-7K7TFBZETaXFX4sLg79VEN02722"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.1.R37x_v20111117-1330-7P7NFUFFIbaUcR7JrhHHBBe5HZTZ"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.1.R37x_v20110909-7X7XGA5FNKoMz-UVh-nB9L9B"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.v20110928-1809-7uF9LFpHFTsKsAm_LKoLQAZq5HTF"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.1.v20110928-1809-7uF9LFpHFUqIcLfpLKwHQIb03BJB"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.101.R37x_v20110909-4-8_9oB5885K5B28WKK"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0pz-UdWr1z0jQHRlY7"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.7.1.R37x_v20110907-9N7sHD_GHWyJ6-tc-e56RJl5FePP"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.1.R37x_v20110907-7u7PFvHFN5LiN7iQI1x2nX0wija1"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4Wrol08uSMTdDoTW4j"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.7.1.R37x_v20110907-7u7PFvHFN5LiN7iQIXvwsz-8winZ"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8i8eNV4WrolW8kVZlXUMvV2H"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.100.v20110502-79-F8PEVVFNNFsFV"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110502-7I77CPBgJ9ECBQ9V8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.1.R37x_v20110907-7z7UFVzFSW5PIAnhrvelMks02129"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110502-44Eo8s73553A4A2629"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFp7LSV-BR-oRkFtx15C44"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmQFpbKK_SJR0vPkGu102722"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.200.r37x_v20110803-7D-FHkFAFkNZZO9PfBZStN"/>
- <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"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVvFEt3dpKXiolsY319"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDqArPw1"/>
<!-- DTP -->
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.9.1.v201108301820-77078CcNBHCBYKYEbNV"/>
@@ -208,7 +208,7 @@
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.3.1.v201108102009-7C7OFeMF7RZHQNJtN8NuOe"/>
<!-- 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.201112011741"/>
+ <unit id="org.eclipse.jsch.ui" version="1.1.300.R37x_v20111201-1600"/>
<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"/>
@@ -270,8 +270,8 @@
<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.jface.text" version="3.7.2.v20111213-1208"/>
+ <unit id="org.eclipse.osgi" version="3.7.2.v20111205-1537"/>
<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"/>
13 years, 2 months
JBoss Tools SVN: r37549 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-22 21:59:06 -0500 (Thu, 22 Dec 2011)
New Revision: 37549
Modified:
trunk/build/target-platform/jbds.target
Log:
update versions in JBDS TP
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-12-23 02:58:59 UTC (rev 37548)
+++ trunk/build/target-platform/jbds.target 2011-12-23 02:59:06 UTC (rev 37549)
@@ -80,13 +80,13 @@
<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-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.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHP9FxGjd-Kt0u7FUjXrkGBRlAGhUKWvcC"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHl90GF5k1LAD7CODE01911"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcrFML8IX_Scz0ZMIXuTADB7"/>
<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.pde.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVvFEt3dpKXiolsY319"/>
<unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFmFFl8nvpcDp7rPz-2"/>
<!-- DTP -->
@@ -181,7 +181,7 @@
<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.201112011741"/>
+ <unit id="org.eclipse.jsch.ui" version="1.1.300.R37x_v20111201-1600"/>
<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"/>
@@ -243,7 +243,7 @@
<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.jface.text" version="3.7.2.v20111213-1208"/>
<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"/>
13 years, 2 months
JBoss Tools SVN: r37548 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-22 21:58:59 -0500 (Thu, 22 Dec 2011)
New Revision: 37548
Modified:
trunk/build/target-platform/contentXml2artifactVersions.xsl
Log:
add sorting to artifact versions properties file
Modified: trunk/build/target-platform/contentXml2artifactVersions.xsl
===================================================================
--- trunk/build/target-platform/contentXml2artifactVersions.xsl 2011-12-23 02:58:51 UTC (rev 37547)
+++ trunk/build/target-platform/contentXml2artifactVersions.xsl 2011-12-23 02:58:59 UTC (rev 37548)
@@ -8,7 +8,7 @@
<xsl:template match="repository">
<xsl:apply-templates select="//unit" />
</xsl:template>
-<xsl:template match="//unit"><xsl:value-of select="@id" />.version=<xsl:value-of select="@version" />
+<xsl:template match="//unit"><xsl:for-each select="."><xsl:sort select="@version" order="descending" case-order="lower-first" data-type="qname"/><xsl:value-of select="@id" />.version=<xsl:value-of select="@version" />
#
-</xsl:template>
+</xsl:for-each></xsl:template>
</xsl:stylesheet>
13 years, 2 months
JBoss Tools SVN: r37546 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-22 20:39:25 -0500 (Thu, 22 Dec 2011)
New Revision: 37546
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
Log:
JBIDE-10565
https://issues.jboss.org/browse/JBIDE-10565
There should be no EL proposals at #|{.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-12-23 01:37:19 UTC (rev 37545)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-12-23 01:39:25 UTC (rev 37546)
@@ -740,6 +740,7 @@
private int length;
private String text;
private boolean isELStarted;
+ private boolean isInsideELStartToken;
private boolean isELClosed;
private boolean isAttributeValue;
private boolean hasOpenQuote;
@@ -786,7 +787,15 @@
public boolean isELStarted() {
return isELStarted;
}
+
+ public boolean isInsideELStartToken() {
+ return isInsideELStartToken;
+ }
+ void setInsideELStartToken(boolean b) {
+ isInsideELStartToken = b;
+ }
+
public boolean isELClosed() {
return isELClosed;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-12-23 01:37:19 UTC (rev 37545)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2011-12-23 01:39:25 UTC (rev 37546)
@@ -144,6 +144,10 @@
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix != null && prefix.isELStarted()) {
+ if(prefix.isInsideELStartToken()) {
+ // "#|{" - wrong place to suggest anything
+ return;
+ }
addTextELProposals(contentAssistRequest, context);
} else {
addELPredicateProposals(contentAssistRequest, getTagInsertionBaseRelevance(), true);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-12-23 01:37:19 UTC (rev 37545)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-12-23 01:39:25 UTC (rev 37546)
@@ -133,6 +133,10 @@
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix != null && prefix.isELStarted()) {
+ if(prefix.isInsideELStartToken()) {
+ // "#|{" - wrong place to suggest anything
+ return;
+ }
addTextELProposals(contentAssistRequest, context);
} else {
addELPredicateProposals(contentAssistRequest, getTagInsertionBaseRelevance(), true);
@@ -150,6 +154,10 @@
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix != null && prefix.isELStarted()) {
+ if(prefix.isInsideELStartToken()) {
+ // "#|{" - wrong place to suggest anything
+ return;
+ }
addAttributeValueELProposals(contentAssistRequest, context);
return;
}
@@ -168,7 +176,7 @@
return;
TextRegion prefix = getELPrefix(contentAssistRequest);
- if (prefix == null)
+ if (prefix == null || prefix.isInsideELStartToken())
return; // Do not return any proposals here (predicate proposals may be created instead)
if(!prefix.isELStarted()) {
@@ -327,6 +335,10 @@
contentAssistRequest.addProposal(proposal);
return;
}
+ if(prefix.isInsideELStartToken()) {
+ // "#|{" - wrong place to suggest anything
+ return;
+ }
String matchString = EL_NUMBER_PREFIX + prefix.getText();
String query = (matchString == null ? "" : matchString); //$NON-NLS-1$
String stringQuery = matchString;
@@ -941,7 +953,7 @@
ELInstance is = ELUtil.findInstance(model, inValueOffset);// ELInstance
ELInvocationExpression ie = ELUtil.findExpression(model, inValueOffset);// ELExpression
-
+
boolean isELStarted = (model != null && is != null && (startsWithELBeginning(model.toString())));
boolean isELClosed = (model != null && is != null && model.toString().endsWith("}")); //$NON-NLS-1$
@@ -951,6 +963,10 @@
isELStarted, isELClosed,
isAttributeValue, hasOpenQuote, hasCloseQuote, quoteChar);
+ if(is != null && ie == null && is.getFirstToken() != null && is.getFirstToken().getStart() + is.getFirstToken().getLength() > inValueOffset) {
+ tr.setInsideELStartToken(true);
+ }
+
return tr;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-12-23 01:37:19 UTC (rev 37545)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-12-23 01:39:25 UTC (rev 37546)
@@ -600,6 +600,9 @@
documentRegion = documentRegion.getPrevious();
completionRegion = getCompletionRegion(request.getDocumentRegion().getStartOffset() + request.getRegion().getStart() - 1, request.getParent());
}
+ if(documentRegion==null || completionRegion==null) {
+ return null;
+ }
if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(completionRegion.getType()) &&
!DOMRegionContext.XML_CONTENT.equals(completionRegion.getType()) &&
!DOMRegionContext.BLOCK_TEXT.equals(completionRegion.getType())) {
13 years, 2 months
JBoss Tools SVN: r37545 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-22 20:37:19 -0500 (Thu, 22 Dec 2011)
New Revision: 37545
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForUnclosedELTest.java
Log:
JBIDE-10565
https://issues.jboss.org/browse/JBIDE-10565
Test added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForUnclosedELTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForUnclosedELTest.java 2011-12-23 00:30:52 UTC (rev 37544)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForUnclosedELTest.java 2011-12-23 01:37:19 UTC (rev 37545)
@@ -1,5 +1,12 @@
package org.jboss.tools.jsf.jsp.ca.test;
+import java.util.List;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.jboss.tools.common.base.test.contentassist.CATestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.TestProjectProvider;
@@ -28,4 +35,16 @@
checkProposals(PAGE_NAME, "<ui:define name=\"pageTitle#{ \"", 30, proposals, false);
checkProposals(PAGE_NAME, "<ui:define name=\"pageHeader\">Greeting Page#{ </ui:define>", 46, proposals, false);
}
+
+ public void testCAInELStartToken() throws BadLocationException {
+ openEditor(PAGE_NAME);
+
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "<ui:define name=\"pageTitle#{ \"", true, true, false, false);
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, reg.getOffset() + 27);
+ boolean found = compareProposal("person", null, res.toArray(new ICompletionProposal[0]));
+ assertFalse(found);
+ res = CATestUtil.collectProposals(contentAssistant, viewer, reg.getOffset() + 28);
+ found = compareProposal("person", null, res.toArray(new ICompletionProposal[0]));
+ assertTrue(found);
+ }
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r37544 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-22 19:30:52 -0500 (Thu, 22 Dec 2011)
New Revision: 37544
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
Log:
Java Seam and CDI quick fixes: after quick fix, editor is scrolled to the beginning. If Undo/Redo commands are used, the entire file content gets selected https://issues.jboss.org/browse/JBIDE-10536
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2011-12-23 00:27:38 UTC (rev 37543)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2011-12-23 00:30:52 UTC (rev 37544)
@@ -337,7 +337,7 @@
}
while(position < buffer.getLength()-1){
char c = buffer.getChar(position);
- if(c != '\r' && c != '\n' && c != ' ' && c != '\t'){
+ if(c != C_CARRIAGE_RETURN && c != C_NEW_LINE && c != C_SPACE && c != C_TAB){
break;
}
position++;
13 years, 2 months