Author: rob.stryker(a)jboss.com Date: 2011-07-14 01:24:51 -0400 (Thu, 14 Jul 2011) New Revision: 32909 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java Log: JBIDE-9343 - ensuring as7 management poller is unavailable for servers it does not apply to. Same for jmx poller. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-07-14 05:24:51 UTC (rev 32909) @@ -83,7 +83,7 @@ } /** Get only the pollers that can poll for startups */ - public ServerStatePollerType[] getStartupPollers() { + public ServerStatePollerType[] getStartupPollers(IServerType serverType) { if( pollers == null ) loadPollers(); ArrayList<ServerStatePollerType> list = new ArrayList<ServerStatePollerType>(); @@ -91,14 +91,14 @@ ServerStatePollerType type; while(i.hasNext()) { type = i.next(); - if( type.supportsStartup()) + if( type.supportsStartup() && pollerSupportsServerType(type, serverType)) list.add(type); } return list.toArray(new ServerStatePollerType[list.size()]); } /** Get only the pollers that can poll for shutdowns */ - public ServerStatePollerType[] getShutdownPollers() { + public ServerStatePollerType[] getShutdownPollers(IServerType serverType) { if( pollers == null ) loadPollers(); ArrayList<ServerStatePollerType> list = new ArrayList<ServerStatePollerType>(); @@ -106,13 +106,26 @@ ServerStatePollerType type; while(i.hasNext()) { type = i.next(); - if( type.supportsShutdown() ) + if( type.supportsShutdown() && pollerSupportsServerType(type, serverType)) list.add(type); } return list.toArray(new ServerStatePollerType[list.size()]); } + protected boolean pollerSupportsServerType(ServerStatePollerType type, IServerType serverType) { + String sTypes = type.getServerTypes(); + if(sTypes == null || sTypes.equals("")) //$NON-NLS-1$ + return true; + String[] allTypes = sTypes.split(","); //$NON-NLS-1$ + for( int i = 0; i < allTypes.length; i++ ) { + if( allTypes[i].equals(serverType.getId())) { + return true; + } + } + return false; + } + /** The method used to load / instantiate the failure handlers */ public void loadFailureHandler() { pollerFailureHandlers = new HashMap<String, IPollerFailureHandler>(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-07-14 05:24:51 UTC (rev 32909) @@ -49,7 +49,8 @@ Bundle-Vendor.0 = JBoss by Red Hat Bundle-Name.0 = JBoss AS Core Plug-in -AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50 -AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50 +AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50 +AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50 AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer -ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60 +ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70 +ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-14 05:24:51 UTC (rev 32909) @@ -733,6 +733,7 @@ class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller" id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller" name="JBoss 7 Manager Service Poller" + serverTypes="org.jboss.ide.eclipse.as.70" supportsShutdown="true" supportsStartup="true"> </serverPoller> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/pollers.exsd 2011-07-14 05:24:51 UTC (rev 32909) @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.jboss.ide.eclipse.as.core"> +<schema targetNamespace="org.jboss.ide.eclipse.as.core" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.jboss.ide.eclipse.as.core" id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers"/> @@ -11,6 +11,11 @@ </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="serverPoller" minOccurs="0" maxOccurs="unbounded"/> @@ -82,6 +87,13 @@ </documentation> </annotation> </attribute> + <attribute name="serverTypes" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> </complexType> </element> @@ -121,13 +133,5 @@ </documentation> </annotation> - <annotation> - <appInfo> - <meta.section type="copyright"/> - </appInfo> - <documentation> - - </documentation> - </annotation> </schema> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml 2011-07-14 05:24:51 UTC (rev 32909) @@ -20,8 +20,9 @@ class="org.jboss.ide.eclipse.as.jmx.integration.JMXPoller" id="org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller" name="JMX Poller" - supportsStartup="true" - supportsShutdown="true"/> + serverTypes="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50" + supportsShutdown="true" + supportsStartup="true"/> </extension> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-07-14 03:58:08 UTC (rev 32908) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-07-14 05:24:51 UTC (rev 32909) @@ -98,8 +98,8 @@ } protected void findPossiblePollers() { - startupTypes = ExtensionManager.getDefault().getStartupPollers(); - shutdownTypes = ExtensionManager.getDefault().getShutdownPollers(); + startupTypes = ExtensionManager.getDefault().getStartupPollers(server.getServerType()); + shutdownTypes = ExtensionManager.getDefault().getShutdownPollers(server.getServerType()); startupTypesStrings = new String[startupTypes.length]; shutdownTypesStrings = new String[shutdownTypes.length];