Author: rob.stryker(a)jboss.com Date: 2011-12-14 06:41:44 -0500 (Wed, 14 Dec 2011) New Revision: 37324 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java Log: JBIDE-10353 - removed irrelevent actions from openshift shown-in Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -102,8 +102,7 @@ String programArguments = getProgramArguments(launchConfig); programArguments = ArgsUtil.setArg(programArguments, IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT, - IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG, - host); + null, host); setProgramArguments(programArguments, launchConfig); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartConfigurator.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -100,8 +100,7 @@ @Override protected String getHost(JBossServer server, IJBossServerRuntime runtime) { - // not needed - return null; + return server.getHost(); } @Override Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -148,8 +148,12 @@ } // turn this to a retval; - if( !found ) - retVal = retVal + longOpt + EQ + value; + if( !found ) { + if( longOpt != null ) + retVal = retVal + longOpt + EQ + value; + else + retVal = retVal + shortOpt + SPACE + value; + } return retVal; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -31,6 +31,7 @@ public static final String EAP_60 = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$ // NEW_SERVER_ADAPTER Add the new runtime constant above this line + public static final String SERVER_AS_PREFIX = "org.jboss.ide.eclipse.as."; //$NON-NLS-1$ public static final String SERVER_AS_32 = "org.jboss.ide.eclipse.as.32"; //$NON-NLS-1$ public static final String SERVER_AS_40 = "org.jboss.ide.eclipse.as.40"; //$NON-NLS-1$ public static final String SERVER_AS_42 = "org.jboss.ide.eclipse.as.42"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -81,6 +81,13 @@ return p; } + public static boolean isJBossServerType(IServerType type) { + // If we start with AS or EAP serverIds and are NOT deploy-only server + return !type.getId().equals(IJBossToolingConstants.DEPLOY_ONLY_SERVER) && + (type.getId().startsWith(IJBossToolingConstants.SERVER_AS_PREFIX) + || type.getId().startsWith(IJBossToolingConstants.EAP_SERVER_PREFIX)); + } + public static boolean isJBoss7(IServer server) { return isJBoss7(server.getServerType()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -87,7 +87,7 @@ if( quick != null && selection != null && selection.toArray().length == 1 ) { if( selection.getFirstElement() instanceof IServer ) { IServer server = (IServer)selection.getFirstElement(); - if( ServerConverter.getJBossServer(server) != null && !ServerUtil.isJBoss7(server)) { + if( ServerUtil.isJBossServerType(server.getServerType()) && !ServerUtil.isJBoss7(server)) { if( menu instanceof MenuManager ) { ((MenuManager)quick).add(showInJMXViewAction); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -32,7 +32,7 @@ if( jbs != null ) { // TODO fix this so anything BELOW 7 works // need new util methods - return !ServerUtil.isJBoss7(server); + return ServerUtil.isJBossServerType(server.getServerType()) && !ServerUtil.isJBoss7(server); } } return false; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -11,8 +11,10 @@ package org.jboss.ide.eclipse.as.ui.views.server.extensions; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.ide.eclipse.as.ui.Messages; @@ -24,6 +26,12 @@ protected String getActionText() { return Messages.ShowInWebManagementConsole_Action_Text; } + + protected boolean shouldAddForSelection(IStructuredSelection sel) { + IServer server = getSingleServer(sel); + return accepts(server); + } + protected boolean accepts(IServer server) { return (ServerUtil.isJBoss7(server) && server.getServerState() == IServer.STATE_STARTED); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-12-14 05:51:18 UTC (rev 37323) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-12-14 11:41:44 UTC (rev 37324) @@ -11,6 +11,7 @@ package org.jboss.ide.eclipse.as.ui.views.server.extensions; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.util.ServerUtil; @@ -25,6 +26,11 @@ return Messages.ShowInWelcomePage_Action_Text; } + protected boolean shouldAddForSelection(IStructuredSelection sel) { + IServer server = getSingleServer(sel); + return ServerUtil.isJBossServerType(server.getServerType()) && accepts(server); + } + protected boolean accepts(IServer server) { return server.getServerState() == IServer.STATE_STARTED; }