JBoss Tools SVN: r29334 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2011-02-25 05:13:11 -0500 (Fri, 25 Feb 2011)
New Revision: 29334
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-7003, junit for checking marker line has been added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java 2011-02-25 08:31:40 UTC (rev 29333)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/I18nValidatorTest.java 2011-02-25 10:13:11 UTC (rev 29334)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.jsf.test.validation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -84,15 +88,24 @@
assertEquals("Marker Severity should be warning",(Integer)IMarker.SEVERITY_ERROR, (Integer)elMarkers[0].getAttribute(IMarker.SEVERITY));//$NON-NLS-1$
}
-// public void testRegionLineIsCorrect() throws CoreException{
-// store.setValue(ELSeverityPreferences.NON_EXTERNALIZED_STRINGS, ELSeverityPreferences.WARNING);
-// ValidationFramework.getDefault().validate(testFile, new NullProgressMonitor());
-// IMarker[] elMarkers = testFile.findMarkers(I18nValidationComponent.PROBLEM_ID, true, IResource.DEPTH_ZERO);
-// assertEquals("There shouldn't be "+NUMBER_OF_EXT_PROBLEMS_IN_FILE+" validation markers", NUMBER_OF_EXT_PROBLEMS_IN_FILE,elMarkers.length); //$NON-NLS-1$ //$NON-NLS-2$
-// assertEquals("Marker Severity should be warning",(Integer)IMarker.SEVERITY_WARNING, (Integer)elMarkers[0].getAttribute(IMarker.SEVERITY));//$NON-NLS-1$
-//
-// assertEquals("Line number should be",8,elMarkers[0].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
-// assertEquals("Line number should be",10,elMarkers[1].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
-// assertEquals("Line number should be",12,elMarkers[2].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
-// }
+ public void testRegionLineIsCorrect() throws CoreException{
+ store.setValue(ELSeverityPreferences.NON_EXTERNALIZED_STRINGS, ELSeverityPreferences.WARNING);
+ ValidationFramework.getDefault().validate(testFile, new NullProgressMonitor());
+ IMarker[] elMarkers = testFile.findMarkers(I18nValidationComponent.PROBLEM_ID, true, IResource.DEPTH_ZERO);
+ assertEquals("There shouldn't be "+NUMBER_OF_EXT_PROBLEMS_IN_FILE+" validation markers", NUMBER_OF_EXT_PROBLEMS_IN_FILE,elMarkers.length); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Marker Severity should be warning",(Integer)IMarker.SEVERITY_WARNING, (Integer)elMarkers[0].getAttribute(IMarker.SEVERITY));//$NON-NLS-1$
+ Arrays.sort(elMarkers,new Comparator<IMarker>() {
+ public int compare(IMarker o1, IMarker o2) {
+ try {
+ return (Integer)o1.getAttribute(IMarker.LINE_NUMBER)-(Integer)o2.getAttribute(IMarker.LINE_NUMBER);
+ } catch (CoreException e) {
+ fail(e.getMessage());
+ }
+ return 0;
+ }
+ });
+ assertEquals("Line number should be",8,elMarkers[0].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
+ assertEquals("Line number should be",10,elMarkers[1].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
+ assertEquals("Line number should be",12,elMarkers[2].getAttribute(IMarker.LINE_NUMBER)); //$NON-NLS-1$
+ }
}
13 years, 2 months
JBoss Tools SVN: r29332 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 00:47:17 -0500 (Fri, 25 Feb 2011)
New Revision: 29332
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
bump up to Helios SR2 versions; bump back to GWT 2.1.1 instead of 2.2.0
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-02-25 05:46:40 UTC (rev 29331)
+++ trunk/build/target-platform/multiple.target 2011-02-25 05:47:17 UTC (rev 29332)
@@ -58,7 +58,7 @@
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXlFLWUl6sr-z0fAKWO"/>
<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
- <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.1.v201009092123-7L7O8dBgJ9EC9MCaE_KD"/>
+ <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
<unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK"/>
@@ -90,9 +90,9 @@
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.1.v20100617a-57B185wFfAqPz0Ef8mBsMkG-0hfS"/>
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
@@ -103,24 +103,24 @@
<unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
<unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
- <unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20100929-9gF78GrzFrEGnHBGWlQYujnX0QBoTCe1knxyNa"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
<unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
<unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
<unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
- <unit id="org.eclipse.rcp.id" version="3.6.0.M20110105-0951"/>
+ <unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
<unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
- <unit id="org.eclipse.sdk.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeF_iesDUeYc"/>
- <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.1.r362_v20101014"/>
+ <unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
+ <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.R36x_v20101213-7sF99FsNFS-Ci4TSP4RBHFJOA5B3"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
@@ -219,9 +219,10 @@
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit version="2.2.0.v201102111811" id="com.google.gdt.eclipse.suite.e36.feature.feature.group"/>
- <unit version="2.2.0.v201102111811" id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group"/>
- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/>
+ <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"/>
+ <!-- <repository location="http://dl.google.com/eclipse/plugin/3.6/"/> -->
+ <repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
</location>
<!-- additional JBoss.org mirrors -->
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-02-25 05:46:40 UTC (rev 29331)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-02-25 05:47:17 UTC (rev 29332)
@@ -45,7 +45,7 @@
<repository location="http://download.eclipse.org/releases/helios/"/>
<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
-<repository location="http://dl.google.com/eclipse/plugin/3.6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/requirements/gwt/201012211742/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/"/>
@@ -180,7 +180,7 @@
<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/>
<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.2.0.feature.group" version=""/>
+<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" 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: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-02-25 05:46:40 UTC (rev 29331)
+++ trunk/build/target-platform/unified.target 2011-02-25 05:47:17 UTC (rev 29332)
@@ -58,7 +58,7 @@
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXlFLWUl6sr-z0fAKWO"/>
<unit id="org.eclipse.tptp.platform.jvmti.feature.group" version="4.5.1.v201009092123-797A38s7354466855B7"/>
- <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.1.v201009092123-7L7O8dBgJ9EC9MCaE_KD"/>
+ <unit id="org.eclipse.tptp.platform.trace.feature.group" version="4.5.2.v201101261720-7L7O8fBgJ9EC9NDREaF9"/>
<unit id="org.eclipse.tptp.platform.xerces.feature.group" version="4.6.0.v201005032111-777K4AkF7B77R7c7N77"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s735346496D33"/>
<unit id="org.eclipse.tptp.platform.probekit.feature.group" version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK"/>
@@ -90,9 +90,9 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.1.v20100617a-57B185wFfAqPz0Ef8mBsMkG-0hfS"/>
+ <unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.2.r262_v20101008-57B381wLglLKxfjdt881PQeMU42p"/>
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
- <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.1.v20100915-1750-35-7w31211A2602861"/>
+ <unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.2.v20110215-1647-3517w3122132602758"/>
<unit id="org.eclipse.birt.chart.feature.group" version="2.6.1.v20100709-7f9T7DFQCnv8nz0gRMa6NG1"/>
<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.1.v20100915-1750-3507w31211A2602861"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
@@ -103,24 +103,24 @@
<unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
<unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
- <unit id="org.eclipse.platform.feature.group" version="3.6.2.r362_v20100929-9gF78GrzFrEGnHBGWlQYujnX0QBoTCe1knxyNa"/>
+ <unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
<unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
- <unit id="org.eclipse.platform.sdk" version="3.6.2.M20110105-0951"/>
+ <unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
<unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
<unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
- <unit id="org.eclipse.rcp.id" version="3.6.0.M20110105-0951"/>
+ <unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
<unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
- <unit id="org.eclipse.sdk.ide" version="3.6.2.M20110105-0951"/>
- <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.1.r362_v20101014-817fFcgFE_daeF_iesDUeYc"/>
- <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.1.r362_v20101014"/>
+ <unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
+ <unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
+ <unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
- <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.1.R36x_v20101213-7sF99FsNFS-Ci4TSP4RBHFJOA5B3"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
- <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.1.R36x_v20101014-7u7NFVmFL9O33b-_gENgz0SvfGYz"/>
+ <unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
@@ -131,7 +131,6 @@
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
<unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFLyFkSAqhRGvl2z-fCfimiBL"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
- <!-- <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> -->
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
@@ -220,8 +219,8 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <unit version="2.2.0.v201102111811" id="com.google.gdt.eclipse.suite.e36.feature.feature.group"/>
- <unit version="2.2.0.v201102111811" id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.2.0.feature.group"/>
+ <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"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-02-25 05:46:40 UTC (rev 29331)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-02-25 05:47:17 UTC (rev 29332)
@@ -180,7 +180,7 @@
<iu id="org.eclipse.wst.ws_ui.feature.feature.group" version=""/>
<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.2.0.feature.group" version=""/>
+<iu id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" 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=""/>
13 years, 2 months
JBoss Tools SVN: r29330 - trunk/download.jboss.org/jbosstools/updates/requirements/gwt.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 00:36:57 -0500 (Fri, 25 Feb 2011)
New Revision: 29330
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
Log:
split versions of GWT into separate folders based on approx timestamp of creation
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2011-02-25 05:35:12 UTC (rev 29329)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/gwt/build.xml 2011-02-25 05:36:57 UTC (rev 29330)
@@ -17,11 +17,11 @@
-->
<target name="mirror">
<property name="URL" value="http://dl.google.com/eclipse/plugin/3.6" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/repo" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/gwt/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}" name="Google plugins for Eclipse 3.6" />
+ <repository location="file:${destination}/201102111811-complete" name="Google plugins for Eclipse 3.6" />
<source>
<repository location="${URL}" />
</source>
@@ -35,6 +35,9 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}" artifactRepository="file:${destination}" publishartifacts="true" source="${destination}" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201010280102" artifactRepository="file:${destination}/201010280102" publishartifacts="true" source="${destination}/201010280102" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201012211742" artifactRepository="file:${destination}/201012211742" publishartifacts="true" source="${destination}/201012211742" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201102111811" artifactRepository="file:${destination}/201102111811" publishartifacts="true" source="${destination}/201102111811" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201102111811-complete" artifactRepository="file:${destination}/201102111811-complete" publishartifacts="true" source="${destination}/201102111811-complete" compress="${compress}" />
</target>
</project>
13 years, 2 months
JBoss Tools SVN: r29329 - trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-25 00:35:12 -0500 (Fri, 25 Feb 2011)
New Revision: 29329
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
Log:
Removing version constraints on a test plugin (unnecessary maintenance)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-02-25 04:50:09 UTC (rev 29328)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-02-25 05:35:12 UTC (rev 29329)
@@ -17,31 +17,31 @@
org.eclipse.debug.core,
org.eclipse.jdt.launching,
org.eclipse.jst.jee,
- org.eclipse.jst.server.core;bundle-version="1.1.0",
+ org.eclipse.jst.server.core,
org.jboss.tools.jmx.core.test,
org.jboss.ide.eclipse.as.ui,
- org.eclipse.ui.navigator;bundle-version="3.3.101",
- org.eclipse.jst.common.frameworks;bundle-version="1.1.300",
- org.eclipse.jst.j2ee;bundle-version="1.1.301",
- org.eclipse.jst.j2ee.core;bundle-version="1.1.301",
- org.eclipse.jst.j2ee.ejb;bundle-version="1.1.300",
- org.eclipse.jst.j2ee.jca;bundle-version="1.1.300",
- org.eclipse.jst.jee.ejb;bundle-version="1.0.201",
- org.eclipse.jst.jee.web;bundle-version="1.0.200",
- org.eclipse.wst.common.emf;bundle-version="1.1.301",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.301",
- org.eclipse.wst.common.core;bundle-version="1.1.201",
- org.eclipse.wst.common.frameworks;bundle-version="1.1.300",
- org.eclipse.wst.validation;bundle-version="1.2.102",
- org.eclipse.jem.util;bundle-version="2.0.200",
- org.eclipse.jst.j2ee.web;bundle-version="1.1.301",
- org.jboss.tools.tests;bundle-version="2.0.0",
+ org.eclipse.ui.navigator,
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.jst.j2ee.ejb,
+ org.eclipse.jst.j2ee.jca,
+ org.eclipse.jst.jee.ejb,
+ org.eclipse.jst.jee.web,
+ org.eclipse.wst.common.emf,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.wst.common.core,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.wst.validation,
+ org.eclipse.jem.util,
+ org.eclipse.jst.j2ee.web,
+ org.jboss.tools.tests,
org.jboss.ide.eclipse.as.classpath.core,
org.jboss.ide.eclipse.as.classpath.ui,
org.jboss.ide.eclipse.as.wtp.core,
org.jboss.ide.eclipse.as.wtp.ui,
- org.eclipse.jst.jsf.core;bundle-version="1.2.5",
- org.eclipse.jpt.core;bundle-version="2.2.1"
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jpt.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
13 years, 2 months
JBoss Tools SVN: r29328 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-24 23:50:09 -0500 (Thu, 24 Feb 2011)
New Revision: 29328
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
Log:
JBIDE-8398 using hte proper patch
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-25 04:49:06 UTC (rev 29327)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-25 04:50:09 UTC (rev 29328)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -87,7 +88,7 @@
// Am I a removal? If yes, remove me, and return
if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
result = removeRemoteDeployment(method2, sourcePath, destFolder, name, monitor);
- } else {
+ } else if( publishType != IJBossServerPublisher.NO_PUBLISH ){
// Locally zip it up into the remote tmp folder
result = super.publishModule(method, server, module, publishType, delta,
AbstractServerToolsPublisher.getSubMon(monitor, 50));
@@ -112,11 +113,9 @@
// Now transfer the file to RSE
RSEPublishMethod method2 = (RSEPublishMethod)method;
try {
+ removeRemoteDeployment(method2, sourcePath, destFolder, name, new NullProgressMonitor());
method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
AbstractServerToolsPublisher.getSubMon(monitor, 150));
- } catch( SystemElementNotFoundException senfe ) {
- /* Ignore intentionally... file already does not exist on remote server */
- return Status.OK_STATUS;
} catch( SystemMessageException sme ) {
return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
} catch(CoreException ce) {
@@ -131,6 +130,9 @@
RSEPublishMethod method2 = (RSEPublishMethod)method;
try {
method2.getFileService().delete(destFolder.toString(), name, monitor);
+ } catch( SystemElementNotFoundException senfe ) {
+ /* Ignore intentionally... file already does not exist on remote server */
+ return Status.OK_STATUS;
} catch( SystemMessageException sme ) {
return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
} catch(CoreException ce) {
13 years, 2 months
JBoss Tools SVN: r29327 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-24 23:49:06 -0500 (Thu, 24 Feb 2011)
New Revision: 29327
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
Log:
JBIDE-8398 reverting bad commit
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-25 04:20:07 UTC (rev 29326)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-02-25 04:49:06 UTC (rev 29327)
@@ -12,32 +12,130 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.rse.core.archives;
-import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.jboss.ide.eclipse.archives.webtools.modules.WTPZippedPublisher;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
+import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
-import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
/**
- * This class is in charge of RSE zipped publishing for deployable folders
+ * This class is in charge of RSE zipped publishing for flexible projects.
+ * It extends the functionality of the local zipped publishing class
+ * by uploading the file after building it in a temporary directory
*/
-public class RSEZippedFolderPublisher extends RSEZippedJSTPublisher {
- public boolean accepts(String method, IServer server, IModule[] module) {
- if( !RSEPublishMethod.RSE_ID.equals(method))
- return false;
+public class RSEZippedJSTPublisher extends WTPZippedPublisher {
+
+ protected String getPublishMethod() {
+ return RSEPublishMethod.RSE_ID;
+ }
+
+ /**
+ * Here we put the deployment first in a temporary remote deploy folder
+ * Then during the publishModule call, we'll also upload it to remote machine
+ */
+ protected String getDeployRoot(IModule[] module, IDeployableServer ds) {
+ IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(ds.getServer()).
+ append(IJBossServerConstants.TEMP_REMOTE_DEPLOY).makeAbsolute();
+ deployRoot.toFile().mkdirs();
+ return deployRoot.toString();
+ }
+
+ @Override
+ public IStatus publishModule(
+ IJBossServerPublishMethod method,
+ IServer server, IModule[] module,
+ int publishType, IModuleResourceDelta[] delta,
+ IProgressMonitor monitor) throws CoreException {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- if( module != null && module.length > 0
- && module[module.length-1] != null
- && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) {
- IModule mod = module[module.length-1];
- IJBTModule del = (IJBTModule)mod.loadAdapter(IJBTModule.class, new NullProgressMonitor());
- if( del != null && !del.isBinary())
- return ds != null && ds.zipsWTPDeployments();; // we have a folder
+ String taskName = "Publishing " + module[0].getName();
+ monitor.beginTask(taskName, 200); //$NON-NLS-1$
+ monitor.setTaskName(taskName);
+ if( module.length > 1 ) {
+ monitor.done();
+ return null;
}
- return false;
+
+ monitor.setTaskName("Publishing to remote server " + server.getName());
+
+ // set up needed vars
+ IDeployableServer server2 = ServerConverter.getDeployableServer(server);
+ String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
+ IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot);
+ IModule lastMod = module[module.length-1];
+ RSEPublishMethod method2 = (RSEPublishMethod)method;
+ IPath destFolder = RSEPublishMethod.findModuleFolderWithDefault(lastMod, server2, method2.getRemoteRootFolder());
+ //IPath tempDestFolder = RSEPublishMethod.findModuleFolderWithDefault(lastMod, server2, method2.getRemoteTemporaryFolder());
+ String name = sourcePath.lastSegment();
+ IStatus result = null;
+
+
+ // Am I a removal? If yes, remove me, and return
+ if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
+ result = removeRemoteDeployment(method2, sourcePath, destFolder, name, monitor);
+ } else {
+ // Locally zip it up into the remote tmp folder
+ result = super.publishModule(method, server, module, publishType, delta,
+ AbstractServerToolsPublisher.getSubMon(monitor, 50));
+ if( !result.isOK() ) {
+ monitor.done();
+ } else {
+ result = remoteFullPublish(method, sourcePath, destFolder, name,
+ AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ }
+ }
+
+ monitor.done();
+ if( result != null ) {
+ return result;
+ }
+
+ return Status.OK_STATUS;
}
+
+ private IStatus remoteFullPublish( IJBossServerPublishMethod method, IPath sourcePath,
+ IPath destFolder, String name, IProgressMonitor monitor) {
+ // Now transfer the file to RSE
+ RSEPublishMethod method2 = (RSEPublishMethod)method;
+ try {
+ method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
+ AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ } catch( SystemElementNotFoundException senfe ) {
+ /* Ignore intentionally... file already does not exist on remote server */
+ return Status.OK_STATUS;
+ } catch( SystemMessageException sme ) {
+ return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
+ } catch(CoreException ce) {
+ return ce.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+
+ private IStatus removeRemoteDeployment( IJBossServerPublishMethod method, IPath sourcePath,
+ IPath destFolder, String name, IProgressMonitor monitor) {
+ // Now transfer the file to RSE
+ RSEPublishMethod method2 = (RSEPublishMethod)method;
+ try {
+ method2.getFileService().delete(destFolder.toString(), name, monitor);
+ } catch( SystemMessageException sme ) {
+ return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
+ } catch(CoreException ce) {
+ return ce.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
}
13 years, 2 months