JBoss Tools SVN: r31636 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-30 12:05:24 -0400 (Mon, 30 May 2011)
New Revision: 31636
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:
remove org.eclipse.rcp.id, org.eclipse.rcp.sdk.id, org.eclipse.equinox.p2.ui.admin.rcp.product from TP as no longer available from Indigo or Eclipse mirrors (?)
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-30 16:05:10 UTC (rev 31635)
+++ trunk/build/target-platform/multiple.target 2011-05-30 16:05:24 UTC (rev 31636)
@@ -79,19 +79,17 @@
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110502-7K7TFBVF7RZHQQHyMe02A66"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7RCE5EVF5"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqnbNsPXLa3"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuJsMLpUla9B15B"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110505-0800-7B78FHk8sF7BB7RBH58YF5"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqnbNrSXFd3"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110505-0800-7z8gFchFMTdFYIuJpVLjXla9B15B"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110520-0800-9gF7UHNFFt4cwE-pibLJ7m-mS0OWjdqewtz0110"/>
<unit id="org.eclipse.platform.ide" version="3.7.0.I20110526-1708"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110524-7P7NFUFFLWUl76mam1"/>
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110526-1708"/>
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYpokAUkS9"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYlit8ITJ5"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110426-7Q7xA7DPb31rE1_WcWcoNvXoGqkAUcZtS3fpz-hRp49iA"/>
- <unit id="org.eclipse.rcp.id" version="3.7.0.I20110526-1708"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110526-1708"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-45-7w31221634"/>
- <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110526-1708"/>
+ <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110519-1138"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcJhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110503"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110502-7X7XGA-FPGjtJGwr-t"/>
@@ -105,7 +103,6 @@
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110502-7I77CPBgJ9ECBQ9V8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110502-7z7UFVsFTy21YX4JV5O20VY"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-FGBF9JgLWWM0LWAWLrL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110526-1708"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110502-44Eo8s73553A4A2629"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AJSy2FajiY"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-30 16:05:10 UTC (rev 31635)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-30 16:05:24 UTC (rev 31636)
@@ -88,8 +88,6 @@
<iu id="org.eclipse.platform.sdk" version=""/>
<iu id="org.eclipse.pde.feature.group" version=""/>
<iu id="org.eclipse.sdk.feature.group" version=""/>
-<iu id="org.eclipse.rcp.id" version=""/>
-<iu id="org.eclipse.rcp.sdk.id" version=""/>
<iu id="org.eclipse.releng.tools.feature.group" version=""/>
<iu id="org.eclipse.sdk.ide" version=""/>
<iu id="org.eclipse.sdk.examples.feature.group" version=""/>
@@ -105,7 +103,6 @@
<iu id="org.eclipse.equinox.server.jetty.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.p2.feature.group" version=""/>
<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version=""/>
-<iu id="org.eclipse.equinox.p2.ui.admin.rcp.product" version=""/>
<iu id="org.eclipse.equinox.server.servletbridge.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.simple.feature.group" version=""/>
<iu id="org.eclipse.rcp.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-05-30 16:05:10 UTC (rev 31635)
+++ trunk/build/target-platform/unified.target 2011-05-30 16:05:24 UTC (rev 31636)
@@ -79,19 +79,17 @@
<unit id="com.ibm.icu.base.feature.group" version="1.2.0.v20110302-797738s7355373J"/>
<unit id="org.eclipse.equinox.server.core.feature.group" version="1.1.0.v20110502-7K7TFBVF7RZHQQHyMe02A66"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110520-0800-7B78FHk8sF7BB7RCE5EVF5"/>
- <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqnbNsPXLa3"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110520-0800-7z8gFchFMTdFYKuJsMLpUla9B15B"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.3.100.v20110505-0800-7B78FHk8sF7BB7RBH58YF5"/>
+ <unit id="org.eclipse.help.feature.group" version="1.3.0.v20110327-7i7uFFiFFt6ZqnbNrSXFd3"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.7.0.v20110505-0800-7z8gFchFMTdFYIuJpVLjXla9B15B"/>
<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20110520-0800-9gF7UHNFFt4cwE-pibLJ7m-mS0OWjdqewtz0110"/>
<unit id="org.eclipse.platform.ide" version="3.7.0.I20110526-1708"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110524-7P7NFUFFLWUl76mam1"/>
<unit id="org.eclipse.platform.sdk" version="3.7.0.I20110526-1708"/>
- <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYpokAUkS9"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.7.0.v20110504-0800-7b7qFVpFEx2XnmYlit8ITJ5"/>
<unit id="org.eclipse.sdk.feature.group" version="3.7.0.v20110426-7Q7xA7DPb31rE1_WcWcoNvXoGqkAUcZtS3fpz-hRp49iA"/>
- <unit id="org.eclipse.rcp.id" version="3.7.0.I20110526-1708"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.7.0.I20110526-1708"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.4.100.v20110503-45-7w31221634"/>
- <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110526-1708"/>
+ <unit id="org.eclipse.sdk.ide" version="3.7.0.I20110519-1138"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.4.0.v20110503-817mFcfFEdccNcJhh8BTgNN"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.4.0.v20110503"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.7.0.v20110502-7X7XGA-FPGjtJGwr-t"/>
@@ -105,7 +103,6 @@
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.100.v20110502-7I77CPBgJ9ECBQ9V8IAD"/>
<unit id="org.eclipse.equinox.server.p2.feature.group" version="1.1.0.v20110502-7z7UFVsFTy21YX4JV5O20VY"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.100.v20110123-7C-FGBF9JgLWWM0LWAWLrL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.I20110526-1708"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.100.v20110502-42DF9oB5865K5D"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.100.v20110502-44Eo8s73553A4A2629"/>
<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20110216-9DB5Fm1FpBGy_AJSy2FajiY"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-30 16:05:10 UTC (rev 31635)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-05-30 16:05:24 UTC (rev 31636)
@@ -88,8 +88,6 @@
<iu id="org.eclipse.platform.sdk" version=""/>
<iu id="org.eclipse.pde.feature.group" version=""/>
<iu id="org.eclipse.sdk.feature.group" version=""/>
-<iu id="org.eclipse.rcp.id" version=""/>
-<iu id="org.eclipse.rcp.sdk.id" version=""/>
<iu id="org.eclipse.releng.tools.feature.group" version=""/>
<iu id="org.eclipse.sdk.ide" version=""/>
<iu id="org.eclipse.sdk.examples.feature.group" version=""/>
@@ -105,7 +103,6 @@
<iu id="org.eclipse.equinox.server.jetty.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.p2.feature.group" version=""/>
<iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version=""/>
-<iu id="org.eclipse.equinox.p2.ui.admin.rcp.product" version=""/>
<iu id="org.eclipse.equinox.server.servletbridge.feature.group" version=""/>
<iu id="org.eclipse.equinox.server.simple.feature.group" version=""/>
<iu id="org.eclipse.rcp.feature.group" version=""/>
13 years, 6 months
JBoss Tools SVN: r31633 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-30 09:16:56 -0400 (Mon, 30 May 2011)
New Revision: 31633
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java
Log:
[JBIDE-8920] replaced usage of deprecated constant, cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java 2011-05-30 12:12:24 UTC (rev 31632)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java 2011-05-30 13:16:56 UTC (rev 31633)
@@ -12,7 +12,6 @@
import java.io.File;
import java.io.FileFilter;
-import java.util.Date;
import java.util.HashMap;
import org.eclipse.core.runtime.IPath;
@@ -49,7 +48,6 @@
this.paths = path == null ? new IPath[0] : path;
}
public void touchDescriptors(IPath moduleRoot, IPublishCopyCallbackHandler handler) {
- File tmp;
for( int i = 0; i < paths.length; i++ ) {
handler.touchResource(paths[i]);
}
@@ -66,12 +64,11 @@
JSTPublisherXMLToucher() {
// I know this is ugly but I don't care. it works.
map = new HashMap<String, IDescriptorToucher>();
- IJBossRuntimeResourceConstants i = new IJBossRuntimeResourceConstants(){};
- map.put(IWTPConstants.FACET_WEB, new PathDescriptorToucher(i.DESCRIPTOR_WEB));
- map.put(IWTPConstants.FACET_EJB, new PathDescriptorToucher(i.DESCRIPTOR_EJB));
- map.put(IWTPConstants.FACET_EAR, new PathDescriptorToucher(i.DESCRIPTOR_EAR));
- map.put(IWTPConstants.FACET_APP_CLIENT, new PathDescriptorToucher(i.DESCRIPTOR_CLIENT));
- map.put(IWTPConstants.FACET_CONNECTOR, new PathDescriptorToucher(i.DESCRIPTOR_CONNECTOR));
+ map.put(IWTPConstants.FACET_WEB, new PathDescriptorToucher(IJBossRuntimeResourceConstants.DESCRIPTOR_WEB));
+ map.put(IWTPConstants.FACET_EJB, new PathDescriptorToucher(IJBossRuntimeResourceConstants.DESCRIPTOR_EJB));
+ map.put(IWTPConstants.FACET_EAR, new PathDescriptorToucher(IJBossRuntimeResourceConstants.DESCRIPTOR_EAR));
+ map.put(IWTPConstants.FACET_APP_CLIENT, new PathDescriptorToucher(IJBossRuntimeResourceConstants.DESCRIPTOR_CLIENT));
+ map.put(IWTPConstants.FACET_CONNECTOR, new PathDescriptorToucher(IJBossRuntimeResourceConstants.DESCRIPTOR_CONNECTOR));
}
public void addDescriptorToucher(String typeId, IDescriptorToucher toucher) {
13 years, 6 months
JBoss Tools SVN: r31632 - in branches/jbosstools-3.2.x: bpmn/plugins/org.eclipse.bpmn2 and 30 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-05-30 08:12:24 -0400 (Mon, 30 May 2011)
New Revision: 31632
Removed:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/bin/
branches/jbosstools-3.2.x/esb/tests/org.jboss.tools.esb.ui.bot.test/bin/
branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/bin/
branches/jbosstools-3.2.x/tests/plugins/org.jboss.tools.tests.performance/bin/
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/bin/
Modified:
branches/jbosstools-3.2.x/
branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2.edit/
branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2.editor/
branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2/
branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.bpmn2.model/
branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram/
branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.jbpm/
branches/jbosstools-3.2.x/bpmn/tests/org.eclipse.bpmn2.tests/
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.docs/
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/
branches/jbosstools-3.2.x/deltacloud/tests/org.jboss.tools.deltacloud.test/
branches/jbosstools-3.2.x/esb/tests/org.jboss.tools.esb.ui.bot.test/
branches/jbosstools-3.2.x/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp.base.test/
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.project.examples/
branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/
branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime/
branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.base.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam211GA.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam212GA.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam212GA.ui.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam220CR1.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam220GA.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR1.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR1.ui.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR2.core.test/
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR2.ui.test/
branches/jbosstools-3.2.x/smooks/tests/org.jboss.tools.smooks.ui.bot.test/
branches/jbosstools-3.2.x/tests/plugins/org.jboss.tools.tests.performance/
branches/jbosstools-3.2.x/tests/plugins/org.jboss.tools.ui.bot.ext.test/
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test/
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.docbook.test/
Log:
fixed a bunch of svn:ignores
Property changes on: branches/jbosstools-3.2.x
___________________________________________________________________
Modified: svn:ignore
- .project
.metadata
org.mozilla.xpcom
jbosstools-l10n
+ .project
.metadata
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2.edit
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.eclipse.bpmn2.editor
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.bpmn2.model
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.bpmn2.process.diagram
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/bpmn/plugins/org.jboss.tools.jbpm
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: branches/jbosstools-3.2.x/bpmn/tests/org.eclipse.bpmn2.tests
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.docs
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/deltacloud/tests/org.jboss.tools.deltacloud.test
___________________________________________________________________
Modified: svn:ignore
- deltacloud-dependencies
jruby-complete-1.5.3
build-custom-jruby.sh
jruby-src-1.5.3.zip
deltacloud2.jar
+ deltacloud-dependencies
jruby-complete-1.5.3
build-custom-jruby.sh
jruby-src-1.5.3.zip
deltacloud2.jar
bin
Property changes on: branches/jbosstools-3.2.x/esb/tests/org.jboss.tools.esb.ui.bot.test
___________________________________________________________________
Modified: svn:ignore
- screenshots
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test
___________________________________________________________________
Modified: svn:ignore
- screenshots
+ screenshots
bin
Property changes on: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp.base.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.project.examples
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/runtime/plugins/org.jboss.tools.runtime
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.base.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam211GA.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam212GA.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam212GA.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam220CR1.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam220GA.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR1.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR1.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR2.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam221CR2.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/smooks/tests/org.jboss.tools.smooks.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: branches/jbosstools-3.2.x/tests/plugins/org.jboss.tools.tests.performance
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/tests/plugins/org.jboss.tools.ui.bot.ext.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.base.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
build
Property changes on: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.docbook.test
___________________________________________________________________
Added: svn:ignore
+ bin
13 years, 6 months
JBoss Tools SVN: r31631 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-30 07:45:44 -0400 (Mon, 30 May 2011)
New Revision: 31631
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
Log:
[JBIDE-8920] replaced usage of deprecated constant, cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-05-30 11:38:59 UTC (rev 31630)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-05-30 11:45:44 UTC (rev 31631)
@@ -35,11 +35,11 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
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.server.xpl.PublishCopyUtil;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
@@ -200,7 +200,7 @@
else {
// A child that must be zipped, forceZip is true
IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
- append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute();
+ append(IJBossToolingConstants.TEMP_DEPLOY).makeAbsolute();
try {
File temp = File.createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$
@@ -248,7 +248,7 @@
else {
// forceZip a child module
IPath localDeployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
- append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute();
+ append(IJBossToolingConstants.TEMP_DEPLOY).makeAbsolute();
try {
File temp = File.createTempFile(module.getName(), ".tmp", localDeployRoot.toFile()); //$NON-NLS-1$
IPath tempFile = new Path(temp.getAbsolutePath());
13 years, 6 months
JBoss Tools SVN: r31630 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/pagedesign and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-05-30 07:38:59 -0400 (Mon, 30 May 2011)
New Revision: 31630
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/StylesOnThePageTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
Log:
Fixes for JBT 3.3.0.M1
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -20,6 +20,7 @@
import org.eclipse.swtbot.swt.finder.results.Result;
import org.eclipse.swtbot.swt.finder.results.VoidResult;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.vpe.editor.xpl.CustomSashForm;
@@ -85,6 +86,10 @@
}
});
assertVisualEditorContains(webBrowser, "INPUT", null, null, MinMaxPanesTest.TEST_PAGE_NAME);
+ jspTextEditor.setFocus();
+ jspTextEditor.selectRange(4,25,0);
+ webBrowser.setFocus();
+ KeyboardHelper.typeKeyCodeUsingAWTRepeately(KeyEvent.VK_RIGHT, 1);
// Make changes to Visual Page and Restore Sash position check for changes reflected in Source Pane
UIThreadRunnable.syncExec(new VoidResult() {
@Override
@@ -92,9 +97,6 @@
csf.maxUp();
}
});
- jspTextEditor.selectRange(4,18,0);
- webBrowser.setFocus();
- KeyboardHelper.typeKeyCodeUsingAWTRepeately(KeyEvent.VK_RIGHT, 1);
String insertTestString = "xxinsertedyy";
KeyboardHelper.typeBasicStringUsingAWT(insertTestString);
jspTextEditor.save();
@@ -104,6 +106,7 @@
csf.downClicked();
}
});
+ bot.sleep(Timing.time1S());
assertSourceEditorContains(jspTextEditor.getText(), insertTestString, MinMaxPanesTest.TEST_PAGE_NAME);
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/StylesOnThePageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/StylesOnThePageTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/StylesOnThePageTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -79,32 +79,32 @@
Browser previewPaneBrowser = browsers.get(1);
// Test if current style is applied on Visual/Source pane
String textToContain = "<STYLE>h3 {" + oldStyle + "}</STYLE>";
- String browserText = SWTUtilExt.invokeMethod(visualSourcePaneBrowser, "getText");
+ String browserText = SWTUtilExt.invokeMethod(visualSourcePaneBrowser, "getText").toLowerCase();
assertTrue("Browser on Visual/>Source pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
textToContain = "<H3 style=\"-moz-user-modify:";
assertTrue("Browser on Visual/>Source pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
// Test if current style is applied on Preview pane
textToContain = "<STYLE>h3 {" + oldStyle + "}</STYLE>";
- browserText = SWTUtilExt.invokeMethod(previewPaneBrowser, "getText");
+ browserText = SWTUtilExt.invokeMethod(previewPaneBrowser, "getText").toLowerCase();
assertTrue("Browser on Preview pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
textToContain = "<H3 style=\"-moz-user-modify:";
assertTrue("Browser on Preview pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
// Apply new style
String newStyle = "background: black;color: white;";
botEditorExt.selectPage(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
@@ -115,32 +115,32 @@
botEditorExt.selectPage(IDELabel.VisualPageEditor.PREVIEW_TAB_LABEL);
// Test if current style is applied on Visual/Source pane
textToContain = "<STYLE>h3 {" + newStyle + "}</STYLE>";
- browserText = SWTUtilExt.invokeMethod(visualSourcePaneBrowser, "getText");
+ browserText = SWTUtilExt.invokeMethod(visualSourcePaneBrowser, "getText").toLowerCase();
assertTrue("Browser on Visual/>Source pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
textToContain = "<H3 style=\"-moz-user-modify:";
assertTrue("Browser on Visual/>Source pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
// Test if current style is applied on Preview pane
textToContain = "<STYLE>h3 {" + newStyle + "}</STYLE>";
- browserText = SWTUtilExt.invokeMethod(previewPaneBrowser, "getText");
+ browserText = SWTUtilExt.invokeMethod(previewPaneBrowser, "getText").toLowerCase();
assertTrue("Browser on Preview pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
textToContain = "<H3 style=\"-moz-user-modify:";
assertTrue("Browser on Preview pane has to contain text " + textToContain +
" but it doesn't.\n" +
"Browser text is:\n" +
browserText,
- browserText.contains(textToContain));
+ browserText.contains(textToContain.toLowerCase()));
botEditorExt.selectPage(IDELabel.VisualPageEditor.VISUAL_SOURCE_TAB_LABEL);
jspEditor.close();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -45,7 +45,7 @@
" </body>\n" +
"</html>";
- private static final String TEST_PAGE_NAME = "CoreHTMLTagsTest.jsp";
+ private static final String TEST_PAGE_NAME = "TextSelectionTest.jsp";
private SWTBotEditorExt jspEditor;
private SWTBotWebBrowser webBrowser;
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -50,6 +50,9 @@
bot.shell(IDELabel.Shell.NEW_CSS_FILE).activate(); //$NON-NLS-1$
bot.textWithLabel(IDELabel.NewCSSWizard.FILE_NAME).setText(IncludedCssFilesJSPTest.CSS_FILE_NAME); //$NON-NLS-1$
bot.button(IDELabel.Button.FINISH).click(); //$NON-NLS-1$
+ if (getException() != null && getException() instanceof NullPointerException){
+ setException(null);
+ }
bot.sleep(Timing.time3S());
util.waitForJobs(JobName.BUILDING_WS);
SWTBotEditor cssEditor = bot.editorByTitle(IncludedCssFilesJSPTest.CSS_FILE_NAME);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -55,6 +55,9 @@
bot.shell(IDELabel.Shell.NEW_CSS_FILE).activate(); //$NON-NLS-1$
bot.textWithLabel(IDELabel.NewCSSWizard.FILE_NAME).setText(IncludedCssFilesTest.CSS_FILE_NAME); //$NON-NLS-1$
bot.button(IDELabel.Button.FINISH).click(); //$NON-NLS-1$
+ if (getException() != null && getException() instanceof NullPointerException){
+ setException(null);
+ }
bot.sleep(Timing.time3S());
util.waitForJobs(JobName.BUILDING_WS);
SWTBotEditor cssEditor = bot.editorByTitle(IncludedCssFilesTest.CSS_FILE_NAME);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -50,7 +50,7 @@
assertNotNull("Selected node in Visual Editor cannot be null",selectedVisualNode);
String expectedSelectedNode = "DIV";
assertTrue("Selected Node has to be '" + expectedSelectedNode + "' node but is " + selectedVisualNode.getLocalName(),
- selectedVisualNode.getLocalName().equals(expectedSelectedNode));
+ selectedVisualNode.getLocalName().equalsIgnoreCase(expectedSelectedNode));
String selectedNodeTitle = SWTBotWebBrowser.getNodeAttribute(selectedVisualNode, "title");
assertNotNull("Selected Node in Visual Editor has to have attribute title but it has not." ,selectedNodeTitle);
final String expectedTitle = "f:view";
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -52,7 +52,7 @@
assertNotNull("Selected node in Visual Editor cannot be null",selectedVisualNode);
String expectedSelectedNode = "SPAN";
assertTrue("Selected Node has to be '" + expectedSelectedNode + "' node but is " + selectedVisualNode.getLocalName(),
- selectedVisualNode.getLocalName().equals(expectedSelectedNode));
+ selectedVisualNode.getLocalName().equalsIgnoreCase(expectedSelectedNode));
String selectedNodeTitle = SWTBotWebBrowser.getNodeAttribute(selectedVisualNode, "title");
assertNotNull("Selected Node in Visual Editor has to have attribute title but it has not." ,selectedNodeTitle);
final String expectedTitle = "h:inputText value: " + AjaxValidatorTagTest.INPUT_TEXT;
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -51,7 +51,7 @@
assertNotNull("Selected node in Visual Editor cannot be null",selectedVisualNode);
String expectedSelectedNode = "SPAN";
assertTrue("Selected Node has to be '" + expectedSelectedNode + "' node but is " + selectedVisualNode.getLocalName(),
- selectedVisualNode.getLocalName().equals(expectedSelectedNode));
+ selectedVisualNode.getLocalName().equalsIgnoreCase(expectedSelectedNode));
String selectedNodeTitle = SWTBotWebBrowser.getNodeAttribute(selectedVisualNode, "title");
assertNotNull("Selected Node in Visual Editor has to have attribute title but it has not." ,selectedNodeTitle);
final String expectedTitle = "h:inputText value: " + BeanValidatorTagTest.INPUT_TEXT;
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/EditorSynchronizationTest.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -64,7 +64,7 @@
bot.viewByTitle(WidgetVariables.OUTLINE).bot().tree().selection().get(0).get(0).startsWith("h:messages "));
SWTBotTree outlineTree = bot.viewByTitle(WidgetVariables.PROPERTIES).bot().tree();
- outlineTree.getTreeItem("Attributes").expand().getNode("style").select();
+ outlineTree.getTreeItem("General").expand().getNode("style").select();
assertTrue("style attribute of h:message node has wrong value within Properties view" +
". Should be 'color: red'",
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-05-30 11:36:51 UTC (rev 31629)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-05-30 11:38:59 UTC (rev 31630)
@@ -92,7 +92,7 @@
public static final String SETUP_VISUAL_TEMPLATE_FOR_MENU_LABEL = "Setup Visual Template for ";
public static final String SELECT_THIS_TAG_MENU_LABEL = "Select This Tag";
public static final String PREFERENCES_MENU_LABEL = "Preferences..";
- public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize strings...";
+ public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize selected string...";
public static final String JSF_MENU_LABEL = "JSF";
public static final String JBOSS_MENU_LABEL = "JBoss";
13 years, 6 months
JBoss Tools SVN: r31629 - in trunk/maven/plugins: org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-05-30 07:36:51 -0400 (Mon, 30 May 2011)
New Revision: 31629
Modified:
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
Log:
JBIDE-8755 : add CDI Facet if the project has seam3 dependencies, add JSF Facet if is has a dependency on seam-faces.
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-05-30 11:34:35 UTC (rev 31628)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2011-05-30 11:36:51 UTC (rev 31629)
@@ -10,6 +10,10 @@
************************************************************************************/
package org.jboss.tools.maven.cdi.configurators;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -27,6 +31,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.maven.cdi.MavenCDIActivator;
import org.jboss.tools.maven.cdi.Messages;
@@ -54,6 +59,7 @@
protected static final IProjectFacet m2Facet;
protected static final IProjectFacetVersion m2Version;
+ private static final String DEFAULT_CDI_VERSION = "1.0";
static {
dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$
@@ -61,7 +67,7 @@
ejbFacet = ProjectFacetsManager.getProjectFacet("jst.ejb"); //$NON-NLS-1$
ejbVersion = ejbFacet.getVersion("3.0"); //$NON-NLS-1$
cdiFacet = ProjectFacetsManager.getProjectFacet("jst.cdi"); //$NON-NLS-1$
- cdiVersion = cdiFacet.getVersion("1.0"); //$NON-NLS-1$
+ cdiVersion = cdiFacet.getVersion(DEFAULT_CDI_VERSION); //$NON-NLS-1$
m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$
m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$
}
@@ -81,11 +87,15 @@
if (!configureCDI) {
return;
}
-
+ final IFacetedProject fproj = ProjectFacetsManager.create(project);
+ if (project.hasNature(CDICoreNature.NATURE_ID)
+ && (fproj == null || (fproj.hasProjectFacet(cdiFacet) && fproj.hasProjectFacet(m2Facet)))) {
+ //everything already installed. Since there's no support for version update -yet- we stop here
+ return;
+ }
String packaging = mavenProject.getPackaging();
String cdiVersion = getCDIVersion(mavenProject);
if (cdiVersion != null) {
- final IFacetedProject fproj = ProjectFacetsManager.create(project);
if ( (fproj != null) && ("war".equals(packaging) || "ejb".equals(packaging)) ) { //$NON-NLS-1$
installDefaultFacets(fproj, cdiVersion, monitor);
}
@@ -121,6 +131,7 @@
}
+ @SuppressWarnings("unchecked")
private void installDefaultFacets(IFacetedProject fproj, String cdiVersion,IProgressMonitor monitor) throws CoreException {
IProjectFacetVersion currentWebVersion = fproj.getProjectFacetVersion(dynamicWebFacet);
IProjectFacetVersion currentEjbVersion = fproj.getProjectFacetVersion(ejbFacet);
@@ -152,7 +163,36 @@
private String getCDIVersion(MavenProject mavenProject) {
String version = Activator.getDefault().getDependencyVersion(mavenProject, CDI_API_GROUP_ID, CDI_API_ARTIFACT_ID);
+ if (version == null) {
+ version = inferCdiVersionFromDependencies(mavenProject);
+ }
return version;
}
+ private String inferCdiVersionFromDependencies(MavenProject mavenProject) {
+ boolean hasCandidates = false;
+ String cdiVersion = null;
+ List<ArtifactRepository> repos = mavenProject.getRemoteArtifactRepositories();
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (isKnownCdiExtension(artifact)) {
+ hasCandidates = true;
+ cdiVersion = Activator.getDefault().getDependencyVersion(artifact, repos, CDI_API_GROUP_ID, CDI_API_ARTIFACT_ID);
+ if (cdiVersion != null) {
+ //TODO should probably not break and take the highest version returned from all dependencies
+ break;
+ }
+ }
+ }
+ //Fallback to default CDI version
+ if (hasCandidates && cdiVersion == null) {
+ return DEFAULT_CDI_VERSION;
+ }
+ return cdiVersion;
+ }
+
+ private boolean isKnownCdiExtension(Artifact artifact) {
+ return artifact.getGroupId().startsWith("org.jboss.seam.")
+ && artifact.getVersion().startsWith("3.");
+ }
+
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-05-30 11:34:35 UTC (rev 31628)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/src/org/jboss/tools/maven/jsf/configurators/JSFProjectConfigurator.java 2011-05-30 11:36:51 UTC (rev 31629)
@@ -12,7 +12,10 @@
import java.io.File;
import java.io.IOException;
+import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -67,12 +70,13 @@
protected static final IProjectFacetVersion jsfVersion11;
protected static final IProjectFacet m2Facet;
protected static final IProjectFacetVersion m2Version;
+ private static final String JSF_VERSION_2_0 = "2.0";
static {
dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$
dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$
jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$
- jsfVersion20 = jsfFacet.getVersion("2.0"); //$NON-NLS-1$
+ jsfVersion20 = jsfFacet.getVersion(JSF_VERSION_2_0);
jsfVersion12 = jsfFacet.getVersion("1.2"); //$NON-NLS-1$
jsfVersion11 = jsfFacet.getVersion("1.1"); //$NON-NLS-1$
m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$
@@ -95,13 +99,16 @@
return;
}
+ final IFacetedProject fproj = ProjectFacetsManager.create(project);
+ if (fproj != null && fproj.hasProjectFacet(jsfFacet) && fproj.hasProjectFacet(m2Facet)) {
+ //everything already installed. Since there's no support for version update -yet- we bail
+ return;
+ }
+
String packaging = mavenProject.getPackaging();
String jsfVersion = getJSFVersion(mavenProject);
- if (jsfVersion != null) {
- final IFacetedProject fproj = ProjectFacetsManager.create(project);
- if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$
- installWarFacets(fproj, jsfVersion, mavenProject, monitor);
- }
+ if (fproj != null && jsfVersion != null && "war".equals(packaging)) { //$NON-NLS-1$
+ installWarFacets(fproj, jsfVersion, mavenProject, monitor);
}
}
@@ -323,7 +330,38 @@
if (version == null) {
version = Activator.getDefault().getDependencyVersion(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID);
}
+ if (version == null) {
+ version = inferJsfVersionFromDependencies(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID, JSF_VERSION_2_0);
+ }
return version;
}
+ private String inferJsfVersionFromDependencies(MavenProject mavenProject, String groupId, String artifactId, String defaultVersion) {
+ boolean hasCandidates = false;
+ String jsfVersion = null;
+ List<ArtifactRepository> repos = mavenProject.getRemoteArtifactRepositories();
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (isKnownJsfBasedArtifact(artifact)) {
+ hasCandidates = true;
+ jsfVersion = Activator.getDefault().getDependencyVersion(artifact, repos, groupId, artifactId);
+ if (jsfVersion != null) {
+ //TODO should probably not break and take the highest version returned from all dependencies
+ break;
+ }
+ }
+ }
+ //Fallback to default JSF version
+ if (hasCandidates && jsfVersion == null) {
+ return defaultVersion;
+ }
+ return jsfVersion;
+ }
+
+ private boolean isKnownJsfBasedArtifact(Artifact artifact) {
+ return artifact.getGroupId().startsWith("org.jboss.seam.") //$NON-NLS-1$
+ && artifact.getArtifactId().equals("seam-faces") //$NON-NLS-1$
+ && artifact.getVersion().startsWith("3."); //$NON-NLS-1$
+ }
+
+
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-05-30 11:34:35 UTC (rev 31628)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-05-30 11:36:51 UTC (rev 31629)
@@ -10,14 +10,24 @@
************************************************************************************/
package org.jboss.tools.maven.ui;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.project.MavenProject;
+import org.eclipse.core.runtime.CoreException;
+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.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.internal.embedder.MavenImpl;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -136,4 +146,70 @@
return null;
}
+ @SuppressWarnings("restriction")
+ public String getDependencyVersion(Artifact artifact, List<ArtifactRepository> remoteRepos, String gid, String aid) {
+ IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject(
+ artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+ //If the artifact is a workspace dependency, the mavenProject is already loaded
+ if (facade != null) {
+ return getDependencyVersion(facade.getMavenProject(), gid, aid);
+ }
+
+ //look at the artifact pom file and if it exists, load the corresponding MavenProject
+ File pom = getPomFile(artifact);
+ String version = null;
+ if (pom != null) {
+ MavenProject mavenProject = null;
+ MavenImpl maven = (MavenImpl)MavenPlugin.getMaven();
+ try {
+ //Create a custom execution request
+ IProgressMonitor monitor = new NullProgressMonitor();
+ MavenExecutionRequest request = maven.createExecutionRequest(monitor);
+ for (ArtifactRepository repo : remoteRepos) {
+ request.addRemoteRepository(repo);
+ }
+ request.setPom(pom);
+ request.getProjectBuildingRequest().setResolveDependencies(true);
+
+ //Load the MavenProject
+ MavenExecutionResult result = maven.readProject(request, monitor);
+ //log errors
+ if (result.hasExceptions()) {
+ for (Throwable e : result.getExceptions()) {
+ log(e);
+ }
+ } else {
+ mavenProject = result.getProject();
+ if (mavenProject != null) {
+ //finally look at the dependency version
+ version = getDependencyVersion(mavenProject , gid, aid);
+ //Detach the mavenProject from the maven session to avoid memory leaks
+ maven.detachFromSession(mavenProject);
+ }
+ }
+ } catch (CoreException e) {
+ //Don't crash on failures to read the dependency version
+ log(e);
+ }
+ }
+ return version;
+ }
+
+ private File getPomFile(Artifact artifact) {
+ File artifactFile = artifact.getFile();
+ if (artifactFile != null) {
+ String path = artifactFile.getAbsolutePath();
+ int lastIndexOfDot = path.lastIndexOf("."); //$NON-NLS-1$
+ if (lastIndexOfDot > 0) {
+ String pomPath = path.substring(0, lastIndexOfDot)+".pom"; //$NON-NLS-1$
+ File pomFile = new File(pomPath);
+ if (pomFile.exists() && pomFile.canRead()) {
+ return pomFile;
+ }
+ }
+ //TODO look inside the artifact jar if pom isn't available
+ }
+ return null;
+ }
+
}
13 years, 6 months
JBoss Tools SVN: r31628 - trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-05-30 07:34:35 -0400 (Mon, 30 May 2011)
New Revision: 31628
Modified:
trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
Log:
Log exception stacktrace when test failed
Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2011-05-30 10:44:50 UTC (rev 31627)
+++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2011-05-30 11:34:35 UTC (rev 31628)
@@ -5,6 +5,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
+import org.apache.log4j.Logger;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
@@ -31,7 +33,7 @@
public static final String PATH_TO_SWT_BOT_PROPERTIES = "SWTBot.properties"; //$NON-NLS-1$
protected SWTJBTBot bot = new SWTJBTBot();
private static int sleepTime = 1000;
-
+ private Logger log = Logger.getLogger(JBTSWTBotTestCase.class);
/*
* (non-Javadoc) This static block read properties from
* org.jboss.tools.ui.bot.test/resources/SWTBot.properties file and set up
@@ -161,8 +163,13 @@
protected void tearDown() throws Exception {
Platform.removeLogListener(this);
deleteLog();
- if (getException() != null) {
- throw new Exception(getException());
+ Throwable e = getException();
+ if (e != null) {
+ log.error(e.getMessage(),e);
+ if (e.getCause() != null){
+ log.error(e.getCause().getMessage(),e.getCause());
+ }
+ throw new Exception(e);
}
}
13 years, 6 months