[jbosstools-commits] JBoss Tools SVN: r28480 - in branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: extensions/events and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2011-01-21 13:04:45 -0500 (Fri, 21 Jan 2011) New Revision: 28480 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java Log: JBIDE-7814 patch to branch cr1 for cr2 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-01-21 17:36:51 UTC (rev 28479) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-01-21 18:04:45 UTC (rev 28480) @@ -60,7 +60,7 @@ CannotLoadServerPoller=Error instantiating Server Poller {0} CannotSaveServersStartArgs=Could not save server start arguments for server {0}. AddingJMXDeploymentFailed=Error adding deployment folder to deployment scanner -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 +JMXPauseScannerError=JBossTools was unable to pause the JBoss deployment scanner. Your deployment may not be recognized by the server. Please ensure your version of JBoss includes an unsecured JMX adapter. +JMXResumeScannerError=JBossTools was unable to resume the JBoss deployment scanner. Your deployment may not be recognized by the server. Please ensure your version of JBoss includes an unsecured JMX adapter. JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped. ConnectingToServerViaJMX=Connecting to {0} via JMX \ No newline at end of file Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-01-21 17:36:51 UTC (rev 28479) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-01-21 18:04:45 UTC (rev 28480) @@ -48,6 +48,7 @@ public static final int RESUME_DEPLOYMENT_SCANNER = PUBLISHING_CODE | ISTATUS_CODE_WARN | (6<<16); public static final int DEPLOYMENT_SCANNER_TRANSITION_CANCELED = PUBLISHING_CODE | ISTATUS_CODE_WARN | (7<<16); public static final int NO_PUBLISHER_ROOT_CODE = PUBLISHING_CODE | ISTATUS_CODE_WARN | (8<<16); + public static final int DEPLOYMENT_SCANNER_TRANSITION_FAILED = PUBLISHING_CODE | ISTATUS_CODE_ERROR | (9<<16); // Publishing.JST public static final int JST_PUB_FULL_SUCCESS = JST_PUBLISHER_CODE | 1; Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-01-21 17:36:51 UTC (rev 28479) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-01-21 18:04:45 UTC (rev 28480) @@ -262,6 +262,10 @@ t.interrupt(); IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.DEPLOYMENT_SCANNER_TRANSITION_CANCELED, Messages.JMXScannerCanceled, null); ServerLogger.getDefault().log(getServer(), status); + } else if( e[0] != null ) { + String error = methodName.equals(IJBossRuntimeConstants.START) ? Messages.JMXResumeScannerError : Messages.JMXPauseScannerError; + IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.DEPLOYMENT_SCANNER_TRANSITION_FAILED, error, e[0]); + ServerLogger.getDefault().log(getServer(), status); } } }