Author: rob.stryker(a)jboss.com Date: 2012-05-23 03:05:18 -0400 (Wed, 23 May 2012) New Revision: 41271 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java Log: incorrect job name when adding deployment scanners Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2012-05-23 00:44:26 UTC (rev 41270) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2012-05-23 07:05:18 UTC (rev 41271) @@ -106,6 +106,8 @@ public static String JBossConfigurationFolderDoesNotExist; public static String JBossAS7ConfigurationFileDoesNotExist; + public static String UpdateDeploymentScannerJobName; + static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2012-05-23 00:44:26 UTC (rev 41270) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2012-05-23 07:05:18 UTC (rev 41271) @@ -84,4 +84,5 @@ ServerMissingRuntime=Server {0} has no designated runtime. RuntimeFolderDoesNotExist=The server's runtime folder does not exist: {0} JBossConfigurationFolderDoesNotExist=The server's configuration folder does not exist: {0} -JBossAS7ConfigurationFileDoesNotExist=The server's configuration file does not exist: {0} \ No newline at end of file +JBossAS7ConfigurationFileDoesNotExist=The server's configuration file does not exist: {0} +UpdateDeploymentScannerJobName=Updating Deployment Scanners for Server: {0} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-05-23 00:44:26 UTC (rev 41270) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-05-23 07:05:18 UTC (rev 41271) @@ -22,6 +22,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerEvent; +import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.Trace; import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; @@ -121,7 +122,7 @@ public void serverChanged(final ServerEvent event) { if( accepts(event.getServer()) && serverSwitchesToState(event, IServer.STATE_STARTED)){ - new Job("Update AS7 Deployment Scanners") { //$NON-NLS-1$ + new Job(getJobName(event.getServer())) { protected IStatus run(IProgressMonitor monitor) { modifyDeploymentScanners(event); return Status.OK_STATUS; @@ -130,6 +131,10 @@ } } + protected String getJobName(IServer server) { + return Messages.bind(Messages.UpdateDeploymentScannerJobName, server.getName() ); + } + protected void modifyDeploymentScanners(ServerEvent event){ String[] folders = getDeployLocationFolders(event.getServer()); ensureScannersAdded(event.getServer(), folders); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-05-23 00:44:26 UTC (rev 41270) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-05-23 07:05:18 UTC (rev 41271) @@ -77,7 +77,8 @@ String asURL = encode(folders2[i]); Trace.trace(Trace.STRING_FINER, "Adding Deployment Scanner: " + asURL); ObjectName name = new ObjectName(IJBossRuntimeConstants.DEPLOYMENT_SCANNER_MBEAN_NAME); - connection.invoke(name, IJBossRuntimeConstants.addURL, new Object[] { asURL }, new String[] {String.class.getName()}); + Object o = connection.invoke(name, IJBossRuntimeConstants.addURL, new Object[] { asURL }, new String[] {String.class.getName()}); + System.out.println(o); } }