geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner DeploymentScanner.java
Date Sun, 24 Aug 2003 21:58:07 GMT
jdillon     2003/08/24 14:58:07

  Modified:    modules/core/src/conf boot-service.xml
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        DeploymentScanner.java
  Log:
   o Parse the value of the initial urls to scan (move to mbean config as soon as
     I can figure out where that is)
   o Using Strings.toURL() to convert Strings to URLs
  
  Revision  Changes    Path
  1.7       +1 -1      incubator-geronimo/modules/core/src/conf/boot-service.xml
  
  Index: boot-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/conf/boot-service.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- boot-service.xml	21 Aug 2003 04:42:11 -0000	1.6
  +++ boot-service.xml	24 Aug 2003 21:58:07 -0000	1.7
  @@ -10,7 +10,7 @@
       <mbean code="org.apache.geronimo.deployment.scanner.DeploymentScanner" name="geronimo.deployment:role=DeploymentScanner">
           <constructor>
               <arg type="java.lang.String">
  -                file:../../deploy/
  +                ${twiddle.home}/deploy/
               </arg>
               <arg type="boolean">true</arg>
           </constructor>
  
  
  
  1.11      +17 -4     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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DeploymentScanner.java	21 Aug 2003 04:32:41 -0000	1.10
  +++ DeploymentScanner.java	24 Aug 2003 21:58:07 -0000	1.11
  @@ -72,6 +72,10 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +
  +import org.apache.geronimo.common.StringValueParser;
  +import org.apache.geronimo.common.Strings;
  +
   import org.apache.geronimo.jmx.JMXUtil;
   import org.apache.geronimo.management.AbstractManagedObject;
   
  @@ -93,10 +97,19 @@
       public DeploymentScanner() {
       }
   
  -    public DeploymentScanner(String initialURLs, boolean recurse) throws MalformedURLException
{
  +    public DeploymentScanner(String initialURLs, boolean recurse) 
  +        throws MalformedURLException
  +    {
  +        //
  +        // TODO: jason: move this to deployment config code, but I can not 
  +        //              find where that is right now
  +        //
  +        StringValueParser parser = new StringValueParser();
  +        initialURLs = parser.parse(initialURLs);
  +        
           StringTokenizer tokenizer = new StringTokenizer(initialURLs, " \t\r\n,[]{}");
           while (tokenizer.hasMoreTokens()) {
  -            addURL(new URL(tokenizer.nextToken()), recurse);
  +            addURL(tokenizer.nextToken(), recurse);
           }
       }
   
  @@ -118,7 +131,7 @@
       }
   
       public void addURL(String url, boolean recurse) throws MalformedURLException {
  -        addURL(new URL(url), recurse);
  +        addURL(Strings.toURL(url), recurse);
       }
   
       public synchronized void addURL(URL url, boolean recurse) {
  
  
  

Mime
View raw message