Author: rob.stryker(a)jboss.com Date: 2011-09-09 08:14:50 -0400 (Fri, 09 Sep 2011) New Revision: 34599 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBDS-1762 - delay browser until modules are started Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2011-09-09 11:55:57 UTC (rev 34598) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2011-09-09 12:14:50 UTC (rev 34599) @@ -97,6 +97,9 @@ return makeDeployable(resource.getFullPath()); } + /** + * @since 2.3 + */ public static boolean makeDeployable(IProject project, IPath[] workspaceRelative) { boolean ret = true; for( int i = 0; i < workspaceRelative.length; i++ ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2011-09-09 11:55:57 UTC (rev 34598) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2011-09-09 12:14:50 UTC (rev 34599) @@ -33,9 +33,9 @@ import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.model.IURLProvider; +import org.eclipse.wst.server.core.model.IURLProvider2; import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate; import org.eclipse.wst.server.core.model.ServerDelegate; -import org.eclipse.wst.server.core.util.HttpLaunchable; import org.eclipse.wst.server.core.util.WebResource; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; @@ -146,7 +146,7 @@ if (portletURL != null) { url = portletURL; } - return new HttpLaunchable(url); + return new JBTCustomHttpLaunchable(moduleObject, url); } catch (MalformedURLException e) { return null; // no launchable available. } @@ -213,4 +213,31 @@ File file = new File(location,portalDir); return file.exists(); } + + + public static class JBTCustomHttpLaunchable { + private IURLProvider2 urlProvider; + private IModuleArtifact artifact; + public JBTCustomHttpLaunchable(IModuleArtifact artifact, final URL url) { + this.artifact = artifact; + this.urlProvider = new IURLProvider2() { + public URL getModuleRootURL(IModule module){ + return url; + } + public URL getLaunchableURL() { + return getModuleRootURL(null); + } + }; + } + + public JBTCustomHttpLaunchable(IURLProvider2 urlProvider){ + this.urlProvider = urlProvider; + } + public URL getURL() { + return urlProvider.getLaunchableURL(); + } + public IModule getModule() { + return artifact.getModule(); + } + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-09 11:55:57 UTC (rev 34598) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-09 12:14:50 UTC (rev 34599) @@ -35,6 +35,7 @@ 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.publishers.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; @@ -245,8 +246,11 @@ protected void resumeDeployment(final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception { + monitor.beginTask("Resuming Deployment Scanner", 1000); //$NON-NLS-1$ ObjectName name = new ObjectName(IJBossRuntimeConstants.DEPLOYMENT_SCANNER_MBEAN_NAME); launchDeployCommand(connection, name, IJBossRuntimeConstants.START, monitor); + monitor.worked(1000); + monitor.done(); } protected void launchDeployCommand(final MBeanServerConnection connection, final ObjectName objectName, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java 2011-09-09 11:55:57 UTC (rev 34598) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java 2011-09-09 12:14:50 UTC (rev 34599) @@ -13,6 +13,8 @@ import javax.management.MBeanServerConnection; import org.eclipse.core.runtime.CoreException; +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.ExtensionManager.IServerJMXRunnable; import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunner; @@ -31,6 +33,7 @@ JBossServerConnectionProvider.run(server, runnable2); } catch(JMXException jmxe) { // TODO wrap and log + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, jmxe.getMessage(), jmxe)); } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-09-09 12:14:50 UTC (rev 34599) @@ -0,0 +1,161 @@ +package org.jboss.ide.eclipse.as.ui.launch; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; + +import javax.management.InstanceNotFoundException; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.browser.IWebBrowser; +import org.eclipse.ui.browser.IWorkbenchBrowserSupport; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.model.ClientDelegate; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +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.internal.JBossLaunchAdapter.JBTCustomHttpLaunchable; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; + +public class JBTWebLaunchableClient extends ClientDelegate { + + public JBTWebLaunchableClient() { + // TODO Auto-generated constructor stub + } + + public boolean supports(IServer server, Object launchable, String launchMode) { + return (launchable instanceof JBTCustomHttpLaunchable); + } + + protected boolean shouldSuspendScanner(IServer server) { + return server.getServerState() == IServer.STATE_STARTED + && ExtensionManager.getDefault().getJMXRunner() != null; + } + + public IStatus launch(final IServer server, final Object launchable, final String launchMode, final ILaunch launch) { + new Thread() { + public void run() { + launch2(server, launchable, launchMode, launch); + } + }.start(); + return null; // intentional null return + } + + public IStatus launch2(IServer server, Object launchable, String launchMode, ILaunch launch) { + final JBTCustomHttpLaunchable http = (JBTCustomHttpLaunchable) launchable; + wait(server, http.getModule()); + Display.getDefault().asyncExec(new Runnable(){ + public void run() { + try { + IWorkbenchBrowserSupport browserSupport = JBossServerUIPlugin.getDefault().getWorkbench().getBrowserSupport(); + IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null); + browser.openURL(http.getURL()); + } catch (Exception e) { + JBossServerUIPlugin.getDefault().getLog().log( + new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "Unable to open web browser", e)); //$NON-NLS-1$ + } + } + }); + return null; + } + + protected void wait(final IServer server, final IModule module) { + if( shouldSuspendScanner(server)) { + IServerJMXRunnable r = new IServerJMXRunnable() { + public void run(MBeanServerConnection connection) throws Exception { + waitForDeploymentStarted(server, module, connection, null); + } + }; + try { + ExtensionManager.getDefault().getJMXRunner().run(server, r); + } catch( CoreException jmxe ) { + IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.RESUME_DEPLOYMENT_SCANNER, Messages.JMXResumeScannerError, jmxe); + ServerLogger.getDefault().log(server, status); + } finally { + ExtensionManager.getDefault().getJMXRunner().endTransaction(server, this); + } + } + } + + protected void waitForDeploymentStarted(final IServer server, final IModule module, + final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception { + monitor = monitor == null ? new NullProgressMonitor() : monitor; + monitor.beginTask("Ensuring Deployments are Loaded", 10000); //$NON-NLS-1$ + long time = new Date().getTime(); + while( new Date().getTime() < (time + 20000)) { + boolean done = checkDeploymentStarted(server, module, connection, monitor); + System.out.println(done); + if( done ) { + monitor.done(); + return; + } + try { + Thread.sleep(1000); + } catch(InterruptedException ie) {} + } + } + + protected boolean checkDeploymentStarted(final IServer server, final IModule module, + final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception { + String typeId; + typeId = module.getModuleType().getId(); + + if( typeId.equals("wst.web") || typeId.equals("jst.web")) { //$NON-NLS-1$ //$NON-NLS-2$ + String mbeanName = null; + IModule earParent = findEarParent(server, module); + String stateAttribute; + Object result; + if( earParent == null ) { + mbeanName = "jboss.web:J2EEApplication=none,J2EEServer=none,j2eeType=WebModule,name=//localhost/" + module.getName(); //$NON-NLS-1$ + stateAttribute = "state"; //$NON-NLS-1$ + result = getAttributeResult(connection, mbeanName, stateAttribute); + if(result == null || !(result instanceof Integer) || ((Integer)result).intValue() != 1 ) { + return false; + } + } else { + mbeanName = "jboss.deployment:id=\"jboss.web.deployment:war=/" + module.getName() + "\",type=Component"; //$NON-NLS-1$//$NON-NLS-2$ + stateAttribute = "State"; //$NON-NLS-1$ + result = getAttributeResult(connection, mbeanName, stateAttribute); + if( result == null || !result.toString().equals("DEPLOYED")) //$NON-NLS-1$ + return false; + } + } + return true; + } + + private Object getAttributeResult(final MBeanServerConnection connection, String mbeanName, String stateAttribute) throws Exception { + ObjectName on = new ObjectName(mbeanName); + try { + return connection.getAttribute(on, stateAttribute); + } catch(InstanceNotFoundException infe) { + return false; + } + } + + private IModule findEarParent(IServer server, IModule module) { + try { + IModule[] deployed = server.getModules(); + ArrayList<IModule> deployedAsList = new ArrayList<IModule>(); + deployedAsList.addAll(Arrays.asList(deployed)); + IModule[] possibleParents = server.getRootModules(module, new NullProgressMonitor()); + for( int i = 0; i < possibleParents.length; i++ ) { + if( possibleParents[i].getModuleType().getId().equals("jst.ear") && deployedAsList.contains(possibleParents[i])) + return possibleParents[i]; + } + } catch(CoreException ce) { + } + return null; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-09-09 11:55:57 UTC (rev 34598) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-09-09 12:14:50 UTC (rev 34599) @@ -449,4 +449,16 @@ typeIds="%AllJBossServerTypes"> </runtimeLocator> </extension> + <extension + point="org.eclipse.wst.server.core.clients"> + <client + class="org.jboss.ide.eclipse.as.ui.launch.JBTWebLaunchableClient" + description="Launches URLs in a web browser" + id="org.jboss.ide.eclipse.as.core.server.internal.launch.jbtLaunchClient" + launchable="org.jboss.ide.eclipse.as.core.server.internal.JBossLaunchAdapter$JBTCustomHttpLaunchable" + name="Web Launchable Client" + priority="20"> + </client> + </extension> + </plugin>