JBoss Tools SVN: r44350 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-05 19:54:17 -0400 (Fri, 05 Oct 2012)
New Revision: 44350
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
Log:
JBIDE-12793
https://issues.jboss.org/browse/JBIDE-12793
Code modified to simplify dialog testing.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-05 22:47:08 UTC (rev 44349)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-05 23:54:17 UTC (rev 44350)
@@ -148,9 +148,10 @@
String typeName = this.type.getFullyQualifiedName();
if(RegisterServiceUtil.isServiceRegistered(type.getType().getJavaProject().getProject(), typeName, serviceType)) {
getButton(IDialogConstants.OK_ID).setEnabled(false);
- setMessage(CommonUIMessages.REGISTER_AS_SERVICE_ALREADY_REGISTERED_MESSAGE, IMessageProvider.ERROR);
+ setErrorMessage(CommonUIMessages.REGISTER_AS_SERVICE_ALREADY_REGISTERED_MESSAGE);
} else {
getButton(IDialogConstants.OK_ID).setEnabled(true);
+ setErrorMessage(null);
if(warning != null) {
setMessage(warning, IMessageProvider.WARNING);
} else {
@@ -169,7 +170,7 @@
return c;
}
- protected void okPressed() {
+ public void okPressed() {
result = serviceTypeSelector.getValueAsString();
super.okPressed();
}
@@ -177,4 +178,11 @@
public String getResult() {
return result;
}
+
+ public void setServiceType(String type) {
+ if(!types.containsKey(type)) {
+ throw new IllegalArgumentException(type);
+ }
+ serviceTypeSelector.setValue(type);
+ }
}
12 years, 3 months
JBoss Tools SVN: r44349 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-05 18:47:08 -0400 (Fri, 05 Oct 2012)
New Revision: 44349
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
Log:
File.listFiles() may return null. Check File.isDirectory() is not 100% safe; another thread or process may remove the directory right between File.isDirectory() and File.listFiles().
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2012-10-05 21:41:06 UTC (rev 44348)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2012-10-05 22:47:08 UTC (rev 44349)
@@ -149,13 +149,28 @@
return (getParent() == null) ? null : ((FolderImpl)getParent()).getProject();
}
+ /**
+ * May return null.
+ *
+ * @return
+ */
private File[] getFiles() {
File f = getFile();
if(f == null) return null;
if (!f.isDirectory()) return new File[0];
- return f.listFiles();
+ return f.listFiles(); //May return null if another thread removes directory right after the check.
}
+ private void fillMap(Map<String, File> m) {
+ File[] fs = getFiles();
+ if(fs != null) {
+ for (File f: fs) {
+ String p = FilePathHelper.toPathPath(f.getName());
+ m.put(p, f);
+ }
+ }
+ }
+
public void set(String name, String value) {
if(XModelObjectConstants.XML_ATTR_NAME.equals(name) && isActive()) {
if(value != null && !value.equals(get(name))) copy();
@@ -368,13 +383,9 @@
} catch (CoreException ex) {
ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()"); //$NON-NLS-1$
}
-
- File[] fs = getFiles();
- for (int i = 0; i < fs.length; i++) {
- String p = FilePathHelper.toPathPath(fs[i].getName());
- mf.put(p, fs[i]);
- }
+ fillMap(mf);
+
Map<String,XModelObject> mc = children.getObjectsMap();
updateAuxiliary(mc, mf);
@@ -856,12 +867,8 @@
}
if(!f.exists()) f.mkdirs();
}
- File[] fs = getFiles();
Map<String,File> t = new HashMap<String,File>();
- for (int i = 0; i < fs.length; i++) {
- String p = FilePathHelper.toPathPath(fs[i].getName());
- t.put(p, fs[i]);
- }
+ fillMap(t);
FileSystemPeer peer = getFileSystem().getPeer();
peer.register(f);
XModelObject[] cs = getChildren();
12 years, 3 months
JBoss Tools SVN: r44348 - trunk/central.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 17:41:06 -0400 (Fri, 05 Oct 2012)
New Revision: 44348
Modified:
trunk/central/pom.xml
Log:
add m2e site to central root pom
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-10-05 21:14:24 UTC (rev 44347)
+++ trunk/central/pom.xml 2012-10-05 21:41:06 UTC (rev 44348)
@@ -27,5 +27,19 @@
<module>tests</module>
<module>site</module>
</modules>
+ <repositories>
+ <!-- JBIDE-12294 merge m2e, m2e-wtp, and m2e-apt into a single site defined in parent pom -->
+ <repository>
+ <id>m2e</id>
+ <url>${m2e}</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
12 years, 3 months
JBoss Tools SVN: r44347 - trunk/central.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 17:14:24 -0400 (Fri, 05 Oct 2012)
New Revision: 44347
Modified:
trunk/central/pom.xml
Log:
remove http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-w... from central's root pom
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-10-05 21:05:39 UTC (rev 44346)
+++ trunk/central/pom.xml 2012-10-05 21:14:24 UTC (rev 44347)
@@ -19,7 +19,7 @@
mvn clean install
or
- mvn clean install -B -U -fae -e -P jbosstools-nightly-staging-composite,jboss-requirements-composite-mirror,jboss-requirements-composite-extras-mirror,local.site -Dlocal.site=file://home/nboldt/tmp/JBT_REPO_Indigo/
+ mvn clean install -B -U -fae -e -P jbosstools-nightly-staging-composite,jboss-requirements-composite-mirror,jboss-requirements-composite-extras-mirror,local.site -Dlocal.site=file:///home/nboldt/tmp/JBT_REPO_Juno/
-->
<modules>
<module>plugins</module>
@@ -27,18 +27,5 @@
<module>tests</module>
<module>site</module>
</modules>
- <repositories>
- <repository>
- <id>jbosstools-m2e-wtp-mirror</id>
- <layout>p2</layout>
- <url>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-w...</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
12 years, 3 months
JBoss Tools SVN: r44346 - in trunk/central/plugins/org.jboss.tools.central.discovery: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 17:05:39 -0400 (Fri, 05 Oct 2012)
New Revision: 44346
Added:
trunk/central/plugins/org.jboss.tools.central.discovery/images/android_32.png
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
switch to android_32 image
Added: trunk/central/plugins/org.jboss.tools.central.discovery/images/android_32.png
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/images/android_32.png (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/images/android_32.png 2012-10-05 21:05:39 UTC (rev 44346)
@@ -0,0 +1,6 @@
+�PNG
+
+
+:�
+��XTpc�8}h�~����PT
\ No newline at end of file
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-10-05 16:59:40 UTC (rev 44345)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-10-05 21:05:39 UTC (rev 44346)
@@ -568,7 +568,7 @@
<iu id="com.android.ide.eclipse.traceview"/>
<!-- DO NOT INCLUDE com.android.ide.eclipse.ndk feature because it requires CDT -->
<icon
- image32="images/google_32.png">
+ image32="images/android_32.png">
</icon>
<overview
url="http://developer.android.com/tools/sdk/eclipse-adt.html">
12 years, 3 months
JBoss Tools SVN: r44345 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 12:59:40 -0400 (Fri, 05 Oct 2012)
New Revision: 44345
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2278, JBIDE-12498, JBIDE-12497, JBIDE-11167, JBDS-2235 - add GWT Designer/WB and Android Tools to Central
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-10-05 16:59:33 UTC (rev 44344)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-10-05 16:59:40 UTC (rev 44345)
@@ -554,6 +554,54 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.web"
groupId="org.jboss.tools.central.discovery.web.extras"
+ description="Android Development Tools, DDMS, Hierarchy Viewer, OpenGL Tracer, Traceview"
+ id="com.android.ide.eclipse.adt"
+ kind="task"
+ license="EPL, Other"
+ name="Android Development Tools"
+ provider="Google, Inc."
+ siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
+ <iu id="com.android.ide.eclipse.adt"/>
+ <iu id="com.android.ide.eclipse.ddms"/>
+ <iu id="com.android.ide.eclipse.hierarchyviewer"/>
+ <iu id="com.android.ide.eclipse.gldebugger"/>
+ <iu id="com.android.ide.eclipse.traceview"/>
+ <!-- DO NOT INCLUDE com.android.ide.eclipse.ndk feature because it requires CDT -->
+ <icon
+ image32="images/google_32.png">
+ </icon>
+ <overview
+ url="http://developer.android.com/tools/sdk/eclipse-adt.html">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.web"
+ groupId="org.jboss.tools.central.discovery.web.extras"
+ description="Google Web Toolkit Designer + WindowBuilder"
+ id="com.google.gdt.eclipse.designer.editor.feature"
+ kind="task"
+ license="EPL, Other"
+ name="Google Web Toolkit Designer"
+ provider="Google, Inc."
+ siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
+ <iu id="com.google.gdt.eclipse.designer.editor.feature"/>
+ <iu id="com.google.gdt.eclipse.designer.gpe.feature"/>
+ <iu id="com.google.gdt.eclipse.designer.hosted.feature"/>
+ <iu id="com.google.gwt.eclipse.sdkbundle.e42.feature"/>
+ <iu id="com.google.gdt.eclipse.suite.e42.feature"/>
+ <iu id="org.eclipse.wb.core.feature"/>
+ <iu id="org.eclipse.wb.core.xml.feature"/>
+ <iu id="org.eclipse.wb.css.feature"/>
+ <icon
+ image32="images/google_32.png">
+ </icon>
+ <overview
+ url="https://developers.google.com/web-toolkit/tools/gwtdesigner/quick_start">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.web"
+ groupId="org.jboss.tools.central.discovery.web.extras"
description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
id="com.google.gwt.eclipse.sdkbundle.e42.feature"
kind="task"
@@ -567,7 +615,7 @@
image32="images/google_32.png">
</icon>
<overview
- url="http://code.google.com/p/google-plugin-for-eclipse/">
+ url="https://developers.google.com/eclipse/">
</overview>
</connectorDescriptor>
<connectorDescriptor
12 years, 3 months
JBoss Tools SVN: r44343 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-05 12:58:19 -0400 (Fri, 05 Oct 2012)
New Revision: 44343
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
Log:
Added generalized method for actions and listeners to deal with random cases of editor not being active
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-10-05 16:44:00 UTC (rev 44342)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-10-05 16:58:19 UTC (rev 44343)
@@ -123,9 +123,12 @@
@Test
public void listeners() {
+ /* Add service is failing on Jenkins - https://issues.jboss.org/browse/JBQA-7100
+ * This problem appeared in the firt week of Oct. 2012 - and is only seen when the
+ * test is run on Jenkins - as a workaround - the editor is saved/shown - ldimaggi */
SWTBotEditor editor = getEditor();
- log.error("Listeners Editor is active = " + editor.isActive());
-
+ getEditorActive(editor, "Listeners");
+
String service = "aaa";
addService(service);
List<String> listenerList = getAvailableListeners(service);
@@ -169,14 +172,7 @@
* This problem appeared in the firt week of Oct. 2012 - and is only seen when the
* test is run on Jenkins - as a workaround - the editor is saved/shown - ldimaggi */
SWTBotEditor editor = getEditor();
- if (!editor.isActive()) {
- log.error("Actions Editor is active? = " + editor.isActive());
- bot.sleep(30000l);
- log.error(editor.getTitle());
- editor.save();
- editor.show();
- log.error("Actions Editor is active? = " + editor.isActive());
- }
+ getEditorActive(editor, "Actions");
addService(service);
String[] actionPath = new String[] { configFileFull, node_services,
@@ -216,6 +212,20 @@
}
}
+
+ /* Add service is failing on Jenkins - https://issues.jboss.org/browse/JBQA-7100
+ * This problem appeared in the firt week of Oct. 2012 - and is only seen when the
+ * test is run on Jenkins - as a workaround - the editor is saved/shown - ldimaggi */
+ public void getEditorActive (SWTBotEditor theEditor, String taskType) {
+ if (!theEditor.isActive()) {
+ log.error(taskType + " Editor is active? = " + theEditor.isActive());
+ bot.sleep(30000l);
+ log.error(theEditor.getTitle());
+ theEditor.save();
+ theEditor.show();
+ log.error(taskType + " Editor is active? = " + theEditor.isActive());
+ }
+ }
private SWTBotEditor getEditor() {
bot.sleep(TIME_5S);
12 years, 3 months
JBoss Tools SVN: r44341 - in trunk/download.jboss.org/jbosstools/updates/juno/extras: SR0b and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-05 12:42:24 -0400 (Fri, 05 Oct 2012)
New Revision: 44341
Added:
trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/
trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeArt...
trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeCon...
Log:
add extras site SR0b - includes updated 3rd party stuff for Central (JBDS-2278)
Added: trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeArt...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeArt... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeArt... 2012-10-05 16:42:24 UTC (rev 44341)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1349454219000'/>
+</properties>
+<children size='8'>
+
+<!-- JBIDE-12498 -->
+<child location='../../../requirements/android/20.0.3.v201208082019-427395/'/>
+
+<!-- JBDS-2283 -->
+<child location='../../../requirements/eclipsecs/5.6.0.201209221626/'/>
+
+<!-- TODO: JBDS-2284, JBDS-2347 verify OK -->
+<child location='../../../requirements/findbugs/2.0.2.20121005/'/>
+
+<!-- JBIDE-12497, JBDS-2235 partially in TP (gwt/gpe) but need to add it here to include GWT Designer + WindowBuilder -->
+<child location='../../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/>
+
+<!-- TODO: JBIDE-12562, JBDS-2272 use pmd 3.2.6 instead of 3.2.4 -->
+<child location='../../../requirements/pmd/3.2.4/'/>
+
+<!-- TODO: JBDS-2280 bump up to 3.0.0.201208090952-RELEASE -->
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<!-- TODO: JBDS-2282 bump to 1.8.16_1.7.5.v1 -->
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+
+<!-- TODO: JBDS-2281 bump to 6.7.0.20120825_1316 -->
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+
+<!-- JBDS-2189 remove <child location='../../../requirements/jslint/1.5/'/> -->
+<!-- JBDS-2278 remove as not included in Central (there is an Indigo version available if we want it later) <child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/> -->
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeCon...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeCon... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/juno/extras/SR0b/compositeCon... 2012-10-05 16:42:24 UTC (rev 44341)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1349454219000'/>
+</properties>
+<children size='8'>
+
+<!-- JBIDE-12498 -->
+<child location='../../../requirements/android/20.0.3.v201208082019-427395/'/>
+
+<!-- JBDS-2283 -->
+<child location='../../../requirements/eclipsecs/5.6.0.201209221626/'/>
+
+<!-- TODO: JBDS-2284, JBDS-2347 verify OK -->
+<child location='../../../requirements/findbugs/2.0.2.20121005/'/>
+
+<!-- JBIDE-12497, JBDS-2235 partially in TP (gwt/gpe) but need to add it here to include GWT Designer + WindowBuilder -->
+<child location='../../../requirements/gwt/3.1.0.v201208080121-rel-r42/'/>
+
+<!-- TODO: JBIDE-12562, JBDS-2272 use pmd 3.2.6 instead of 3.2.4 -->
+<child location='../../../requirements/pmd/3.2.4/'/>
+
+<!-- TODO: JBDS-2280 bump up to 3.0.0.201208090952-RELEASE -->
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<!-- TODO: JBDS-2282 bump to 1.8.16_1.7.5.v1 -->
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+
+<!-- TODO: JBDS-2281 bump to 6.7.0.20120825_1316 -->
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+
+<!-- JBDS-2189 remove <child location='../../../requirements/jslint/1.5/'/> -->
+<!-- JBDS-2278 remove as not included in Central (there is an Indigo version available if we want it later) <child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/> -->
+</children>
+</repository>
12 years, 3 months