JBoss Tools SVN: r38103 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-01-24 10:41:37 -0500 (Tue, 24 Jan 2012)
New Revision: 38103
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
Log:
remove swt patch features/plugins; instead, add the site to the pom for building the JBDS product site since we can't have BOTH 3.6.2.broken and 3.6.2.patched on same TP
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:41:26 UTC (rev 38102)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:41:37 UTC (rev 38103)
@@ -27,12 +27,12 @@
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
+ <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201005080502"/>
- <unit id="org.apache.commons.io" version="2.0.1.v201101200200"/>
+ <unit id="org.apache.commons.io" version="1.4.0.v20081110-1000"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
@@ -40,27 +40,27 @@
<unit id="org.hamcrest.integration" version="1.1.0.v20090501071000"/>
<!-- CVS -->
- <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKv99HL0GvIAF99I8H14B7E"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
<!-- DTP 1.8.2 -->
<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.8.2.v201010181125-7I977XFE9JfheEiJQF88iIv2_vUh"/>
- <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.2.v201010181125-7P9j7eFEPPYjqNWgPz-1SsWN7dZo"/>
+ <unit id="org.eclipse.datatools.sdk.feature.feature.group" version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT"/>
<unit id="org.eclipse.datatools.modelbase.feature.feature.group" version="1.8.2.v201010181125-77078CcNBGKBZI_FcRd"/>
- <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.2.v201010181125-7C7b8mEt1Zwkn9kfkUHHsoP_3to"/>
+ <unit id="org.eclipse.datatools.connectivity.feature.feature.group" version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6"/>
<unit id="org.eclipse.datatools.connectivity.oda.feature.feature.group" version="1.8.2.v201010181125-7H7C7CCcNBHEDPHcETPO"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.8.2.v201010181125-4107w3121151A1A53"/>
- <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.8.2.v201010181125-7B7C7ACcNBGLEOIeD_SO"/>
- <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.2.v201010181125-7J8x7UBWwUN6z02z-fiI_w4x4uLf"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group" version="1.8.1.v20100618-4107w3121151A1A53"/>
+ <unit id="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group" version="1.8.1.v20100618-7B7C79CcNBGKBgIZCSNS"/>
+ <unit id="org.eclipse.datatools.enablement.feature.feature.group" version="1.8.1.v20100618-7J8x7FBWwUL6z-2z-fcrYC2s55KI"/>
<unit id="org.eclipse.datatools.enablement.apache.derby.feature.feature.group" version="1.8.2.v201010181125-77778fBmKDNOMgJvJ8Of7QBR"/>
- <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.8.2.v201010181125-67C2AqGBJVKbHlH1GU7QBR"/>
- <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.8.2.v201010181125-7F47SFC7sRbrSZope9vW"/>
+ <unit id="org.eclipse.datatools.enablement.hsqldb.feature.feature.group" version="1.8.1.v20100618-67C1AqGBJVKbHlH1GU7QBR"/>
+ <unit id="org.eclipse.datatools.enablement.ibm.feature.feature.group" version="1.8.1.v20100618-7F47SFC7sRbrSZope9vW"/>
<unit id="org.eclipse.datatools.enablement.jdbc.feature.feature.group" version="1.8.2.v201010181125-4-29oB56N5N7L6PAQ"/>
<unit id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="1.8.2.v201010181125-2-07w31211518181A"/>
- <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.8.2.v201010181125-542AkF79P7QCP9SDB"/>
- <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.8.2.v201010181125-546AkF78Y7R9PAX77"/>
+ <unit id="org.eclipse.datatools.enablement.msft.feature.feature.group" version="1.8.1.v20100618-542AkF79P7QCP9SDB"/>
+ <unit id="org.eclipse.datatools.enablement.mysql.feature.feature.group" version="1.8.1.v20100618-546AkF78Y7R9PAX77"/>
<unit id="org.eclipse.datatools.enablement.oda.feature.feature.group" version="1.8.2.v201010181125-7A7T78DZRDKDFbGwFjNK"/>
<unit id="org.eclipse.datatools.enablement.oda.designer.feature.feature.group" version="1.8.2.v201010181125-3328s735357795A78"/>
- <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.8.2.v201010181125-548dAkF79Q7RAN9UEE"/>
+ <unit id="org.eclipse.datatools.enablement.oracle.feature.feature.group" version="1.8.1.v20100618-548cAkF79P7UBMATEE"/>
<unit id="org.eclipse.datatools.enablement.postgresql.feature.feature.group" version="1.8.2.v201010181125-542AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sap.feature.feature.group" version="1.8.2.v201010181125-540AkF77g7V9N9e77"/>
<unit id="org.eclipse.datatools.enablement.sybase.feature.feature.group" version="1.8.2.v201010181125-7E45F9NiNZVR6a1PMVn"/>
@@ -68,19 +68,19 @@
<unit id="org.eclipse.datatools.enablement.sqlite.feature.feature.group" version="1.8.2.v201010181125-541AkF79P7N8NAQ77"/>
<unit id="org.eclipse.datatools.sqldevtools.feature.feature.group" version="1.8.2.v201010181125-7N7y7JFDrhqbGIFUNhcFodMMD2J0"/>
- <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.8.2.v201010181125-4219oB57E6G9F7KDB"/>
+ <unit id="org.eclipse.datatools.sqldevtools.results.feature.feature.group" version="1.8.1.v20100618-4209oB57E5N8H9ICE"/>
<unit id="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group" version="1.8.2.v201010181125-7A-3F7RZHLz-Hz-OlPz0Qf"/>
<unit id="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group" version="1.8.2.v201010181125-277178B04G8S_IMz00Iz00PmQz01"/>
<unit id="org.eclipse.datatools.sqldevtools.data.feature.feature.group" version="1.8.2.v201010181125-641BgJ9DJ9VGTCaHL"/>
- <unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.8.2.v201010181125-622BgJ9CR9XFcEWLP"/>
- <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.8.2.v201010181125-79-4EVVFJoFwKcN-L_"/>
+ <unit id="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group" version="1.8.1.v20100618-622BgJ9CR9XFcEWLP"/>
+ <unit id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group" version="1.8.1.v20100618-79-3EVVFJoFsJcMz0Pe"/>
<unit id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group" version="1.8.2.v201010181125-4208375LG5BJ93413"/>
- <unit id="org.eclipse.datatools.intro.feature.group" version="1.8.2.v201010181125-26-7w312116392911"/>
+ <unit id="org.eclipse.datatools.intro.feature.group" version="1.8.1.v20100618-26-7w312116392911"/>
<unit id="org.eclipse.datatools.doc.user.feature.group" version="1.8.2.v201010181125-47C08w95ENAK6AFDFK7"/>
- <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.8.2.v201010181125-26-311A16321A3557"/>
+ <unit id="org.eclipse.datatools.common.doc.user.feature.group" version="1.8.1.v20100618-26-311A16321A3557"/>
<unit id="org.eclipse.datatools.connectivity.doc.user.feature.group" version="1.8.2.v201010181125-37D-7733L3D753L7BBF"/>
- <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.8.2.v201010181125-37D-7733L3D753L7BBF"/>
+ <unit id="org.eclipse.datatools.sqltools.doc.user.feature.group" version="1.8.1.v20100618-37D-7733L3D753L7BBF"/>
<!-- XSD -->
<unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.6.0.v20100914-1218"/>
@@ -95,92 +95,96 @@
<!-- GEF 3.6.2 -->
<unit id="org.eclipse.draw2d.feature.group" version="3.6.2.v20110128-0100-4517w3122123901211"/>
- <unit id="org.eclipse.gef.feature.group" version="3.6.2.v20110128-0100-777B381A4Bz06565376E32322"/>
- <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.6.1.v20100908-1100-777B181A3Bz-6B663E7974242"/>
+ <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67808yE5F-8HAH4HECF4242"/>
<!-- JDT 3.6.2 -->
<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
<!-- WTP 3.2.3 -->
- <unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.4.v201104192310-7778BkBgJ9EA9VGcDFBA"/>
- <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.4.v201104192310-7N7UF77FD3wTgcVbmmf0cT"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.4.v201104182301-7E7I7CF9JgLWPN-X2DIHK"/>
+ <unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.3.v201102072310-7778BkBgJ9EA9VGcDFBA"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
- <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.3.v201102071500-52FMUAkF7B87PAT8SA8"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.4.v201104201417-7b7HHfYFSK2WDvSHB0pTyNZ7TpYo"/>
- <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.3.10.v201104200444-62FSgBgJ9EA9YGdILLd"/>
+ <unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
+ <unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.2.100.v201007151547-62FR7BgJ9E99_EmEJFX"/>
<unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.102.v201104182301-208_7w31211A17"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.5.v20110729_1202-777HFGTCcNBDjBfIW4BA8"/>
- <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.3.v201104191412-208Z7w31211419"/>
- <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.4.v20110323-31FA38s73543B4E"/>
+ <unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
+ <unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.4.v20110323-7A5FEn9xFc7TCFKWBBINHK43A"/>
<unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.0.v201005241530-2-Eo7w3121162A3329"/>
<unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.2.5.v201106160200-7Q7BG7XFE9LeABBt3_bz0Jqpiwz018nIng5963"/>
<unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v201104182301-4619oB5865D8I2331"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.4.v201103231838-7F77FJcC25Tkfz-8pggwPyqQj55b71NDjuB2IcyF"/>
- <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.2.2.v201010211813-2107w31211938"/>
+ <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
+ <unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.2.1.v201009091720-2107w31211938"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
<unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.3.v201103270854-7H777FFAKlRiQX8jSbaqy878J"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
- <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.2.v201103270854-7E777DF8NcJSTJwUFS1_i"/>
+ <unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
<unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.2.v201008232129-3-28s73533I67767I"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.4.v201103101400-7B7DFEuF7RZHOaLjSqMqRK"/>
- <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.3.v201101121727-377AC8s73543C6H4A5H"/>
- <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.4.v201103101400-7C78FPmEdhO_oXYe4k_elbMkTrNrSL"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
+ <unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.5.v201109150410-7E79FICFBBoPbWQsbUQ1Vw"/>
- <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.1.v201104191422-51EoAkF77g8HBSc"/>
+ <unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.5.v20110729_1202-30F8_8s73553F4Ga264A"/>
- <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.4.v20110323-7B4FDgAtJcbuEKOlpFPMJIjBD33"/>
- <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.1.120.v201104182004-20DF7w312215222664"/>
+ <unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
+ <unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.1.10.v201005241510-20Bg7w3121162A3236"/>
<unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.5.v201106202200-7E7AFIFAJtn6XO60yNSJscPbXtKGSp"/>
- <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.4.v201103170600-7O7CFbbEMf84sL-GEz-v6KOf-MfOa4C140IylMHO"/>
+ <unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.2.0.v201005241510-31Eo8s734B3E4H7799"/>
<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.2.5.v201106290433-7L7RFf1FGtGd-ohvz07mHmf4852"/>
- <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.4.v201103170600-7I78FZLEtEoO4cC9yKz-eSNz0B07ngOrgut6FPKH"/>
+ <unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.200.v201007151546-44FO-9oB5855O8M9JHH"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.4.v201103231834-7C7OFXfF7RZHQLInN2MhWd"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.5.v201106160200-7H7AFUeDxumQJP58ph_R_6rz0oA8uNCN3V3QuPL"/>
- <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.2.101.v201102161624-50FXNAkF7B77RBgFFBF"/>
+ <unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.2.100.v201005241420-50FXNAkF7B77RBgFFBF"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
<!-- RCP 3.6.2 -->
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFa-FX0z-z-ntoaavz0JPX628"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
<unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LSlC_z0w1D"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
<unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFMKFkSAqi8axkv1ZjegmiBLY"/>
<!-- UML -->
- <unit id="org.eclipse.uml2.feature.group" version="3.1.2.v201010261927"/>
+ <unit id="org.eclipse.uml2.feature.group" version="3.1.1.v201008191505"/>
<unit id="org.eclipse.uml2.doc.feature.group" version="3.1.0.v201005281015"/>
<!-- PDE -->
- <unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"/>
<!-- TPTP 4.7 -->
<unit id="org.eclipse.tptp.platform.commons.logging.feature.group" version="4.5.0.v201005032111-2-37w312116191612"/>
- <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.2.v201101261720-8X8ZFXoFLWUl6wn5veAISx"/>
- <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.2.v201101261720-797918s735435695C83"/>
+ <unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/>
+ <unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s73533D4H6D56"/>
<unit id="org.eclipse.tptp.platform.jakarta.log4j.feature.group" version="4.5.0.v201005032111-217E7w312116191611"/>
<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.2.v201101261720-797A48s735536585A93"/>
- <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.2.v201101271120-7H7BF8QAkF7B87RBVCFFD"/>
- <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.2.v201101261720-7H7F4AkF7B88MAQCKJH"/>
- <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
+ <unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK"/>
+ <unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/>
+ <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
<!-- RSE 3.2 -->
- <unit id="org.eclipse.rse.feature.group" version="3.2.2.R32x_v201102130925-7L78FA58SreKCHr_JG7UA8bra19p"/>
+ <unit id="org.eclipse.rse.feature.group" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ"/>
<unit id="org.eclipse.rse.useractions.feature.group" version="1.1.200.v201005221100-31A78s733L3D7H7933"/>
<unit id="org.eclipse.tm.terminal.feature.group" version="3.0.202.R32x_v201102011435-4-8a7S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.2.R32x_v201102011435-3017S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
- <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... -->
- <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/>
- <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/>
+ <!-- DO NOT INCLUDE JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660..., as TP can't be resolved
+ INSTEAD, add http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... to sites used to build JBDS update site/installer
+ -->
+ <!-- <unit id="org.eclipse.rcp.patch.JBDS1648.x86.feature.feature.group" version="3.6.2.v3660-patched_JBDS-1648"/>
+ <unit id="org.eclipse.rcp.patch.JBDS1648.x86_64.feature.feature.group" version="3.6.2.v3660-patched_JBDS-1648"/> -->
+ <!-- <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/>
+ <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/> -->
</location>
</locations>
- </target>
+ </target>
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:41:26 UTC (rev 38102)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:41:37 UTC (rev 38103)
@@ -168,8 +168,6 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
-<iu id="org.eclipse.swt.win32.win32.x86" version=""/>
-<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/>
</p2.mirror>
</target>
</project>
12 years, 11 months
JBoss Tools SVN: r38102 - branches/jbosstools-3.2.x/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-01-24 10:41:26 -0500 (Tue, 24 Jan 2012)
New Revision: 38102
Modified:
branches/jbosstools-3.2.x/build/build.xml
Log:
maven 3.0.4 is released, update build script
Modified: branches/jbosstools-3.2.x/build/build.xml
===================================================================
--- branches/jbosstools-3.2.x/build/build.xml 2012-01-24 15:03:15 UTC (rev 38101)
+++ branches/jbosstools-3.2.x/build/build.xml 2012-01-24 15:41:26 UTC (rev 38102)
@@ -2,7 +2,7 @@
<!-- ****************************** Configuration ****************************** -->
<!-- default maven version -->
- <property name="maven.version" value="3.0.3" />
+ <property name="maven.version" value="3.0.4" />
<!-- set name of component(s) to build+test, IN ORDER; if no subcomponents, use "." -->
<property name="COMPONENTS"
12 years, 11 months
JBoss Tools SVN: r38101 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-01-24 10:03:15 -0500 (Tue, 24 Jan 2012)
New Revision: 38101
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
branches/jbosstools-3.2.x/build/target-platform/unified.target
branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
Log:
JBDS-1648 fix patched feature inclusions so that JBDS agg build can find the patched plugins on its TP; also, include plugins instead of features
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:03:15 UTC (rev 38101)
@@ -178,9 +178,9 @@
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
- <!-- JBDS-1648 SWT patches -->
- <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
+ <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... -->
+ <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/>
+ <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/>
</location>
</locations>
</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101)
@@ -168,6 +168,8 @@
<iu id="org.eclipse.tm.terminal.view.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.telnet.feature.group" version=""/>
<iu id="org.eclipse.tm.terminal.ssh.feature.group" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/>
</p2.mirror>
</target>
</project>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2012-01-24 15:03:15 UTC (rev 38101)
@@ -223,9 +223,9 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
- <!-- JBDS-1648 SWT patches -->
- <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
+ <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... -->
+ <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/>
+ <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/>
</location>
</locations>
<includeBundles>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101)
@@ -206,8 +206,8 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333360.feature.group" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2012-01-24 15:03:15 UTC (rev 38101)
@@ -223,9 +223,9 @@
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
- <!-- JBDS-1648 SWT patches -->
- <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
- <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
+ <!-- JBDS-1648 SWT patches from http://download.jboss.org/jbosstools/updates/requirements/swt/3.6.2.v3660... -->
+ <unit id="org.eclipse.swt.win32.win32.x86" version="3.6.2.v3660"/>
+ <unit id="org.eclipse.swt.win32.win32.x86_64" version="3.6.2.v3660"/>
</location>
</locations>
<includeBundles>
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2012-01-24 15:03:03 UTC (rev 38100)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target.p2mirror.xml 2012-01-24 15:03:15 UTC (rev 38101)
@@ -205,8 +205,8 @@
<iu id="org.eclipse.wst.xml_core.feature.feature.group" version=""/>
<iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version=""/>
<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch333630.feature.group" version=""/>
-<iu id="org.eclipse.rcp.patch64333630.feature.group" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86" version=""/>
+<iu id="org.eclipse.swt.win32.win32.x86_64" version=""/>
<iu id="org.drools.eclipse.feature.feature.group" version=""/>
<iu id="org.drools.eclipse.task.feature.feature.group" version=""/>
<iu id="org.guvnor.tools.feature.feature.group" version=""/>
12 years, 11 months
JBoss Tools SVN: r38100 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-01-24 10:03:03 -0500 (Tue, 24 Jan 2012)
New Revision: 38100
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
Log:
add SWT patches to JBDS TP (JBDS-1648) and bump up to same wsdl version from JBT
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 14:46:05 UTC (rev 38099)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2012-01-24 15:03:03 UTC (rev 38100)
@@ -27,7 +27,7 @@
<unit id="org.eclipse.net4j.jms.api" version="3.0.0.v20110215-1551"/>
<!-- Orbit bundles -->
- <unit id="javax.wsdl" version="1.5.1.v201005080630"/>
+ <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.jdom" version="1.0.0.v201005080400"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.3.0.v20100518-1140"/>
@@ -177,6 +177,10 @@
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.1.2.R32x_v201102011435-3017S43yaw312213122546"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.0.200.v201005032000-3-8_7w311A1A271116"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.0.200.v201005271030-3-A77w312116382141"/>
+
+ <!-- JBDS-1648 SWT patches -->
+ <unit id="org.eclipse.rcp.patch333630.feature.group" version="1.0.0"/>
+ <unit id="org.eclipse.rcp.patch64333360.feature.group" version="1.0.0"/>
</location>
</locations>
</target>
12 years, 11 months
JBoss Tools SVN: r38099 - in workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite: features and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-01-24 09:46:05 -0500 (Tue, 24 Jan 2012)
New Revision: 38099
Added:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.2.201201241535.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.2.201201241535.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.2.201201241535.jar
Removed:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.1.201201241100.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.1.201201241100.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.1.201201241100.jar
Modified:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
Log:
JBIDE-9309 Easily adding full JBoss AS source
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.1.201201241100.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.2.201201241535.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.2.201201241535.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.1.201201241100.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.2.201201241535.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.2.201201241535.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.1.201201241100.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.2.201201241535.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.2.201201241535.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml 2012-01-24 14:43:43 UTC (rev 38098)
+++ workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml 2012-01-24 14:46:05 UTC (rev 38099)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.as.sourcelookup.feature_1.0.1.201201241100.jar" id="org.jboss.tools.as.sourcelookup.feature" version="1.0.1.201201241100">
+ <feature url="features/org.jboss.tools.as.sourcelookup.feature_1.0.2.201201241535.jar" id="org.jboss.tools.as.sourcelookup.feature" version="1.0.2.201201241535">
<category name="org.jboss.tools.as.sourcelookup"/>
</feature>
<category-def name="org.jboss.tools.as.sourcelookup" label="JBoss Tools Source Lookup"/>
12 years, 11 months
JBoss Tools SVN: r38098 - in trunk/openshift: tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-01-24 09:43:43 -0500 (Tue, 24 Jan 2012)
New Revision: 38098
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestUtils.java
Log:
[JBIDE-10624] implemented push force and test
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-01-24 14:41:46 UTC (rev 38097)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-01-24 14:43:43 UTC (rev 38098)
@@ -61,6 +61,7 @@
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteConfig;
+import org.eclipse.jgit.transport.RemoteRefUpdate;
import org.eclipse.jgit.transport.Transport;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
@@ -417,47 +418,43 @@
private static PushOperation createPushOperation(RemoteConfig remoteConfig, Repository repository, boolean force)
throws CoreException {
- PushOperationSpecification spec = new PushOperationSpecification();
- List<URIish> pushToUris = getPushURIs(remoteConfig);
- List<RefSpec> pushRefSpecs = getPushRefSpecs(remoteConfig);
- addURIRefToPushSpecification(pushToUris, pushRefSpecs, repository, spec);
-
- // return new PushOperation(repository, spec, false, PUSH_TIMEOUT);
- // TODO: fix pushoperation to really use the spec (currently seems like
- // it does not work so we push everything to the remote)
-
- // TODO ensure the 'force' is respected
- return new PushOperation(repository, remoteConfig.getName(), false, PUSH_TIMEOUT);
+ Collection<URIish> pushURIs = getPushURIs(remoteConfig);
+ Collection<RefSpec> pushRefSpecs = createForceRefSpecs(force, getPushRefSpecs(remoteConfig));
+ PushOperationSpecification pushSpec = createPushSpec(pushURIs, pushRefSpecs, repository);
+ return new PushOperation(repository, pushSpec, false, PUSH_TIMEOUT);
}
/**
- * Adds the given push uris to the given push operation specification.
+ * Creates a push operation specification for the given push uris to the
+ * given push operation specification.
*
- * @param urisToPush
- * the uris to push
+ * @param pushURIs
+ * the push uri's
* @param pushRefSpecs
* the push ref specs
* @param repository
* the repository
- * @param spec
- * the spec
+ * @return the push operation specification
* @throws CoreException
* the core exception
*/
- private static void addURIRefToPushSpecification(List<URIish> urisToPush, List<RefSpec> pushRefSpecs,
- Repository repository, PushOperationSpecification spec) throws CoreException {
- for (URIish uri : urisToPush) {
- try {
- spec.addURIRefUpdates(uri,
- Transport.open(repository, uri).findRemoteRefUpdatesFor(pushRefSpecs));
- } catch (NotSupportedException e) {
- throw new CoreException(createStatus(e, "Could not connect repository \"{0}\" to a remote",
- repository.toString()));
- } catch (IOException e) {
- throw new CoreException(createStatus(e,
- "Could not convert remote specifications for repository \"{0}\" to a remote",
- repository.toString()));
+ private static PushOperationSpecification createPushSpec(Collection<URIish> pushURIs, Collection<RefSpec> pushRefSpecs,
+ Repository repository) throws CoreException {
+ try {
+ PushOperationSpecification pushSpec = new PushOperationSpecification();
+ for (URIish uri : pushURIs) {
+ Collection<RemoteRefUpdate> remoteRefUpdates =
+ Transport.open(repository, uri).findRemoteRefUpdatesFor(pushRefSpecs);
+ pushSpec.addURIRefUpdates(uri, remoteRefUpdates);
}
+ return pushSpec;
+ } catch (NotSupportedException e) {
+ throw new CoreException(createStatus(e, "Could not connect repository \"{0}\" to a remote",
+ repository.toString()));
+ } catch (IOException e) {
+ throw new CoreException(createStatus(e,
+ "Could not convert remote specifications for repository \"{0}\" to a remote",
+ repository.toString()));
}
}
@@ -468,21 +465,26 @@
* the remote config
* @return the push ur is
*/
- private static List<URIish> getPushURIs(RemoteConfig remoteConfig) {
- List<URIish> urisToPush = new ArrayList<URIish>();
- for (URIish uri : remoteConfig.getPushURIs())
- urisToPush.add(uri);
- if (urisToPush.isEmpty() && !remoteConfig.getURIs().isEmpty())
- urisToPush.add(remoteConfig.getURIs().get(0));
- return urisToPush;
+ private static Collection<URIish> getPushURIs(RemoteConfig remoteConfig) {
+ List<URIish> pushURIs = new ArrayList<URIish>();
+ for (URIish uri : remoteConfig.getPushURIs()) {
+ pushURIs.add(uri);
+ }
+ if (pushURIs.isEmpty()
+ && !remoteConfig.getURIs().isEmpty()) {
+ pushURIs.add(remoteConfig.getURIs().get(0));
+ }
+ return pushURIs;
}
/**
- * Gets the push RefSpecs from the given remote configuration.
+ * Gets the push RefSpecs from the given remote configuration. If none is
+ * defined, a default refspec is returned with
+ * {@link #DEFAULT_REFSPEC_SOURCE} and {@link #DEFAULT_REFSPEC_DESTINATION}.
*
* @param config
- * the config
- * @return the push ref specs
+ * the remote config to get the push specs from
+ * @return the push specs to use for the given remote configuration.
*/
private static List<RefSpec> getPushRefSpecs(RemoteConfig config) {
List<RefSpec> pushRefSpecs = new ArrayList<RefSpec>();
@@ -497,6 +499,14 @@
return pushRefSpecs;
}
+ private static Collection<RefSpec> createForceRefSpecs(boolean forceUpdate, Collection<RefSpec> refSpecs) {
+ List<RefSpec> newRefSpecs = new ArrayList<RefSpec>();
+ for (RefSpec refSpec : refSpecs) {
+ newRefSpecs.add(refSpec.setForceUpdate(forceUpdate));
+ }
+ return newRefSpecs;
+ }
+
/**
* Gets the repository that is configured to the given project.
*
@@ -719,10 +729,11 @@
* Returns <code>true</code> if the given repository has uncommitted
* changes.
*
- * @param repository the repository to check for uncommitted changes
+ * @param repository
+ * the repository to check for uncommitted changes
* @return
- * @throws IOException
- * @throws NoWorkTreeException
+ * @throws IOException
+ * @throws NoWorkTreeException
*/
public static boolean isDirty(Repository repository) throws NoWorkTreeException, IOException {
boolean hasChanges = false;
Modified: trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-01-24 14:41:46 UTC (rev 38097)
+++ trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-01-24 14:43:43 UTC (rev 38098)
@@ -13,6 +13,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.op.PushOperationResult;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
@@ -22,6 +23,7 @@
import org.jboss.tools.openshift.egit.internal.test.util.TestUtils;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
public class EGitUtilsTest {
@@ -56,7 +58,7 @@
testRepository2.connect(testProject2.getProject());
this.testRepositoryClone = cloneRepository(testRepository);
- testRepositoryClone.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository());
+// testRepositoryClone.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository());
}
private TestRepository cloneRepository(TestRepository repository) throws URISyntaxException,
@@ -117,13 +119,13 @@
public void fileAddedToCloneIsInRemoteAfterPush() throws Exception {
String fileName = "c.txt";
String fileContent = "adietish(a)redhat.com";
-
File file = testRepositoryClone.createFile(fileName, fileContent);
testRepositoryClone.addAndCommit(file, "adding a file");
+ testRepositoryClone.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository());
EGitUtils.push(REPO2_REMOTE_NAME, testRepositoryClone.getRepository(), null);
- // does origin contain file added to clone?
+ // repo2 must contain file added to clone
testUtils.assertRepositoryContainsFilesWithContent(
testRepository2.getRepository(),
fileName,
@@ -132,27 +134,54 @@
@Test
public void forcedPushRemovesFileInRemote() throws Exception {
- String fileName = "c.txt";
+ String fileName = "a.txt";
String fileContent = "adietish(a)redhat.com";
+ File file = testRepository.createFile(fileName, fileContent);
+ testRepository.addAndCommit(file, "adding a file");
- IFile fileInRepo2 = testUtils.addFileToProject(
- testProject2.getProject(),
+ File file2 = testRepository2.createFile("b.txt", "bingobongo");
+ testRepository2.addAndCommit(file2, "adding a file");
+
+ testRepository.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository());
+ EGitUtils.pushForce(REPO2_REMOTE_NAME, testRepository.getRepository(), null);
+
+ // repo2 mustn't contain "b.txt"
+ testUtils.assertRepositoryMisses(
+ testRepository2.getRepository(),
+ file2.getName());
+ // repo2 must contain "a.txt"
+ testUtils.assertRepositoryContainsFilesWithContent(
+ testRepository2.getRepository(),
fileName,
fileContent);
- testRepository2.add(fileInRepo2);
+ }
+
- File fileInClone = testRepositoryClone.createFile(fileName, fileContent);
- testRepositoryClone.addAndCommit(fileInClone, "adding a file");
+ @Ignore
+ @Test
+ public void pushFailsOnNonFastForward() throws Exception {
+ String fileName = "a.txt";
+ String fileContent = "adietish(a)redhat.com";
+ File file = testRepository.createFile(fileName, fileContent);
+ testRepository.addAndCommit(file, "adding a file");
- EGitUtils.push(REPO2_REMOTE_NAME, testRepositoryClone.getRepository(), null);
+ File file2 = testRepository2.createFile("b.txt", "bingobongo");
+ testRepository2.addAndCommit(file2, "adding a file");
+
+ testRepository.addRemoteTo(REPO2_REMOTE_NAME, testRepository2.getRepository());
+ PushOperationResult result = EGitUtils.push(REPO2_REMOTE_NAME, testRepository.getRepository(), null);
- // does origin contain file added to clone?
+ // repo2 mustn't contain "b.txt"
+ testUtils.assertRepositoryMisses(
+ testRepository2.getRepository(),
+ file2.getName());
+ // repo2 must contain "a.txt"
testUtils.assertRepositoryContainsFilesWithContent(
- testRepositoryClone.getRepository(),
+ testRepository2.getRepository(),
fileName,
fileContent);
}
-
+
@Test
public void canGetRepoForProject() throws Exception {
Repository repository = EGitUtils.getRepository(testProject.getProject());
Modified: trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestUtils.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestUtils.java 2012-01-24 14:41:46 UTC (rev 38097)
+++ trunk/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestUtils.java 2012-01-24 14:43:43 UTC (rev 38098)
@@ -17,9 +17,12 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -46,7 +49,7 @@
/**
* Create a "temporary" directory
- *
+ *
* @param name
* the name of the directory
* @return a directory as child of a "temporary" folder in the user home
@@ -68,7 +71,7 @@
/**
* Cleanup: delete the "temporary" folder and all children
- *
+ *
* @throws IOException
*/
public void deleteTempDirs() throws IOException {
@@ -80,7 +83,7 @@
/**
* Read the stream into a String
- *
+ *
* @param inputStream
* @return the contents of the stream
* @throws IOException
@@ -100,7 +103,7 @@
/**
* Add a file to an existing project
- *
+ *
* @param project
* the project
* @param path
@@ -132,7 +135,7 @@
/**
* Change the content of a file
- *
+ *
* @param project
* @param file
* @param newContent
@@ -148,7 +151,7 @@
/**
* Create a project in the local file system
- *
+ *
* @param parentFile
* the parent
* @param projectName
@@ -177,43 +180,113 @@
/**
* verifies that repository contains exactly the given files.
+ *
* @param repository
* @param paths
* @throws Exception
*/
- public void assertRepositoryContainsFiles(Repository repository,
- String[] paths) throws Exception {
- Set<String> expectedfiles = new HashSet<String>();
- for (String path : paths)
- expectedfiles.add(path);
+ public void assertRepositoryExactlyContains(Repository repository, String... paths) throws Exception {
+ RepoDiff repoDiff = createRepoDiff(repository, paths);
+ if (repoDiff.hasUnexpected()) {
+ fail(repoDiff.getUnexpectedFiles());
+ }
+ if (repoDiff.hasMissing()) {
+ fail(repoDiff.getUnexpectedFiles());
+ }
+ }
+
+ public void assertRepositoryMisses(Repository repository, String... paths) throws Exception {
+ RepoDiff repoDiff = createRepoDiff(repository, paths);
+ for (String missingPath : paths) {
+ assertTrue(repoDiff.getMissing().contains(missingPath));
+ }
+ }
+
+ /**
+ * verifies that repository contains exactly the given files.
+ *
+ * @param repository
+ * @param paths
+ * @throws Exception
+ */
+ private RepoDiff createRepoDiff(Repository repository, String... expectedPaths) throws Exception {
+ RepoDiff repoDiff = new RepoDiff();
+ Set<String> expectedFiles = new HashSet<String>(Arrays.asList(expectedPaths));
+
TreeWalk treeWalk = new TreeWalk(repository);
treeWalk.addTree(repository.resolve("HEAD^{tree}"));
treeWalk.setRecursive(true);
+
while (treeWalk.next()) {
String path = treeWalk.getPathString();
- if (!expectedfiles.contains(path))
- fail("Repository contains unexpected expected file " + path);
- expectedfiles.remove(path);
+ if (!expectedFiles.contains(path)) {
+ repoDiff.addUnexpected(path);
+ }
+ expectedFiles.remove(path);
}
- if (expectedfiles.size() > 0) {
- StringBuilder message = new StringBuilder(
- "Repository does not contain expected files: ");
- for (String path : expectedfiles) {
- message.append(path);
- message.append(" ");
+ repoDiff.addAllMissing(expectedFiles);
+ return repoDiff;
+ }
+
+ public class RepoDiff {
+
+ private List<String> unexpected = new ArrayList<String>();
+ private List<String> missing = new ArrayList<String>();
+
+ public void addMissing(String path) {
+ missing.add(path);
+ }
+
+ public void addAllMissing(Collection<String> paths) {
+ missing.addAll(paths);
+ }
+
+ public List<String> getMissing() {
+ return missing;
+ }
+
+ public boolean hasMissing() {
+ return !missing.isEmpty();
+ }
+
+ public String getMissingFiles() {
+ StringBuilder builder = new StringBuilder("Repository is nissing files: ");
+ for (String missingPath : getMissing()) {
+ builder.append(missingPath).append(',');
}
- fail(message.toString());
+ return builder.toString();
}
+
+ public void addUnexpected(String path) {
+ unexpected.add(path);
+ }
+
+ public List<String> getUnexpected() {
+ return unexpected;
+ }
+
+ public boolean hasUnexpected() {
+ return !unexpected.isEmpty();
+ }
+
+ public String getUnexpectedFiles() {
+ StringBuilder builder = new StringBuilder("Repository contains unexpected expected files: ");
+ for (String unexpectedPath : getUnexpected()) {
+ builder.append(unexpectedPath).append(',');
+ }
+ return builder.toString();
+ }
}
/**
* verifies that repository contains exactly the given files with the given
* content. Usage example:<br>
- *
+ *
* <code>
* assertRepositoryContainsFiles(repository, "foo/a.txt", "content of A",
* "foo/b.txt", "content of B")
* </code>
+ *
* @param repository
* @param args
* @throws Exception
@@ -255,11 +328,11 @@
throw new IllegalArgumentException("needs to be pairs");
HashMap<String, String> map = new HashMap<String, String>();
for (int i = 0; i < args.length; i += 2) {
- map.put(args[i], args[i+1]);
+ map.put(args[i], args[i + 1]);
}
return map;
}
-
+
public String getPathInRepository(IResource resource) {
RepositoryMapping mapping = RepositoryMapping.getMapping(resource);
if (mapping == null) {
12 years, 11 months
JBoss Tools SVN: r38097 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace: config_files and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:41:46 -0500 (Tue, 24 Jan 2012)
New Revision: 38097
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch
Log:
Template configuration moved from launchers to resources
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties 2012-01-24 14:41:26 UTC (rev 38096)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties 2012-01-24 14:41:46 UTC (rev 38097)
@@ -1,3 +0,0 @@
-SERVER=EPP,4.3,default,${JBOSS_EPP_4_3}/jboss-as
-SEAM=2.0,${JBOSS_EPP_4_3}/seam2
-DB=hsqldb18,internal, , , , ,
\ No newline at end of file
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties 2012-01-24 14:41:26 UTC (rev 38096)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties 2012-01-24 14:41:46 UTC (rev 38097)
@@ -1,3 +0,0 @@
-SERVER=EPP,5.1.1,default,${JBOSS_EPP_5_1}/jboss-as
-SEAM=2.2,${JBOSS_EPP_5_1}/seam
-DB=hsqldb18,internal, , , , ,
\ No newline at end of file
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-01-24 14:41:26 UTC (rev 38096)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-01-24 14:41:46 UTC (rev 38097)
@@ -9,9 +9,13 @@
<build>
<resources>
<resource>
- <directory>./config_files</directory>
+ <directory>../../resources/product_config_files</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>../../resources/project_config_files</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
<outputDirectory>../../resources/generated_config_files</outputDirectory>
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch 2012-01-24 14:41:26 UTC (rev 38096)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch 2012-01-24 14:41:46 UTC (rev 38097)
@@ -6,8 +6,10 @@
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
-<listEntry value="JBOSS_EPP_4_3=${folder_prompt:EPP 4.3 installation directory}"/>
-<listEntry value="JBOSS_EPP_5_1=${folder_prompt:EPP 5.1 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-epp-4.3.home=${folder_prompt:EPP 4.3 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-epp-5.1.home=${folder_prompt:EPP 5.1 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-gatein.home=${folder_prompt:GateIn 3.1.0 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-seam.home=${folder_prompt:Seam 2.2 installation directory}"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
12 years, 11 months
JBoss Tools SVN: r38096 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test: resources and 10 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:41:26 -0500 (Tue, 24 Jan 2012)
New Revision: 38096
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/JBDSCompatibilityTestSuite.launch
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
Log:
JBDS compatibility test
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/JBDSCompatibilityTestSuite.launch
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/JBDSCompatibilityTestSuite.launch (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/JBDSCompatibilityTestSuite.launch 2012-01-24 14:41:26 UTC (rev 38096)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.portlet.ui.bot.test.compatibility.JBDSCompatibilityTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.portlet.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.tools.portlet.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-01-24 14:40:32 UTC (rev 38095)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-01-24 14:41:26 UTC (rev 38096)
@@ -9,6 +9,7 @@
import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExampleRuntime4x;
import org.jboss.tools.portlet.ui.bot.test.example.RichFacesPortletExampleRuntime5x;
import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleRuntime4x;
+import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleRuntime5x;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime4x;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime5x;
@@ -24,6 +25,7 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
+ GateinStartupFix.class,
CreateJavaPortletProject.class,
CreateJavaPortlet.class,
RunJavaPortletOnServer.class,
@@ -41,7 +43,8 @@
JSFPortletExampleRuntime4x.class,
SeamPortletExampleRuntime4x.class,
JSFPortletExampleRuntime5x.class,
- RichFacesPortletExampleRuntime5x.class
+ RichFacesPortletExampleRuntime5x.class,
+ SeamPortletExampleRuntime5x.class
})
public class AllTestsSuite {
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5Compatibility.java 2012-01-24 14:41:26 UTC (rev 38096)
@@ -0,0 +1,64 @@
+package org.jboss.tools.portlet.ui.bot.test.compatibility;
+
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
+
+import org.jboss.tools.portlet.ui.bot.task.importing.project.ExistingProjectImportTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.importing.project.ExistingProjectWizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.Activator;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.junit.Test;
+
+/**
+ * Tests that project from JBDS 4 can work in JBDS 5 without any problems.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=@Server(version="5.0", operator=">", state=ServerState.Present), db=@DB, seam=@Seam)
+public class JBDS4vs5Compatibility extends SWTTaskBasedTestCase {
+
+ private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip";
+
+ private static final String CORE_PROJECT_NAME = "jbds-4-core";
+
+ private static final String JSF_PROJECT_NAME = "jbds-4-jsf";
+
+ private static final String SEAM_PROJECT_NAME = "jbds-4-seam";
+
+ @Test
+ public void testCompatibility(){
+ doPerform(new ExistingProjectImportTask());
+ doPerform(getWizardFillingTask());
+
+ doAssertThatInWorkspace(CORE_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(JSF_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(SEAM_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(0, isNumberOfErrors());
+ }
+
+ private WizardFillingTask getWizardFillingTask(){
+ WizardFillingTask wizard = new WizardFillingTask();
+ wizard.addWizardPage(getWizardPage());
+ return wizard;
+ }
+
+ private ExistingProjectWizardPageFillingTask getWizardPage(){
+ ExistingProjectWizardPageFillingTask task = new ExistingProjectWizardPageFillingTask();
+ task.setZipFilePath(getZIPFileLocation());
+ task.setProjectNames(CORE_PROJECT_NAME, JSF_PROJECT_NAME, SEAM_PROJECT_NAME);
+ task.setCopyProjectsIntoWorkspace(true);
+ return task;
+ }
+
+ private String getZIPFileLocation(){
+ return SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, ZIP_FILE);
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java 2012-01-24 14:41:26 UTC (rev 38096)
@@ -0,0 +1,13 @@
+package org.jboss.tools.portlet.ui.bot.test.compatibility;
+
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ JBDS4vs5Compatibility.class,
+})
+public class JBDSCompatibilityTestSuite {
+
+}
12 years, 11 months
JBoss Tools SVN: r38095 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task: importing and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:40:32 -0500 (Tue, 24 Jan 2012)
New Revision: 38095
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/project/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/project/ExistingProjectImportTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/project/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/project/ExistingProjectWizardPageFillingTask.java
Log:
Created task for import
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java 2012-01-24 14:40:32 UTC (rev 38095)
@@ -0,0 +1,54 @@
+package org.jboss.tools.portlet.ui.bot.task.importing;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.gen.IImport;
+
+/**
+ * Imports the specified object under the specified category.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ImportingTask extends AbstractSWTTask {
+
+ private String category;
+
+ private String name;
+
+ public ImportingTask(String name) {
+ super();
+ this.name = name;
+ }
+
+ public ImportingTask(String category, String name) {
+ super();
+ this.category = category;
+ this.name = name;
+ }
+
+ @Override
+ public void perform() {
+ IImport importPath = new IImport() {
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public List<String> getGroupPath() {
+ if (category == null){
+ return Collections.emptyList();
+ }
+
+ return Arrays.asList(category.split("/"));
+ }
+ };
+ SWTBotFactory.getOpen().newImport(importPath);
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/project/ExistingProjectImportTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/project/ExistingProjectImportTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/project/ExistingProjectImportTask.java 2012-01-24 14:40:32 UTC (rev 38095)
@@ -0,0 +1,17 @@
+package org.jboss.tools.portlet.ui.bot.task.importing.project;
+
+import org.jboss.tools.portlet.ui.bot.task.importing.ImportingTask;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+
+/**
+ * Loads dialog for importing existing project into the workspace.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ExistingProjectImportTask extends ImportingTask {
+
+ public ExistingProjectImportTask() {
+ super(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName());
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/project/ExistingProjectWizardPageFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/project/ExistingProjectWizardPageFillingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/importing/project/ExistingProjectWizardPageFillingTask.java 2012-01-24 14:40:32 UTC (rev 38095)
@@ -0,0 +1,112 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard.importing.project;
+
+import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
+
+/**
+ * Fills the wizard page for importing existing projects into workspace.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ExistingProjectWizardPageFillingTask extends AbstractSWTTask implements WizardPageFillingTask {
+
+ private String[] projectNames;
+
+ private String projectPath;
+
+ private String zipFilePath;
+
+ private boolean copyProjectsIntoWorkspace;
+
+ public ExistingProjectWizardPageFillingTask() {
+ super();
+ }
+
+ @Override
+ public void perform() {
+ loadProjects();
+ selectProjects();
+ }
+
+ private void loadProjects() {
+ if (projectPath != null && zipFilePath != null){
+ throw new IllegalArgumentException("You have to choose between folder and ZIP path");
+ }
+
+ if (projectPath != null){
+ loadProjectsFromFolder();
+ return;
+ }
+
+ if (zipFilePath != null){
+ loadProjectsFromZIP();
+ return;
+ }
+
+ throw new IllegalArgumentException("You have to provide either folder or ZIP path");
+ }
+
+ private void loadProjectsFromFolder() {
+ getBot().text(0).setText(projectPath);
+ KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ }
+
+ private void loadProjectsFromZIP() {
+ getBot().radio("Select archive file:").click();
+ getBot().text(1).setText(zipFilePath);
+ KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ }
+
+ private void selectProjects() {
+ selectCopyProjectsIntoWorkspace();
+ getBot().button("Deselect All").click();
+ SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
+ for (String projectName : projectNames){
+ SWTBotTreeItem projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
+ projectItem.check();
+ }
+ }
+
+ private void selectCopyProjectsIntoWorkspace() {
+ if (isFileSystem()){
+ if (copyProjectsIntoWorkspace){
+ getBot().checkBox("Copy projects into workspace").select();
+ } else {
+ getBot().checkBox("Copy projects into workspace").deselect();
+ }
+ }
+ }
+
+ private String getProjectLabel(String project){
+ if (isFileSystem()){
+ return project + " (" + projectPath + "/" + project + ")";
+ } else {
+ return project + " (" + project + ")";
+ }
+ }
+
+ private boolean isFileSystem(){
+ return projectPath != null;
+ }
+
+ public void setProjectNames(String... projectNames) {
+ this.projectNames = projectNames;
+ }
+
+ public void setProjectPath(String projectPath) {
+ this.projectPath = projectPath;
+ }
+
+ public void setZipFilePath(String zipFilePath) {
+ this.zipFilePath = zipFilePath;
+ }
+
+ public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) {
+ this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace;
+ }
+}
12 years, 11 months