[jbosstools-commits] JBoss Tools SVN: r41440 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/action and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri May 25 16:28:25 EDT 2012
Author: xcoulon
Date: 2012-05-25 16:28:24 -0400 (Fri, 25 May 2012)
New Revision: 41440
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractSSHAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/ApplicationPortForwardingActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ApplicationPortForwardingActionProvider.java
Log:
Fixed - JBIDE-12005
Handle SSH auth fail correctly
https://issues.jboss.org/browse/JBIDE-12005
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -1,82 +0,0 @@
-package org.jboss.tools.openshift.express.internal.core.portforward;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction;
-import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-
-import com.openshift.client.IApplication;
-
-public class ApplicationPortForwardingAction extends AbstractAction {
-
- public ApplicationPortForwardingAction() {
- super("Port forwarding...", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT));
- }
-
- /**
- * Operation called when the user clicks on 'Show In>Remote Console'. If no
- * Console/Worker existed, a new one is created, otherwise, it is displayed.
- * {@inheritDoc}
- */
- @Override
- public void run() {
- if (selection != null && selection instanceof ITreeSelection) {
- Object sel = ((ITreeSelection) selection).getFirstElement();
- if (sel instanceof IApplication) {
- openPortForwarding((IApplication) sel);
- } else if (sel instanceof IServer) {
- openPortForwarding((IServer) sel);
- }
- }
- }
-
- /**
- * Retrieves the application from the given server, then opens the dialog.
- * Since retrieving the application can be time consuming, the task is
- * performed in a separate job (ie, in a background thread).
- *
- * @param server
- */
- private void openPortForwarding(final IServer server) {
- Job job = new Job("Retrieving application's forwardable ports...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- final IApplication application = ExpressServerUtils.getApplication(server);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- openPortForwarding(application);
- }
- });
- return Status.OK_STATUS;
- }
- };
- job.setUser(true);
- job.schedule();
- }
-
- /**
- * @param application
- */
- private void openPortForwarding(IApplication application) {
- try {
- ApplicationPortForwardingWizard wizard = new ApplicationPortForwardingWizard(application);
- WizardDialog dialog = new ApplicationPortForwardingWizardDialog(Display.getCurrent().getActiveShell(),
- wizard);
- dialog.setMinimumPageSize(700, 300);
- dialog.create();
- dialog.open();
- } catch (Exception e) {
- Logger.error("Failed to perform 'port-forwarding' for application '" + application.getName() + "'", e);
- }
- }
-
-}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -70,7 +70,7 @@
if (this.application.isPortFowardingStarted()) {
return;
}
-
+
final MessageConsole console = ConsoleUtils.findMessageConsole(getMessageConsoleName());
MessageConsoleStream stream = console.newMessageStream();
stream.println("Starting port-forwarding...");
@@ -87,7 +87,8 @@
* @return
*/
private String getMessageConsoleName() {
- return "Port forwarding for application '" + application.getName() + "' (" + application.getDomain().getId() + ")";
+ return "Port forwarding for application '" + application.getName() + "' (" + application.getDomain().getId()
+ + ")";
}
public void stopPortForwarding() throws OpenShiftSSHOperationException {
@@ -151,7 +152,10 @@
* @throws OpenShiftSSHOperationException
*/
public void setUseFreePorts(Boolean useFreePorts) throws OpenShiftSSHOperationException {
- if(!application.isPortFowardingStarted()) { // do not change the current bindings if port forwarding is already started.
+ if (!application.isPortFowardingStarted()) { // do not change the
+ // current bindings if
+ // port forwarding is
+ // already started.
updateLocalPortBindings(useFreePorts);
}
firePropertyChange(PROPERTY_USE_DEFAULT_LOCAL_IP_ADDRESS, this.useFreePorts, this.useFreePorts = useFreePorts);
@@ -169,11 +173,12 @@
final List<String> bindings = new ArrayList<String>();
// update local bindings while avoiding duplicates
for (IApplicationPortForwarding port : ports) {
- if(useFreePorts) {
+ if (useFreePorts) {
// find free port for every port
port.setLocalPort(SocketUtil.findFreePort());
} else {
- // find duplicates and if match we find free port for those until stops.
+ // find duplicates and if match we find free port for those
+ // until stops.
port.setLocalPort(port.getRemotePort());
String key = computeKey(port);
while (bindings.contains(key)) {
@@ -199,7 +204,13 @@
}
public void refreshForwardablePorts() throws OpenShiftSSHOperationException {
- if(!application.isPortFowardingStarted()) { // we don't reload/refresh the ports if portforwarding is already running since we then loose the existing local ip/ports.
+ if (!application.isPortFowardingStarted()) { // we don't reload/refresh
+ // the ports if
+ // portforwarding is
+ // already running since
+ // we then loose the
+ // existing local
+ // ip/ports.
application.refreshForwardablePorts();
updateLocalAddressBindings(this.useDefaultLocalIpAddress);
updateLocalPortBindings(this.useFreePorts);
@@ -208,18 +219,20 @@
/**
* @param monitor
- * @throws OpenShiftSSHOperationException
+ * @throws OpenShiftSSHOperationException
* @throws JSchException
*/
// TODO : move this method into the WizardModel ?
- void verifyApplicationSSHSession() throws OpenShiftSSHOperationException {
- final boolean hasSSHSession = getApplication().hasSSHSession();
- if (!hasSSHSession) {
+ boolean verifyApplicationSSHSession() throws OpenShiftSSHOperationException {
+ final boolean hasAlreadySSHSession = getApplication().hasSSHSession();
+ if (!hasAlreadySSHSession) {
Logger.debug("Opening a new SSH Session for application '" + getApplication().getName() + "'");
final Session session = OpenShiftSshSessionFactory.getInstance().createSession(
getApplication());
- getApplication().setSSHSession(session);
+ getApplication().setSSHSession(session);
}
+ // now, check if the session is valid (ie, not null and still connected)
+ return getApplication().hasSSHSession();
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -163,7 +163,9 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- wizardModel.verifyApplicationSSHSession();
+ if(!wizardModel.verifyApplicationSSHSession()) {
+ return Status.CANCEL_STATUS;
+ }
wizardModel.refreshForwardablePorts();
refreshViewerInput();
} catch (OpenShiftSSHOperationException e) {
@@ -188,7 +190,10 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- wizardModel.verifyApplicationSSHSession();
+ if(!wizardModel.verifyApplicationSSHSession()) {
+ return Status.CANCEL_STATUS;
+ }
+
wizardModel.startPortForwarding();
refreshViewerInput();
} catch (OpenShiftSSHOperationException e) {
@@ -229,7 +234,10 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- wizardModel.verifyApplicationSSHSession();
+ if(!wizardModel.verifyApplicationSSHSession()) {
+ return Status.CANCEL_STATUS;
+ }
+
wizardModel.stopPortForwarding();
refreshViewerInput();
} catch (OpenShiftSSHOperationException e) {
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractSSHAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractSSHAction.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractSSHAction.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -0,0 +1,43 @@
+package org.jboss.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftSshSessionFactory;
+
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import com.openshift.client.IApplication;
+import com.openshift.client.OpenShiftSSHOperationException;
+
+public abstract class AbstractSSHAction extends AbstractAction {
+
+ public AbstractSSHAction(String text) {
+ super(text);
+ }
+
+ public AbstractSSHAction(String text, boolean enableForSingleElement) {
+ super(text, enableForSingleElement);
+ }
+
+ public AbstractSSHAction(String text, ImageDescriptor image) {
+ super(text, image);
+ }
+
+ /**
+ * @param monitor
+ * @throws OpenShiftSSHOperationException
+ * @throws JSchException
+ */
+ protected boolean verifyApplicationSSHSession(final IApplication application) throws OpenShiftSSHOperationException {
+ final boolean hasAlreadySSHSession = application.hasSSHSession();
+ if (!hasAlreadySSHSession) {
+ Logger.debug("Opening a new SSH Session for application '" + application.getName() + "'");
+ final Session session = OpenShiftSshSessionFactory.getInstance().createSession(
+ application);
+ application.setSSHSession(session);
+ }
+ // now, check if the session is valid (ie, not null and still connected)
+ return application.hasSSHSession();
+ }
+
+}
\ 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/action/AbstractSSHAction.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/action/ApplicationPortForwardingAction.java (from rev 41426, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -0,0 +1,110 @@
+package org.jboss.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.portforward.ApplicationPortForwardingWizard;
+import org.jboss.tools.openshift.express.internal.core.portforward.ApplicationPortForwardingWizardDialog;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+
+import com.openshift.client.IApplication;
+import com.openshift.client.OpenShiftSSHOperationException;
+
+public class ApplicationPortForwardingAction extends AbstractSSHAction {
+
+ public ApplicationPortForwardingAction() {
+ super("Port forwarding...", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT));
+ }
+
+ /**
+ * Operation called when the user clicks on 'Show In>Remote Console'. If no
+ * Console/Worker existed, a new one is created, otherwise, it is displayed.
+ * {@inheritDoc}
+ */
+ @Override
+ public void run() {
+ if (selection != null && selection instanceof ITreeSelection) {
+ Object sel = ((ITreeSelection) selection).getFirstElement();
+ if (sel instanceof IApplication) {
+ openPortForwardingDialog((IApplication) sel);
+ } else if (sel instanceof IServer) {
+ openPortForwardingDialog((IServer) sel);
+ }
+ }
+ }
+
+ /**
+ * Retrieves the application from the given server, then opens the dialog.
+ * Since retrieving the application can be time consuming, the task is
+ * performed in a separate job (ie, in a background thread).
+ *
+ * @param server
+ */
+ private void openPortForwardingDialog(final IServer server) {
+ Job job = new Job("Identifying OpenShift Application from selected Server...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ final IApplication application = ExpressServerUtils.getApplication(server);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ openPortForwardingDialog(application);
+ }
+ });
+ return Status.OK_STATUS;
+ }
+ };
+ job.setUser(true);
+ job.schedule();
+ }
+
+ private void openPortForwardingDialog(final IApplication application) {
+ Job job = new Job("Retrieving application's forwardable ports...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ verifyApplicationSSHSession(application);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ runAsync(application);
+ }
+ });
+ return Status.OK_STATUS;
+ } catch (OpenShiftSSHOperationException e) {
+ return OpenShiftUIActivator.createErrorStatus(e.getMessage(), e.getCause());
+ }
+ }
+ };
+ job.setUser(true);
+ job.schedule();
+ }
+
+ /**
+ * @param application
+ */
+ private void runAsync(final IApplication application) {
+ try {
+ ApplicationPortForwardingWizard wizard = new ApplicationPortForwardingWizard(
+ application);
+ WizardDialog dialog = new ApplicationPortForwardingWizardDialog(Display.getCurrent()
+ .getActiveShell(),
+ wizard);
+ dialog.setMinimumPageSize(700, 300);
+ dialog.create();
+ dialog.open();
+ } catch (Exception e) {
+ Logger.error(
+ "Failed to perform 'port-forwarding' for application '" + application.getName()
+ + "'", e);
+ }
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ApplicationPortForwardingAction.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/action/ShowEnvironmentAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowEnvironmentAction.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -27,14 +27,13 @@
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftSshSessionFactory;
-import com.jcraft.jsch.JSchException;
import com.openshift.client.IApplication;
import com.openshift.client.OpenShiftSSHOperationException;
/**
* @author Xavier Coulon
*/
-public class ShowEnvironmentAction extends AbstractAction {
+public class ShowEnvironmentAction extends AbstractSSHAction {
public ShowEnvironmentAction() {
super(OpenShiftExpressUIMessages.SHOW_ENVIRONMENT_ACTION, true);
@@ -66,7 +65,7 @@
* @param server
*/
private void showEnvironmentProperties(final IServer server) {
- Job job = new Job("Retrieving application's forwardable ports...") {
+ Job job = new Job("Identifying OpenShift Application from selected Server...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
final IApplication application = ExpressServerUtils.getApplication(server);
@@ -82,12 +81,31 @@
job.schedule();
}
+ private void showEnvironmentProperties(final IApplication application) {
+ Job job = new Job("Retrieving selected OpenShift Application's environment variables...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ verifyApplicationSSHSession(application);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ runAsync(application);
+ }
+ });
+ return Status.OK_STATUS;
+ } catch (OpenShiftSSHOperationException e) {
+ return OpenShiftUIActivator.createErrorStatus(e.getMessage(), e.getCause());
+ }
+ }
+ };
+ job.setUser(true);
+ job.schedule();
+ }
+
/**
* @param application
- * @throws JSchException
- * @throws OpenShiftSSHOperationException
*/
- private void showEnvironmentProperties(final IApplication application) {
+ private void runAsync(final IApplication application) {
try {
if (!application.hasSSHSession()) {
application.setSSHSession(OpenShiftSshSessionFactory.getInstance().createSession(application));
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -132,9 +132,7 @@
Thread thread = new Thread(tailServerLogWorker);
thread.start();
} catch (IOException e) {
- String message = NLS.bind("Failed to tail files for application ''{0}''.\n" +
- "Please make sure your SSH key is confugred to the SSH2 workbench preferences", appName);
- return OpenShiftUIActivator.createErrorStatus(message, e);
+ return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to tail files for application ''{0}''", appName), e);
}
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/ApplicationPortForwardingActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/ApplicationPortForwardingActionProvider.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/ApplicationPortForwardingActionProvider.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -1,6 +1,6 @@
package org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate;
-import org.jboss.tools.openshift.express.internal.core.portforward.ApplicationPortForwardingAction;
+import org.jboss.tools.openshift.express.internal.ui.action.ApplicationPortForwardingAction;
public class ApplicationPortForwardingActionProvider extends AbstractServerViewerActionProvider {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -84,7 +84,7 @@
try {
cache.put(uri, createSession(hc, user, host, port, fs));
} catch (JSchException e) {
- throw new OpenShiftSSHOperationException(e, "Unable to create SSH session for application ''{0}}''", application);
+ throw new OpenShiftSSHOperationException(e, "Unable to create SSH session for application ''{0}''", application);
}
}
return cache.get(uri);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ApplicationPortForwardingActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ApplicationPortForwardingActionProvider.java 2012-05-25 19:25:16 UTC (rev 41439)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ApplicationPortForwardingActionProvider.java 2012-05-25 20:28:24 UTC (rev 41440)
@@ -1,6 +1,6 @@
package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
-import org.jboss.tools.openshift.express.internal.core.portforward.ApplicationPortForwardingAction;
+import org.jboss.tools.openshift.express.internal.ui.action.ApplicationPortForwardingAction;
public class ApplicationPortForwardingActionProvider extends AbstractOpenShiftExplorerViewerActionProvider {
More information about the jbosstools-commits
mailing list