[jbosstools-commits] JBoss Tools SVN: r15591 - in branches/jbosstools-3.0.x/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events and 2 other directories.

Author: rob.stryker(a)jboss.com Date: 2009-05-29 00:01:51 -0400 (Fri, 29 May 2009) New Revision: 15591 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java Log: /JBIDE-4385 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2009-05-29 02:25:21 UTC (rev 15590) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2009-05-29 04:01:51 UTC (rev 15591) @@ -29,6 +29,8 @@ public static String server; public static String runtime; public static String runModeNotSupported; + public static String JMXPauseScannerError; + public static String JMXResumeScannerError; static { NLS.initializeMessages(JBossServerCorePlugin.PLUGIN_ID + ".Messages", Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2009-05-29 02:25:21 UTC (rev 15590) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2009-05-29 04:01:51 UTC (rev 15591) @@ -1,4 +1,6 @@ jboss=JBoss server=Server runtime=Runtime -runModeNotSupported=Selected VM does not support this mode \ No newline at end of file +runModeNotSupported=Selected VM does not support this mode +JMXPauseScannerError=JBossTools was unable to pause the JBoss deployment scanner. For optimal performance, verify your version includes an unsecured JMX RMI adaptor +JMXResumeScannerError=JBossTools was unable to resume the JBoss deployment scanner. For optimal performance, verify your version includes an unsecured JMX RMI adaptor \ No newline at end of file Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2009-05-29 02:25:21 UTC (rev 15590) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2009-05-29 04:01:51 UTC (rev 15591) @@ -1,8 +1,16 @@ package org.jboss.ide.eclipse.as.core.extensions.events; +import org.eclipse.core.runtime.IStatus; + public interface IEventCodes { - public static final int MAJOR_TYPE_MASK = 0xFF << 24; + public static final int ISTATUS_CODE_OK = 0 << 29; + public static final int ISTATUS_CODE_INFO = 1 << 29; + public static final int ISTATUS_CODE_WARN = 2 << 29; + public static final int ISTATUS_CODE_ERROR = 3 << 29; + + public static final int ISTATUS_MASK = 0xE0 << 24; // slot 31 and 32 + public static final int MAJOR_TYPE_MASK = 0x1F << 24; public static final int POLLING_CODE = 1 << 24; public static final int PUBLISHING_CODE = 2 << 24; public static final int POLLER_MASK = 0xFF << 16; @@ -25,7 +33,10 @@ public static final int JST_PUBLISHER_CODE = PUBLISHING_CODE | (2 << 16); public static final int SINGLE_FILE_PUBLISHER_CODE = PUBLISHING_CODE | (3 << 16); public static final int ADD_DEPLOYMENT_FOLDER = PUBLISHING_CODE | (4<<16); - + public static final int SUSPEND_DEPLOYMENT_SCANNER = PUBLISHING_CODE | ISTATUS_CODE_WARN | (5<<16); + public static final int RESUME_DEPLOYMENT_SCANNER = PUBLISHING_CODE | ISTATUS_CODE_WARN | (6<<16); + + // Publishing.JST public static final int JST_PUB_FULL_SUCCESS = JST_PUBLISHER_CODE | 1; public static final int JST_PUB_FULL_FAIL = JST_PUBLISHER_CODE | 2; Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-05-29 02:25:21 UTC (rev 15590) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-05-29 04:01:51 UTC (rev 15591) @@ -36,6 +36,7 @@ import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IServer; 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.extensions.jmx.JBossServerConnectionProvider; @@ -44,6 +45,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration; import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; /** * @@ -190,16 +192,19 @@ protected void publishStart(IProgressMonitor monitor) throws CoreException { super.publishStart(monitor); - JMXClassLoaderRepository.getDefault().addConcerned(getServer(), this); - final boolean suspend = shouldSuspendScanner(); - if( suspend ) { + if( shouldSuspendScanner()) { + JMXClassLoaderRepository.getDefault().addConcerned(getServer(), this); IJMXRunnable r = new IJMXRunnable() { public void run(MBeanServerConnection connection) throws Exception { - if( suspend ) - suspendDeployment(connection); + suspendDeployment(connection); } }; - JBossServerConnectionProvider.run(getServer(), r); + try { + JBossServerConnectionProvider.run(getServer(), r); + } catch( JMXException jmxe ) { + IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.SUSPEND_DEPLOYMENT_SCANNER, Messages.JMXPauseScannerError, jmxe); + ServerLogger.getDefault().log(getServer(), status); + } } } @@ -210,15 +215,21 @@ resumeDeployment(connection); } }; - JBossServerConnectionProvider.run(getServer(), r); + try { + JBossServerConnectionProvider.run(getServer(), r); + } catch( JMXException jmxe ) { + IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.RESUME_DEPLOYMENT_SCANNER, Messages.JMXResumeScannerError, jmxe); + ServerLogger.getDefault().log(getServer(), status); + } finally { + JMXClassLoaderRepository.getDefault().removeConcerned(getServer(), this); + } } - JMXClassLoaderRepository.getDefault().removeConcerned(getServer(), this); super.publishFinish(monitor); } protected boolean shouldSuspendScanner() { - if( getServer().getServerType().getId().equals("org.jboss.ide.eclipse.as.50")) - return false; +// if( getServer().getServerType().getId().equals("org.jboss.ide.eclipse.as.50")) +// return false; if( getServer().getServerState() != IServer.STATE_STARTED) return false; return true; Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-29 02:25:21 UTC (rev 15590) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-29 04:01:51 UTC (rev 15591) @@ -17,6 +17,8 @@ import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.views.ServerLogView.EventCategory; +import sun.security.util.BitArray; + public class LogLabelProvider extends LabelProvider implements ITableLabelProvider { public Image getImage(Object element) { if( element instanceof EventCategory ) { @@ -28,8 +30,17 @@ } - if( element instanceof LogEntry) { + if( element instanceof LogEntry) { int code = ((LogEntry)element).getCode(); + int istatusCode = (code & IEventCodes.ISTATUS_MASK) >> 29; + + if(istatusCode != 0 ) { + switch(istatusCode) { + case 1: return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK); + case 2: return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK); + case 3: return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + } + } int majorType = code & IEventCodes.MAJOR_TYPE_MASK; switch(majorType) { case IEventCodes.POLLING_CODE: