From geronimo-cvs-return-1011-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org Fri Sep 05 05:53:03 2003
Return-Path: <geronimo-cvs-return-1011-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org
Received: (qmail 64435 invoked from network); 5 Sep 2003 05:53:03 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 5 Sep 2003 05:53:03 -0000
Received: (qmail 6728 invoked by uid 500); 5 Sep 2003 05:52:28 -0000
Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org
Received: (qmail 6655 invoked by uid 500); 5 Sep 2003 05:52:27 -0000
Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:geronimo-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:geronimo-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:geronimo-cvs@incubator.apache.org>
Reply-To: geronimo-dev@incubator.apache.org
Delivered-To: mailing list geronimo-cvs@incubator.apache.org
Received: (qmail 6565 invoked from network); 5 Sep 2003 05:52:26 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 5 Sep 2003 05:52:26 -0000
Received: (qmail 63727 invoked by uid 1711); 5 Sep 2003 05:52:10 -0000
Date: 5 Sep 2003 05:52:10 -0000
Message-ID: <20030905055210.63726.qmail@minotaur.apache.org>
From: dain@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner DeploymentScanner.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

dain        2003/09/04 22:52:10

  Modified:    modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScanner.java
  Log:
  Fixed formatting.
  
  Added debug messsage to show which URLs are being watched.
  
  Revision  Changes    Path
  1.16      +17 -20    incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java
  
  Index: DeploymentScanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DeploymentScanner.java	3 Sep 2003 13:50:29 -0000	1.15
  +++ DeploymentScanner.java	5 Sep 2003 05:52:10 -0000	1.16
  @@ -89,10 +89,7 @@
    *
    * @version $Revision$ $Date$
    */
  -public class DeploymentScanner
  -    extends AbstractManagedObject
  -    implements DeploymentScannerMBean
  -{
  +public class DeploymentScanner extends AbstractManagedObject implements DeploymentScannerMBean {
       private static final Log log = LogFactory.getLog(DeploymentScanner.class);
   
       private RelationServiceMBean relationService;
  @@ -106,43 +103,42 @@
        */
       public DeploymentScanner() {
       }
  -    
  +
       /**
        * @jmx:managed-constructor
        */
  -    public DeploymentScanner(final URL[] urls, final boolean recurse) 
  -    {
  -        for (int i=0; i<urls.length; i++ ) {
  +    public DeploymentScanner(final URL[] urls, final boolean recurse) {
  +        for (int i = 0; i < urls.length; i++) {
               addURL(urls[i], recurse);
           }
       }
  -    
  +
       public ObjectName preRegister(MBeanServer server, ObjectName objectName) throws Exception {
           relationService = JMXUtil.getRelationService(server);
           return super.preRegister(server, objectName);
       }
  -    
  +
       /**
        * @jmx:managed-attribute
        */
       public synchronized long getScanInterval() {
           return scanInterval;
       }
  -    
  +
       /**
        * @jmx:managed-attribute
        */
       public synchronized void setScanInterval(long scanInterval) {
           this.scanInterval = scanInterval;
       }
  -    
  +
       /**
        * @jmx:managed-attribute
        */
       public synchronized Set getWatchedURLs() {
           return Collections.unmodifiableSet(new HashSet(scanners.keySet()));
       }
  -    
  +
       /**
        * @jmx:managed-operation
        */
  @@ -152,17 +148,18 @@
           //
           addURL(URLFactory.create(url), recurse);
       }
  -    
  +
       /**
        * @jmx:managed-operation
        */
       public synchronized void addURL(URL url, boolean recurse) {
           if (!scanners.containsKey(url)) {
  +            log.debug("Watching URL: " + url);
               Scanner scanner = getScannerForURL(url, recurse);
               scanners.put(url, scanner);
           }
       }
  -    
  +
       private Scanner getScannerForURL(URL url, boolean recurse) {
           String protocol = url.getProtocol();
           if ("file".equals(protocol)) {
  @@ -173,7 +170,7 @@
               throw new IllegalArgumentException("Unknown protocol " + protocol);
           }
       }
  -    
  +
       /**
        * @jmx:managed-operation
        */
  @@ -183,14 +180,14 @@
           //
           removeURL(URLFactory.create(url));
       }
  -    
  +
       /**
        * @jmx:managed-operation
        */
       public synchronized void removeURL(URL url) {
           scanners.remove(url);
       }
  -    
  +
       private synchronized boolean shouldScannerThreadRun() {
           return run;
       }
  @@ -220,7 +217,7 @@
               scanThread = null;
           }
       }
  -    
  +
       /**
        * @jmx:managed-operation
        */