Author: rob.stryker(a)jboss.com Date: 2008-12-09 17:29:34 -0500 (Tue, 09 Dec 2008) New Revision: 12516 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java Log: JBIDE-3374 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2008-12-09 22:20:33 UTC (rev 12515) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2008-12-09 22:29:34 UTC (rev 12516) @@ -24,6 +24,7 @@ public static final int PUBLISHING_ROOT_CODE = PUBLISHING_CODE | (1 << 16); 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); // Publishing.JST public static final int JST_PUB_FULL_SUCCESS = JST_PUBLISHER_CODE | 1; @@ -45,4 +46,7 @@ public static final int SINGLE_FILE_UNPUBLISH_SUCCESS = SINGLE_FILE_PUBLISHER_CODE | 3; public static final int SINGLE_FILE_PUBLISH_MNF = SINGLE_FILE_PUBLISH_FAIL | 16; public static final int SINGLE_FILE_UNPUBLISH_MNF = SINGLE_FILE_UNPUBLISH_FAIL | 16; + + // Add deployment folder + public static final int ADD_DEPLOYMENT_FOLDER_FAIL = ADD_DEPLOYMENT_FOLDER | 1; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-12-09 22:20:33 UTC (rev 12515) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-12-09 22:29:34 UTC (rev 12516) @@ -60,7 +60,8 @@ r.run(connection); } } catch( Exception e ) { - throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e)); + throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + e.getMessage() == null ? e.getClass().getName() : e.getMessage(), e)); } finally { JMXClassLoaderRepository.getDefault().removeConcerned(s, r); Thread.currentThread().setContextClassLoader(currentLoader); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-09 22:20:33 UTC (rev 12515) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-09 22:29:34 UTC (rev 12516) @@ -134,7 +134,6 @@ protected transient IDebugEventSetListener processListener; public void setProcess(final IProcess newProcess) { if (process != null) { - System.out.println(process.isTerminated()); return; } process = newProcess; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 22:20:33 UTC (rev 12515) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-09 22:29:34 UTC (rev 12516) @@ -6,11 +6,15 @@ import javax.management.ObjectName; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerEvent; +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; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; @@ -76,7 +80,10 @@ try { JBossServerConnectionProvider.run(event.getServer(), r); } catch( JMXException jmxe ) { - // TODO log + IStatus s = jmxe.getStatus(); + IStatus newStatus = new Status(s.getSeverity(), s.getPlugin(), IEventCodes.ADD_DEPLOYMENT_FOLDER_FAIL, + "Error adding deployment folder to Deployment Scanner", s.getException()); + ServerLogger.getDefault().log(event.getServer(), newStatus); } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2008-12-09 22:20:33 UTC (rev 12515) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2008-12-09 22:29:34 UTC (rev 12516) @@ -182,7 +182,6 @@ // fill the combo NamedNodeMap map = node.getAttributes(); - System.out.println(map.getLength()); ArrayList list = new ArrayList(); list.add(NO_ATTRIBUTE); int selectedIndex = 0;