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 wo...@apache.org on 2003/10/23 15:04:29 UTC

cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog StandardGenerator.java

woolfel     2003/10/23 06:04:28

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog
                        StandardGenerator.java
  Log:
  
  removed excess stuff not used in the class. clean up stuff...
  
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.3       +5 -28     jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
  
  Index: StandardGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardGenerator.java	17 Oct 2003 15:08:31 -0000	1.2
  +++ StandardGenerator.java	23 Oct 2003 13:04:28 -0000	1.3
  @@ -61,12 +61,7 @@
   import java.io.IOException;
   import java.io.OutputStream;
   import java.io.Serializable;
  -import org.apache.jorphan.collections.ListedHashTree;
   import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
  -import org.apache.jmeter.save.SaveService;
  -import org.apache.jmeter.threads.ThreadGroup;
  -import org.apache.jmeter.control.gui.LoopControlPanel;
  -import org.apache.jmeter.control.LoopController;
   
   /**
    * Title:		Apache Jakarta JMeter<br>
  @@ -107,14 +102,11 @@
   public class StandardGenerator implements Generator, Serializable {
   
   	protected HTTPSampler SAMPLE = null;
  -	protected ListedHashTree SAMPLERS = null;
   	protected FileWriter WRITER = null;
   	protected OutputStream OUTPUT = null;
   	protected String FILENAME = null;
   	protected File FILE = null;
   	protected ThreadGroup THREADGROUP = null;
  -	protected LoopControlPanel PANEL = null;
  -	protected LoopController CONTROL = null;
   	
   	/**
   	 * The constructor is used by GUI and samplers
  @@ -146,23 +138,6 @@
   	 */
   	protected void init(){
   		generateRequest();
  -		// I haven't figured out exactly how to
  -		// generate a valid JMeter test plan
  -		// and save it.
  -		/*
  -		SAMPLERS = new ListedHashTree();
  -		if (FILENAME != null){
  -			FILE = new File(FILENAME);
  -			initStream();
  -		}
  -		THREADGROUP = new ThreadGroup();
  -		THREADGROUP.setNumThreads(1);
  -		PANEL = new LoopControlPanel();
  -		CONTROL = new LoopController();
  -		SAMPLERS.add("org.apache.jmeter.threads.ThreadGroup",THREADGROUP);
  -		SAMPLERS.add("org.apache.jmeter.control.gui.LoopControlPanel",PANEL);
  -		SAMPLERS.add("org.apache.jmeter.control.LoopController",CONTROL);
  -		*/
   	}
   
   	/**
  @@ -180,8 +155,6 @@
   	 * @see org.apache.jmeter.protocol.http.util.accesslog.Generator#close()
   	 */
   	public void close() {
  -		SAMPLERS.clear();
  -		SAMPLERS = null;
   		try {
   			if (OUTPUT != null){
   				OUTPUT.close();
  @@ -274,7 +247,11 @@
   	 */
   	public void save(){
   		try {
  -			SaveService.saveSubTree(this.SAMPLERS,this.OUTPUT);
  +			// no implementation at this time, since
  +			// we bypass the idea of having a console
  +			// tool to generate test plans. Instead
  +			// I decided to have a sampler that uses
  +			// the generator and parser directly
   		} catch (Exception exception){
   		}
   	}
  
  
  

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