Author: rob.stryker(a)jboss.com Date: 2012-04-18 16:51:53 -0400 (Wed, 18 Apr 2012) New Revision: 40310 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.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java Log: JBIDE-10903 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-04-18 20:43:00 UTC (rev 40309) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-04-18 20:51:53 UTC (rev 40310) @@ -24,16 +24,13 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerEvent; -import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +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; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; -import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.ide.eclipse.as.management.core.IJBoss7ManagerService; -import org.jboss.ide.eclipse.as.management.core.JBoss7ManagerUtil; public class LocalJBoss7DeploymentScannerAdditions extends UnitedServerListener { protected boolean accepts(IServer server) { @@ -57,6 +54,7 @@ * @param folders */ protected void ensureScannersAdded(final IServer server, final String[] folders) { + Trace.trace(Trace.STRING_FINER, "Adding AS7 Deployment Scanners"); //$NON-NLS-1$ ArrayList<String> asList = new ArrayList<String>(); asList.addAll(Arrays.asList(folders)); ArrayList<String> added = new ArrayList<String>(); // list of the paths @@ -75,17 +73,19 @@ JBossServerCorePlugin.log(failStat); } } - - Iterator<Object> i2 = props.keySet().iterator(); + + // Properties file of format like: JBossToolsScanner4=/some/folder + Iterator<Object> lastStartup = props.keySet().iterator(); String k = null; String v = null; - while(i2.hasNext()) { - k = (String)i2.next(); + while(lastStartup.hasNext()) { + k = (String)lastStartup.next(); v = (String)props.get(k); if( !asList.contains(v)) removed.add(k); else { added.remove(v); + Trace.trace(Trace.STRING_FINEST, "Unchanged Deployment Scanner " + k + ":" + v); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -100,6 +100,7 @@ if( s.isOK()) { props.remove(scannerName); } + Trace.trace(Trace.STRING_FINER, "Removed Deployment Scanner: success="+s.isOK() + ", " + scannerName + ":" + props.get(scannerName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } // Do the adds @@ -113,8 +114,9 @@ if( s.isOK()){ props.put(newScannerName, path); } + Trace.trace(Trace.STRING_FINER, "Added Deployment Scanner: success="+s.isOK() + ", " + scannerName + ":" + props.get(scannerName)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - + // Write the file out if( added.size() != 0 || removed.size() != 0 ) { try { @@ -125,6 +127,7 @@ JBossServerCorePlugin.log(failStat); } } + Trace.trace(Trace.STRING_FINER, "Finished Adding AS7 Deployment Scanners"); //$NON-NLS-1$ } private static final String SCANNER_PREFIX = "JBossToolsScanner"; //$NON-NLS-1$ 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-04-18 20:43:00 UTC (rev 40309) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2012-04-18 20:51:53 UTC (rev 40310) @@ -21,6 +21,7 @@ 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.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -48,8 +49,10 @@ protected void modifyDeploymentScanners(ServerEvent event){ String[] folders = getDeployLocationFolders(event.getServer()); + Trace.trace(Trace.STRING_FINER, "Adding " + folders.length + " Deployment Scanners via JMX"); //$NON-NLS-1$ if( folders.length > 0 ) ensureScannersAdded(event.getServer(), folders); + Trace.trace(Trace.STRING_FINER, "Finished Adding Deployment Scanners via JMX"); //$NON-NLS-1$ } protected void ensureScannersAdded(final IServer server, final String[] folders) { @@ -72,6 +75,7 @@ MBeanServerConnection connection, String[] folders2) throws Exception { for( int i = 0; i < folders2.length; i++ ) { 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()}); }