Author: sebb
Date: Sat Oct 6 16:42:24 2007
New Revision: 582558
URL: http://svn.apache.org/viewvc?rev=582558&view=rev
Log:
initialiseProperties should not set JMeterHome
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=582558&r1=582557&r2=582558&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sat
Oct 6 16:42:24 2007
@@ -220,7 +220,7 @@
* @param expression
* @return compiled pattern
*
- * @throws MalformedPatternException (Runtime)
+ * @throws org.apache.oro.text.regex.MalformedPatternException
(Runtime)
* This should be caught for expressions that may vary (e.g. user input)
*
*/
@@ -235,7 +235,7 @@
* @param options e.g. READ_ONLY_MASK
* @return compiled pattern
*
- * @throws MalformedPatternException (Runtime)
+ * @throws org.apache.oro.text.regex.MalformedPatternException
(Runtime)
* This should be caught for expressions that may vary (e.g. user input)
*
*/
@@ -246,17 +246,6 @@
public void initializeProperties(String file) {
System.out.println("Initializing Properties: " + file);
getProperties(file);
- String home;
- int pathend = file.lastIndexOf("/"); // $NON-NLS-1$
- if (pathend == -1) {// No path separator found, must be in
current
- // directory
- home = "."; // $NON-NLS-1$
- } else {
- home = file.substring(0, pathend);
- }
- home = new File(home + "/..").getAbsolutePath(); // $NON-NLS-1$
- System.out.println("Setting JMeter home: " + home);
- setJMeterHome(home);
}
public static String[] getSearchPaths() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
