JBoss Tools SVN: r28663 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-27 12:28:22 -0500 (Thu, 27 Jan 2011)
New Revision: 28663
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
Log:
[JBIDE-8249] changed order: first log, then display error dialog
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-27 17:25:55 UTC (rev 28662)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-27 17:28:22 UTC (rev 28663)
@@ -25,8 +25,8 @@
public class ErrorUtils {
public static IStatus handleError(final String title, final String message, Throwable e, final Shell shell) {
IStatus status = createStatus(e);
+ log(status);
openErrorDialog(title, message, status, shell);
- log(status);
return status;
}
13 years, 4 months
JBoss Tools SVN: r28662 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-27 12:25:55 -0500 (Thu, 27 Jan 2011)
New Revision: 28662
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-8254] corrected error text (conntection -> connecting)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-27 16:43:47 UTC (rev 28661)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-27 17:25:55 UTC (rev 28662)
@@ -644,7 +644,7 @@
} catch (DeltaCloudAuthClientException e) {
return false;
} catch (DeltaCloudClientException e) {
- throw new DeltaCloudException(MessageFormat.format("Could not connection to cloud \"{0}\" at \"{1}\"",
+ throw new DeltaCloudException(MessageFormat.format("Could not connect to cloud \"{0}\" at \"{1}\"",
name, url), e);
}
13 years, 4 months
JBoss Tools SVN: r28661 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-27 11:43:47 -0500 (Thu, 27 Jan 2011)
New Revision: 28661
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
Log:
[JBIDE-8249] removed check for platform debug state, logging always. No cleanup of log invocations needed since I log errors only so far.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-27 16:34:41 UTC (rev 28660)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-27 16:43:47 UTC (rev 28661)
@@ -31,9 +31,7 @@
}
private static void log(IStatus status) {
- if (Activator.getDefault().isDebugging()) {
- Activator.log(status);
- }
+ Activator.log(status);
}
/**
13 years, 4 months
JBoss Tools SVN: r28660 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-27 11:34:41 -0500 (Thu, 27 Jan 2011)
New Revision: 28660
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
revert to CR1 until after the green light from QA on release of JBDS 4 CR1
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-27 15:56:06 UTC (rev 28659)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-27 16:34:41 UTC (rev 28660)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>CR2</BUILD_ALIAS>
+ <BUILD_ALIAS>CR1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 4 months
JBoss Tools SVN: r28659 - branches/jbosstools-3.2.x/requirements/soap.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-27 10:56:06 -0500 (Thu, 27 Jan 2011)
New Revision: 28659
Modified:
branches/jbosstools-3.2.x/requirements/soap/build.properties
Log:
bump SOA-P to ER8 release
Modified: branches/jbosstools-3.2.x/requirements/soap/build.properties
===================================================================
--- branches/jbosstools-3.2.x/requirements/soap/build.properties 2011-01-27 15:52:08 UTC (rev 28658)
+++ branches/jbosstools-3.2.x/requirements/soap/build.properties 2011-01-27 15:56:06 UTC (rev 28659)
@@ -10,9 +10,9 @@
soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
soap50.build.archive.root=jboss-soa-p.5.0.0
-# JBDS-1374, JBIDE-8055 add SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER7/unsigned/soa-5....
-soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER7/unsigned/
-soap51.build.name=soa-5.1.0.ER7
+# JBDS-1374, JBIDE-8055 add SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER8/unsigned/soa-5....
+soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER8/unsigned/
+soap51.build.name=soa-5.1.0.ER8
soap51.build.archive=${soap51.build.name}.zip
-soap51.build.archive.md5=2084142acbf99b4e71b40013ef131033
+soap51.build.archive.md5=5a8886b2cbb6633302081c45caa9caca
soap51.build.archive.root=jboss-soa-p.5.1.0
13 years, 4 months
JBoss Tools SVN: r28658 - trunk/requirements/soap.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-27 10:52:08 -0500 (Thu, 27 Jan 2011)
New Revision: 28658
Modified:
trunk/requirements/soap/build.properties
Log:
bump SOA-P to ER8 release
Modified: trunk/requirements/soap/build.properties
===================================================================
--- trunk/requirements/soap/build.properties 2011-01-27 15:45:36 UTC (rev 28657)
+++ trunk/requirements/soap/build.properties 2011-01-27 15:52:08 UTC (rev 28658)
@@ -10,10 +10,10 @@
soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
soap50.build.archive.root=jboss-soa-p.5.0.0
-# JBDS-1374, JBIDE-8055 add SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER7/unsigned/soa-5....
-soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER7/unsigned/
-soap51.build.name=soa-5.1.0.ER7
+# JBDS-1374, JBIDE-8055 add SOA-P 5.1 - http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER8/unsigned/soa-5....
+soap51.build.uri=http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER8/unsigned/
+soap51.build.name=soa-5.1.0.ER8
soap51.build.archive=${soap51.build.name}.zip
-soap51.build.archive.md5=2084142acbf99b4e71b40013ef131033
+soap51.build.archive.md5=5a8886b2cbb6633302081c45caa9caca
soap51.build.archive.root=jboss-soa-p.5.1.0
13 years, 4 months
JBoss Tools SVN: r28657 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-27 10:45:36 -0500 (Thu, 27 Jan 2011)
New Revision: 28657
Modified:
trunk/build/parent/pom.xml
Log:
bump up to CR2 suffix in 3.2.x branch
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-01-27 15:43:19 UTC (rev 28656)
+++ trunk/build/parent/pom.xml 2011-01-27 15:45:36 UTC (rev 28657)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>trunk</scmBranch>
- <BUILD_ALIAS>CR2</BUILD_ALIAS>
+ <BUILD_ALIAS>Alpha1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 4 months
JBoss Tools SVN: r28656 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-01-27 10:43:19 -0500 (Thu, 27 Jan 2011)
New Revision: 28656
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump up to CR2 suffix in 3.2.x branch
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-27 15:07:51 UTC (rev 28655)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-27 15:43:19 UTC (rev 28656)
@@ -14,8 +14,8 @@
<properties>
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
- <scmBranch>branches/jbosstools-3.2.0.CR1</scmBranch>
- <BUILD_ALIAS>CR1</BUILD_ALIAS>
+ <scmBranch>branches/jbosstools-3.2.x</scmBranch>
+ <BUILD_ALIAS>CR2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 4 months
JBoss Tools SVN: r28655 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-27 10:07:51 -0500 (Thu, 27 Jan 2011)
New Revision: 28655
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
Log:
[JBIDE-8253] checking relative ssh private key entries now, too
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 13:49:55 UTC (rev 28654)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 15:07:51 UTC (rev 28655)
@@ -1,6 +1,12 @@
2011-01-27 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
+ (contains):
+ (getAbsoluteKeyPath):
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
+ (KeyValidator.isKeyKnowToSsh):
+ [JBIDE-8253] checking relative ssh private key entries now, too
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
(KeyValidator.validate):
(KeyValidator.isKeyKnowToSsh):
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (performFinish):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-27 13:49:55 UTC (rev 28654)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-27 15:07:51 UTC (rev 28655)
@@ -437,7 +437,7 @@
private boolean isKeyKnowToSsh(String keyId) {
try {
File file = PemFileManager.getFile(keyId, SshPrivateKeysPreferences.getSshKeyDirectory());
- return SshPrivateKeysPreferences.contains(file.getAbsolutePath());
+ return SshPrivateKeysPreferences.contains(file);
} catch (FileNotFoundException e) {
return false;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-27 13:49:55 UTC (rev 28654)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-27 15:07:51 UTC (rev 28655)
@@ -51,20 +51,38 @@
}
/**
- * Adds the given keyName to the ssh-preferences
+ * Checks if the given key is cotained in the ssh-preferences
*
* @param keyName
* the name of the key to add
*/
- public static boolean contains(String keyName) {
+ public static boolean contains(File key) {
+ if (key == null) {
+ return false;
+ }
+
+ String keyPath = key.getAbsolutePath();
for (String privateKey : sshPrivateKeyPreference.get()) {
- if (privateKey.equals(keyName)) {
+ if (keyPath.equals(getAbsoluteKeyPath(privateKey))) {
return true;
}
}
return false;
}
-
+
+ private static String getAbsoluteKeyPath(String keyName) {
+ try {
+ if (keyName != null && !keyName.startsWith(File.separator)) {
+ StringBuilder builder = new StringBuilder(getSshKeyDirectory());
+ builder.append(File.separatorChar).append(keyName);
+ return builder.toString();
+ }
+ } catch (FileNotFoundException e) {
+ // ignore
+ }
+ return keyName;
+ }
+
/**
* Removes the given keyName from the ssh-preferences
*
13 years, 4 months
JBoss Tools SVN: r28654 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-01-27 08:49:55 -0500 (Thu, 27 Jan 2011)
New Revision: 28654
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
Log:
[JBIDE-8254] replaced the warning dialog by a similar decoration to the key text field. Warning is displayed in the title area and in the tooltip of the decoration
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 13:49:12 UTC (rev 28653)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-27 13:49:55 UTC (rev 28654)
@@ -4,7 +4,8 @@
(KeyValidator.validate):
(KeyValidator.isKeyKnowToSsh):
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (performFinish):
- [JBIDE-8254] replaced the warning dialog by a similar decoration to the key text field. Warning is displayed in the title area and in the tooltip of the decoration
+ [JBIDE-8254] replaced the warning dialog by a similar decoration to the key text field.
+ Warning is displayed in the title area and in the tooltip of the decoration
2011-01-26 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
13 years, 4 months