Author: rob.stryker(a)jboss.com Date: 2011-08-01 01:51:07 -0400 (Mon, 01 Aug 2011) New Revision: 33404 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java Log: JBIDE-9425 - tracing for launching, related to JBIDE-9243 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -8,9 +8,10 @@ import java.util.List; import java.util.Properties; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.PollingException; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller.RequiresInfoException; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; @@ -122,8 +123,16 @@ return TIMEOUT_BEHAVIOR_FAIL; } - public boolean getCurrentStateSynchronous(IServer server) { - return onePing(server); + public IStatus getCurrentStateSynchronous(IServer server) { + String url = getURL(server); + boolean b = onePing(url); + if( b ) { + Status s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, + "Web Poller find a running server at url " + url); //$NON-NLS-1$ + return s; + } + Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, + "Web Poller did not find a running server at url " + url); //$NON-NLS-1$ + return s; } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller2.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.server; +import org.eclipse.core.runtime.IStatus; import org.eclipse.wst.server.core.IServer; /** @@ -32,5 +33,5 @@ * * @return IServerStatePoller.SERVER_UP or SERVER_DOWN */ - public boolean getCurrentStateSynchronous(IServer server); + public IStatus getCurrentStateSynchronous(IServer server); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -30,6 +30,7 @@ import org.jboss.ide.eclipse.as.core.ExtensionManager; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.Trace; import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; @@ -49,18 +50,26 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); - if (!jbsBehavior.canStart(mode).isOK()) + IStatus s = jbsBehavior.canStart(mode); + + Trace.trace(Trace.STRING_FINEST, "Ensuring Server can start: " + s.getMessage()); //$NON-NLS-1$ + if (!s.isOK()) throw new CoreException(jbsBehavior.canStart(mode)); if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) { + Trace.trace(Trace.STRING_FINEST, "Server is marked as ignore Launch. Marking as started."); //$NON-NLS-1$ jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); return false; } + + Trace.trace(Trace.STRING_FINEST, "Checking if similar server is already up on the same ports."); //$NON-NLS-1$ boolean started = isServerStarted(jbsBehavior); if (started) { + Trace.trace(Trace.STRING_FINEST, "A server is already started. Now handling the already started scenario."); //$NON-NLS-1$ return handleAlreadyStartedScenario(jbsBehavior); } + Trace.trace(Trace.STRING_FINEST, "A full launch will now proceed."); //$NON-NLS-1$ return true; } @@ -75,8 +84,11 @@ // Need to be able to FORCE the poller to poll immediately if( poller == null || !(poller instanceof IServerStatePoller2)) poller = new WebPortPoller(); - boolean started = ((IServerStatePoller2)poller).getCurrentStateSynchronous(jbsBehavior.getServer()); - return started; + IStatus started = ((IServerStatePoller2)poller).getCurrentStateSynchronous(jbsBehavior.getServer()); + // Trace + Trace.trace(Trace.STRING_FINER, "Checking if a server is already started: " + started.getMessage()); //$NON-NLS-1$ + + return started.isOK(); } protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior) { @@ -90,6 +102,7 @@ return false; } } + Trace.trace(Trace.STRING_FINEST, "There is no handler available to prompt the user. The server will be set to started automatically. "); //$NON-NLS-1$ // force server to started mode jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -15,8 +15,11 @@ import java.util.List; import java.util.Properties; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; @@ -132,9 +135,9 @@ return TIMEOUT_BEHAVIOR_FAIL; } - public boolean getCurrentStateSynchronous(final IServer server) { + public IStatus getCurrentStateSynchronous(final IServer server) { try { - return JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() { + Boolean result = JBoss7ManagerUtil.executeWithService(new IServiceAware<Boolean>() { @Override public Boolean execute(IJBoss7ManagerService service) throws Exception { @@ -142,10 +145,21 @@ return state == JBoss7ServerState.RUNNING ? IServerStatePoller.SERVER_UP : IServerStatePoller.SERVER_DOWN; } }, server); + if( result.booleanValue()) { + Status s = new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, + "A JBoss 7 Management Service on " + server.getHost() //$NON-NLS-1$ + + ", port " + getManagementPort(server) + " has responded that the server is completely started."); //$NON-NLS-1$ //$NON-NLS-2$ + return s; + } + Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, + "A JBoss 7 Management Service on " + server.getHost() //$NON-NLS-1$ + + ", port " + getManagementPort(server) + " has responded that the server is not completely started."); //$NON-NLS-1$ //$NON-NLS-2$ + return s; } catch(Exception e) { -e.printStackTrace(); - // ignore + Status s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, + "An attempt to reach the JBoss 7 Management Service on host " + server.getHost() //$NON-NLS-1$ + + " and port " + getManagementPort(server) + " has resulted in an exception"); //$NON-NLS-1$ //$NON-NLS-2$ + return s; } - return IServerStatePoller.SERVER_DOWN; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -13,7 +13,6 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.osgi.framework.BundleContext; public class JBoss7ManagerUtil { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-01 05:47:42 UTC (rev 33403) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-01 05:51:07 UTC (rev 33404) @@ -29,7 +29,6 @@ import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; @@ -257,19 +256,24 @@ ServerLogger.getDefault().log(server,s); } - public boolean getCurrentStateSynchronous(IServer server) { + public IStatus getCurrentStateSynchronous(IServer server) { JMXClassLoaderRepository.getDefault().addConcerned(server, this); JMXPollerRunnable runnable2 = new JMXPollerRunnable(); JMXSafeRunner runner2 = new JMXSafeRunner(server); try { runner2.run(runnable); int started2 = runnable2.result ? STATE_STARTED : STATE_TRANSITION; - if( started2 == STATE_STARTED ) - return IServerStatePoller.SERVER_UP; + if( started2 == STATE_STARTED ) { + Status s = new Status(IStatus.OK, Activator.PLUGIN_ID, + "JMX Poller found a running server on " + server.getHost()); + return s; + } } catch(CoreException ce) { } finally { JMXClassLoaderRepository.getDefault().removeConcerned(server, this); } - return IServerStatePoller.SERVER_DOWN; + Status s = new Status(IStatus.INFO, Activator.PLUGIN_ID, + "JMX Poller did not find a running server on " + server.getHost()); + return s; } -} +} \ No newline at end of file