Author: rob.stryker(a)jboss.com Date: 2012-04-20 12:43:30 -0400 (Fri, 20 Apr 2012) New Revision: 40386 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossJMXConnectionProviderModel.java Log: JBIDE-11514 - as6 browser popping up Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java 2012-04-20 16:27:28 UTC (rev 40385) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss6ModuleStateVerifier.java 2012-04-20 16:43:30 UTC (rev 40386) @@ -10,50 +10,47 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server.internal; -import org.eclipse.core.runtime.IProgressMonitor; +import javax.management.MBeanServerConnection; + import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IServerModuleStateVerifier; -public class JBoss6ModuleStateVerifier /* extends JBossLT6ModuleStateVerifier */ implements IServerModuleStateVerifier { +public class JBoss6ModuleStateVerifier extends JBossLT6ModuleStateVerifier implements IServerModuleStateVerifier { - @Override - public boolean isModuleStarted(IServer server, IModule module, - IProgressMonitor monitor) { - // NO IDEA - return true; - } - - @Override - public void waitModuleStarted(IServer server, IModule module, - IProgressMonitor monitor) { - return; - } - - @Override - public void waitModuleStarted(IServer server, IModule module, int maxDelay) { - return; - } - - // If proper mbeans are found, uncomment this and customize it - -// protected boolean checkNestedWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception { -// String mbeanName = "jboss.deployment:id=\"jboss.web.deployment:war=/" + module.getName() + "\",type=Component"; //$NON-NLS-1$//$NON-NLS-2$ -// String stateAttribute = "State"; //$NON-NLS-1$ -// Object result = getAttributeResult(connection, mbeanName, stateAttribute); -// if( result == null || !result.toString().equals("DEPLOYED")) //$NON-NLS-1$ -// return false; +// @Override +// public boolean isModuleStarted(IServer server, IModule module, +// IProgressMonitor monitor) { +// // NO IDEA // return true; // } // -// protected boolean checkStandaloneWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception { -// String mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$ -// String stateAttribute = "state"; //$NON-NLS-1$ -// Object result = getAttributeResult(connection, mbeanName, stateAttribute); -// if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) { -// return false; -// } -// return true; +// @Override +// public void waitModuleStarted(IServer server, IModule module, +// IProgressMonitor monitor) { +// return; // } +// +// @Override +// public void waitModuleStarted(IServer server, IModule module, int maxDelay) { +// return; +// } + + // If proper mbeans are found, uncomment this and customize it + + protected boolean checkNestedWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception { + boolean val = checkStandaloneWebModuleStarted(server, module, connection); + return val; + } + protected boolean checkStandaloneWebModuleStarted(IServer server, IModule module, MBeanServerConnection connection) throws Exception { + String mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$ + String stateAttribute = "state"; //$NON-NLS-1$ + Object result = getAttributeResult(connection, mbeanName, stateAttribute); + if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) { + return false; + } + return true; + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossJMXConnectionProviderModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossJMXConnectionProviderModel.java 2012-04-20 16:27:28 UTC (rev 40385) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossJMXConnectionProviderModel.java 2012-04-20 16:43:30 UTC (rev 40386) @@ -13,6 +13,7 @@ import java.util.HashMap; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.ExtensionManager; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.IJMXRunnable; @@ -27,20 +28,24 @@ return instance; } - private HashMap<Integer, AbstractJBossJMXConnectionProvider> providers; + private HashMap<Integer, AbstractJBossJMXConnectionProvider> providers = null; public JBossJMXConnectionProviderModel() { - providers = new HashMap<Integer, AbstractJBossJMXConnectionProvider>(); -// providers.put(ServerExtendedProperties.JMX_NULL_PROVIDER, null); -// providers.put(ServerExtendedProperties.JMX_AS_3_TO_6_PROVIDER, new JBoss3To6ConnectionProvider()); -// providers.put(ServerExtendedProperties.JMX_DEFAULT_PROVIDER, new JBoss70ConnectionProvider()); -// providers.put(ServerExtendedProperties.JMX_AS_710_PROVIDER, null); } + private void initProviders() { + if( providers == null) { + providers = new HashMap<Integer, AbstractJBossJMXConnectionProvider>(); + org.jboss.tools.jmx.core.ExtensionManager.getProviders(); + } + } + public void registerProvider(int type, AbstractJBossJMXConnectionProvider provider) { + initProviders(); providers.put(type, provider); } public AbstractJBossJMXConnectionProvider getProvider(int type) { + initProviders(); return providers.get(type); } @@ -58,6 +63,7 @@ return null; int i = properties.getJMXProviderType(); + initProviders(); AbstractJBossJMXConnectionProvider provider = providers.get(i); return provider; }