You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/24 15:23:27 UTC

svn commit: r388531 - /jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java

Author: sebb
Date: Fri Mar 24 06:23:09 2006
New Revision: 388531

URL: http://svn.apache.org/viewcvs?rev=388531&view=rev
Log:
Extract Property file load as public method for use in testing

Modified:
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java?rev=388531&r1=388530&r2=388531&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java Fri Mar 24 06:23:09 2006
@@ -107,7 +107,7 @@
 	public static final String version = "1.2"; // $NON-NLS-1$
 
     // This is written to JMX files by ScriptWrapperConverter
-	static String propertiesVersion = "";// read from properties file; written to JMS files
+	static String propertiesVersion = "";// read from properties file; written to JMX files
     static final String PROPVERSION = "1.8";// Expected $NON-NLS-1$
 
     // Internal information only
@@ -136,13 +136,18 @@
 		}
 	}
 
+    public static Properties loadProperties() throws IOException{
+        Properties nameMap = new Properties();
+            nameMap.load(new FileInputStream(JMeterUtils.getJMeterHome()
+                    + JMeterUtils.getPropDefault(SAVESERVICE_PROPERTIES, SAVESERVICE_PROPERTIES_FILE)));
+            return nameMap;
+    }
 	private static void initProps() {
 		// Load the alias properties
 		Properties nameMap = new Properties();
 		try {
-			nameMap.load(new FileInputStream(JMeterUtils.getJMeterHome()
-					+ JMeterUtils.getPropDefault(SAVESERVICE_PROPERTIES, SAVESERVICE_PROPERTIES_FILE)));
-			// now create the aliases
+            nameMap = loadProperties();
+            // now create the aliases
 			Iterator it = nameMap.entrySet().iterator();
 			while (it.hasNext()) {
 				Map.Entry me = (Map.Entry) it.next();



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