cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/resources PackageTest.java

2004-01-19 Thread sebb
sebb2004/01/19 18:52:31

  Modified:src/core/org/apache/jmeter/resources PackageTest.java
  Log:
  Amended tests to allow for missing non-default locale entries
  
  Revision  ChangesPath
  1.6   +36 -52
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
  
  Index: PackageTest.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PackageTest.java  20 Jan 2004 02:13:02 -  1.5
  +++ PackageTest.java  20 Jan 2004 02:52:31 -  1.6
  @@ -7,6 +7,7 @@
   import java.util.Collections;
   import java.util.Enumeration;
   import java.util.List;
  +import java.util.MissingResourceException;
   import java.util.PropertyResourceBundle;
   
   import junit.framework.Test;
  @@ -19,7 +20,7 @@
* Test the composition of the properties files
* - properties files exist (default, DE, NO, JA)
* - properties files don't have duplicate keys
  - * - non-default properties files have same keys as the default.
  + * - non-default properties files don't have any extra keys.
* 
* N.B. If there is a default resource, ResourceBundle does not detect missing 
resources,
* i.e. the presence of messages.properties means that the ResourceBundle for 
Locale "XYZ"
  @@ -40,29 +41,18 @@
   public class PackageTest extends TestCase
   {
   
  -private static int defaultListSize;
  -
  -private static List defaultList = null;
  -
  -private int countKeys(Enumeration e, List l){
  - int i=0;
  - while (e.hasMoreElements()){
  - i++;
  - l.add(e.nextElement());
  - }
  - return i;
  -}
  +//private static List defaultList = null;
  +private static PropertyResourceBundle defaultPRB;
   
   // Read resource into ResourceBundle and store in List
  -private int getRAS(String res, List l) throws Exception{
  +private PropertyResourceBundle getRAS(String res) throws Exception{
InputStream ras = this.getClass().getResourceAsStream(res);
  - PropertyResourceBundle prb = new PropertyResourceBundle(ras);
  - return countKeys(prb.getKeys(),l);
  + return new PropertyResourceBundle(ras);
   }
   
  -private int readRF(String res, List l) throws Exception
  -{//Read resource file and return # of lines; saving the keys
  - int i=0;// no of lines
  +//   Read resource file saving the keys
  +private void readRF(String res, List l) throws Exception
  +{
InputStream ras = this.getClass().getResourceAsStream(res);
BufferedReader fileReader =
new BufferedReader(new InputStreamReader(ras));
  @@ -71,10 +61,8 @@
   {
if (s.length() > 0)  {
l.add(s.substring(0,s.indexOf('=')));
  - i++;
}
} 
  - return i;
   }
   
   // Helper method to construct resource name
  @@ -86,15 +74,16 @@
}
   }

  + /*
  +  * perform the checks on the resources
  +  * 
  +  */
private void check(String resname) throws Exception
{
ArrayList alf = new ArrayList(500);// holds keys from file
  - ArrayList alr = new ArrayList(500);// holds keys from resource
String res = getResName(resname);
readRF(res,alf);
  - getRAS(res,alr);
Collections.sort(alf);
  - Collections.sort(alr);

// Look for duplicate keys in the file
String last="";
  @@ -107,31 +96,28 @@
last=curr;
}

  - if (defaultList != null){
  - if (defaultListSize != alr.size()){
  - subTestFailures++;
  - System.out.println("\nKey counts differ: "
  - +getResName("")+"="+defaultListSize+" 
"+res+"="+alr.size());
  - }
  - if (!defaultList.equals(alr)){
  - subTestFailures++;
  - System.out.println("\nKeys in "
  - +res
  - +" do not match keys in "
  - +getResName("")
  - );
  - for (int i=0;i 0) {
  @@ -144,12 +130,10 @@
 */
public static Test suite(){
TestSuite ts=new TestSuite();
  -// Disabled test altogether while we think what to do about it
  -// TODO: reinstate
  -/*   ts.addTest(new PackageTest("atestDefault"));
  + ts.addTest(new PackageTest("atestDefault"));
ts.addTest(new PackageTe

cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/resources PackageTest.java

2004-01-19 Thread sebb
sebb2004/01/19 18:13:02

  Modified:src/core/org/apache/jmeter/samplers ExampleSampler.java
   src/core/org/apache/jmeter/testelement
OnErrorTestElement.java
   src/core/org/apache/jmeter/gui/action Help.java
   src/core/org/apache/jmeter/samplers/gui
ExampleSamplerGui.java
   src/core/org/apache/jmeter/util JMeterVersion.java
   src/core/org/apache/jmeter/resources PackageTest.java
  Log:
  Fix CVS tag case
  
  Revision  ChangesPath
  1.3   +1 -1  
jakarta-jmeter/src/core/org/apache/jmeter/samplers/ExampleSampler.java
  
  Index: ExampleSampler.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/ExampleSampler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExampleSampler.java   15 Jan 2004 23:46:47 -  1.2
  +++ ExampleSampler.java   20 Jan 2004 02:13:02 -  1.3
  @@ -71,7 +71,7 @@
* However, access to class fields must be synchronized.
*  
* @author sebb AT apache DOT org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class ExampleSampler extends AbstractSampler
   {
  
  
  
  1.2   +1 -1  
jakarta-jmeter/src/core/org/apache/jmeter/testelement/OnErrorTestElement.java
  
  Index: OnErrorTestElement.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/OnErrorTestElement.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OnErrorTestElement.java   9 Dec 2003 23:17:39 -   1.1
  +++ OnErrorTestElement.java   20 Jan 2004 02:13:02 -  1.2
  @@ -8,7 +8,7 @@
   
   /**
* @author sebb at apache dot org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public abstract class OnErrorTestElement extends AbstractTestElement
   {
  
  
  
  1.19  +1 -1  jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java
  
  Index: Help.java
  ===
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Help.java 9 Oct 2003 01:01:46 -   1.18
  +++ Help.java 20 Jan 2004 02:13:02 -  1.19
  @@ -19,7 +19,7 @@
   /**
* 
* @author unattributed
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class Help implements Command
   {
  
  
  
  1.3   +1 -1  
jakarta-jmeter/src/core/org/apache/jmeter/samplers/gui/ExampleSamplerGui.java
  
  Index: ExampleSamplerGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/gui/ExampleSamplerGui.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExampleSamplerGui.java15 Jan 2004 23:09:33 -  1.2
  +++ ExampleSamplerGui.java20 Jan 2004 02:13:02 -  1.3
  @@ -80,7 +80,7 @@
* perform any additional setup that a test would need at run-time
* 
* @author sebb AT apache DOT org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class ExampleSamplerGui extends AbstractSamplerGui
   {
  
  
  
  1.8   +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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JMeterVersion.java20 Dec 2003 00:00:06 -  1.7
  +++ JMeterVersion.java20 Jan 2004 02:13:02 -  1.8
  @@ -14,7 +14,7 @@
* Utility class to define the JMeter Version string
* 
* @author sebb AT apache.org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class JMeterVersion
   {
  
  
  
  1.5   +1 -1  
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
  
  Index: PackageTest.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PackageTest.java  20 Jan 2004 01:27:30 -  1.4
  +++ PackageTest.java  20 Jan 2004 02:13:02 -  1.5
  @@ -35,7 +35,7 @@
   
   /**
* @author sebb AT apache DOT org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class PackageTest extends TestCase
   {
  
  
  

-
To un

cvs commit: jakarta-jmeter/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler TCPClient.java

2004-01-19 Thread sebb
sebb2004/01/19 18:12:38

  Modified:src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler
TCPClient.java
  Log:
  Fix CVS tag case
  
  Revision  ChangesPath
  1.2   +1 -1  
jakarta-jmeter/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
  
  Index: TCPClient.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TCPClient.java16 Nov 2003 02:09:06 -  1.1
  +++ TCPClient.java20 Jan 2004 02:12:37 -  1.2
  @@ -11,7 +11,7 @@
   
   /**
* @author sebb AT apache DOT org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public interface TCPClient
   {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions PackageTest.java

2004-01-19 Thread sebb
sebb2004/01/19 18:05:34

  Modified:src/functions/org/apache/jmeter/functions PackageTest.java
  Log:
  Fix CVS tag case
  
  Revision  ChangesPath
  1.2   +1 -1  
jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java
  
  Index: PackageTest.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PackageTest.java  20 Jan 2004 02:04:14 -  1.1
  +++ PackageTest.java  20 Jan 2004 02:05:34 -  1.2
  @@ -23,7 +23,7 @@
   
   /**
* @author sebb 'AT apache DOT org
  - * @version $revision$ $date$
  + * @version $Revision$ $Date$
*/
   public class PackageTest extends JMeterTestCase
   {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions PackageTest.java

2004-01-19 Thread sebb
sebb2004/01/19 18:04:14

  Added:   src/functions/org/apache/jmeter/functions PackageTest.java
  Log:
  Initial stab at testing Functions - only CVSRead at present
  
  Revision  ChangesPath
  1.1  
jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java
  
  Index: PackageTest.java
  ===
  /*
   * Package to test functions
   * 
   * Functions are created and parameters set up in one thread.
   * 
   * They are then tested in another thread, or two threads running in parallel
   * 
   */
  package org.apache.jmeter.functions;
  
  import java.io.PrintWriter;
  import java.util.Collection;
  import java.util.LinkedList;
  
  import junit.extensions.ActiveTestSuite;
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import org.apache.jmeter.engine.util.CompoundVariable;
  import org.apache.jmeter.junit.JMeterTestCase;
  import org.apache.jorphan.logging.LoggingManager;
  import org.apache.log.Logger;
  
  /**
   * @author sebb 'AT apache DOT org
   * @version $revision$ $date$
   */
  public class PackageTest extends JMeterTestCase
  {
  
  //transient private static final Logger log = LoggingManager.getLoggerForClass();
  //
  //static{
  //LoggingManager.setPriority("DEBUG","jmeter");
  //LoggingManager.setTarget(new PrintWriter(System.out));
  //}
  //
  public PackageTest(String arg0)
  {
  super(arg0);
  }
  
  
  // Create the CSVRead function and set its parameters.
private static CSVRead setParams(String p1, String p2) throws Exception
{
CSVRead cr = new CSVRead();
Collection parms = new LinkedList();
if (p1 != null) parms.add(new CompoundVariable(p1));
if (p2 != null) parms.add(new CompoundVariable(p2));
cr.setParameters(parms);
return cr;
}
  
public static Test suite() throws Exception
{
   TestSuite suite = new TestSuite("SingleThreaded");
   suite.addTest(new PackageTest("CSV2Setup"));
   suite.addTest(new PackageTest("CSV2Run"));
  
  
 //Reset files
 suite.addTest(new PackageTest("CSV2Setup"));
   TestSuite par = new ActiveTestSuite("Parallel");
   par.addTest(new PackageTest("Thread1"));
   par.addTest(new PackageTest("Thread2"));
   suite.addTest(par);
   return suite;
  }
  
  
  // Function objects to be tested
  private static CSVRead cr1, cr2, cr3, cr4;
  
  // Helper class used to implement co-routine between two threads
  private static class Baton{
void pass(){
done();
try
  {

//System.out.println(">wait:"+Thread.currentThread().getName());
  wait(1000);
  }
  catch (InterruptedException e)
  {
System.out.println(e);
  }

//System.out.println("done:"+Thread.currentThread().getName());
notifyAll();
}
  
  }
  
  private static Baton baton = new Baton();
  
public void Thread1() throws Exception
{
Thread.currentThread().setName("One");
synchronized(baton){

assertEquals("b1",cr1.execute(null,null));
  
assertEquals("",cr4.execute(null,null));

assertEquals("b2",cr1.execute(null,null));
 
baton.pass();
  
assertEquals("",cr4.execute(null,null));

assertEquals("b4",cr1.execute(null,null));
  
assertEquals("",cr4.execute(null,null));
  
baton.pass();
  
assertEquals("b3",cr1.execute(null,null));
  
assertEquals("",cr4.execute(null,null));
  
baton.done();
}
}
  
public void Thread2() throws Exception
{
Thread.currentThread().setName("Two");
Thread.sleep(500);// Allow other thread to start
synchronized(baton){
  
assertEquals("b3",cr1.execute(null,null));

  assertEquals("",cr4.execute(null,null));

baton.pass();

assertEquals("b1",cr1.execute(null,null));
  
assertEquals("",cr4.execute(null,null));
  
assertEquals("b2",cr1.execute(null,null));

baton.pass();
  
   

cvs commit: jakarta-jmeter/src/jorphan/org/apache/jorphan/test AllTests.java

2004-01-19 Thread sebb
sebb2004/01/19 18:01:14

  Modified:src/jorphan/org/apache/jorphan/test AllTests.java
  Log:
  Log some extra info
  
  Revision  ChangesPath
  1.17  +9 -1  jakarta-jmeter/src/jorphan/org/apache/jorphan/test/AllTests.java
  
  Index: AllTests.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/test/AllTests.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AllTests.java 7 Jan 2004 00:39:58 -   1.16
  +++ AllTests.java 20 Jan 2004 02:01:14 -  1.17
  @@ -135,6 +135,10 @@
   {
   }
   
  +private static void logprop(String prop)
  +{
  + log.info(prop+"="+System.getProperty(prop));
  +}
   /**
* Starts a run through all unit tests found in the specified classpaths.
* The first argument should be a list of paths to search.  The second
  @@ -158,6 +162,10 @@
   initializeManager(args);
   // end : added - 11 July 2001
   
  +logprop("java.version");
  + logprop("java.vendor");
  + logprop("java.class.version");
  + logprop("java.class.path");
   //++
   // GUI tests throw the error 
   // 
testArgumentCreation(org.apache.jmeter.config.gui.ArgumentsPanel$Test)java.lang.NoClassDefFoundError
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: Bean Properties

2004-01-19 Thread Jordi Salvat i Alabart


En/na Jordi Salvat i Alabart ha escrit:
[...]
In which case, we should:
- Add i18nEdit's i18nedit.properties and .../*.metaprops files to CVS.
Done.

- Write some brief documentation on how a translator should use i18nEdit 
to write translations, and how a committer should merge in submitted 
translations.
Done, although steps still untested.

I've scratched the resources unit tests... sebb: can you please help in 
reinstating them?

--
Salut,
Jordi.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: jakarta-jmeter/src/functions/org/apache/jmeter/functions CSVRead.java

2004-01-19 Thread sebb
sebb2004/01/19 17:30:06

  Modified:src/functions/org/apache/jmeter/functions CSVRead.java
  Log:
  Fix threading bug (I hope) - don't increment row until line has been read (i.e. used)
  
  Revision  ChangesPath
  1.9   +2 -2  
jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java
  
  Index: CSVRead.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/CSVRead.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CSVRead.java  26 Oct 2003 19:18:16 -  1.8
  +++ CSVRead.java  20 Jan 2004 01:30:06 -  1.9
  @@ -155,7 +155,6 @@
   // if argument is 'next' - go to the next line
   if (columnOrNext.equals("next()") || columnOrNext.equals("next"))
   {
  -myfileData.incrementRowPosition();
   storeCurrentLine(null);
   /*
* All done now ,so return the empty string - this allows the 
caller to
  @@ -175,6 +174,7 @@
   if (myfileData != null && processedLines == null)
   {
   processedLines = (ArrayList) myfileData.getNextLine();
  + myfileData.incrementRowPosition();
   this.storeCurrentLine(processedLines);
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/xdocs index.xml

2004-01-19 Thread jsalvata
jsalvata2004/01/19 17:27:30

  Modified:src/core/org/apache/jmeter/resources messages.properties
PackageTest.java messages_de.properties
messages_no.properties messages_ja.properties
   src/components/org/apache/jmeter/timers
ConstantThroughputTimerResources_ja.properties
   xdocsindex.xml
  Added:   src  i18nedit.properties
   src/core/org/apache/jmeter/resources messages.metaprops
   src/components/org/apache/jmeter/timers
ConstantThroughputTimerResources.metaprops
   src/htmlparser ExceptionMessages_en_US.metaprops
ExceptionMessages_ja_JP.metaprops
   xdocs/localising index.xml
  Log:
  Get ready to use i18nEdit in localisation.
  
  Revision  ChangesPath
  1.1  jakarta-jmeter/src/i18nedit.properties
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/i18nedit.properties?rev=1.1
  
  
  1.94  +92 -92
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties.diff?r1=1.93&r2=1.94
  
  
  1.4   +4 -2  
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java.diff?r1=1.3&r2=1.4
  
  
  1.78  +69 -359   
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties.diff?r1=1.77&r2=1.78
  
  
  1.74  +59 -372   
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties.diff?r1=1.73&r2=1.74
  
  
  1.75  +364 -467  
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties.diff?r1=1.74&r2=1.75
  
  
  1.1  
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.metaprops
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.metaprops?rev=1.1
  
  
  1.2   +3 -4  
jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_ja.properties.diff?r1=1.1&r2=1.2
  
  
  1.1  
jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources.metaprops
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources.metaprops?rev=1.1
  
  
  1.1  jakarta-jmeter/src/htmlparser/ExceptionMessages_en_US.metaprops
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/htmlparser/ExceptionMessages_en_US.metaprops?rev=1.1
  
  
  1.1  jakarta-jmeter/src/htmlparser/ExceptionMessages_ja_JP.metaprops
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/htmlparser/ExceptionMessages_ja_JP.metaprops?rev=1.1
  
  
  1.1  jakarta-jmeter/xdocs/localising/index.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/localising/index.xml?rev=1.1
  
  
  1.6   +1 -0  jakarta-jmeter/xdocs/index.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/index.xml.diff?r1=1.5&r2=1.6
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/xdocs/localising - New directory

2004-01-19 Thread jsalvata
jsalvata2004/01/19 17:26:34

  jakarta-jmeter/xdocs/localising - New directory

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 23780] - Open new test plan does not delete old test plan entries

2004-01-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23780

Open new test plan does not delete old test plan entries

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-01-19 22:32 ---
Sebb fixed this a while ago.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 17845] - In Solaris 8, Counter ref was not replaced by real value if I checked track counter checkbox

2004-01-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17845

In Solaris 8, Counter ref was not replaced by real value if I checked track counter 
checkbox

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME



--- Additional Comments From [EMAIL PROTECTED]  2004-01-19 22:28 ---
No additional input since my last message, almost one month ago.

Resolving as unreproducible.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: current CVS build runtime issues on JVM 1.3

2004-01-19 Thread Jordi Salvat i Alabart
VMS? I thought that disappeared in the mid-twentieth century :-)

Sorry, I didn't even know there was a JVM for that. I was referring to 
the HP-UX one. Actually for PA-RISC -- it's the only one on which I have 
experience.

--
Salut,
Jordi.

En/na BAZLEY, Sebastian ha escrit:
A notelet:

It's not strictly IBM-specific - nor do all HP JVMs support the flags:

I've just checked on HP OpenVMS 7.3, and "-XX:" is not supported on 1.3.1 or
1.4.1 - not that either of the JMeter scripts would run on VMS anyway ...
[In case anyone is wondering, JMeter does run fine on VMS.]

S.
-Original Message-
From: Jordi Salvat i Alabart [mailto:[EMAIL PROTECTED]
Sent: 19 January 2004 17:35
To: JMeter Developers List
Subject: Re: current CVS build runtime issues on JVM 1.3
Just a note: -XX:NewSize, etc. are there on Sun and HP's 1.3 JVMs. This 
issue seems to be IBM-specific, then.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui ProxyControlGui.java

2004-01-19 Thread jsalvata
jsalvata2004/01/19 11:04:08

  Modified:src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
  Log:
  
  
  Revision  ChangesPath
  1.36  +0 -0  
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
  
  Index: ProxyControlGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui GuiPackage.java

2004-01-19 Thread jsalvata
jsalvata2004/01/19 11:03:36

  Modified:src/core/org/apache/jmeter/gui GuiPackage.java
  Log:
  
  
  Revision  ChangesPath
  1.22  +0 -0  jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java
  
  Index: GuiPackage.java
  ===
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/control/gui ModuleControllerGui.java

2004-01-19 Thread jsalvata
jsalvata2004/01/19 11:03:06

  Modified:src/components/org/apache/jmeter/control/gui
ModuleControllerGui.java
  Log:
  
  
  Revision  ChangesPath
  1.13  +0 -0  
jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
  
  Index: ModuleControllerGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: current CVS build runtime issues on JVM 1.3

2004-01-19 Thread BAZLEY, Sebastian
A notelet:

It's not strictly IBM-specific - nor do all HP JVMs support the flags:

I've just checked on HP OpenVMS 7.3, and "-XX:" is not supported on 1.3.1 or
1.4.1 - not that either of the JMeter scripts would run on VMS anyway ...

[In case anyone is wondering, JMeter does run fine on VMS.]

S.
-Original Message-
From: Jordi Salvat i Alabart [mailto:[EMAIL PROTECTED]
Sent: 19 January 2004 17:35
To: JMeter Developers List
Subject: Re: current CVS build runtime issues on JVM 1.3


Just a note: -XX:NewSize, etc. are there on Sun and HP's 1.3 JVMs. This 
issue seems to be IBM-specific, then.

-- 
Salut,

Jordi.

En/na BAZLEY, Sebastian ha escrit:
>>-Original Message-
>>From: Sonam Chauhan [mailto:[EMAIL PROTECTED]
>>Sent: 19 January 2004 08:20
>>To: '[EMAIL PROTECTED]'
>>Subject: current CVS build runtime issues on JVM 1.3
>>
>>
>>[ FYI only ]
> 
> 
> Thanks for trying it out!
> 
> 
>>Seb wrote on Jan 7:
>>
>>>JMeter should now build and run on both 1.3 and 1.4.
>>>
>>>If built on 1.3, it should run on 1.3 and 1.4, and vice versa.
>>
>>^^^
>>Does this mean that if JMeter was built with Java 1.4, that 
>>build should run
>>on a 1.3 JVM? 
> 
> 
> Well, it did when I tried it using Eclipse. 
> AFAIK, basically the same compiler is used - it's just the 
libraries that
> are different.
> 
> 
>>I built the current CVS (Jan 19) on JVM 1.4, but ran into a 
>>couple of minor
>>problems running it on IBM JVM 1.3/Linux (JVM details at end of mail).
>>
>>1.IBM Java 1.3.0 didn't like some JVM options in '/bin/jmeter':
>>  ---
>>  Unrecognized option: -XX:NewSize=128m
>>  Unable to parse 1.2 format supplied options - rc=-6
>>  ---
> 
> 
> I'm afraid I didn't test the command file ... it was the Java 
code I was
> concerned about.
> 
> Not sure if it is easy to fix the script file - patches welcome...!
> 
> 
>>  I could run JMeter manually without those options. 
> 
> 
> That's good!
> 
> 
>>2.Trying to access HTTPS URL throws malformed URL exceptions. 
>>  ---
>>  java.net.MalformedURLException: unknown protocol: HTTPS
>>  at java.lang.Throwable.(Throwable.java:96)
>>  at java.lang.Exception.(Exception.java:44)
>>  ...
>>  ---
>>  Is HTTPS client support external in JVM 1.3?
>>
>>
> 
> 
> I think HTTPS requires some libraries that are not supplied 
by default.
> For example, 1.4 includes JSSE, but 1.3 does not.
> 
> I've never tried HTTPS so I don't know for sure...
> 
> 
>>With regards,
>>Sonam Chauhan
>>-- 
>>Corporate Express Australia Ltd.
>>Phone: +61-2-9335-0725, Fax: 9335-0753, Email: [EMAIL PROTECTED]
>>
>>
>>
>>---
>>java version "1.3.0"
>>Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0)
>>Classic VM (build 1.3.0, J2RE 1.3.0 IBM build cx130-20001124 
>>(JIT enabled:
>>jitc))
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: current CVS build runtime issues on JVM 1.3

2004-01-19 Thread Jordi Salvat i Alabart
Just a note: -XX:NewSize, etc. are there on Sun and HP's 1.3 JVMs. This 
issue seems to be IBM-specific, then.

--
Salut,
Jordi.

En/na BAZLEY, Sebastian ha escrit:
-Original Message-
From: Sonam Chauhan [mailto:[EMAIL PROTECTED]
Sent: 19 January 2004 08:20
To: '[EMAIL PROTECTED]'
Subject: current CVS build runtime issues on JVM 1.3
[ FYI only ]


Thanks for trying it out!


Seb wrote on Jan 7:

JMeter should now build and run on both 1.3 and 1.4.

If built on 1.3, it should run on 1.3 and 1.4, and vice versa.
   ^^^
Does this mean that if JMeter was built with Java 1.4, that 
build should run
on a 1.3 JVM? 


Well, it did when I tried it using Eclipse. 
AFAIK, basically the same compiler is used - it's just the libraries that
are different.


I built the current CVS (Jan 19) on JVM 1.4, but ran into a 
couple of minor
problems running it on IBM JVM 1.3/Linux (JVM details at end of mail).

1.  IBM Java 1.3.0 didn't like some JVM options in '/bin/jmeter':
---
Unrecognized option: -XX:NewSize=128m
Unable to parse 1.2 format supplied options - rc=-6
---


I'm afraid I didn't test the command file ... it was the Java code I was
concerned about.
Not sure if it is easy to fix the script file - patches welcome...!


	I could run JMeter manually without those options. 


That's good!


2. 	Trying to access HTTPS URL throws malformed URL exceptions. 
	---
		java.net.MalformedURLException: unknown protocol: HTTPS
			at java.lang.Throwable.(Throwable.java:96)
			at java.lang.Exception.(Exception.java:44)
		...
	---
	Is HTTPS client support external in JVM 1.3?




I think HTTPS requires some libraries that are not supplied by default.
For example, 1.4 includes JSSE, but 1.3 does not.
I've never tried HTTPS so I don't know for sure...


With regards,
Sonam Chauhan
--
Corporate Express Australia Ltd.
Phone: +61-2-9335-0725, Fax: 9335-0753, Email: [EMAIL PROTECTED]


---
java version "1.3.0"
Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0)
Classic VM (build 1.3.0, J2RE 1.3.0 IBM build cx130-20001124 
(JIT enabled:
jitc))


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


DO NOT REPLY [Bug 23487] - Remote execution from command-line does not work correctly

2004-01-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23487

Remote execution from command-line does not work correctly





--- Additional Comments From [EMAIL PROTECTED]  2004-01-19 12:19 ---
In org.apache.jmeter.engine.ClientJMeterEngine.run() I have put an extra try-
catch block:

try {
theTree.traverse(sampleListeners);
}
catch (java.lang.IndexOutOfBoundsException e) {
System.out.println("A java.lang.IndexOutOfBoundsException appeared."
+ "\nApparently the Listener is already 
replaced."
+ "\nTry to move on...");
}

That seems to work. The problem was that in the HashTree corresponding to the 
testplan, for remote testing, any ResultCollector has to be replaced bij a 
RemoteListenerWrapper. This replacement was done bij all instances of 
ClientJMeterEngine (one per remote testPC). Only the first of these instances 
succeeded in doing this. The idea behind above workaround is that once the 
replacement is done, all is OK, and the other ClientJMeterEngine's don't have 
to bother.

This workaround is not THE solution, it seems to me. The code for replacing the 
ResultCollector should be somewhere else probably.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/visualizers ViewResultsFullVisualizer.java

2004-01-19 Thread jsalvata
jsalvata2004/01/19 03:15:28

  Modified:src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
  Log:
  * Use tabbed pannels instead of adjacent ones to present
  the different views of the result.
  * Prevent attempting to show excessively large texts -- it's
  too costly both in time and in memory.
  
  Revision  ChangesPath
  1.36  +45 -23
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
  
  Index: ViewResultsFullVisualizer.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ViewResultsFullVisualizer.java17 Dec 2003 03:39:30 -  1.35
  +++ ViewResultsFullVisualizer.java19 Jan 2004 11:15:28 -  1.36
  @@ -72,6 +72,7 @@
   import javax.swing.JRadioButton;
   import javax.swing.JScrollPane;
   import javax.swing.JSplitPane;
  +import javax.swing.JTabbedPane;
   import javax.swing.JTextArea;
   import javax.swing.JTextPane;
   import javax.swing.JTree;
  @@ -237,7 +238,7 @@
   }
   
   /**
  - * Sets the bottom pane to correspond to the selected node of the top tree.
  + * Sets the right pane to correspond to the selected node of the left tree.
*/
   public void valueChanged(TreeSelectionEvent e)
   {
  @@ -343,17 +344,30 @@
   // get the text response and image icon
   // to determine which is NOT null
   byte[] responseBytes = (byte[]) res.getResponseData();
  +
   if (res.getDataType() != null
   && res.getDataType().equals(SampleResult.TEXT))
   {
   String response = null;
   try
   {
  -response = new String(responseBytes, "UTF-8");
  + // Showing large strings can 
be VERY costly, so we will avoid doing so if the response
  + // data is larger than 200K. 
TODO: instead, we could delay doing the result.setText
  + // call until the user chooses 
the "Response data" tab. Plus we could warn the user
  + // if this happens and revert 
the choice if he doesn't confirm he's ready to wait.
  + if (responseBytes.length > 
200*1024)
  + {
  + response= 
  + ("Response too 
large to be displayed ("+responseBytes.length+" bytes).");
  + }
  + else
  + {
  + response = new 
String(responseBytes, "UTF-8");
  + }
   }
   catch (UnsupportedEncodingException err)
   {
  -response = new String(responseBytes);
  +throw new Error(err.toString()); // UTF-8 not 
supported? Com'on!
   }
   
   if (textMode)
  @@ -391,7 +405,7 @@
   protected void showTextResponse(String response)
   {
   results.setContentType("text/plain");
  -results.setText(response == null ? "" : response);
  + results.setText(response == null ? "" : response);
   results.setCaretPosition(0);
   resultsScrollPane.setViewportView(results);
   
  @@ -438,11 +452,24 @@
   {
   try
   {
  -response = new String(responseBytes, "UTF-8");
  + // Showing large strings can be VERY costly, 
so we will avoid doing so if the response
  + // data is larger than 200K. TODO: instead, we 
could delay doing the result.setText
  + // call until the user chooses the "Response 
data" tab. Plus we could warn the user
  + // if this happens and revert the choice if he 
doesn't confirm he's ready to wait.
  + if (responseBytes.length > 200*1024)
  + {
  + response= 
  + ("Response too large

RE: current CVS build runtime issues on JVM 1.3

2004-01-19 Thread BAZLEY, Sebastian
>-Original Message-
>From: Sonam Chauhan [mailto:[EMAIL PROTECTED]
>Sent: 19 January 2004 08:20
>To: '[EMAIL PROTECTED]'
>Subject: current CVS build runtime issues on JVM 1.3
>
>
>[ FYI only ]

Thanks for trying it out!

>
>Seb wrote on Jan 7:
>> JMeter should now build and run on both 1.3 and 1.4.
>>
>> If built on 1.3, it should run on 1.3 and 1.4, and vice versa.
> ^^^
>Does this mean that if JMeter was built with Java 1.4, that 
>build should run
>on a 1.3 JVM? 

Well, it did when I tried it using Eclipse. 
AFAIK, basically the same compiler is used - it's just the libraries that
are different.

>
>I built the current CVS (Jan 19) on JVM 1.4, but ran into a 
>couple of minor
>problems running it on IBM JVM 1.3/Linux (JVM details at end of mail).
>
>1. IBM Java 1.3.0 didn't like some JVM options in '/bin/jmeter':
>   ---
>   Unrecognized option: -XX:NewSize=128m
>   Unable to parse 1.2 format supplied options - rc=-6
>   ---

I'm afraid I didn't test the command file ... it was the Java code I was
concerned about.

Not sure if it is easy to fix the script file - patches welcome...!

>   I could run JMeter manually without those options. 

That's good!

>
>2. Trying to access HTTPS URL throws malformed URL exceptions. 
>   ---
>   java.net.MalformedURLException: unknown protocol: HTTPS
>   at java.lang.Throwable.(Throwable.java:96)
>   at java.lang.Exception.(Exception.java:44)
>   ...
>   ---
>   Is HTTPS client support external in JVM 1.3?
>
>

I think HTTPS requires some libraries that are not supplied by default.
For example, 1.4 includes JSSE, but 1.3 does not.

I've never tried HTTPS so I don't know for sure...

>With regards,
>Sonam Chauhan
>-- 
>Corporate Express Australia Ltd.
>Phone: +61-2-9335-0725, Fax: 9335-0753, Email: [EMAIL PROTECTED]
>
>
>
>---
>java version "1.3.0"
>Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0)
>Classic VM (build 1.3.0, J2RE 1.3.0 IBM build cx130-20001124 
>(JIT enabled:
>jitc))

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



current CVS build runtime issues on JVM 1.3

2004-01-19 Thread Sonam Chauhan
[ FYI only ]

Seb wrote on Jan 7:
> JMeter should now build and run on both 1.3 and 1.4.
>
> If built on 1.3, it should run on 1.3 and 1.4, and vice versa.
 ^^^
Does this mean that if JMeter was built with Java 1.4, that build should run
on a 1.3 JVM? 

I built the current CVS (Jan 19) on JVM 1.4, but ran into a couple of minor
problems running it on IBM JVM 1.3/Linux (JVM details at end of mail).

1.  IBM Java 1.3.0 didn't like some JVM options in '/bin/jmeter':
---
Unrecognized option: -XX:NewSize=128m
Unable to parse 1.2 format supplied options - rc=-6
---
I could run JMeter manually without those options. 

2.  Trying to access HTTPS URL throws malformed URL exceptions. 
---
java.net.MalformedURLException: unknown protocol: HTTPS
at java.lang.Throwable.(Throwable.java:96)
at java.lang.Exception.(Exception.java:44)
...
---
Is HTTPS client support external in JVM 1.3?


With regards,
Sonam Chauhan
-- 
Corporate Express Australia Ltd.
Phone: +61-2-9335-0725, Fax: 9335-0753, Email: [EMAIL PROTECTED]



---
java version "1.3.0"
Java(TM) 2 Runtime Environment, Standard Edition (build 1.3.0)
Classic VM (build 1.3.0, J2RE 1.3.0 IBM build cx130-20001124 (JIT enabled:
jitc))


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]