JBoss Tools SVN: r43840 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-19 13:40:28 -0400 (Wed, 19 Sep 2012)
New Revision: 43840
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java
Log:
JBIDE-12604 - "Favorite @ Marketplace" button points to old version of JBT on marketplace.
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java 2012-09-19 17:39:16 UTC (rev 43839)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java 2012-09-19 17:40:28 UTC (rev 43840)
@@ -18,9 +18,11 @@
*/
public class FavoriteAtEclipseMarketplaceHandler extends OpenWithBrowserHandler {
+ private static final String MARKETPLACE_ECLIPSE_URL = "http://marketplace.eclipse.org/node/420896";
+
@Override
public String getLocation() {
- return "http://marketplace.eclipse.org/node/121986";
+ return MARKETPLACE_ECLIPSE_URL;
}
}
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43839 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: utils and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-19 13:39:16 -0400 (Wed, 19 Sep 2012)
New Revision: 43839
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/FileNameValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ISSHKeyWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/DirectoryValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyNameValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/NonEmptyStringValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyNameValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyValidator.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/AlphanumericStringValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyJob.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java
Log:
[JBIDE-11912] implemented "Add new SSH key"
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/AlphanumericStringValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/AlphanumericStringValidator.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/AlphanumericStringValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.databinding;
-import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.IStatus;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
@@ -18,21 +17,18 @@
/**
* @author Andre Dietisheim
*/
-public class AlphanumericStringValidator implements IValidator {
+public class AlphanumericStringValidator extends RequiredStringValidator {
private String fieldName;
public AlphanumericStringValidator(String fieldName) {
- this.fieldName = fieldName;
+ super(fieldName);
}
@Override
- public IStatus validate(Object value) {
- String name = (String) value;
- if (StringUtils.isEmpty(name)) {
- return ValidationStatus.cancel("You have to provide a " + fieldName);
- } else if (!StringUtils.isAlphaNumeric(name)) {
- return ValidationStatus.cancel("You have to provide an alphanumeric " + fieldName);
+ public IStatus validateString(String value) {
+ if (!StringUtils.isAlphaNumeric(value)) {
+ return ValidationStatus.error("You have to provide an alphanumeric " + fieldName);
}
return ValidationStatus.ok();
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/FileNameValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/FileNameValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/FileNameValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.databinding;
+
+import java.io.File;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * Validates a given String positively if it is non-empty and has no separator
+ * chars (it's a file name, not a path)
+ *
+ * @author Andre Dietisheim
+ */
+public class FileNameValidator extends RequiredStringValidator implements IValidator {
+
+ public FileNameValidator() {
+ super("private key file name");
+ }
+
+ @Override
+ public IStatus validateString(String value) {
+ if (value.indexOf(File.separator) >= 0) {
+ ValidationStatus.error("You may only provide a file name, not a path.");
+ }
+ return ValidationStatus.ok();
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/FileNameValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/NonEmptyStringValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/NonEmptyStringValidator.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/NonEmptyStringValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.databinding;
-
-import org.eclipse.core.databinding.validation.IValidator;
-import org.eclipse.core.databinding.validation.ValidationStatus;
-import org.eclipse.core.runtime.IStatus;
-import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-
-/**
- * @author Andre Dietisheim
- */
-public class NonEmptyStringValidator implements IValidator {
-
- private String fieldName;
-
- public NonEmptyStringValidator(String fieldName) {
- this.fieldName = fieldName;
- }
-
- @Override
- public IStatus validate(Object value) {
- String name = (String) value;
- if (StringUtils.isEmpty(name)) {
- return ValidationStatus.cancel("You have to provide a " + fieldName);
- }
- return ValidationStatus.ok();
- }
-
-}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java (from rev 43816, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/NonEmptyStringValidator.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.databinding;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class RequiredStringValidator implements IValidator {
+
+ private String fieldName;
+
+ public RequiredStringValidator(String fieldName) {
+ this.fieldName = fieldName;
+ }
+
+ @Override
+ public IStatus validate(Object value) {
+ String name = (String) value;
+ if (StringUtils.isEmpty(name)) {
+ return ValidationStatus.cancel("You have to provide a " + fieldName);
+ }
+ return validateString((String)value);
+ }
+
+ public IStatus validateString(String value) {
+ return ValidationStatus.ok();
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -98,4 +98,12 @@
.toString();
}
+ public static String getWithoutSuffix(String string, String suffix) {
+ String stringNoSuffix = string;
+ int suffixIndex = string.indexOf(suffix);
+ if (suffixIndex >= 0) {
+ stringNoSuffix = string.substring(0, suffixIndex);
+ }
+ return stringNoSuffix;
+ }
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
+
+import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+
+/**
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractSSHKeyWizardPageModel extends ObservableUIPojo implements ISSHKeyWizardPageModel {
+
+ private String name;
+ private UserDelegate user;
+
+ public AbstractSSHKeyWizardPageModel(UserDelegate user) {
+ this.user = user;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public void setName(String name) {
+ firePropertyChange(PROPERTY_NAME, this.name, this.name = name);
+ }
+
+ @Override
+ public boolean hasKeyName(String name) {
+ return user.hasSSHKeyName(name);
+ }
+
+ @Override
+ public boolean hasPublicKey(String publicKeyContent) {
+ return user.hasSSHPublicKey(publicKeyContent);
+ }
+
+ protected UserDelegate getUser() {
+ return user;
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyJob.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyJob.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyJob.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -22,9 +22,9 @@
*/
public class AddSSHKeyJob extends Job {
- private AddSSHKeyWizardPageModel model;
+ private ISSHKeyWizardPageModel model;
- public AddSSHKeyJob(AddSSHKeyWizardPageModel model) {
+ public AddSSHKeyJob(ISSHKeyWizardPageModel model) {
super("Adding SSH key " + model.getName() + "...");
this.model = model;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -38,6 +38,8 @@
import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding.SSHPublicKeyNameValidator;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding.SSHPublicKeyValidator;
/**
* @author André Dietisheim
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -14,7 +14,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import com.openshift.client.OpenShiftException;
@@ -23,47 +22,34 @@
/**
* @author Andre Dietisheim
*/
-public class AddSSHKeyWizardPageModel extends ObservableUIPojo {
+public class AddSSHKeyWizardPageModel extends AbstractSSHKeyWizardPageModel {
public static final String PROPERTY_PUBLICKEY_PATH = "publicKeyPath";
- public static final String PROPERTY_NAME = "name";
- private String name;
- private String filePath;
- private UserDelegate user;
+ private String keyPath;
public AddSSHKeyWizardPageModel(UserDelegate user) {
- this.user = user;
+ super(user);
}
public String getPublicKeyPath() {
- return filePath;
+ return keyPath;
}
- public void setPublicKeyPath(String filePath) {
- firePropertyChange(PROPERTY_PUBLICKEY_PATH, this.filePath, this.filePath = filePath);
+ public File getPublicKey() {
+ return new File(keyPath);
}
- public String getName() {
- return name;
+ public void setPublicKeyPath(String keyPath) {
+ firePropertyChange(PROPERTY_PUBLICKEY_PATH, this.keyPath, this.keyPath = keyPath);
}
- public void setName(String name) {
- firePropertyChange(PROPERTY_NAME, this.name, this.name = name);
- }
-
- public boolean hasKeyName(String name) {
- return user.hasSSHKeyName(name);
- }
-
public boolean hasPublicKey(String publicKeyContent) {
- return user.hasSSHPublicKey(publicKeyContent);
- }
-
+ return getUser().hasSSHPublicKey(publicKeyContent);
+ }
+
public void addConfiguredSSHKey() throws FileNotFoundException, OpenShiftException, IOException {
- SSHPublicKey sshPublicKey = new SSHPublicKey(new File(filePath));
- user.putSSHKey(name, sshPublicKey);
+ SSHPublicKey sshPublicKey = new SSHPublicKey(getPublicKey());
+ getUser().putSSHKey(getName(), sshPublicKey);
}
-
-
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ISSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ISSHKeyWizardPageModel.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ISSHKeyWizardPageModel.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import com.openshift.client.OpenShiftException;
+
+/**
+ * @author Andre Dietisheim
+ */
+public interface ISSHKeyWizardPageModel {
+
+ public static final String PROPERTY_NAME = "name";
+
+ public String getName();
+
+ public void setName(String name);
+
+ public boolean hasKeyName(String name);
+
+ public boolean hasPublicKey(String publicKeyContent);
+
+ public void addConfiguredSSHKey() throws FileNotFoundException, OpenShiftException, IOException;
+
+ public File getPublicKey();
+}
\ No newline at end of file
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ISSHKeyWizardPageModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -36,10 +36,13 @@
import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import org.jboss.tools.openshift.express.internal.ui.databinding.NonEmptyStringValidator;
+import org.jboss.tools.openshift.express.internal.ui.databinding.FileNameValidator;
import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding.DirectoryValidator;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding.SSHPublicKeyNameValidator;
import com.openshift.client.SSHKeyType;
@@ -66,7 +69,7 @@
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(newSSHKeyGroup);
GridLayoutFactory.fillDefaults()
- .numColumns(3).margins(6, 6).applyTo(newSSHKeyGroup);
+ .numColumns(4).margins(6, 6).applyTo(newSSHKeyGroup);
Label nameLabel = new Label(newSSHKeyGroup, SWT.NONE);
nameLabel.setText("Name:");
@@ -75,7 +78,7 @@
Text nameText = new Text(newSSHKeyGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(nameText);
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(3, 1).applyTo(nameText);
Binding nameBinding = ValueBindingBuilder
.bind(WidgetProperties.text(SWT.Modify).observe(nameText))
.validatingAfterConvert(new SSHPublicKeyNameValidator(pageModel))
@@ -90,18 +93,19 @@
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).applyTo(typeLabel);
- ComboViewer typeCombo = new ComboViewer(newSSHKeyGroup, SWT.DEFAULT);
+ ComboViewer typeCombo = new ComboViewer(newSSHKeyGroup, SWT.READ_ONLY);
typeCombo.setContentProvider(ArrayContentProvider.getInstance());
typeCombo.setInput(SSHKeyType.values());
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).applyTo(typeCombo.getControl());
- ValueBindingBuilder.bind(
- ViewerProperties.singleSelection().observe(typeCombo))
- .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_TYPE).observe(typeCombo))
+ ValueBindingBuilder
+ .bind(ViewerProperties.singleSelection().observe(typeCombo))
+ .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_TYPE).observe(pageModel))
.in(dbc);
+
Label fillerLabel = new Label(newSSHKeyGroup, SWT.NONE);
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).applyTo(fillerLabel);
+ .align(SWT.LEFT, SWT.CENTER).span(2, 1).applyTo(fillerLabel);
Label ssh2HomeLabel = new Label(newSSHKeyGroup, SWT.NONE);
GridDataFactory.fillDefaults()
@@ -114,18 +118,26 @@
.align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(ssh2HomeText);
Binding ssh2HomeBinding = ValueBindingBuilder
.bind(WidgetProperties.text(SWT.Modify).observe(ssh2HomeText))
- .validatingAfterConvert(new NonEmptyStringValidator("ssh2 home directory"))
+ .validatingAfterConvert(new DirectoryValidator("ssh2 home directory"))
.to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_SSH2_HOME).observe(pageModel))
.in(dbc);
ControlDecorationSupport.create(
ssh2HomeBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
- Button ss2HomeBrowseButton = new Button(newSSHKeyGroup, SWT.PUSH);
- ss2HomeBrowseButton.setText("Browse...");
- ss2HomeBrowseButton.addSelectionListener(onBrowse());
+ Button ssh2HomeBrowseButton = new Button(newSSHKeyGroup, SWT.PUSH);
+ ssh2HomeBrowseButton.setText("Browse...");
+ ssh2HomeBrowseButton.addSelectionListener(onBrowse(ssh2HomeText));
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).applyTo(ss2HomeBrowseButton);
+ .align(SWT.FILL, SWT.CENTER).applyTo(ssh2HomeBrowseButton);
+ Button defaultSSH2HomeHomeButton = new Button(newSSHKeyGroup, SWT.CHECK);
+ defaultSSH2HomeHomeButton.setText("Default");
+ defaultSSH2HomeHomeButton.addSelectionListener(onDefault(ssh2HomeText, ssh2HomeBrowseButton));
+ defaultSSH2HomeHomeButton.setSelection(true);
+ updateSSH2HomeWidgets(true, ssh2HomeText, ssh2HomeBrowseButton);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).applyTo(ssh2HomeBrowseButton);
+
Label privateKeyLabel = new Label(newSSHKeyGroup, SWT.NONE);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).applyTo(privateKeyLabel);
@@ -133,11 +145,11 @@
Text privateKeyText = new Text(newSSHKeyGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(privateKeyText);
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(3, 1).applyTo(privateKeyText);
Binding privateKeyBinding = ValueBindingBuilder
.bind(WidgetProperties.text(SWT.Modify).observe(privateKeyText))
- .validatingAfterConvert(new NonEmptyStringValidator("private key file name"))
- .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_PRIVATEKEY_PATH).observe(pageModel))
+ .validatingAfterConvert(new FileNameValidator())
+ .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_PRIVATEKEY_FILENAME).observe(pageModel))
.in(dbc);
ControlDecorationSupport.create(
privateKeyBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
@@ -149,10 +161,9 @@
Text passphraseText = new Text(newSSHKeyGroup, SWT.BORDER | SWT.PASSWORD);
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(passphraseText);
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(3, 1).applyTo(passphraseText);
ValueBindingBuilder
.bind(WidgetProperties.text(SWT.Modify).observe(passphraseText))
- .validatingAfterConvert(new NonEmptyStringValidator("pass phrase"))
.to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_PRIVATEKEY_PASSPHRASE).observe(pageModel))
.in(dbc);
@@ -163,31 +174,57 @@
Text publicKeyText = new Text(newSSHKeyGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(publicKeyText);
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(3, 1).applyTo(publicKeyText);
Binding publicKeyBinding = ValueBindingBuilder
.bind(WidgetProperties.text(SWT.Modify).observe(publicKeyText))
- .validatingAfterConvert(new NonEmptyStringValidator("public key file name"))
- .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_PUBLICKEY_PATH).observe(pageModel))
+ .validatingAfterConvert(new FileNameValidator())
+ .to(BeanProperties.value(NewSSHKeyWizardPageModel.PROPERTY_PUBLICKEY_FILENAME).observe(pageModel))
.in(dbc);
ControlDecorationSupport.create(
publicKeyBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
}
- private SelectionListener onBrowse() {
+ private SelectionListener onBrowse(final Text ssh2HomeText) {
return new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN);
- dialog.setFilterPath(SSHUtils.getSSH2Home());
- String filePath = null;
- if ((filePath = dialog.open()) != null) {
- pageModel.setPublicKeyPath(filePath);
+ dialog.setFilterPath(getFilterPath(ssh2HomeText.getText()));
+ String ssh2HomePath = null;
+ if ((ssh2HomePath = dialog.open()) != null) {
+ pageModel.setSSH2Home(ssh2HomePath);
}
}
+
+ private String getFilterPath(String currentFilterPath) {
+ if (StringUtils.isEmpty(currentFilterPath)) {
+ return currentFilterPath;
+ } else {
+ return SSHUtils.getSSH2Home();
+ }
+ }
};
}
+ private SelectionListener onDefault(final Text ssh2HomeText, final Button ssh2HomeBrowseButton) {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ updateSSH2HomeWidgets(((Button) e.widget).getSelection(), ssh2HomeText, ssh2HomeBrowseButton);
+ }
+ };
+ }
+
+ private void updateSSH2HomeWidgets(boolean isDefault, final Text ssh2HomeText, final Button ssh2HomeBrowseButton) {
+ ssh2HomeText.setEnabled(!isDefault);
+ ssh2HomeBrowseButton.setEnabled(!isDefault);
+ if (isDefault) {
+ ssh2HomeText.setText(SSHUtils.getSSH2Home());
+ }
+ }
+
public IStatus addConfiguredSSHKey() {
try {
return WizardUtils.runInWizard(new AddSSHKeyJob(pageModel), getContainer());
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -10,24 +10,35 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.client.OpenShiftException;
+import com.openshift.client.SSHKeyPair;
import com.openshift.client.SSHKeyType;
/**
* @author Andre Dietisheim
*/
-public class NewSSHKeyWizardPageModel extends AddSSHKeyWizardPageModel {
+public class NewSSHKeyWizardPageModel extends AbstractSSHKeyWizardPageModel {
public static final String PROPERTY_TYPE = "type";
- public static final String PROPERTY_SSH2_HOME = "SSH22Home";
- public static final String PROPERTY_PRIVATEKEY_PATH = "privateKeyPath";
+ public static final String PROPERTY_SSH2_HOME = "SSH2Home";
+ public static final String PROPERTY_PRIVATEKEY_FILENAME = "privateKeyName";
public static final String PROPERTY_PRIVATEKEY_PASSPHRASE = "privateKeyPassphrase";
+ public static final String PROPERTY_PUBLICKEY_FILENAME = "publicKeyName";
+ private static final String PUBLICKEY_SUFFIX = ".pub";
private SSHKeyType type = SSHKeyType.SSH_RSA;
- private String ssh2Home;
- private String privateKeyPath;
+ private String ssh2Home = SSHUtils.getSSH2Home();
+ private String privateKeyName;
private String privateKeyPathphrase;
+ private String publicKeyName;
public NewSSHKeyWizardPageModel(UserDelegate user) {
super(user);
@@ -50,14 +61,34 @@
this.privateKeyPathphrase, this.privateKeyPathphrase = privateKeyPathphrase);
}
- public String getPrivateKeyPath() {
- return privateKeyPath;
+ public String getPrivateKeyName() {
+ return privateKeyName;
}
- public void setPrivateKeyPath(String privateKeyPath) {
- firePropertyChange(PROPERTY_PRIVATEKEY_PATH, this.privateKeyPath, this.privateKeyPath = privateKeyPath);
+ public void setPrivateKeyName(String privateKeyName) {
+ firePropertyChange(PROPERTY_PRIVATEKEY_FILENAME, this.privateKeyName, this.privateKeyName = privateKeyName);
+ updatePublicKeyNameFromPrivateKey(privateKeyName);
}
+ private void updatePublicKeyNameFromPrivateKey(String privateKeyName) {
+ if (StringUtils.isEmpty(publicKeyName)) {
+ setPublicKeyName(privateKeyName + PUBLICKEY_SUFFIX);
+ } else {
+ String publicKeyNameNoSuffix = StringUtils.getWithoutSuffix(publicKeyName, PUBLICKEY_SUFFIX);
+ if (privateKeyName.startsWith(publicKeyNameNoSuffix)) {
+ setPublicKeyName(privateKeyName + PUBLICKEY_SUFFIX);
+ }
+ }
+ }
+
+ public String getPublicKeyName() {
+ return publicKeyName;
+ }
+
+ public void setPublicKeyName(String publicKeyName) {
+ firePropertyChange(PROPERTY_PUBLICKEY_FILENAME, this.publicKeyName, this.publicKeyName = publicKeyName);
+ }
+
public String getSSH2Home() {
return ssh2Home;
}
@@ -65,5 +96,17 @@
public void setSSH2Home(String ssh2Home) {
firePropertyChange(PROPERTY_SSH2_HOME, this.ssh2Home, this.ssh2Home = ssh2Home);
}
+
+ public File getPublicKey() {
+ return new File(ssh2Home, publicKeyName);
+ }
+
+ public void addConfiguredSSHKey() throws FileNotFoundException, OpenShiftException, IOException {
+ String privateKeyPath = new File(ssh2Home, privateKeyName).getAbsolutePath();
+ String publicKeyPath = new File(ssh2Home, publicKeyName).getAbsolutePath();
+ SSHKeyPair keyPair = SSHKeyPair.create(privateKeyPathphrase, privateKeyPath, publicKeyPath);
+ getUser().putSSHKey(getName(), keyPair);
+ }
+
}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyNameValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyNameValidator.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyNameValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -1,29 +0,0 @@
-package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
-
-import org.eclipse.core.databinding.validation.ValidationStatus;
-import org.eclipse.core.runtime.IStatus;
-import org.jboss.tools.openshift.express.internal.ui.databinding.AlphanumericStringValidator;
-
-public class SSHPublicKeyNameValidator extends AlphanumericStringValidator {
-
- private AddSSHKeyWizardPageModel model;
-
- public SSHPublicKeyNameValidator(AddSSHKeyWizardPageModel model) {
- super("key name");
- this.model = model;
- }
-
- @Override
- public IStatus validate(Object value) {
- IStatus validationStatus = super.validate(value);
- if (!validationStatus.isOK()) {
- return validationStatus;
- }
- String keyName = (String) value;
- if (model.hasKeyName(keyName)) {
- return ValidationStatus.error("There's already a key with the name " + keyName);
- }
- return ValidationStatus.ok();
-
- }
-}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyValidator.java 2012-09-19 17:24:37 UTC (rev 43838)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.validation.MultiValidator;
-import org.eclipse.core.databinding.validation.ValidationStatus;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-
-import com.openshift.client.OpenShiftException;
-import com.openshift.client.SSHPublicKey;
-
-/**
- * @author Andre Dietisheim
- */
-public class SSHPublicKeyValidator extends MultiValidator {
-
- private IObservableValue filePathObservable;
- private AddSSHKeyWizardPageModel model;
-
- public SSHPublicKeyValidator(IObservableValue filePathObservable, AddSSHKeyWizardPageModel model) {
- this.filePathObservable = filePathObservable;
- this.model = model;
- }
-
- @Override
- protected IStatus validate() {
- String filePath = (String) filePathObservable.getValue();
- if (StringUtils.isEmpty(filePath)) {
- return ValidationStatus.cancel("You have to supply a public SSH key.");
- }
- try {
- SSHPublicKey sshPublicKey = new SSHPublicKey(filePath);
- if (model.hasPublicKey(sshPublicKey.getPublicKey())) {
- return ValidationStatus.error("The public key in " + filePath + " is already in use on OpenShift. Choose another key.");
- }
- } catch (FileNotFoundException e) {
- return ValidationStatus.error("Could not load file: " + e.getMessage());
- } catch (OpenShiftException e) {
- return ValidationStatus.error(filePath + "is not a valid public SSH key: " + e.getMessage());
- } catch (IOException e) {
- return ValidationStatus.error("Could not load file: " + e.getMessage());
- }
-
- return Status.OK_STATUS;
- }
-
-}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/DirectoryValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/DirectoryValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/DirectoryValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,30 @@
+package org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding;
+
+import java.io.File;
+
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredStringValidator;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class DirectoryValidator extends RequiredStringValidator {
+
+ public DirectoryValidator(String fieldName) {
+ super(fieldName);
+ }
+
+ @Override
+ public IStatus validateString(String value) {
+ File ssh2HomeDirectory = new File(value);
+ if (!ssh2HomeDirectory.isDirectory()) {
+ return ValidationStatus.error(value + " is not a directory.");
+ }
+ if (!ssh2HomeDirectory.exists()) {
+ return ValidationStatus.error("The directory " + value + " does not exist.");
+ }
+ return ValidationStatus.ok();
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/DirectoryValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyNameValidator.java (from rev 43816, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyNameValidator.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyNameValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyNameValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding;
+
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.openshift.express.internal.ui.databinding.AlphanumericStringValidator;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.ISSHKeyWizardPageModel;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class SSHPublicKeyNameValidator extends AlphanumericStringValidator {
+
+ private ISSHKeyWizardPageModel model;
+
+ public SSHPublicKeyNameValidator(ISSHKeyWizardPageModel model) {
+ super("key name");
+ this.model = model;
+ }
+
+ @Override
+ public IStatus validateString(String value) {
+ IStatus validationStatus = super.validateString(value);
+ if (!validationStatus.isOK()) {
+ return validationStatus;
+ }
+ if (model.hasKeyName(value)) {
+ return ValidationStatus.error("There's already a key with the name " + value);
+ }
+ return ValidationStatus.ok();
+
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyNameValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java (from rev 43816, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/SSHPublicKeyValidator.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java 2012-09-19 17:39:16 UTC (rev 43839)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.validation.MultiValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.AddSSHKeyWizardPageModel;
+
+import com.openshift.client.OpenShiftException;
+import com.openshift.client.SSHPublicKey;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class SSHPublicKeyValidator extends MultiValidator {
+
+ private IObservableValue filePathObservable;
+ private AddSSHKeyWizardPageModel model;
+
+ public SSHPublicKeyValidator(IObservableValue filePathObservable, AddSSHKeyWizardPageModel model) {
+ this.filePathObservable = filePathObservable;
+ this.model = model;
+ }
+
+ @Override
+ protected IStatus validate() {
+ String filePath = (String) filePathObservable.getValue();
+ if (StringUtils.isEmpty(filePath)) {
+ return ValidationStatus.cancel("You have to supply a public SSH key.");
+ }
+ try {
+ SSHPublicKey sshPublicKey = new SSHPublicKey(filePath);
+ if (model.hasPublicKey(sshPublicKey.getPublicKey())) {
+ return ValidationStatus.error("The public key in " + filePath + " is already in use on OpenShift. Choose another key.");
+ }
+ } catch (FileNotFoundException e) {
+ return ValidationStatus.error("Could not load file: " + e.getMessage());
+ } catch (OpenShiftException e) {
+ return ValidationStatus.error(filePath + "is not a valid public SSH key: " + e.getMessage());
+ } catch (IOException e) {
+ return ValidationStatus.error("Could not load file: " + e.getMessage());
+ }
+
+ return Status.OK_STATUS;
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/databinding/SSHPublicKeyValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43838 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-19 13:24:37 -0400 (Wed, 19 Sep 2012)
New Revision: 43838
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkUIParamTest.java
Log:
JBIDE-12626
https://issues.jboss.org/browse/JBIDE-12626
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkUIParamTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkUIParamTest.java 2012-09-19 17:23:38 UTC (rev 43837)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JSPELHyperlinkUIParamTest.java 2012-09-19 17:24:37 UTC (rev 43838)
@@ -73,7 +73,7 @@
WorkbenchUtils.closeAllEditors();
}
textToFind = "myparam2";
- resultEditor = new String[]{"a.xhtml", "String.java"};
+ resultEditor = new String[]{"a.xhtml", "String."};
try {
doELHyperlinkUIParam(pageName, textToFind, false, resultEditor);
} finally {
@@ -128,7 +128,7 @@
link.open();
IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- assertEquals("Link " + i + " leads to a wrong editor.", editorName[i], resultEditor.getTitle());
+ assertTrue("Link " + i + " leads to a wrong editor: " + resultEditor.getTitle(), resultEditor.getTitle().startsWith(editorName[i]));
}
}
}
\ No newline at end of file
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43837 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-19 13:23:38 -0400 (Wed, 19 Sep 2012)
New Revision: 43837
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
JBIDE-12631 remove flow, jbpm4, jpdl4 from svn trunk - available from 4.0.0.Alpha1 branch or 3.3.x branch
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-19 17:18:00 UTC (rev 43836)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-19 17:23:38 UTC (rev 43837)
@@ -1,6 +1,6 @@
Revised swimlanes, as implemented for 3.2.x, 3.3.x, 4.0.x jobs
-Last updated 2012/09/18
+Last updated 2012/09/19
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -20,7 +20,7 @@
New in 4.0 (SOA Tooling):
-* Flow/jbpm4 may be removed. See https://issues.jboss.org/browse/JBIDE-12631
+* Flow/jbpm4/jpdl4 removed. See https://issues.jboss.org/browse/JBIDE-12631
------------------------
@@ -83,4 +83,4 @@
esb -> jst -> common -> tests
-runtime, tests, usage, drools, pi4soa, savara, teiid -> [NONE]
\ No newline at end of file
+runtime, tests, usage, drools, pi4soa, savara, teiid -> [NONE]
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43836 - in trunk/jbpm: features and 22 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-19 13:18:00 -0400 (Wed, 19 Sep 2012)
New Revision: 43836
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/pom.xml
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/pom.xml
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/feature.xml
trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/pom.xml
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
trunk/jbpm/features/pom.xml
trunk/jbpm/plugins/org.jboss.tools.jbpm.common/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.jbpm.common/pom.xml
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
trunk/jbpm/plugins/pom.xml
trunk/jbpm/pom.xml
trunk/jbpm/site/pom.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml
trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF
trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml
trunk/jbpm/tests/pom.xml
Log:
JBIDE-12631 bump all jbpm plugins to 4.5.0 (largest version + 0.1.0)
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/feature.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.jbpm.common.feature"
label="%featureName"
- version="4.4.0.qualifier"
+ version="4.5.0.qualifier"
provider-name="%featureProvider">
<description>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.common.feature/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm.common.feature</artifactId>
- <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.jbpm.convert.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="4.5.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.jbpm.convert">
Modified: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm.convert.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.jbpm3.feature"
label="%featureName"
- version="3.2.1.qualifier"
+ version="4.5.0.qualifier"
provider-name="%featureProvider">
<description>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm3.feature</artifactId>
- <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/feature.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/feature.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.jbpm3.test.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%featureProvider">
+<feature
+ id="org.jboss.tools.jbpm3.test.feature"
+ label="%featureName"
+ version="4.5.0.qualifier"
+ provider-name="%featureProvider">
<description>
%description
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.test.feature/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm3.test.feature</artifactId>
- <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
<feature
id="org.jbpm.gd.jpdl.feature"
label="%featureName"
- version="3.2.1.qualifier"
+ version="4.5.0.qualifier"
provider-name="%featureProvider">
<description>
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jbpm.gd.jpdl.feature</artifactId>
- <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/features/pom.xml
===================================================================
--- trunk/jbpm/features/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/features/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,11 +5,10 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>jbpm</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>jbpm.features</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Tools for jBPM 3 and jBPM 4
Bundle-SymbolicName: org.jboss.tools.jbpm.common;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.jface;bundle-version="3.4.2",
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.common/pom.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.common/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.common/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jboss.tools.jbpm.common</artifactId>
- <version>4.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Require-Bundle: org.eclipse.ui,
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,10 +5,9 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jboss.tools.jbpm.convert</artifactId>
- <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jbpm.gd.jpdl;singleton:=true
-Bundle-Version: 3.4.1.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-ClassPath: .,
lib/dom4j-1.4.jar
Bundle-Activator: org.jbpm.gd.jpdl.Plugin
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,10 +5,9 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jbpm.gd.jpdl</artifactId>
- <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/jbpm/plugins/pom.xml
===================================================================
--- trunk/jbpm/plugins/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/plugins/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -1,15 +1,13 @@
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>jbpm</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>jbpm.plugins</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -9,13 +9,13 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>jbpm</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>jbpm.all</name>
+ <version>4.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
- <module>features</module>
<module>plugins</module>
<module>tests</module>
+ <module>features</module>
<module>site</module>
</modules>
</project>
Modified: trunk/jbpm/site/pom.xml
===================================================================
--- trunk/jbpm/site/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/site/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,11 +5,9 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>jbpm</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>jbpm.site</artifactId>
- <name>jbpm.site</name>
- <version>0.0.1-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
</project>
\ No newline at end of file
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.jbpm.common.test
-Bundle-Version: 4.3.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-Vendor: %BundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit,
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.common.test/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,13 +5,11 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.tests</groupId>
<artifactId>org.jboss.tools.jbpm.common.test</artifactId>
- <version>4.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<coverage.filter>org.jboss.tools.jbpm*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jbpm.common</emma.instrument.bundles>
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.jbpm.convert.test;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.jbpm.convert,
org.junit;bundle-version="4.8.0",
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,18 +5,15 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.tests</groupId>
<artifactId>org.jboss.tools.jbpm.convert.test</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<coverage.filter>org.jboss.tools.jbpm.convert*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.jbpm.convert</emma.instrument.bundles>
</properties>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: jBPM Tools SWTBot Tests
Bundle-SymbolicName: org.jboss.tools.jbpm.ui.bot.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-Activator: org.jboss.tools.jbpm.ui.bot.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,17 +5,14 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.tests</groupId>
<artifactId>org.jboss.tools.jbpm.ui.bot.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
</properties>
-
<build>
<plugins>
<plugin>
Modified: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/META-INF/MANIFEST.MF 2012-09-19 17:18:00 UTC (rev 43836)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jbpm.gd.jpdl.test;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 4.5.0.qualifier
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Modified: trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/org.jbpm.gd.jpdl.test/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,15 +5,13 @@
<parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm.tests</groupId>
<artifactId>org.jbpm.gd.jpdl.test</artifactId>
- <version>3.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
<properties>
<coverage.filter>org.jbpm.gd*</coverage.filter>
<emma.instrument.bundles>org.jbpm.gd.jpdl</emma.instrument.bundles>
</properties>
-</project>
\ No newline at end of file
+<version>4.5.1-SNAPSHOT</version></project>
\ No newline at end of file
Modified: trunk/jbpm/tests/pom.xml
===================================================================
--- trunk/jbpm/tests/pom.xml 2012-09-19 16:22:27 UTC (rev 43835)
+++ trunk/jbpm/tests/pom.xml 2012-09-19 17:18:00 UTC (rev 43836)
@@ -5,11 +5,10 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>jbpm</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.jbpm</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<name>jbpm.tests</name>
<packaging>pom</packaging>
<modules>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43835 - in trunk/as/tests/org.jboss.tools.as.test.core: src/org/jboss/tools/as/test/core/internal/utils/classpath and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-19 12:22:27 -0400 (Wed, 19 Sep 2012)
New Revision: 43835
Modified:
trunk/as/tests/org.jboss.tools.as.test.core/plugin.xml
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/classpath/ASToolsInternalVariableInitializer.java
Log:
Unit test errors required changes to the unit test plugin
Modified: trunk/as/tests/org.jboss.tools.as.test.core/plugin.xml
===================================================================
(Binary files differ)
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/classpath/ASToolsInternalVariableInitializer.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/classpath/ASToolsInternalVariableInitializer.java 2012-09-19 16:05:59 UTC (rev 43834)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/internal/utils/classpath/ASToolsInternalVariableInitializer.java 2012-09-19 16:22:27 UTC (rev 43835)
@@ -10,16 +10,56 @@
******************************************************************************/
package org.jboss.tools.as.test.core.internal.utils.classpath;
+import java.io.File;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ClasspathVariableInitializer;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.tools.as.test.core.ASMatrixTests;
+import org.jboss.tools.as.test.core.internal.utils.BundleUtils;
+
/**
* @author Rob Stryker
*
*/
-public class ASToolsInternalVariableInitializer {
+public class ASToolsInternalVariableInitializer extends ClasspathVariableInitializer {
- public static final String ASTOOLS_TEST_HOME_VAR = "JUNIT_HOME";
+ public static final String ASTOOLS_TEST_HOME_VAR = "ASTOOLS_TEST_HOME";
+ private static final String twiddle_suffix = ".mf.twiddle.jar";
+ private static final String twiddle_3_2_8 = "3.2.8" + twiddle_suffix;
+
public static void ensureFoldersCreated() {
- // TODO Auto-generated method stub
+ IPath jarFolder = getPath();
+ jarFolder.toFile().mkdirs();
+
+ try {
+ File source = BundleUtils.getFileLocation("serverMock/" + twiddle_3_2_8);
+ File dest = jarFolder.append("junit.jar").toFile();
+ FileUtil.fileSafeCopy(source, dest);
+ } catch(CoreException ce) {
+ ce.printStackTrace();
+ }
}
-
+
+ public void initialize(String variable) {
+ ensureFoldersCreated();
+ if( variable.equals(ASTOOLS_TEST_HOME_VAR)) {
+ IPath newPath = getPath();
+ try {
+ JavaCore.setClasspathVariable(variable, newPath, new NullProgressMonitor());
+ } catch(JavaModelException jme) {
+ jme.printStackTrace();
+ }
+ }
+ }
+ protected static IPath getPath() {
+ IPath state = ASMatrixTests.getDefault().getStateLocation();
+ IPath jarFolder = state.append(".astools_test");
+ return jarFolder;
+ }
}
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43834 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-19 12:05:59 -0400 (Wed, 19 Sep 2012)
New Revision: 43834
Modified:
trunk/build/pom-soa-tooling.xml
Log:
JBIDE-12631 remove flow, jbpm4, jpdl4 from svn trunk - available from 4.0.0.Alpha1 branch or 3.3.x branch
Modified: trunk/build/pom-soa-tooling.xml
===================================================================
--- trunk/build/pom-soa-tooling.xml 2012-09-19 16:03:58 UTC (rev 43833)
+++ trunk/build/pom-soa-tooling.xml 2012-09-19 16:05:59 UTC (rev 43834)
@@ -19,7 +19,7 @@
this profile (excluding all others); currently parent pom includes target-platform build too, so only need to build the parent
mvn clean install -P parent,\!libs,\!tests,\!jmx,\!archives,\!common \
- -P \!smooks,\!bpel,\!esb,\!jst,\!modeshape,\!flow,\!jbpm,\!usage,\!aggregate-coverage
+ -P \!smooks,\!bpel,\!esb,\!jst,\!modeshape,\!jbpm,\!usage,\!aggregate-coverage
-->
<profile>
@@ -161,7 +161,6 @@
<module>../usage</module>
<module>../runtime</module>
<module>../esb</module>
- <module>../flow</module>
<module>../jbpm</module>
<module>../examples</module>
<!-- also needs drools but that's only available as binary upstream so be sure to build it first and resolve from composite staging site -->
@@ -252,25 +251,6 @@
</profile>
<profile>
- <id>flow</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../flow</module>
- </modules>
- </profile>
-
- <profile>
- <id>flow-bootstrap</id>
- <modules>
- <module>../tests</module>
- <module>../flow</module>
- <module>../usage</module>
- </modules>
- </profile>
-
- <profile>
<id>jbpm</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -284,9 +264,8 @@
<id>jbpm-bootstrap</id>
<modules>
<module>../tests</module>
- <module>../flow</module>
- <module>../jbpm</module>
<module>../usage</module>
+ <module>../jbpm</module>
</modules>
</profile>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43832 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-19 11:56:07 -0400 (Wed, 19 Sep 2012)
New Revision: 43832
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
deltacloud removed; link to new github repo migration jira and image, etc.
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-19 15:55:07 UTC (rev 43831)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-19 15:56:07 UTC (rev 43832)
@@ -1,35 +1,27 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/05/24
+Revised swimlanes, as implemented for 3.2.x, 3.3.x, 4.0.x jobs
-TODO: replace 3.3_trunk w/ 3.4_trunk; add 3.4_stable jobs
+Last updated 2012/09/18
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
------------------------
-In 3.2 / 3.3:
+New in 4.0 (Core):
-maven -> cdi -> jst -> common -> tests
- -> seam -> jst -> common -> tests
- -> seam -> as -> archives, jmx -> tests
- -> hibernate -> freemarker -> tests
- -> jsf -> vpe -> jst -> common -> tests
+New component hierarchy/organization (after migration to git):
-struts -> vpe -> xulrunner
+https://issues.jboss.org/secure/attachment/12356737/Components-Final%20.png
-examples -> portlet
+* migration to git: https://issues.jboss.org/browse/JBIDE-12475?
-birt, portlet, modeshape, profiler, smooks, tptp -> tests
+* deltacloud [removed]
-ws, deltacloud -> as -> archives, jmx -> tests
+* runtime no longer depends on as, seam
-bpel -> archives
+New in 4.0 (SOA Tooling):
-jbpm -> flow, common -> tests
+* Flow/jbpm4 may be removed. See https://issues.jboss.org/browse/JBIDE-12631
-esb -> jst -> common -> tests
-
-runtime, tests, usage, drools, pi4soa, savara, teiid -> [NONE]
-
------------------------
New in 3.3 (Core):
@@ -67,3 +59,28 @@
(also includes SwitchYard, Drools, Savara)
+----------------------------------------
+
+In 3.2 / 3.3:
+
+maven -> cdi -> jst -> common -> tests
+ -> seam -> jst -> common -> tests
+ -> seam -> as -> archives, jmx -> tests
+ -> hibernate -> freemarker -> tests
+ -> jsf -> vpe -> jst -> common -> tests
+
+struts -> vpe -> xulrunner
+
+examples -> portlet
+
+birt, portlet, modeshape, profiler, smooks, tptp -> tests
+
+ws, deltacloud -> as -> archives, jmx -> tests
+
+bpel -> archives
+
+jbpm -> flow, common -> tests
+
+esb -> jst -> common -> tests
+
+runtime, tests, usage, drools, pi4soa, savara, teiid -> [NONE]
\ No newline at end of file
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43831 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-19 11:55:07 -0400 (Wed, 19 Sep 2012)
New Revision: 43831
Removed:
trunk/flow/
Log:
JBIDE-12631 remove Flow from svn trunk - available from 4.0.0.Alpha1 branch or 3.3.x branch
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43830 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-19 09:48:36 -0400 (Wed, 19 Sep 2012)
New Revision: 43830
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
Trying to fix issue with headless awt toolkit on mac with jdk 1.7
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-09-19 13:39:13 UTC (rev 43829)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-09-19 13:48:36 UTC (rev 43830)
@@ -197,6 +197,11 @@
if (System.getProperty("swt.bot.test.record.screencast","false").equalsIgnoreCase("true")){
RequirementAwareSuite.startScreenRecorder(getTestClass().getJavaClass().getSimpleName());
}
+
+ if (SWTJBTExt.isRunningOnMacOs() && "1.7".equals(System.getProperty("java.specification.version"))){
+ System.setProperty("awt.toolkit", "sun.lwawt.macosx.LWCToolkit");
+ }
+
if (RequirementAwareSuite.runManageBlockingWindow){
SWTJBTExt.manageBlockingWidows(false, false);
RequirementAwareSuite.runManageBlockingWindow = false;
13 years, 6 months
- 1
- 0