[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jmeter-dev
Subject:    cvs commit: jakarta-jmeter/bin jmeter.properties
From:       sebb () apache ! org
Date:       2005-09-22 23:10:21
Message-ID: 20050922231021.96806.qmail () minotaur ! apache ! org
[Download RAW message or body]

sebb        2005/09/22 16:10:21

  Modified:    src/core/org/apache/jmeter/testelement Tag: rel-2-1
                        TestPlan.java
               src/core/org/apache/jmeter Tag: rel-2-1 JMeter.java
               bin      Tag: rel-2-1 jmeter.properties
  Log:
  Move user.classpath setup to JMeter start
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.17.2.3  +2 -6      jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java
  
  Index: TestPlan.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java,v
  retrieving revision 1.17.2.2
  retrieving revision 1.17.2.3
  diff -u -r1.17.2.2 -r1.17.2.3
  --- TestPlan.java	21 Sep 2005 19:38:30 -0000	1.17.2.2
  +++ TestPlan.java	22 Sep 2005 23:10:21 -0000	1.17.2.3
  @@ -301,10 +301,6 @@
   				log.error("Failed to set file server base dir with " + getBasedir(), e);
   			}
   		}
  -        String propClasspath = JMeterUtils.getPropDefault("user.classpath","");
  -        if (propClasspath.length() > 0) {
  -            NewDriver.addURL(propClasspath);
  -        }
   	}
   
   	/*
  
  
  
  No                   revision
  No                   revision
  1.41.2.2  +30 -1     jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
  
  Index: JMeter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
  retrieving revision 1.41.2.1
  retrieving revision 1.41.2.2
  diff -u -r1.41.2.1 -r1.41.2.2
  --- JMeter.java	7 Sep 2005 18:34:00 -0000	1.41.2.1
  +++ JMeter.java	22 Sep 2005 23:10:21 -0000	1.41.2.2
  @@ -23,12 +23,15 @@
   import java.io.FileNotFoundException;
   import java.io.IOException;
   import java.net.Authenticator;
  +import java.net.MalformedURLException;
  +import java.net.URL;
   import java.util.Enumeration;
   import java.util.Iterator;
   import java.util.LinkedList;
   import java.util.List;
   import java.util.Locale;
   import java.util.Properties;
  +import java.util.StringTokenizer;
   
   import org.apache.commons.cli.avalon.CLArgsParser;
   import org.apache.commons.cli.avalon.CLOption;
  @@ -230,6 +233,8 @@
   			log.info("java.version=" + System.getProperty("java.version"));
   			log.info("Locale=" + Locale.getDefault().getDisplayName());
   			log.info(JMeterUtils.getJMeterCopyright());
  +            
  +            updateClassLoader();
   			if (parser.getArgumentById(VERSION_OPT) != null) {
   				System.out.println(JMeterUtils.getJMeterCopyright());
   				System.out.println("Version " + JMeterUtils.getJMeterVersion());
  @@ -257,7 +262,31 @@
   		}
   	}
   
  -	/**
  +    // Update classloader if necessary
  +	private void updateClassLoader() {
  +        String userpath= JMeterUtils.getPropDefault("user.classpath","");
  +        if (userpath.length()> 0){
  +            log.info("user.classpath="+userpath);
  +            StringTokenizer tok = new StringTokenizer(userpath, File.pathSeparator);
  +            while(tok.hasMoreTokens()) {
  +                String path=tok.nextToken();
  +                File f=new File(path);
  +                if (!f.canRead() && !f.isDirectory()) {
  +                    log.warn("Can't read "+path);   
  +                } else {
  +                    URL url;
  +                    try {
  +                        url = new URL("file","",path);
  +                        NewDriver.addURL(url);
  +                    } catch (MalformedURLException e) {
  +                        log.warn("Can't create URL for "+path+" "+e);
  +                    }
  +                }
  +            }
  +        }
  +    }
  +
  +    /**
   	 * 
   	 */
   	private void startBSH() {
  
  
  
  No                   revision
  No                   revision
  1.124.2.2 +4 -3      jakarta-jmeter/bin/jmeter.properties
  
  Index: jmeter.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
  retrieving revision 1.124.2.1
  retrieving revision 1.124.2.2
  diff -u -r1.124.2.1 -r1.124.2.2
  --- jmeter.properties	20 Sep 2005 13:25:08 -0000	1.124.2.1
  +++ jmeter.properties	22 Sep 2005 23:10:21 -0000	1.124.2.2
  @@ -358,5 +358,6 @@
   # Change default port used by server (need to start rmiregistry with same port)
   #server.rmi.port=1099
   
  -# Users can define additional classpaths by setting the property below
  -user.classpath=../../
  \ No newline at end of file
  +# Users can define additional classpath items by setting the property below
  +# Paths with spaces may cause problems for the JVM
  +#user.classpath=../classes;../jars/jar1.jar
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]