[jbosstools-commits] JBoss Tools SVN: r38463 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui and 5 other directories.

Author: xcoulon Date: 2012-02-07 09:31:09 -0500 (Tue, 07 Feb 2012) New Revision: 38463 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.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/action/TailServerLogWorker.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditDomainActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml Log: OPEN - issue JBIDE-10528: Improve OpenShift UI https://issues.jboss.org/browse/JBIDE-10528 Remote Console action implemented, working from both the ServerView and the 'OpenShift Express Console' view Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-07 14:31:09 UTC (rev 38463) @@ -187,18 +187,18 @@ <viewerContentBinding viewerId="org.eclipse.wst.server.ui.ServersView"> </viewerContentBinding> <viewerActionBinding viewerId="org.eclipse.wst.server.ui.ServersView"> - <includes> - <actionExtension - pattern="org.jboss.tools.openshift.express.ui.internal.ui.console.tailServerLogActionProvider"/> - </includes> - </viewerActionBinding> + <includes> + <actionExtension + pattern="org.jboss.tools.openshift.express.ui.internal.ui.console.tailServerLogActionProvider"/> + </includes> + </viewerActionBinding> </extension> <extension point="org.eclipse.ui.console.consolePageParticipants"> <consolePageParticipant class="org.jboss.tools.openshift.express.internal.ui.console.TailConsolePageParticipant" - id="org.jboss.tools.openshift.express.ui.tailConsolePageParticipant"> + id="org.jboss.tools.openshift.express.ui.action.tailConsolePageParticipant"> <enablement> <and> <instanceof @@ -336,7 +336,7 @@ <viewerActionBinding viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> <includes> <actionExtension - pattern="org.jboss.tools.openshift.express.internal.ui.viewer.*"/> + pattern="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.*"/> </includes> </viewerActionBinding> <viewerContentBinding @@ -359,8 +359,8 @@ <triggerPoints></triggerPoints> </navigatorContent> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.EditDomainActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.editDomainAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.EditDomainActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.editDomainActionProvider"> <enablement> <and> <instanceof @@ -370,8 +370,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.CreateApplicationActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.createApplicationAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.createApplicationActionProvider"> <enablement> <and> <instanceof @@ -381,8 +381,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.OpenInWebBrowserActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.openInWebBrowserAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.OpenInWebBrowserActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.openInWebBrowserActionProvider"> <enablement> <and> <instanceof @@ -392,8 +392,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.TailServerLogActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.tailServerLogAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.TailServerLogActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.tailServerLogActionProvider"> <enablement> <and> <instanceof @@ -403,8 +403,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.EditCartridgesActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.editCartridgesAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.EditCartridgesActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.editCartridgesActionProvider"> <enablement> <and> <instanceof @@ -414,8 +414,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.ImportApplicationActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.importApplicationAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ImportApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.importApplicationActionProvider"> <enablement> <and> <instanceof @@ -425,8 +425,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.DeleteApplicationActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.deleteApplicationAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.deleteApplicationActionProvider"> <enablement> <and> <instanceof @@ -436,8 +436,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.CreateServerAdapterActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.createServerAdapterAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateServerAdapterActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.createServerAdapterActionProvider"> <enablement> <and> <instanceof @@ -447,8 +447,8 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.ShowPropertiesActionProvider" - id="org.jboss.tools.openshift.express.internal.ui.viewer.showPropertiesAction"> + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowPropertiesActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showPropertiesActionProvider"> <enablement> <or> <instanceof @@ -480,7 +480,7 @@ toolbarPath="openshift"> </action--> <action - class="org.jboss.tools.openshift.express.internal.ui.viewer.action.OpenConnectionDialogActionDelegate" + class="org.jboss.tools.openshift.express.internal.ui.action.OpenConnectionDialogActionDelegate" icon="icons/resource_obj.gif" id="org.jboss.tools.openshift.express.ui.viewActions.openConnectionWizard" label="Connect" Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/AbstractAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,36 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.ui.navigator.CommonViewer; + +public abstract class AbstractAction extends Action implements ISelectionChangedListener { + + /** The current selection in the view. */ + protected ISelection selection = null; + + public AbstractAction(String text) { + super(text); + } + + public AbstractAction(String text, ImageDescriptor image) { + super(text, image); + } + + @Override + public void selectionChanged(SelectionChangedEvent event) { + Object source = event.getSource(); + if (source instanceof CommonViewer) { + this.selection = ((CommonViewer) source).getSelection(); + } + } + + public void setSelection(ISelection selection) { + this.selection = selection; + + } + +} \ 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/AbstractAction.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/CreateApplicationAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,32 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.express.client.IApplication; + +public class CreateApplicationAction extends AbstractAction { + + /** + * Constructor + */ + public CreateApplicationAction() { + super(OpenShiftExpressUIMessages.CREATE_APPLICATION_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("query-new.gif")); + } + + /** + * 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 && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.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/CreateServerAdapterAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,31 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.wst.server.core.ServerCore; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.express.client.IApplication; + +public class CreateServerAdapterAction extends AbstractAction { + + public CreateServerAdapterAction() { + super(OpenShiftExpressUIMessages.CREATE_SERVER_ADAPTER_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection) selection; + if (selection != null && selection instanceof ITreeSelection + && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + ServerCore.getServers(); + /* + * EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(user, user); WizardDialog dialog = new + * WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open(); + */ + + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.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/DeleteApplicationAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,63 @@ +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.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; + +public class DeleteApplicationAction extends AbstractAction { + + /** + * Constructor + */ + public DeleteApplicationAction() { + super(OpenShiftExpressUIMessages.DELETE_APPLICATION_ACTION); + setImageDescriptor(PlatformUI.getWorkbench().getSharedImages() + .getImageDescriptor(ISharedImages.IMG_ETOOL_DELETE)); + } + + /** + * 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 && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); + final String appName = application.getName(); + final boolean confirm = MessageDialog + .openConfirm( + Display.getCurrent().getActiveShell(), + "Application deletion", + "You are about to destroy the '" + appName + "' application.\n" + + "This is NOT reversible, all remote data for this application will be removed."); + if (confirm) { + Job job = new Job("Deleting application '" + appName + "'...") { + protected IStatus run(IProgressMonitor monitor) { + try { + application.destroy(); + } catch (OpenShiftException e) { + Logger.error("Failed to delete application '" + appName + "'", e); + } finally { + monitor.done(); + } + return Status.OK_STATUS; + } + }; + job.setPriority(Job.SHORT); + job.schedule(); // start as soon as possible + } + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.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/EditCartridgesAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,35 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + +public class EditCartridgesAction extends AbstractAction { + + public EditCartridgesAction() { + super(OpenShiftExpressUIMessages.EDIT_CARTRIDGES_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("task-repository-new.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.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/EditDomainAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditDomainAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditDomainAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,33 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EditDomainDialog; + +import com.openshift.express.client.IUser; + +public class EditDomainAction extends AbstractAction { + + public EditDomainAction() { + super(OpenShiftExpressUIMessages.EDIT_DOMAIN_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) { + final IUser user = (IUser) treeSelection.getFirstElement(); + EditDomainDialog wizard = new EditDomainDialog(user); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditDomainAction.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/ImportApplicationAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,36 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; +import org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizard; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + +public class ImportApplicationAction extends AbstractAction { + + public ImportApplicationAction() { + super(OpenShiftExpressUIMessages.IMPORT_APPLICATION_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("go-into.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + ImportExistingApplicationWizard wizard = new ImportExistingApplicationWizard(); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.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/OpenConnectionDialogActionDelegate.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,54 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.navigator.CommonNavigator; +import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; +import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentCategory; + +import com.openshift.express.client.IUser; + +public class OpenConnectionDialogActionDelegate implements IViewActionDelegate { + + private CommonNavigator view; + + @Override + public void run(IAction action) { + final Display display = Display.getCurrent(); + final Shell shell = new Shell(display); + final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(); + int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell); + if (returnCode == Window.OK) { + Logger.debug("OpenShift Auth succeeded."); + if (view != null) { + IUser user = OpenShiftUIActivator.getDefault().getUser(); + //view.switchToCommonViewer(); + view.getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user)); + //view.getCommonViewer().refresh(); + } + } + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + + } + + @Override + public void init(IViewPart view) { + if (view instanceof CommonNavigator) { + this.view = (CommonNavigator) view; + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.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/OpenInWebBrowserAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,42 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.jboss.tools.common.ui.BrowserUtil; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; + +public class OpenInWebBrowserAction extends AbstractAction { + + /** + * Constructor + */ + public OpenInWebBrowserAction() { + super(OpenShiftExpressUIMessages.SHOW_IN_BROWSER_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("open-browser.gif")); + } + + /** + * 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 + && ((ITreeSelection) selection).getFirstElement() instanceof IApplication) { + try { + final IApplication application = (IApplication) ((ITreeSelection) selection).getFirstElement(); + final String appName = application.getName(); + final String appUrl = application.getApplicationUrl(); + BrowserUtil.checkedCreateInternalBrowser(appUrl, appName, + OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); + } catch (OpenShiftException e) { + Logger.error("Failed to open OpenShift Application in a browser", e); + } + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.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/RefreshDomainAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,28 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; + +public class RefreshDomainAction implements IViewActionDelegate { + + @Override + public void run(IAction action) { + // TODO Auto-generated method stub + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.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/ShowPropertiesAction.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,28 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +public class ShowPropertiesAction extends AbstractAction { + + public ShowPropertiesAction() { + super(OpenShiftExpressUIMessages.SHOW_PROPERTIES_VIEW_ACTION); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.action.Action#run() + */ + @Override + public void run() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.ui.views.PropertySheet"); + } catch (PartInitException e) { + Logger.error("Failed to show properties view", e); + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,234 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +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.jface.viewers.IStructuredSelection; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.RemoteSession; +import org.eclipse.jgit.transport.SshSessionFactory; +import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.util.FS; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.console.IConsole; +import org.eclipse.ui.console.IConsoleConstants; +import org.eclipse.ui.console.IConsoleListener; +import org.eclipse.ui.console.MessageConsole; +import org.eclipse.ui.views.IViewDescriptor; +import org.eclipse.ui.views.IViewRegistry; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.IServerModule; +import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils; +import org.jboss.tools.openshift.express.internal.ui.console.JschToEclipseLogger; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; +import com.openshift.express.client.utils.Base64Encoder; + +/** + * The action associated with the "Show In>Remote Console" menu item. + * + * @author Xavier Coulon + * + */ +public class TailServerLogAction extends AbstractAction implements IConsoleListener { + + /** + * The message consoles associated with the 'tail' workers that write the output. + */ + private Map<String, TailServerLogWorker> consoleWorkers = new HashMap<String, TailServerLogWorker>(); + + /** + * Constructor + */ + public TailServerLogAction() { + super(OpenShiftExpressUIMessages.TAIL_SERVER_LOG_ACTION); + IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry(); + IViewDescriptor desc = reg.find(IConsoleConstants.ID_CONSOLE_VIEW); + setImageDescriptor(desc.getImageDescriptor()); + ConsoleUtils.registerConsoleListener(this); + } + + /** + * 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() { + try { + if (selection instanceof IStructuredSelection) { + final Object selectedItem = ((IStructuredSelection) selection).getFirstElement(); + if (selectedItem instanceof IServer) { + final IServer server = ((IServer) selectedItem); + run(server); + } else if (selectedItem instanceof IServerModule) { + final IServer server = ((IServerModule) selectedItem).getServer(); + run(server); + } else if (selectedItem instanceof IApplication) { + final IApplication application = (IApplication) selectedItem; + run(application); + } + } + } catch (Exception e) { + Logger.error("Failed to open Remote Console", e); + } + } + + private void run(final IApplication application) throws OpenShiftException, MalformedURLException { + final String host = new URL(application.getApplicationUrl()).getHost(); + final String appId = application.getUUID(); + final String appName = application.getName(); + final MessageConsole console = ConsoleUtils.findMessageConsole(createConsoleId(appName, host)); + ConsoleUtils.displayConsoleView(console); + console.newMessageStream().println("Loading...."); + if (!this.consoleWorkers.containsKey(console.getName())) { + launchTailServerJob(host, appId, appName, console); + } + } + + private static String createConsoleId(String appName, String host) { + return host; + } + + private void run(final IServer server) { + if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { + final String host = server.getHost(); + final String appId = ExpressServerUtils.getExpressApplicationId(server); + final String appName = ExpressServerUtils.getExpressApplicationName(server); + final MessageConsole console = ConsoleUtils.findMessageConsole(createConsoleId(appName, host)); + ConsoleUtils.displayConsoleView(console); + console.newMessageStream().println("Loading...."); + if (!this.consoleWorkers.containsKey(console.getName())) { + launchTailServerJob(host, appId, appName, console); + } + } + } + + private void launchTailServerJob(final String host, final String appId, final String appName, + final MessageConsole console) { + new Job("Launching Tail Server Operation") { + protected IStatus run(IProgressMonitor monitor) { + try { + final TailServerLogWorker tailServerLogWorker = startTailProcess(host, appId, appName, console); + consoleWorkers.put(console.getName(), tailServerLogWorker); + Thread thread = new Thread(tailServerLogWorker); + thread.start(); + } catch (Exception e) { + Logger.error("Failed to retrieve remote server logs", e); + } + return Status.OK_STATUS; + } + + }.schedule(); + } + + /** + * Starting the tail process on the remote OpenShift Platform. This method relies on the JGit SSH support (including + * JSch) to open a connection AND execute a command in a single invocation. The connection establishement requires + * an SSH key, and the passphrase is prompted to the user if necessary. + * + * @param server + * the server adapter on which the action is performed + * @param console + * the console into which the tail should be writtent + * @return the Worker that encapsulate the established RemoteSession, the tail Process and the output console + * @throws JSchException + * in case of underlying exception + * @throws IOException + * in case of underlying exception + */ + private TailServerLogWorker startTailProcess(final String host, final String appId, final String appName, + final MessageConsole console) throws JSchException, IOException { + final String logFilePath = appName + "/logs/*.log"; + final String options = "-f -n 100"; + + JSch.setLogger(new JschToEclipseLogger()); + final SshSessionFactory sshSessionFactory = SshSessionFactory.getInstance(); + final URIish uri = new URIish().setHost(host).setUser(appId); + RemoteSession remoteSession = sshSessionFactory.getSession(uri, CredentialsProvider.getDefault(), FS.DETECTED, + 0); + + // the rhc-tail-files command template + // ssh_cmd = + // "ssh -t #{app_uuid}(a)#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'" + final String command = buildCommand(logFilePath, options); + Process process = remoteSession.exec(command, 0); + return new TailServerLogWorker(console, process, remoteSession); + + } + + /** + * Builds the 'ssh tail' command that should be executed on the remote OpenShift platform. + * + * @param filePath + * @param options + * @return + * @throws UnsupportedEncodingException + */ + private String buildCommand(final String filePath, final String options) throws UnsupportedEncodingException { + StringBuilder commandBuilder = new StringBuilder("tail "); + if (options != null && !options.isEmpty()) { + final String opts = new String(Base64Encoder.encode(options.getBytes("UTF-8")), "UTF-8"); + commandBuilder.append("--opts ").append(opts).append(" "); + } + commandBuilder.append(filePath); + final String command = commandBuilder.toString(); + Logger.debug("ssh command to execute: " + command); + return command; + } + + public Object getSelection() { + if (selection instanceof IStructuredSelection) { + final Object selectedItem = ((IStructuredSelection) selection).getFirstElement(); + if (selectedItem instanceof IServer) { + return ((IServer) selectedItem); + } + if (selectedItem instanceof IServerModule) { + return ((IServerModule) selectedItem).getServer(); + } + if (selectedItem instanceof IApplication) { + + } + } + return null; + } + + @Override + public void consolesAdded(IConsole[] consoles) { + // don't do anything special + } + + /** + * Operation to perform when the console is removed (through the CloseConsoleAction that was brung by the + * <code>TailConsolePageParticipant</code>). In the current case, the associated worker is stopped and the + * console/worker are removed from the map, so that further 'Show In>Remote Console' invocation will trigger a new + * worker process. + */ + @Override + public void consolesRemoved(IConsole[] consoles) { + // if the console is associated with a 'tail' process, stop that process + for (IConsole console : consoles) { + final String consoleName = console.getName(); + if (consoleWorkers.containsKey(consoleName)) { + final TailServerLogWorker worker = consoleWorkers.get(consoleName); + worker.stop(); + consoleWorkers.remove(consoleName); + } + } + + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.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/TailServerLogWorker.java (from rev 38420, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,73 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; + +import org.eclipse.jgit.transport.RemoteSession; +import org.eclipse.ui.console.MessageConsole; + + +/** + * The underlying 'Tail' worker, that uses an established RemoteSession (with + * the help of JGit), runs in a dedicated process and displays the outputstream + * into a specific console. This worker is a <code>java.lang.Runnable</code> in + * order to run in a separate thread + * + * @author Xavier Coulon + * + */ +public class TailServerLogWorker implements Runnable { + + /** the remote 'tail' process. */ + private final Process process; + + /** the output message console. */ + private final MessageConsole console; + + /** the SSH session. */ + private final RemoteSession remoteSession; + + /** + * Constructor. + * + * @param console + * @param process + * @param remoteSession + */ + public TailServerLogWorker(final MessageConsole console, final Process process, final RemoteSession remoteSession) { + this.console = console; + this.process = process; + this.remoteSession = remoteSession; + } + + @Override + public void run() { + try { + // get I/O streams for remote tail + final InputStream in = process.getInputStream(); + BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + String line; + // Read File Line By Line + while ((line = reader.readLine()) != null) { + console.newMessageStream().println(line); + } + } catch (Throwable e) { + org.jboss.tools.openshift.express.internal.ui.utils.Logger.error( + "Error while receiving the remote server log", e); + } finally { + + } + } + + /** + * Method called when the overall 'tail' process should be stopped: the + * underlying ssh remote session must be disconnected and the running + * process must be destroyed. + */ + public void stop() { + this.remoteSession.disconnect(); + this.process.destroy(); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogWorker.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,45 @@ +package org.jboss.tools.openshift.express.internal.ui.console; + +import com.jcraft.jsch.Logger; + +/** + * Bridge between the JSch logger and the Eclipse logger (to ouput results + * in the .log files and/or into the 'Error log' view. + * + * @author Xavier Coulon + * + */ +public class JschToEclipseLogger implements Logger { + + static java.util.Hashtable<Integer, String> name = new java.util.Hashtable<Integer, String>(); + static { + name.put(new Integer(DEBUG), "DEBUG: "); + name.put(new Integer(INFO), "INFO: "); + name.put(new Integer(WARN), "WARN: "); + name.put(new Integer(ERROR), "ERROR: "); + name.put(new Integer(FATAL), "FATAL: "); + } + + @Override + public boolean isEnabled(int level) { + return true; + } + + @Override + public void log(int level, String message) { + switch (level) { + case DEBUG: + case INFO: + org.jboss.tools.openshift.express.internal.ui.utils.Logger.debug(message); + break; + case WARN: + org.jboss.tools.openshift.express.internal.ui.utils.Logger.warn(message); + break; + case ERROR: + case FATAL: + org.jboss.tools.openshift.express.internal.ui.utils.Logger.error(message); + break; + } + } + +} \ 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/console/JschToEclipseLogger.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/console/TailServerLogAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,195 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.console; - -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; - -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.jface.viewers.IStructuredSelection; -import org.eclipse.jgit.transport.CredentialsProvider; -import org.eclipse.jgit.transport.RemoteSession; -import org.eclipse.jgit.transport.SshSessionFactory; -import org.eclipse.jgit.transport.URIish; -import org.eclipse.jgit.util.FS; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.console.IConsole; -import org.eclipse.ui.console.IConsoleConstants; -import org.eclipse.ui.console.IConsoleListener; -import org.eclipse.ui.console.MessageConsole; -import org.eclipse.ui.views.IViewDescriptor; -import org.eclipse.ui.views.IViewRegistry; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.ui.IServerModule; -import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; -import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker.JschToEclipseLogger; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import org.jboss.tools.openshift.express.internal.ui.viewer.action.AbstractAction; - -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.openshift.express.client.utils.Base64Encoder; - -/** - * The action associated with the "Show In>Remote Console" menu item. - * - * @author Xavier Coulon - * - */ -public class TailServerLogAction extends AbstractAction implements IConsoleListener { - - /** - * The message consoles associated with the 'tail' workers that write the - * output. - */ - private Map<String, TailServerLogWorker> consoleWorkers = new HashMap<String, TailServerLogWorker>(); - - /** - * Constructor - */ - public TailServerLogAction() { - super(OpenShiftExpressUIMessages.TAIL_SERVER_LOG_ACTION); - IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry(); - IViewDescriptor desc = reg.find(IConsoleConstants.ID_CONSOLE_VIEW); - setImageDescriptor(desc.getImageDescriptor()); - ConsoleUtils.registerConsoleListener(this); - } - - /** - * 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() { - final IServer server = getServer(); - if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { - MessageConsole console = ConsoleUtils.findMessageConsole(server.getId()); - ConsoleUtils.displayConsoleView(console); - console.newMessageStream().println("Loading...."); - - if (!this.consoleWorkers.containsKey(console.getName())) { - launchTailServerJob(console, server); - } - } - } - - private void launchTailServerJob(final MessageConsole console, final IServer server) { - new Job("Launching Tail Server Operation") { - protected IStatus run(IProgressMonitor monitor) { - try { - final TailServerLogWorker tailServerLogWorker = startTailProcess(server, console); - consoleWorkers.put(console.getName(), tailServerLogWorker); - Thread thread = new Thread(tailServerLogWorker); - thread.start(); - } catch (Exception e) { - Logger.error("Failed to retrieve remote server logs", e); - } - return Status.OK_STATUS; - } - - }.schedule(); - } - - /** - * Starting the tail process on the remote OpenShift Platform. This method - * relies on the JGit SSH support (including JSch) to open a connection AND - * execute a command in a single invocation. The connection establishement - * requires an SSH key, and the passphrase is prompted to the user if - * necessary. - * - * @param server the server adapter on which the action is perforemd - * @param console the console into which the tail should be writtent - * @return the Worker that encapsulate the established RemoteSession, the tail Process and the output console - * @throws JSchException in case of underlying exception - * @throws IOException in case of underlying exception - */ - private TailServerLogWorker startTailProcess(final IServer server, final MessageConsole console) - throws JSchException, IOException { - final String host = server.getHost(); - final String appId = ExpressServerUtils.getExpressApplicationId(server); - final String appName = ExpressServerUtils.getExpressApplicationName(server); - final String logFilePath = appName + "/logs/*.log"; - final String options = "-f -n 100"; - - JSch.setLogger(new JschToEclipseLogger()); - final SshSessionFactory sshSessionFactory = SshSessionFactory.getInstance(); - final URIish uri = new URIish().setHost(host).setUser(appId); - RemoteSession remoteSession = sshSessionFactory.getSession(uri, CredentialsProvider.getDefault(), FS.DETECTED, - 0); - - // the rhc-tail-files command template - // ssh_cmd = - // "ssh -t #{app_uuid}(a)#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'" - final String command = buildCommand(logFilePath, options); - Process process = remoteSession.exec(command, 0); - return new TailServerLogWorker(console, process, remoteSession); - - } - - /** - * Builds the 'ssh tail' command that should be executed on the remote - * OpenShift platform. - * - * @param filePath - * @param options - * @return - * @throws UnsupportedEncodingException - */ - private String buildCommand(final String filePath, final String options) throws UnsupportedEncodingException { - StringBuilder commandBuilder = new StringBuilder("tail "); - if (options != null && !options.isEmpty()) { - final String opts = new String(Base64Encoder.encode(options.getBytes("UTF-8")), "UTF-8"); - commandBuilder.append("--opts ").append(opts).append(" "); - } - commandBuilder.append(filePath); - final String command = commandBuilder.toString(); - Logger.debug("ssh command to execute: " + command); - return command; - } - - public IServer getServer() { - if (selection instanceof IStructuredSelection) { - final Object selectedItem = ((IStructuredSelection) selection).getFirstElement(); - if (selectedItem instanceof IServer) { - return ((IServer) selectedItem); - } - if (selectedItem instanceof IServerModule) { - return ((IServerModule) selectedItem).getServer(); - } - } - return null; - } - - @Override - public void consolesAdded(IConsole[] consoles) { - // don't do anything special - } - - /** - * Operation to perform when the console is removed (through the - * CloseConsoleAction that was brung by the - * <code>TailConsolePageParticipant</code>). In the current case, the - * associated worker is stopped and the console/worker are removed from the - * map, so that further 'Show In>Remote Console' invocation will trigger a - * new worker process. - */ - @Override - public void consolesRemoved(IConsole[] consoles) { - // if the console is associated with a 'tail' process, stop that process - for (IConsole console : consoles) { - final String consoleName = console.getName(); - if (consoleWorkers.containsKey(consoleName)) { - final TailServerLogWorker worker = consoleWorkers.get(consoleName); - worker.stop(); - consoleWorkers.remove(consoleName); - } - } - - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,54 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.console; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils; -import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; - -public class TailServerLogActionProvider extends CommonActionProvider { - - private TailServerLogAction action; - - private ICommonActionExtensionSite actionExtensionSite; - - public void init(ICommonActionExtensionSite actionExtensionSite) { - super.init(actionExtensionSite); - this.actionExtensionSite = actionExtensionSite; - ICommonViewerSite site = actionExtensionSite.getViewSite(); - if (site instanceof ICommonViewerWorkbenchSite) { - action = new TailServerLogAction(); - action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); - actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); - } - } - - public void fillContextMenu(IMenuManager menu) { - if (action != null && action.isEnabled()) { - Object sel = getSelection(); - if( sel instanceof IServer ) { - IServer server = (IServer)sel; - if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { - //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action); - CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite); - } - } - } - } - - protected Object getSelection() { - ICommonViewerSite site = actionExtensionSite.getViewSite(); - IStructuredSelection selection = null; - if (site instanceof ICommonViewerWorkbenchSite) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; - selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); - Object first = selection.getFirstElement(); - return first; - } - return null; - } -} Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,55 @@ +package org.jboss.tools.openshift.express.internal.ui.console; + +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils; +import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.ui.action.TailServerLogAction; + +public class TailServerLogActionProvider extends CommonActionProvider { + + private TailServerLogAction action; + + private ICommonActionExtensionSite actionExtensionSite; + + public void init(ICommonActionExtensionSite actionExtensionSite) { + super.init(actionExtensionSite); + this.actionExtensionSite = actionExtensionSite; + ICommonViewerSite site = actionExtensionSite.getViewSite(); + if (site instanceof ICommonViewerWorkbenchSite) { + action = new TailServerLogAction(); + action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); + actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); + } + } + + public void fillContextMenu(IMenuManager menu) { + if (action != null && action.isEnabled()) { + Object sel = getSelection(); + if( sel instanceof IServer ) { + IServer server = (IServer)sel; + if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { + //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action); + CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite); + } + } + } + } + + protected Object getSelection() { + ICommonViewerSite site = actionExtensionSite.getViewSite(); + IStructuredSelection selection = null; + if (site instanceof ICommonViewerWorkbenchSite) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; + selection = (IStructuredSelection) wsSite.getSelectionProvider().getSelection(); + Object first = selection.getFirstElement(); + return first; + } + return null; + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.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/console/TailServerLogWorker.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,116 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.console; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; - -import org.eclipse.jgit.transport.RemoteSession; -import org.eclipse.ui.console.MessageConsole; - -import com.jcraft.jsch.Logger; - -/** - * The underlying 'Tail' worker, that uses an established RemoteSession (with - * the help of JGit), runs in a dedicated process and displays the outputstream - * into a specific console. This worker is a <code>java.lang.Runnable</code> in - * order to run in a separate thread - * - * @author Xavier Coulon - * - */ -public class TailServerLogWorker implements Runnable { - - /** the remote 'tail' process. */ - private final Process process; - - /** the output message console. */ - private final MessageConsole console; - - /** the SSH session. */ - private final RemoteSession remoteSession; - - /** - * Constructor. - * - * @param console - * @param process - * @param remoteSession - */ - public TailServerLogWorker(final MessageConsole console, final Process process, final RemoteSession remoteSession) { - this.console = console; - this.process = process; - this.remoteSession = remoteSession; - } - - @Override - public void run() { - try { - // get I/O streams for remote tail - final InputStream in = process.getInputStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(in)); - String line; - // Read File Line By Line - while ((line = reader.readLine()) != null) { - console.newMessageStream().println(line); - } - } catch (Throwable e) { - org.jboss.tools.openshift.express.internal.ui.utils.Logger.error( - "Error while receiving the remote server log", e); - } finally { - - } - } - - /** - * Method called when the overall 'tail' process should be stopped: the - * underlying ssh remote session must be disconnected and the running - * process must be destroyed. - */ - public void stop() { - this.remoteSession.disconnect(); - this.process.destroy(); - } - - /** - * Bridge between the JSch logger and the Eclipse logger (to ouput results - * in the .log files and/or into the 'Error log' view. - * - * @author Xavier Coulon - * - */ - static class JschToEclipseLogger implements Logger { - - static java.util.Hashtable<Integer, String> name = new java.util.Hashtable<Integer, String>(); - static { - name.put(new Integer(DEBUG), "DEBUG: "); - name.put(new Integer(INFO), "INFO: "); - name.put(new Integer(WARN), "WARN: "); - name.put(new Integer(ERROR), "ERROR: "); - name.put(new Integer(FATAL), "FATAL: "); - } - - @Override - public boolean isEnabled(int level) { - return true; - } - - @Override - public void log(int level, String message) { - switch (level) { - case DEBUG: - case INFO: - org.jboss.tools.openshift.express.internal.ui.utils.Logger.debug(message); - break; - case WARN: - org.jboss.tools.openshift.express.internal.ui.utils.Logger.warn(message); - break; - case ERROR: - case FATAL: - org.jboss.tools.openshift.express.internal.ui.utils.Logger.error(message); - break; - } - } - - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,36 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.ui.navigator.CommonViewer; - -public abstract class AbstractAction extends Action implements ISelectionChangedListener { - - /** The current selection in the view. */ - protected ISelection selection = null; - - public AbstractAction(String text) { - super(text); - } - - public AbstractAction(String text, ImageDescriptor image) { - super(text, image); - } - - @Override - public void selectionChanged(SelectionChangedEvent event) { - Object source = event.getSource(); - if (source instanceof CommonViewer) { - this.selection = ((CommonViewer) source).getSelection(); - } - } - - public void setSelection(ISelection selection) { - this.selection = selection; - - } - -} \ No newline at end of file Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,36 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; - -public abstract class AbstractActionProvider extends CommonActionProvider { - - private final AbstractAction action; - - private final String group; - - public AbstractActionProvider(AbstractAction action, String group) { - this.action = action; - this.group = group; - } - - public void init(ICommonActionExtensionSite actionExtensionSite) { - super.init(actionExtensionSite); - ICommonViewerSite site = actionExtensionSite.getViewSite(); - if (site instanceof ICommonViewerWorkbenchSite) { - action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); - actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); - } - } - - @Override - public void fillContextMenu(IMenuManager menu) { - if (action != null && action.isEnabled()) { - menu.appendToGroup(group, action); - } - } - -} \ No newline at end of file Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,32 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; - -import com.openshift.express.client.IApplication; - -public class CreateApplicationAction extends AbstractAction { - - /** - * Constructor - */ - public CreateApplicationAction() { - super(OpenShiftExpressUIMessages.CREATE_APPLICATION_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("query-new.gif")); - } - - /** - * 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 && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); - - } - } - - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,11 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - - -public class CreateApplicationActionProvider extends AbstractActionProvider { - - public CreateApplicationActionProvider() { - super(new CreateApplicationAction(), "group.edition"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,31 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.wst.server.core.ServerCore; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; - -import com.openshift.express.client.IApplication; - -public class CreateServerAdapterAction extends AbstractAction { - - public CreateServerAdapterAction() { - super(OpenShiftExpressUIMessages.CREATE_SERVER_ADAPTER_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); - } - - @Override - public void run() { - final ITreeSelection treeSelection = (ITreeSelection) selection; - if (selection != null && selection instanceof ITreeSelection - && treeSelection.getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) treeSelection.getFirstElement(); - ServerCore.getServers(); - /* - * EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(user, user); WizardDialog dialog = new - * WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open(); - */ - - } - } -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,9 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -public class CreateServerAdapterActionProvider extends AbstractActionProvider { - - public CreateServerAdapterActionProvider() { - super(new CreateServerAdapterAction(), "group.server"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,63 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.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.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; - -public class DeleteApplicationAction extends AbstractAction { - - /** - * Constructor - */ - public DeleteApplicationAction() { - super(OpenShiftExpressUIMessages.DELETE_APPLICATION_ACTION); - setImageDescriptor(PlatformUI.getWorkbench().getSharedImages() - .getImageDescriptor(ISharedImages.IMG_ETOOL_DELETE)); - } - - /** - * 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 && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); - final String appName = application.getName(); - final boolean confirm = MessageDialog - .openConfirm( - Display.getCurrent().getActiveShell(), - "Application deletion", - "You are about to destroy the '" + appName + "' application.\n" + - "This is NOT reversible, all remote data for this application will be removed."); - if (confirm) { - Job job = new Job("Deleting application '" + appName + "'...") { - protected IStatus run(IProgressMonitor monitor) { - try { - application.destroy(); - } catch (OpenShiftException e) { - Logger.error("Failed to delete application '" + appName + "'", e); - } finally { - monitor.done(); - } - return Status.OK_STATUS; - } - }; - job.setPriority(Job.SHORT); - job.schedule(); // start as soon as possible - } - } - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - -public class DeleteApplicationActionProvider extends AbstractActionProvider { - - public DeleteApplicationActionProvider() { - super(new DeleteApplicationAction(), "group.edition"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,35 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; - -public class EditCartridgesAction extends AbstractAction { - - public EditCartridgesAction() { - super(OpenShiftExpressUIMessages.EDIT_CARTRIDGES_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("task-repository-new.gif")); - } - - @Override - public void run() { - final ITreeSelection treeSelection = (ITreeSelection)selection; - if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) treeSelection.getFirstElement(); - final IUser user = OpenShiftUIActivator.getDefault().getUser(); - EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); - dialog.create(); - dialog.open(); - - } - } - - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - -public class EditCartridgesActionProvider extends AbstractActionProvider { - - public EditCartridgesActionProvider() { - super(new EditCartridgesAction(), "group.edition"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,33 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.wizard.EditDomainDialog; - -import com.openshift.express.client.IUser; - -public class EditDomainAction extends AbstractAction { - - public EditDomainAction() { - super(OpenShiftExpressUIMessages.EDIT_DOMAIN_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); - } - - @Override - public void run() { - final ITreeSelection treeSelection = (ITreeSelection)selection; - if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) { - final IUser user = (IUser) treeSelection.getFirstElement(); - EditDomainDialog wizard = new EditDomainDialog(user); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); - dialog.create(); - dialog.open(); - - } - } - - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,11 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.ui.navigator.ICommonMenuConstants; - -public class EditDomainActionProvider extends AbstractActionProvider { - - public EditDomainActionProvider() { - super(new EditDomainAction(), "group.edition"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,36 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; -import org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizard; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; - -public class ImportApplicationAction extends AbstractAction { - - public ImportApplicationAction() { - super(OpenShiftExpressUIMessages.IMPORT_APPLICATION_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("go-into.gif")); - } - - @Override - public void run() { - final ITreeSelection treeSelection = (ITreeSelection)selection; - if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) treeSelection.getFirstElement(); - final IUser user = OpenShiftUIActivator.getDefault().getUser(); - ImportExistingApplicationWizard wizard = new ImportExistingApplicationWizard(); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); - dialog.create(); - dialog.open(); - - } - } - - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - -public class ImportApplicationActionProvider extends AbstractActionProvider { - - public ImportApplicationActionProvider() { - super(new ImportApplicationAction(), "group.server"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,54 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.navigator.CommonNavigator; -import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; -import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; -import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentCategory; - -import com.openshift.express.client.IUser; - -public class OpenConnectionDialogActionDelegate implements IViewActionDelegate { - - private CommonNavigator view; - - @Override - public void run(IAction action) { - final Display display = Display.getCurrent(); - final Shell shell = new Shell(display); - final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(); - int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell); - if (returnCode == Window.OK) { - Logger.debug("OpenShift Auth succeeded."); - if (view != null) { - IUser user = OpenShiftUIActivator.getDefault().getUser(); - //view.switchToCommonViewer(); - view.getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user)); - //view.getCommonViewer().refresh(); - } - } - - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - - } - - @Override - public void init(IViewPart view) { - if (view instanceof CommonNavigator) { - this.view = (CommonNavigator) view; - } - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,42 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.viewers.ITreeSelection; -import org.jboss.tools.common.ui.BrowserUtil; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.OpenShiftException; - -public class OpenInWebBrowserAction extends AbstractAction { - - /** - * Constructor - */ - public OpenInWebBrowserAction() { - super(OpenShiftExpressUIMessages.SHOW_IN_BROWSER_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("open-browser.gif")); - } - - /** - * 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 - && ((ITreeSelection) selection).getFirstElement() instanceof IApplication) { - try { - final IApplication application = (IApplication) ((ITreeSelection) selection).getFirstElement(); - final String appName = application.getName(); - final String appUrl = application.getApplicationUrl(); - BrowserUtil.checkedCreateInternalBrowser(appUrl, appName, - OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); - } catch (OpenShiftException e) { - Logger.error("Failed to open OpenShift Application in a browser", e); - } - } - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - -public class OpenInWebBrowserActionProvider extends AbstractActionProvider { - - public OpenInWebBrowserActionProvider() { - super(new OpenInWebBrowserAction(), "group.showIn"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,28 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; - -public class RefreshDomainAction implements IViewActionDelegate { - - @Override - public void run(IAction action) { - // TODO Auto-generated method stub - - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - // TODO Auto-generated method stub - - } - - @Override - public void init(IViewPart view) { - // TODO Auto-generated method stub - - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,28 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; - -public class ShowPropertiesAction extends AbstractAction { - - public ShowPropertiesAction() { - super(OpenShiftExpressUIMessages.SHOW_PROPERTIES_VIEW_ACTION); - } - - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ - @Override - public void run() { - try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.ui.views.PropertySheet"); - } catch (PartInitException e) { - Logger.error("Failed to show properties view", e); - } - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - - -public class ShowPropertiesActionProvider extends AbstractActionProvider { - - public ShowPropertiesActionProvider() { - super(new ShowPropertiesAction(), "group.properties"); - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java 2012-02-07 14:10:18 UTC (rev 38462) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -1,10 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.viewer.action; - -import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogAction; - -public class TailServerLogActionProvider extends AbstractActionProvider { - - public TailServerLogActionProvider() { - super(new TailServerLogAction(), "group.showIn"); - } -} Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,37 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction; + +public abstract class AbstractActionProvider extends CommonActionProvider { + + private final AbstractAction action; + + private final String group; + + public AbstractActionProvider(AbstractAction action, String group) { + this.action = action; + this.group = group; + } + + public void init(ICommonActionExtensionSite actionExtensionSite) { + super.init(actionExtensionSite); + ICommonViewerSite site = actionExtensionSite.getViewSite(); + if (site instanceof ICommonViewerWorkbenchSite) { + action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); + actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); + } + } + + @Override + public void fillContextMenu(IMenuManager menu) { + if (action != null && action.isEnabled()) { + menu.appendToGroup(group, action); + } + } + +} \ 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/viewer/actionProvider/AbstractActionProvider.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/viewer/actionProvider/CreateApplicationActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,13 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.CreateApplicationAction; + + + +public class CreateApplicationActionProvider extends AbstractActionProvider { + + public CreateApplicationActionProvider() { + super(new CreateApplicationAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.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/viewer/actionProvider/CreateServerAdapterActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,11 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.CreateServerAdapterAction; + +public class CreateServerAdapterActionProvider extends AbstractActionProvider { + + public CreateServerAdapterActionProvider() { + super(new CreateServerAdapterAction(), "group.server"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.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/viewer/actionProvider/DeleteApplicationActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.DeleteApplicationAction; + + +public class DeleteApplicationActionProvider extends AbstractActionProvider { + + public DeleteApplicationActionProvider() { + super(new DeleteApplicationAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.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/viewer/actionProvider/EditCartridgesActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.EditCartridgesAction; + + +public class EditCartridgesActionProvider extends AbstractActionProvider { + + public EditCartridgesActionProvider() { + super(new EditCartridgesAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.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/viewer/actionProvider/EditDomainActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditDomainActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditDomainActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.eclipse.ui.navigator.ICommonMenuConstants; +import org.jboss.tools.openshift.express.internal.ui.action.EditDomainAction; + +public class EditDomainActionProvider extends AbstractActionProvider { + + public EditDomainActionProvider() { + super(new EditDomainAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditDomainActionProvider.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/viewer/actionProvider/ImportApplicationActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.ImportApplicationAction; + + +public class ImportApplicationActionProvider extends AbstractActionProvider { + + public ImportApplicationActionProvider() { + super(new ImportApplicationAction(), "group.server"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.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/viewer/actionProvider/OpenInWebBrowserActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.OpenInWebBrowserAction; + + +public class OpenInWebBrowserActionProvider extends AbstractActionProvider { + + public OpenInWebBrowserActionProvider() { + super(new OpenInWebBrowserAction(), "group.showIn"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.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/viewer/actionProvider/ShowPropertiesActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,12 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.ShowPropertiesAction; + + +public class ShowPropertiesActionProvider extends AbstractActionProvider { + + public ShowPropertiesActionProvider() { + super(new ShowPropertiesAction(), "group.properties"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.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/viewer/actionProvider/TailServerLogActionProvider.java (from rev 38419, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java 2012-02-07 14:31:09 UTC (rev 38463) @@ -0,0 +1,11 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.jboss.tools.openshift.express.internal.ui.action.TailServerLogAction; + + +public class TailServerLogActionProvider extends AbstractActionProvider { + + public TailServerLogActionProvider() { + super(new TailServerLogAction(), "group.showIn"); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain