JBoss Tools SVN: r42547 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:29:22 -0400 (Thu, 12 Jul 2012)
New Revision: 42547
Modified:
trunk/build/target-platform/pom.xml
Log:
disable target validation for unified.target as it will never validate until AFTER multiple.target is built and published; add jbds.target to validator too
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2012-07-12 16:29:14 UTC (rev 42546)
+++ trunk/build/target-platform/pom.xml 2012-07-12 16:29:22 UTC (rev 42547)
@@ -34,12 +34,15 @@
<execution>
<phase>validate</phase>
<goals>
- <goal>validate-target-platform</goal>
+ <goal>validate-target-platform</goal>
</goals>
<configuration>
<targetFiles>
<param>multiple.target</param>
- <param>unified.target</param>
+ <!-- DO NOT VALIDATE unified.target because this cannot be validated until multiple.target is built and published
+ <param>unified.target</param>
+ -->
+ <param>jbds.target</param>
</targetFiles>
<failOnError>true</failOnError>
</configuration>
13 years, 9 months
JBoss Tools SVN: r42546 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:29:14 -0400 (Thu, 12 Jul 2012)
New Revision: 42546
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
use javax.servlet.jsp from an older Orbit release (same bits, different qualifier)
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-12 16:29:05 UTC (rev 42545)
+++ trunk/build/target-platform/jbds.target 2012-07-12 16:29:14 UTC (rev 42546)
@@ -23,7 +23,8 @@
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <!-- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/> -->
+ <unit id="javax.servlet.jsp" version="2.0.0.v200806031607"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 16:29:05 UTC (rev 42545)
+++ trunk/build/target-platform/multiple.target 2012-07-12 16:29:14 UTC (rev 42546)
@@ -24,7 +24,8 @@
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <!-- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/> -->
+ <unit id="javax.servlet.jsp" version="2.0.0.v200806031607"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 16:29:05 UTC (rev 42545)
+++ trunk/build/target-platform/unified.target 2012-07-12 16:29:14 UTC (rev 42546)
@@ -24,6 +24,7 @@
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
+ <!-- <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/> -->
<unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
13 years, 9 months
JBoss Tools SVN: r42545 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:29:05 -0400 (Thu, 12 Jul 2012)
New Revision: 42545
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
merge contents of jbds.target, mutliple.target, unified.target
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-07-12 16:28:57 UTC (rev 42544)
+++ trunk/build/target-platform/jbds.target 2012-07-12 16:29:05 UTC (rev 42545)
@@ -12,6 +12,31 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+ <!-- for these IUs we need multiple versions -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="org.jdom" version="1.1.1.v201101151400"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
+ <unit id="javax.servlet" version="3.0.0.v201112011016"/>
+ <unit id="javax.servlet" version="2.5.0.v200910301333"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+ <unit id="javax.xml.bind" version="2.1.9.v201005080401"/>
+ <unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
+ <unit id="javax.xml.soap" version="1.2.0.v201005080501"/>
+ <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
+ <unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
+ <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
+ <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
@@ -28,9 +53,7 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
- <unit id="org.jdom" version="1.1.1.v201101151400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -55,6 +78,15 @@
<unit id="org.eclipse.emf.validation.feature.group" version="1.6.0.v20120328-0001-479-9oB56N5BBR6LCA6"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.6.0.v20120328-0001-377-8s734C3E7D15D6B"/>
<unit id="org.eclipse.emf.feature.group" version="2.8.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/>
+ <unit id="org.eclipse.emf.codegen.feature.group" version="2.8.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.8.0.v20120606-0717"/>
+ <unit id="org.eclipse.emf.databinding.feature.group" version="1.2.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.8.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.8.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.8.0.v20120608-0554"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/>
+ <unit id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20120608-0554"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120319-0555"/>
<unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20120319-0555"/>
<unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20120319-0555"/>
@@ -73,11 +105,27 @@
<unit id="org.eclipse.uml2.doc.feature.group" version="4.0.0.v20120604-0919"/>
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
+ <unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
<unit id="org.eclipse.platform.feature.group" version="4.2.0.v20120608-135145-9JF7BHV8FyMteji0Oi_ePMz0xuZ8TVo7lV0z0ecb"/>
+ <unit id="org.eclipse.platform.ide" version="4.2.0.I20120608-1400"/>
+ <unit id="org.eclipse.platform.sdk" version="4.2.0.I20120608-1400"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.2.0.v20120528-1648-7T7oDFDPz-3FepgRqG6kkFFY0UF4_otgmt0XcoU3Zh27X"/>
+ <unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/>
<unit id="org.eclipse.cvs.feature.group" version="1.3.200.v20120525-1249-7B79FJJAkF7BF7SDL5EAJT"/>
<unit id="org.eclipse.jdt.feature.group" version="3.8.0.v20120525-1249-8-8nFqlFNOfwKDRGz-pXLdGxEM83"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.2.0.v20120522-1841-7K7VFMRF7RZHQYI0Yh8U-ov"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.8.0.v20120522-1841-7X7eGb7FPGjtJjv1kjS_NdG"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.100.v20120524-0542-4-Bh9oB58A5N9L28PCQ"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.0.v20120524-0542-62DG9JXTlSiz-UbcP0w0KGe8CBOP"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.8.0.v20120522-1841-9Q7dFszFYGis9uYGz0QodZP3fH0t"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20120522-1841-7M7fA78g5_y-eMftHxcd13UXuq5J"/>
+ <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.200.v20120522-1841-79-FKsEVVFNVFsVk7O6G6"/>
+ <unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.1.0.v20120522-1841-8077C0F8NcJTbL1ab47MJ5"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.2.0.v20120522-1841-7z7_FfoFTy21Yu4Ydp_WohB38"/>
+ <unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.101.v20120522-1841-42F9w9oB58B5KBB2ADHO"/>
<unit id="org.eclipse.rcp.feature.group" version="4.2.0.v20120528-1648-7IAPA7BrHQicRpNdOz-Obz-rlRCA"/>
<unit id="org.eclipse.pde.feature.group" version="3.8.0.v20120525-1249-7c7vFitFFt6Zr5a12MM4IKMFZ"/>
<unit id="org.eclipse.help.feature.group" version="1.4.0.v20120608-133537-8P7vFOTFK_Qj4JmDIQXL8Tn"/>
@@ -121,13 +169,28 @@
<!-- RSE, TM -->
<unit id="org.eclipse.rse.feature.group" version="3.4.0.201205300905-7L7IFBV83omxZWwIDyHWipb2Sz-f"/>
+ <unit id="org.eclipse.rse.ssh.feature.group" version="3.0.400.201205300905-7A4FEc7F7BF7RJ77g7R"/>
+ <unit id="org.eclipse.rse.terminals.feature.group" version="1.2.0.201205300905-773Eo7H89G8OJ8Db8NB27"/>
+ <unit id="org.eclipse.rse.telnet.feature.group" version="2.3.0.201205300905-775FD3879AE8MH9BZFP4"/>
+ <unit id="org.eclipse.rse.ftp.feature.group" version="3.1.0.201205300905-782FBV8377A6FC79ODI4"/>
+ <unit id="org.eclipse.rse.local.feature.group" version="2.1.400.201205300905-7B4FSg7J9EJ9YO99r9Y"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.400.201205300905-31FBV773573D933L3D"/>
<unit id="org.eclipse.tm.terminal.feature.group" version="3.2.0.201205300905-41-312316411A16"/>
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.3.0.201205300905-32-312316411A16"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
+ <unit id="org.eclipse.tm.terminal.serial.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
+ <unit id="org.eclipse.tm.terminal.feature.group" version="3.2.0.201205300905-41-312316411A16"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
<!-- WTP -->
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
+ <unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
+ <unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
+ <unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
+ <unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
+ <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.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.0.v201203150000-66-AkF7BF7PBN7778"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.0.v201203150000-33-8s7357395D3333"/>
<unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.0.v201203150000-7M7J4F7RZHQYIwMz0JyOWFD7"/>
@@ -239,8 +302,9 @@
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
+ <!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
- <unit id="org.xmlpull" version="1.1.3.4_v2012015148"/>
+ <unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
<unit id="org.eclipse.core.runtime" version="3.8.0.v20120521-2346"/>
<unit id="org.eclipse.core.resources" version="3.8.0.v20120522-2034"/>
@@ -256,7 +320,6 @@
<unit id="org.eclipse.jface" version="3.8.0.v20120521-2329"/>
<unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
<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"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -265,12 +328,26 @@
<unit id="org.mortbay.jetty.util" version="6.1.23.v201012071420"/>
<unit id="org.apache.jasper" version="7.0.26.v201205030742"/>
<unit id="org.apache.catalina" version="7.0.26.v201205021508"/>
+ <unit id="javax.ejb" version="3.1.1.v201204261316"/>
+ <unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201112011016"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201108011116"/>
+ <!-- SWTBot -->
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
+
+ <!-- BIRT -->
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="4.2.0.v20120611-793-87iDWCFP8ZDTAN72TPI4jrXA"/>
+ <unit id="org.eclipse.birt.feature.group" version="4.2.0.v20120611-C_BC7CGWoJMfAnw8Y8QVz0nD0JPl"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
+ <unit id="org.eclipse.birt.chart.feature.group" version="4.2.0.v20120611-828i2FQCnvK_6W8GmbB8"/>
+ <unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="4.2.0.v20120613-1143-51-7w3123172402254"/>
+
<!-- GWT/GPE dependencies (include only those which are EPL or other OSS licensed!) -->
<unit id="com.google.gdt.eclipse.suite.e42.feature.feature.group" version="3.0.1.v201206290132-rel-r42"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e42.feature.feature.group" version="2.4.0.v201206290132-rel-r42"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 16:28:57 UTC (rev 42544)
+++ trunk/build/target-platform/multiple.target 2012-07-12 16:29:05 UTC (rev 42545)
@@ -23,7 +23,7 @@
<unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
@@ -89,6 +89,10 @@
<unit id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/>
<unit id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20120608-0554"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20120319-0555"/>
<unit id="org.eclipse.xsd.feature.group" version="2.8.0.v20120319-0555"/>
<!-- GEF, Draw2D, Graphiti, Zest -->
@@ -99,6 +103,7 @@
<!-- UML2 -->
<unit id="org.eclipse.uml2.feature.group" version="4.0.0.v20120604-0919"/>
+ <unit id="org.eclipse.uml2.doc.feature.group" version="4.0.0.v20120604-0919"/>
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
@@ -179,6 +184,7 @@
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
<!-- WTP -->
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
<unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
@@ -188,35 +194,49 @@
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.0.v201203150000-66-AkF7BF7PBN7778"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.0.v201203150000-33-8s7357395D3333"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.0.v201203150000-7M7J4F7RZHQYIwMz0JyOWFD7"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.0.v201203150000-7S7K8aFBBoPaoQNZZRKUVFD7"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.0.v201203141800-7O7MFsGEMkBJz0rWbgfTLwn-4WKIocbP_pkka3Il"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFeBDxumUpsl5liePhK3loz-m62J4rSz011R1"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.0.v201111090639-7H7DFeHFC7sRemSZgYbe4"/>
<unit id="org.eclipse.jsf.feature.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <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.100.v20110810_1722-777HFL5CcNBDmBfJVFHJD6"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <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.4.0.v201111022313-7Q7EGVtFE9LeAJKiyp_z-Rsyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.7.v201203021447-46DF9oB5896E6J7G7E3357"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.0.v201111022313-7F7DFSgC25TrkWsplelWwGPu4Ajn5UiEiyuqxZp4"/>
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.7.v201203021447-46DF9oB5896E6J7G7E3357"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.0.v201111022313-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.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.0.v201107190500-7B7EFMSF7RZHOjIpQz-P-QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.0.v201203141800-7C7AFeBEdhOawe9e8mNfykJqRz00Q0RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.0.v201111090639-7H7DFeHFC7sRemSZgYbe4"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.101.v20111212_1019-51F8OAkF79S8JCTA597K"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.100.v20110810_1722-7B7AFGHAtMcLXxbGc-IjRefCA84"/>
+ <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.4.0.v201203141800-7E7HFSgAJz-mw9oH21HGMpHiKb_kVAz0D"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.0.v201203141800-7O7MFsGEMkBJz0rWbgfTLwn-4WKIocbP_pkka3Il"/>
+ <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.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.0.v201203150412-7I7CFkWEtEoXHw284K6n3-oEz-uotfK5qz-68n73"/>
+ <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.4.0.v201111021744-7C7OFm4F7RZHQRIpOz-P2Xk"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFeBDxumUpsl5liePhK3loz-m62J4rSz011R1"/>
+ <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="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
@@ -279,6 +299,7 @@
<unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 16:28:57 UTC (rev 42544)
+++ trunk/build/target-platform/unified.target 2012-07-12 16:29:05 UTC (rev 42545)
@@ -23,7 +23,7 @@
<unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
<unit id="javax.servlet" version="3.0.0.v201112011016"/>
<unit id="javax.servlet" version="2.5.0.v200910301333"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.wsdl" version="1.5.1.v201012040544"/>
@@ -89,6 +89,10 @@
<unit id="org.eclipse.emf.ecore.feature.group" version="2.8.0.v20120606-0717"/>
<unit id="org.eclipse.emf.edit.feature.group" version="2.8.0.v20120608-0554"/>
<unit id="org.eclipse.xsd.edit.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.editor.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.7.0.v20120319-0555"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.7.0.v20120319-0555"/>
<unit id="org.eclipse.xsd.feature.group" version="2.8.0.v20120319-0555"/>
<!-- GEF, Draw2D, Graphiti, Zest -->
@@ -99,6 +103,7 @@
<!-- UML2 -->
<unit id="org.eclipse.uml2.feature.group" version="4.0.0.v20120604-0919"/>
+ <unit id="org.eclipse.uml2.doc.feature.group" version="4.0.0.v20120604-0919"/>
<!-- Platform: CVS, JDT, RCP, PDE, Equinox, Help -->
<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
@@ -179,6 +184,7 @@
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.100.201205300905-308Z312316411A16"/>
<!-- WTP -->
+ <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
<unit id="org.eclipse.jst.jee" version="1.0.500.v201202020745"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.200.v201203141800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.300.v201111030424"/>
@@ -188,35 +194,49 @@
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
<unit id="org.eclipse.jpt.common.feature.feature.group" version="1.2.0.v201203150000-66-AkF7BF7PBN7778"/>
<unit id="org.eclipse.jpt.common.eclipselink.feature.feature.group" version="1.2.0.v201203150000-33-8s7357395D3333"/>
+ <unit id="org.eclipse.jpt.jpa.eclipselink.feature.feature.group" version="3.2.0.v201203150000-7M7J4F7RZHQYIwMz0JyOWFD7"/>
<unit id="org.eclipse.jpt.jpa.feature.feature.group" version="3.2.0.v201203150000-7S7K8aFBBoPaoQNZZRKUVFD7"/>
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.4.0.v20120608-r11652"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.0.v201203141800-7O7MFsGEMkBJz0rWbgfTLwn-4WKIocbP_pkka3Il"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFeBDxumUpsl5liePhK3loz-m62J4rSz011R1"/>
- <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
- <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.0.v201111090639-7H7DFeHFC7sRemSZgYbe4"/>
<unit id="org.eclipse.jsf.feature.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
- <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.4.0.v201108231500-377DG8s73543J5H6D66"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.4.0.v201108110300-52FShAkF7BA8O8J9OC8"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.4.0.v201107072300-7b7JIM0FSK2WM1PS9Ar7AKUz0TrWn"/>
+ <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.100.v20110810_1722-777HFL5CcNBDmBfJVFHJD6"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.200.v20120517_1442-20A77w31231628a2553"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.4.0.v20120503_1042-31FEe8s73554A4Fa2153"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.4.0.v20120503_1042-7A77FHr9xFcC2CFLZBCJMHLg7D64"/>
+ <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.4.0.v201111022313-7Q7EGVtFE9LeAJKiyp_z-Rsyivz-0sSxz003877"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.7.v201203021447-46DF9oB5896E6J7G7E3357"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.4.0.v201111022313-7F7DFSgC25TrkWsplelWwGPu4Ajn5UiEiyuqxZp4"/>
- <unit id="org.eclipse.jsf.feature.source.feature.group" version="3.4.0.v201111022140-7E7JFBZF9JgLWZLz0U0QoZm3357"/>
- <unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.7.v201203021447-46DF9oB5896E6J7G7E3357"/>
- <unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.301.v201102200555-2407w312123151655"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.4.0.v201111022313-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.1.0.v201201312103-7H79FHxFAKlbotH5e9l3vAA6MBG"/>
+ <unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.200.v201109042201-5-F8NAkF7BB7U8PEK8K"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.2.0.v201204151854-7E7AF70F8NcJS_KqT5TpXq"/>
+ <unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.200.v201205012246-3-DF8s73573D795LAF"/>
<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.4.0.v201107190500-7B7EFMSF7RZHOjIpQz-P-QS"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.4.0.v201202292300-377F8N8s735555393B7B"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.4.0.v201203141800-7C7AFeBEdhOawe9e8mNfykJqRz00Q0RT"/>
+ <unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.4.0.v201111090639-7H7DFeHFC7sRemSZgYbe4"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.101.v20111212_1019-51F8OAkF79S8JCTA597K"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.3.100.v20110810_1722-33Et8s73563B6Ha3113"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.3.100.v20110810_1722-7B7AFGHAtMcLXxbGc-IjRefCA84"/>
+ <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.4.0.v201203141800-7E7HFSgAJz-mw9oH21HGMpHiKb_kVAz0D"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.4.0.v201203141800-7O7MFsGEMkBJz0rWbgfTLwn-4WKIocbP_pkka3Il"/>
+ <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.4.0.v201108230503-7L7RFoGFGtGd-xhuy-rRwz-2766"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.4.0.v201203150412-7I7CFkWEtEoXHw284K6n3-oEz-uotfK5qz-68n73"/>
+ <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.4.0.v201111021744-7C7OFm4F7RZHQRIpOz-P2Xk"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFeBDxumUpsl5liePhK3loz-m62J4rSz011R1"/>
+ <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="2.0.100.v201203131922-7A7K0CcNBGPCTJ_FUOb"/>
+ <unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.3.100.v201111021744-7T7ZFUaFIqUoJuvaKoCpQDKaGVPc"/>
<!-- JBIDE-9549, JBDS-1904 add egit/jgit and mylyn support to TP, including dependent plugins -->
<unit id="org.eclipse.jsch.ui" version="1.1.400.v20120522-1148"/>
@@ -279,6 +299,7 @@
<unit id="com.atlassian.connector.eclipse.jira.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.jira.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.monitor.core" version="3.0.6.v20120628"/>
+ <unit id="com.atlassian.connector.eclipse.monitor.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.core" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
13 years, 9 months
JBoss Tools SVN: r42544 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:28:57 -0400 (Thu, 12 Jul 2012)
New Revision: 42544
Modified:
trunk/build/target-platform/unified.target
Log:
update versions in TP
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 16:28:49 UTC (rev 42543)
+++ trunk/build/target-platform/unified.target 2012-07-12 16:28:57 UTC (rev 42544)
@@ -21,10 +21,8 @@
<unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
- <unit id="javax.activation" version="1.1.0.v201005080500"/>
- <unit id="javax.activation" version="1.1.0.v201105071233"/>
- <unit id="javax.servlet" version="3.0.0.v201103241727"/>
- <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet" version="3.0.0.v201112011016"/>
+ <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
<unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -56,6 +54,7 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
+ <unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
13 years, 9 months
JBoss Tools SVN: r42543 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:28:49 -0400 (Thu, 12 Jul 2012)
New Revision: 42543
Modified:
trunk/build/target-platform/multiple.target
Log:
update versions in TP
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 16:28:39 UTC (rev 42542)
+++ trunk/build/target-platform/multiple.target 2012-07-12 16:28:49 UTC (rev 42543)
@@ -21,10 +21,8 @@
<unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
- <unit id="javax.activation" version="1.1.0.v201005080500"/>
- <unit id="javax.activation" version="1.1.0.v201105071233"/>
- <unit id="javax.servlet" version="3.0.0.v201103241727"/>
- <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet" version="3.0.0.v201112011016"/>
+ <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
<unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
@@ -56,6 +54,7 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
+ <unit id="javax.activation" version="1.1.0.v201108011116"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -284,7 +283,6 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
- <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
13 years, 9 months
JBoss Tools SVN: r42542 - trunk/download.jboss.org/jbosstools/updates/juno/SR0.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:28:39 -0400 (Thu, 12 Jul 2012)
New Revision: 42542
Modified:
trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml
Log:
add older orbit to Juno SR0 mirror to resolve old version of javax.servlet (2.5) as well as 3.0
Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml 2012-07-12 16:28:28 UTC (rev 42541)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeArtifacts.xml 2012-07-12 16:28:39 UTC (rev 42542)
@@ -3,15 +3,20 @@
<repository name='JBoss Tools Requirements - Composite Juno SR0 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1342036537000'/>
+<property name='p2.timestamp' value='1342106152000'/>
</properties>
-<children size='11'>
+<children size='12'>
<!-- new for Juno -->
<child location='../../requirements/juno/201206270900-R/'/>
<child location='../../requirements/atlassian/3.0.6.v20120628/'/>
<child location='../../requirements/birt/4.2.0.v20120613/'/>
<child location='../../requirements/eclipse/R-4.2-201206081400/'/>
+
+<!-- need newer orbit for javax.servlet 3.0 -->
<child location='../../requirements/orbit/R20120526062928/'/>
+<!-- need older orbit for javax.servlet 2.5 -->
+<child location='../../requirements/orbit/R20100519200754/'/>
+
<child location='../../requirements/webtools/R-3.4.0-20120612174739/'/>
<!-- removed egit as all its features are included in juno -->
<!-- removed emf to see if it's still needed or if it's sufficient to include juno -->
Modified: trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml 2012-07-12 16:28:28 UTC (rev 42541)
+++ trunk/download.jboss.org/jbosstools/updates/juno/SR0/compositeContent.xml 2012-07-12 16:28:39 UTC (rev 42542)
@@ -3,15 +3,20 @@
<repository name='JBoss Tools Requirements - Composite Juno SR0 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1342036556000'/>
+<property name='p2.timestamp' value='1342106152000'/>
</properties>
-<children size='11'>
+<children size='12'>
<!-- new for Juno -->
<child location='../../requirements/juno/201206270900-R/'/>
<child location='../../requirements/atlassian/3.0.6.v20120628/'/>
<child location='../../requirements/birt/4.2.0.v20120613/'/>
<child location='../../requirements/eclipse/R-4.2-201206081400/'/>
+
+<!-- need newer orbit for javax.servlet 3.0 -->
<child location='../../requirements/orbit/R20120526062928/'/>
+<!-- need older orbit for javax.servlet 2.5 -->
+<child location='../../requirements/orbit/R20100519200754/'/>
+
<child location='../../requirements/webtools/R-3.4.0-20120612174739/'/>
<!-- removed egit as all its features are included in juno -->
<!-- removed emf to see if it's still needed or if it's sufficient to include juno -->
13 years, 9 months
JBoss Tools SVN: r42541 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:28:28 -0400 (Thu, 12 Jul 2012)
New Revision: 42541
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
itemize all the IUs for which there are multiple version - org.jdom, org.apache.*, org.junit, javax.*
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-07-12 16:28:17 UTC (rev 42540)
+++ trunk/build/target-platform/multiple.target 2012-07-12 16:28:28 UTC (rev 42541)
@@ -13,6 +13,33 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/juno/SR0/"/>
+ <!-- for these IUs we need multiple versions -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="org.jdom" version="1.1.1.v201101151400"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
+ <unit id="javax.activation" version="1.1.0.v201005080500"/>
+ <unit id="javax.activation" version="1.1.0.v201105071233"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+ <unit id="javax.xml.bind" version="2.1.9.v201005080401"/>
+ <unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
+ <unit id="javax.xml.soap" version="1.2.0.v201005080501"/>
+ <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
+ <unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
+ <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
+ <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
@@ -29,9 +56,6 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
- <unit id="org.jdom" version="1.1.1.v201101151400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -278,7 +302,6 @@
<unit id="org.eclipse.jface" version="3.8.0.v20120521-2329"/>
<unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
<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"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -290,8 +313,6 @@
<unit id="javax.ejb" version="3.1.1.v201204261316"/>
<unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201112011016"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201108011116"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-07-12 16:28:17 UTC (rev 42540)
+++ trunk/build/target-platform/unified.target 2012-07-12 16:28:28 UTC (rev 42541)
@@ -13,6 +13,33 @@
build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.SR0..."/>
+ <!-- for these IUs we need multiple versions -->
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="org.jdom" version="1.1.1.v201101151400"/>
+ <unit id="org.jdom" version="1.0.0.v201005080400"/>
+ <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
+ <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
+ <unit id="org.apache.commons.lang" version="2.1.0.v201005080500"/>
+ <unit id="javax.activation" version="1.1.0.v201005080500"/>
+ <unit id="javax.activation" version="1.1.0.v201105071233"/>
+ <unit id="javax.servlet" version="3.0.0.v201103241727"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.jsp" version="2.2.0.v201103241009"/>
+ <unit id="javax.servlet.jsp" version="2.0.0.v201101211617"/>
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201012040544"/>
+ <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+ <unit id="javax.xml.bind" version="2.1.9.v201005080401"/>
+ <unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
+ <unit id="javax.xml.soap" version="1.2.0.v201005080501"/>
+ <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+ <unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+ <unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
+ <unit id="org.apache.lucene" version="1.9.1.v201101211617"/>
+ <unit id="org.junit_4.8.2.v4_8" version="2_v20110321-1705"/>
+ <unit id="org.junit_3.8.2.v3_8" version="2_v20100427-1100"/>
+
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.1.0.20120530-0009"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20120530-0009"/>
@@ -29,9 +56,6 @@
<unit id="org.eclipse.equinox.p2.ui.discovery" version="1.0.0.v20110808-1657"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
- <unit id="org.jdom" version="1.1.1.v201101151400"/>
- <unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -260,7 +284,6 @@
<unit id="com.atlassian.connector.eclipse.subclipse.ui" version="3.0.6.v20120628"/>
<unit id="com.atlassian.connector.eclipse.ui" version="3.0.6.v20120628"/>
<!-- dep for com.atlassian.connector.eclipse.directclickthrough.ui -->
- <unit id="javax.servlet" version="2.5.0.v200910301333"/>
<unit id="com.thoughtworks.xstream" version="1.3.1.v201111240924"/>
<unit id="org.xmlpull" version="1.1.3.4_v201201052148"/>
<unit id="org.eclipse.ui" version="3.103.0.v20120521-2329"/>
@@ -278,7 +301,6 @@
<unit id="org.eclipse.jface" version="3.8.0.v20120521-2329"/>
<unit id="org.eclipse.compare" version="3.5.300.v20120522-1148"/>
<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"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
@@ -290,8 +312,6 @@
<unit id="javax.ejb" version="3.1.1.v201204261316"/>
<unit id="javax.transaction" version="1.1.1.v201105210645"/>
<unit id="org.joda.time" version="1.6.0.v20081202-0100"/>
- <unit id="javax.servlet" version="3.0.0.v201112011016"/>
- <unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
<unit id="javax.xml.rpc" version="1.1.0.v201005080400"/>
<unit id="javax.el" version="2.2.0.v201108011116"/>
13 years, 9 months
JBoss Tools SVN: r42540 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-12 12:28:17 -0400 (Thu, 12 Jul 2012)
New Revision: 42540
Modified:
trunk/build/target-platform/build.xml
trunk/build/target-platform/target2p2mirror.xml
trunk/build/target-platform/target2p2mirrorXml.xsl
Log:
set default operation to useLatest=false so that p2mirror script will include actual versions of IUs
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2012-07-12 13:38:19 UTC (rev 42539)
+++ trunk/build/target-platform/build.xml 2012-07-12 16:28:17 UTC (rev 42540)
@@ -3,7 +3,7 @@
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
- <property name="useLatest" value="true" />
+ <property name="useLatest" value="false" />
<property name="tmpdir" value="${java.io.tmpdir}/target-platform-build" />
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2012-07-12 13:38:19 UTC (rev 42539)
+++ trunk/build/target-platform/target2p2mirror.xml 2012-07-12 16:28:17 UTC (rev 42540)
@@ -7,7 +7,7 @@
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
- <property name="useLatest" value="true" />
+ <property name="useLatest" value="false" />
<target name="custom.build" depends="gen.p2mirror.script" />
Modified: trunk/build/target-platform/target2p2mirrorXml.xsl
===================================================================
--- trunk/build/target-platform/target2p2mirrorXml.xsl 2012-07-12 13:38:19 UTC (rev 42539)
+++ trunk/build/target-platform/target2p2mirrorXml.xsl 2012-07-12 16:28:17 UTC (rev 42540)
@@ -9,7 +9,7 @@
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
- <xsl:param name="useLatest" select="'true'" as="xs:string"/>
+ <xsl:param name="useLatest" select="'false'" as="xs:string"/>
<xsl:param name="verbose" select="'${verbose}'" as="xs:string"/>
<xsl:param name="followStrict" select="'${followStrict}'" as="xs:string"/>
13 years, 9 months
JBoss Tools SVN: r42539 - in branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui: src/org/jboss/tools/forge/ui/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-12 09:38:19 -0400 (Thu, 12 Jul 2012)
New Revision: 42539
Modified:
branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-12223: Forge should use the console font + listen to font changes
Modified: branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-07-12 13:36:36 UTC (rev 42538)
+++ branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-07-12 13:38:19 UTC (rev 42539)
@@ -191,4 +191,17 @@
class="org.jboss.tools.forge.ui.startup.ForgeStarter">
</startup>
</extension>
+ <extension
+ point="org.eclipse.ui.themes">
+ <fontDefinition
+ categoryId="org.jboss.tools.forge.ui"
+ defaultsTo="org.eclipse.debug.ui.consoleFont"
+ id="org.jboss.tools.forge.console.font"
+ label="Forge Console Font">
+ </fontDefinition>
+ <themeElementCategory
+ id="org.jboss.tools.forge.ui"
+ label="Forge ">
+ </themeElementCategory>
+ </extension>
</plugin>
Modified: branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-07-12 13:36:36 UTC (rev 42538)
+++ branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-07-12 13:38:19 UTC (rev 42539)
@@ -4,6 +4,8 @@
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.TextViewer;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ST;
import org.eclipse.swt.custom.StyleRange;
@@ -28,6 +30,8 @@
private static String NEXT_HISTORY = new Character((char)14).toString();
private static String DELETE_NEXT_CHAR = new Character((char)127).toString();
+ private static final String FORGE_CONSOLE_FONT = "org.jboss.tools.forge.console.font";
+
private class DocumentListener implements IDocumentListener, ForgeDocument.CursorListener {
@Override
public void documentAboutToBeChanged(DocumentEvent event) {
@@ -63,7 +67,19 @@
private void initialize() {
initDocument();
initViewer();
+ initFontListener();
}
+
+ private void initFontListener() {
+ JFaceResources.getFontRegistry().addListener(new IPropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
+ if (FORGE_CONSOLE_FONT.equals(event.getProperty())) {
+ getTextWidget().setFont(JFaceResources.getFont(FORGE_CONSOLE_FONT));
+ }
+ }
+ });
+ }
private void initDocument() {
ForgeDocument.INSTANCE.addDocumentListener(documentListener);
@@ -73,7 +89,7 @@
private void initViewer() {
getTextWidget().setStyleRanges(ForgeDocument.INSTANCE.getStyleRanges());
- getTextWidget().setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
+ getTextWidget().setFont(JFaceResources.getFont(FORGE_CONSOLE_FONT));
getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
@Override
public void verifyKey(VerifyEvent event) {
13 years, 9 months
JBoss Tools SVN: r42538 - in trunk/forge/plugins/org.jboss.tools.forge.ui: src/org/jboss/tools/forge/ui/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-12 09:36:36 -0400 (Thu, 12 Jul 2012)
New Revision: 42538
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-12223: Forge should use the console font + listen to font changes
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-07-12 12:32:10 UTC (rev 42537)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2012-07-12 13:36:36 UTC (rev 42538)
@@ -191,4 +191,17 @@
class="org.jboss.tools.forge.ui.startup.ForgeStarter">
</startup>
</extension>
+ <extension
+ point="org.eclipse.ui.themes">
+ <fontDefinition
+ categoryId="org.jboss.tools.forge.ui"
+ defaultsTo="org.eclipse.debug.ui.consoleFont"
+ id="org.jboss.tools.forge.console.font"
+ label="Forge Console Font">
+ </fontDefinition>
+ <themeElementCategory
+ id="org.jboss.tools.forge.ui"
+ label="Forge ">
+ </themeElementCategory>
+ </extension>
</plugin>
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-07-12 12:32:10 UTC (rev 42537)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-07-12 13:36:36 UTC (rev 42538)
@@ -4,6 +4,8 @@
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.TextViewer;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ST;
import org.eclipse.swt.custom.StyleRange;
@@ -28,6 +30,8 @@
private static String NEXT_HISTORY = new Character((char)14).toString();
private static String DELETE_NEXT_CHAR = new Character((char)127).toString();
+ private static final String FORGE_CONSOLE_FONT = "org.jboss.tools.forge.console.font";
+
private class DocumentListener implements IDocumentListener, ForgeDocument.CursorListener {
@Override
public void documentAboutToBeChanged(DocumentEvent event) {
@@ -63,7 +67,19 @@
private void initialize() {
initDocument();
initViewer();
+ initFontListener();
}
+
+ private void initFontListener() {
+ JFaceResources.getFontRegistry().addListener(new IPropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
+ if (FORGE_CONSOLE_FONT.equals(event.getProperty())) {
+ getTextWidget().setFont(JFaceResources.getFont(FORGE_CONSOLE_FONT));
+ }
+ }
+ });
+ }
private void initDocument() {
ForgeDocument.INSTANCE.addDocumentListener(documentListener);
@@ -73,7 +89,7 @@
private void initViewer() {
getTextWidget().setStyleRanges(ForgeDocument.INSTANCE.getStyleRanges());
- getTextWidget().setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
+ getTextWidget().setFont(JFaceResources.getFont(FORGE_CONSOLE_FONT));
getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
@Override
public void verifyKey(VerifyEvent event) {
13 years, 9 months