Author: rob.stryker(a)jboss.com Date: 2012-02-03 02:03:34 -0500 (Fri, 03 Feb 2012) New Revision: 38407 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 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 Log: Show in -> remote console needs to work for an as7 server in openshift binary mode Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-03 05:28:40 UTC (rev 38406) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-03 07:03:34 UTC (rev 38407) @@ -286,6 +286,9 @@ return url; } + /** + * @since 2.3 + */ public static ArrayList<XPathCategory> loadDefaultPortQueries(IServer server, String baseDir) { ArrayList<XPathCategory> retVal = new ArrayList<XPathCategory>(); URL url = rtToPortsFile.get(server.getRuntime().getRuntimeType().getId()); @@ -303,6 +306,9 @@ return retVal; } + /** + * @since 2.3 + */ public static void addQueriesToCategoryFromDefaultFile(IServer server, XPathCategory category, String baseDir, URL url) throws IOException { Properties pr = new Properties(); 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-03 05:28:40 UTC (rev 38406) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 07:03:34 UTC (rev 38407) @@ -177,10 +177,6 @@ <instanceof value="org.eclipse.wst.server.core.IServer"> </instanceof> - <test - forcePluginActivation="true" - property="org.jboss.tools.openshift.express.isOpenShiftServer"> - </test> </and> </enablement> </actionProvider> Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 05:28:40 UTC (rev 38406) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-03 07:03:34 UTC (rev 38407) @@ -20,8 +20,11 @@ import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; +import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils; import org.jboss.ide.eclipse.as.core.util.ServerUtil; @@ -279,4 +282,23 @@ return (OPENSHIFT_SERVER_TYPE.equals(serverTypeId)); } + /** + * Returns true if the given server is a server using an openshift behaviour + * @param server the server to check + * @return true or false + */ + public static boolean isInOpenshiftBehaviourMode(IServer server) { + IDeployableServer ds = ServerConverter.getDeployableServer(server); + if( ds != null ) { + IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server); + if( type != null ) { + String id = type.getId(); + if( ExpressBinaryBehaviourDelegate.OPENSHIFT_BINARY_ID.equals(id) || ExpressBehaviourDelegate.OPENSHIFT_ID.equals(id)) + return true; + } + } + return false; + } + + } Modified: 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-03 05:28:40 UTC (rev 38406) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-03 07:03:34 UTC (rev 38407) @@ -5,6 +5,10 @@ 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.action.Action; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -70,22 +74,32 @@ @Override public void run() { final IServer server = getServer(); - if (ExpressServerUtils.isOpenShiftRuntime(server)) { + if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { MessageConsole console = ConsoleUtils.findMessageConsole(server.getId()); - String consoleName = console.getName(); - if (!this.consoleWorkers.containsKey(consoleName)) { + 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(consoleName, tailServerLogWorker); 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; } - ConsoleUtils.displayConsoleView(console); - } + + }.schedule(); } /** Modified: 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-03 05:28:40 UTC (rev 38406) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-03 07:03:34 UTC (rev 38407) @@ -6,7 +6,9 @@ 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 { @@ -27,9 +29,14 @@ public void fillContextMenu(IMenuManager menu) { if (action != null && action.isEnabled()) { - //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action); - CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite); - + 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); + } + } } }