mstover1 2005/02/13 06:16:46
Modified: src/core/org/apache/jmeter/services FileServer.java
src/core/org/apache/jmeter/util JMeterVersion.java
. build.xml
Added: legacy jdom-b9.jar
Log:
fixing doc building and gump complaints
Revision Changes Path
1.5 +38 -9
jakarta-jmeter/src/core/org/apache/jmeter/services/FileServer.java
Index: FileServer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/services/FileServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileServer.java 31 Oct 2004 18:17:57 -0000 1.4
+++ FileServer.java 13 Feb 2005 14:16:46 -0000 1.5
@@ -7,17 +7,20 @@
package org.apache.jmeter.services;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
+import java.io.FileWriter;
import java.io.IOException;
-import java.util.Random;
import java.io.Reader;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Random;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.gui.JMeterFileFilter;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -108,21 +111,47 @@
throw new IOException("File never reserved");
}
+ public synchronized void write(String filename,String value) throws
IOException
+ {
+ Object[] file = (Object[])files.get(filename);
+ if(file != null)
+ {
+ if(file[1] == null)
+ {
+ file[1] = new BufferedWriter(new FileWriter((File)file[0]));
+ }
+ else if(!(file[1] instanceof Writer))
+ {
+ throw new IOException("File " + filename + " already in
use");
+ }
+ BufferedWriter writer = (BufferedWriter)file[1];
+ writer.write(value);
+ }
+ }
+
public void closeFiles() throws IOException
{
Iterator iter = files.keySet().iterator();
while(iter.hasNext())
{
- String name = (String)iter.next();
- Object[] file = (Object[])files.get(name);
- if(file[1] != null)
- {
- ((Reader)file[1]).close();
- file[1] = null;
- }
+ closeFile((String)iter.next());
}
files.clear();
}
+
+ /**
+ * @param name
+ * @throws IOException
+ */
+ public synchronized void closeFile(String name) throws IOException
+ {
+ Object[] file = (Object[])files.get(name);
+ if(file[1] != null)
+ {
+ ((Reader)file[1]).close();
+ file[1] = null;
+ }
+ }
protected boolean filesOpen()
{
1.1 jakarta-jmeter/legacy/jdom-b9.jar
<<Binary file>>
1.34 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JMeterVersion.java 10 Feb 2005 14:31:12 -0000 1.33
+++ JMeterVersion.java 13 Feb 2005 14:16:46 -0000 1.34
@@ -39,7 +39,7 @@
* pattern: VERSION = <quote>.*<quote>
*
*/
- static final String VERSION = "2.1.20050210";
+ static final String VERSION = "2.1.20050211";
static final String COPYRIGHT = "Copyright (c) 1998-2005 The Apache
Software Foundation";
1.199 +4 -3 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- build.xml 11 Nov 2004 22:33:30 -0000 1.198
+++ build.xml 13 Feb 2005 14:16:46 -0000 1.199
@@ -262,6 +262,7 @@
<!-- Directory where these 3rd party libraries will live -->
<property name="lib.dir" value="lib"/>
+ <property name="legacy.dir" location="legacy"/>
<!-- Directory where Optional 3rd party libraries will live -->
<property name="lib.opt" value="lib/opt"/>
@@ -373,7 +374,7 @@
-->
<path id="anakia.classpath">
<fileset dir="${lib.dir}" includes="velocity*.jar"/>
- <fileset dir="${lib.dir}" includes="jdom-*.jar"/>
+ <fileset dir="${legacy.dir}" includes="jdom-*.jar"/>
<fileset dir="${lib.dir}" includes="commons-collections*.jar"/>
<fileset dir="${lib.dir}" includes="logkit-*.jar"/>
</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
