modifiers

2002-01-23 Thread David La France 

Hi,

I have a couple of questions.

I'm trying to figure out how to implement a http parameter modifier so that every 
thread in a threadgroup would get a unique value for that parameter..for example, if 
one parameter to a servlet is a user id, then ideally you would like every thread in 
the group to have a unique user id, so that each thread appears to the servlet as a 
unique user.

I already created a http parameter modifier that allows a thread to change a 
parameter, so that every time through that thread's loop, the parameter has a 
different 
value.

However, I am having a hard time figuring out how to implement the former.

If I use a static object to dole out the values, then threads that are not even in the 
same threadgroup will ALSO get their values from this object...which would 
obviously be a Bad Thing.

Is there some way I can attach this object to the thread group itself, so that only 
its threads could access it?  Should I give up and do it the other way?

My other question is: would the http parameter modifier that I already implemented be 
useful to anyone else?  Should I look into submitting it to the project?

Thanks for your time!
David La France



--
To unsubscribe, e-mail:   
For additional commands, e-mail:

RE: modifiers

2002-01-24 Thread Stover, Michael 
First of all, yes it would be useful to others.

If I understand right, then I think you can already do what you want - which
is to set up x threads, each with it's own unique value for a parameter that
gets set once and only once.  Is that right?

So, simplest solution, if you want to login each thread as a different user,
put the Modification Manager with it's Web Test and modifier under a Once
Only Controller.  This way, each thread will get a unique value, the thread
will be logged in, and then it will never run again.

If you want a more universal solution, then I'd suggest creating a mapping
between the thread name and it's assigned unique value.  Every thread gets a
unique name, and you can ask at any time what the current thread's name is.
Thus, in your modifier, you can keep this information in a hashmap.  If the
thread has a value already, simply retrieve it from the hashmap using the
thread's name.  If it doesn't, then create the unique value, and store it
appropriately.

Will that work for you?

-Mike 

> -Original Message-
> From: David La France [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, January 24, 2002 1:51 AM
> To: jmeter-dev
> Subject: modifiers
> 
> 
> Hi,
> 
> I have a couple of questions.
> 
> I'm trying to figure out how to implement a http parameter 
> modifier so that every thread in a threadgroup would get a 
> unique value for that parameter..for example, if 
> one parameter to a servlet is a user id, then ideally you 
> would like every thread in the group to have a unique user 
> id, so that each thread appears to the servlet as a 
> unique user.
> 
> I already created a http parameter modifier that allows a 
> thread to change a parameter, so that every time through that 
> thread's loop, the parameter has a different 
> value.
> 
> However, I am having a hard time figuring out how to 
> implement the former.
> 
> If I use a static object to dole out the values, then threads 
> that are not even in the same threadgroup will ALSO get their 
> values from this object...which would 
> obviously be a Bad Thing.
> 
> Is there some way I can attach this object to the thread 
> group itself, so that only its threads could access it?  
> Should I give up and do it the other way?
> 
> My other question is: would the http parameter modifier that 
> I already implemented be useful to anyone else?  Should I 
> look into submitting it to the project?
> 
> Thanks for your time!
> David La France
> 
> 
> 
> --
> To unsubscribe, e-mail:   
> <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: 
> <mailto:[EMAIL PROTECTED]>
> 

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

Re: RE: modifiers

2002-01-24 Thread David La France 
Mike,

Ok, I'm cleaning it up so I can send it to you.

About the other modifier, yes, that is helpful.  Thanks!

--Dave



2002/01/24 23:51:21, "Stover, Michael" <[EMAIL PROTECTED]> wrote:

>First of all, yes it would be useful to others.
>
>If I understand right, then I think you can already do what you want - which
>is to set up x threads, each with it's own unique value for a parameter that
>gets set once and only once.  Is that right?
>
>So, simplest solution, if you want to login each thread as a different user,
>put the Modification Manager with it's Web Test and modifier under a Once
>Only Controller.  This way, each thread will get a unique value, the thread
>will be logged in, and then it will never run again.
>
>If you want a more universal solution, then I'd suggest creating a mapping
>between the thread name and it's assigned unique value.  Every thread gets a
>unique name, and you can ask at any time what the current thread's name is.
>Thus, in your modifier, you can keep this information in a hashmap.  If the
>thread has a value already, simply retrieve it from the hashmap using the
>thread's name.  If it doesn't, then create the unique value, and store it
>appropriately.
>
>Will that work for you?
>
>-Mike 
>
>> -Original Message-
>> From: David La France [mailto:[EMAIL PROTECTED]]
>> Sent: Thursday, January 24, 2002 1:51 AM
>> To: jmeter-dev
>> Subject: modifiers
>> 
>> 
>> Hi,
>> 
>> I have a couple of questions.
>> 
>> I'm trying to figure out how to implement a http parameter 
>> modifier so that every thread in a threadgroup would get a 
>> unique value for that parameter..for example, if 
>> one parameter to a servlet is a user id, then ideally you 
>> would like every thread in the group to have a unique user 
>> id, so that each thread appears to the servlet as a 
>> unique user.
>> 
>> I already created a http parameter modifier that allows a 
>> thread to change a parameter, so that every time through that 
>> thread's loop, the parameter has a different 
>> value.
>> 
>> However, I am having a hard time figuring out how to 
>> implement the former.
>> 
>> If I use a static object to dole out the values, then threads 
>> that are not even in the same threadgroup will ALSO get their 
>> values from this object...which would 
>> obviously be a Bad Thing.
>> 
>> Is there some way I can attach this object to the thread 
>> group itself, so that only its threads could access it?  
>> Should I give up and do it the other way?
>> 
>> My other question is: would the http parameter modifier that 
>> I already implemented be useful to anyone else?  Should I 
>> look into submitting it to the project?
>> 
>> Thanks for your time!
>> David La France
>> 
>> 
>> 
>> --
>> To unsubscribe, e-mail:   
>> <mailto:[EMAIL PROTECTED]>
>> For additional commands, e-mail: 
>> <mailto:[EMAIL PROTECTED]>
>> 
>
>--
>To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
>For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
>
>
>




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

RE: RE: modifiers

2002-01-25 Thread Stover, Michael 
Don't send anything to me, I have no access to Apache's CVS currently

I just answer list questions from time to time.

-Mike

> -Original Message-
> From: David La France [mailto:[EMAIL PROTECTED]]
> Sent: Friday, January 25, 2002 2:22 AM
> To: JMeter Developers List
> Subject: Re: RE: modifiers
> 
> 
> Mike,
> 
> Ok, I'm cleaning it up so I can send it to you.
> 
> About the other modifier, yes, that is helpful.  Thanks!
> 
> --Dave
> 
> 
> 
> 2002/01/24 23:51:21, "Stover, Michael" 
> <[EMAIL PROTECTED]> wrote:
> 
> >First of all, yes it would be useful to others.
> >
> >If I understand right, then I think you can already do what 
> you want - which
> >is to set up x threads, each with it's own unique value for 
> a parameter that
> >gets set once and only once.  Is that right?
> >
> >So, simplest solution, if you want to login each thread as a 
> different user,
> >put the Modification Manager with it's Web Test and modifier 
> under a Once
> >Only Controller.  This way, each thread will get a unique 
> value, the thread
> >will be logged in, and then it will never run again.
> >
> >If you want a more universal solution, then I'd suggest 
> creating a mapping
> >between the thread name and it's assigned unique value.  
> Every thread gets a
> >unique name, and you can ask at any time what the current 
> thread's name is.
> >Thus, in your modifier, you can keep this information in a 
> hashmap.  If the
> >thread has a value already, simply retrieve it from the 
> hashmap using the
> >thread's name.  If it doesn't, then create the unique value, 
> and store it
> >appropriately.
> >
> >Will that work for you?
> >
> >-Mike 
> >
> >> -Original Message-
> >> From: David La France [mailto:[EMAIL PROTECTED]]
> >> Sent: Thursday, January 24, 2002 1:51 AM
> >> To: jmeter-dev
> >> Subject: modifiers
> >> 
> >> 
> >> Hi,
> >> 
> >> I have a couple of questions.
> >> 
> >> I'm trying to figure out how to implement a http parameter 
> >> modifier so that every thread in a threadgroup would get a 
> >> unique value for that parameter..for example, if 
> >> one parameter to a servlet is a user id, then ideally you 
> >> would like every thread in the group to have a unique user 
> >> id, so that each thread appears to the servlet as a 
> >> unique user.
> >> 
> >> I already created a http parameter modifier that allows a 
> >> thread to change a parameter, so that every time through that 
> >> thread's loop, the parameter has a different 
> >> value.
> >> 
> >> However, I am having a hard time figuring out how to 
> >> implement the former.
> >> 
> >> If I use a static object to dole out the values, then threads 
> >> that are not even in the same threadgroup will ALSO get their 
> >> values from this object...which would 
> >> obviously be a Bad Thing.
> >> 
> >> Is there some way I can attach this object to the thread 
> >> group itself, so that only its threads could access it?  
> >> Should I give up and do it the other way?
> >> 
> >> My other question is: would the http parameter modifier that 
> >> I already implemented be useful to anyone else?  Should I 
> >> look into submitting it to the project?
> >> 
> >> Thanks for your time!
> >> David La France
> >> 
> >> 
> >> 
> >> --
> >> To unsubscribe, e-mail:   
> >> <mailto:[EMAIL PROTECTED]>
> >> For additional commands, e-mail: 
> >> <mailto:[EMAIL PROTECTED]>
> >> 
> >
> >--
> >To unsubscribe, e-mail:   
> <mailto:[EMAIL PROTECTED]>
> >For additional commands, e-mail: 
> <mailto:[EMAIL PROTECTED]>
> >
> >
> >
> 
> 
> 
> 
> --
> To unsubscribe, e-mail:   
> <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: 
> <mailto:[EMAIL PROTECTED]>
> 

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers CounterConfig.java

2002-12-13 Thread mstover1 
mstover12002/12/13 10:20:01

  Modified:src/components/org/apache/jmeter/modifiers
CounterConfig.java
  Log:
  Fixing counter config bug
  
  Revision  ChangesPath
  1.3   +37 -9 
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CounterConfig.java30 Aug 2002 14:43:19 -  1.2
  +++ CounterConfig.java13 Dec 2002 18:20:01 -  1.3
  @@ -5,6 +5,9 @@
   import org.apache.jmeter.testelement.ThreadListener;
   import org.apache.jmeter.testelement.VariablesCollection;
   import org.apache.jmeter.threads.JMeterVariables;
  +import org.apache.jmeter.util.JMeterUtils;
  +import org.apache.jorphan.logging.LoggingManager;
  +import org.apache.log.Logger;
   /**
* @author Administrator
*
  @@ -15,6 +18,7 @@
extends ConfigTestElement
implements Serializable, ThreadListener
   {
  + private static Logger log = LoggingManager.getLoggerFor(JMeterUtils.ELEMENTS);
private final static String START = "CounterConfig.start";
private final static String END = "CounterConfig.end";
private final static String INCREMENT = "CounterConfig.incr";
  @@ -27,25 +31,49 @@
private int start = 0;
private int end = Integer.MAX_VALUE;
private VariablesCollection vars = new VariablesCollection();
  + private int currentIterationCount = -1;
/**
 * @see org.apache.jmeter.testelement.ThreadListener#iterationStarted(int)
 */
public synchronized void iterationStarted(int iterationCount)
{
JMeterVariables variables = vars.getVariables();
  - if(perUser)
  - {
  - int value = start + (increment * (iterationCount-1));
  - value = value % end;
  - variables.put(getVarName(),Integer.toString(value));
  - }
  - else
  + if(!perUser)
{
globalCounter++;
int value = start + (increment * globalCounter);
  - value = value % end;
  + if(value > end)
  + {
  + globalCounter = 0;
  + value = start;
  + }
variables.put(getVarName(),Integer.toString(value));
  - }   
  + }
  + else
  + {   
  + String value = variables.get(getVarName());
  + if(value == null)
  + {
  + variables.put(getVarName(),Integer.toString(start));
  + }
  + else
  + {
  + try
  + {
  + int current = Integer.parseInt(value);
  + current += increment;
  + if(current > end)
  + {
  + current = start;
  + }
  + 
variables.put(getVarName(),Integer.toString(current));
  + }
  + catch(NumberFormatException e)
  + {
  + log.info("Bad number in Counter config",e);
  + }   
  + }   
  + }   
}

/**
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers UserParameters.java

2003-10-30 Thread sebb 
sebb2003/10/30 13:54:20

  Modified:src/components/org/apache/jmeter/modifiers
UserParameters.java
  Log:
  Extra debug logging
  
  Revision  ChangesPath
  1.20  +20 -3 
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
  
  Index: UserParameters.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- UserParameters.java   5 Oct 2003 01:08:40 -   1.19
  +++ UserParameters.java   30 Oct 2003 21:54:20 -  1.20
  @@ -14,6 +14,8 @@
   import org.apache.jmeter.testelement.property.PropertyIterator;
   import org.apache.jmeter.threads.JMeterContextService;
   import org.apache.jmeter.threads.JMeterVariables;
  +import org.apache.jorphan.logging.LoggingManager;
  +import org.apache.log.Logger;
   
   /**
* @version $Revision$
  @@ -22,6 +24,7 @@
   extends AbstractTestElement
   implements Serializable, PreProcessor, LoopIterationListener
   {
  + private static final Logger log = LoggingManager.getLoggerForClass();
   
   public static final String NAMES = "UserParameters.names";
   public static final String THREAD_VALUES = "UserParameters.thread_values";
  @@ -108,6 +111,10 @@
   
   public void process()
   {
  + if (log.isDebugEnabled())
  + {
  + log.debug(Thread.currentThread().getName() + " process " + 
isPerIteration());//$NON-NLS-1$
  + }
   if (!isPerIteration())
   {
   setValues();
  @@ -118,7 +125,10 @@
   {
   synchronized (lock)
   {
  -log.debug("Running up named: " + getName());
  + if (log.isDebugEnabled())
  + {
  + log.debug(Thread.currentThread().getName() + " Running up 
named: " + getName());//$NON-NLS-1$
  + }
   PropertyIterator namesIter = getNames().iterator();
   PropertyIterator valueIter = getValues().iterator();
   JMeterVariables jmvars =
  @@ -127,7 +137,10 @@
   {
   String name = namesIter.next().getStringValue();
   String value = valueIter.next().getStringValue();
  -log.debug("saving variable: " + name + "=" + value);
  + if (log.isDebugEnabled())
  + {
  +log.debug(Thread.currentThread().getName()+" saving variable: 
"+name+"="+value);//$NON-NLS-1$
  + }
   jmvars.put(name, value);
   }
   }
  @@ -138,6 +151,10 @@
*/
   public void iterationStart(LoopIterationEvent event)
   {
  + if (log.isDebugEnabled())
  +{
  + log.debug(Thread.currentThread().getName() + " iteration start 
" + isPerIteration());//$NON-NLS-1$
  +}
   if (isPerIteration())
   {
   setValues();
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers CounterConfig.java

2004-02-22 Thread sebb 
sebb2004/02/22 11:17:22

  Modified:src/components/org/apache/jmeter/modifiers
CounterConfig.java
  Log:
  For speed, use getThreadContext() instead of JMeterContextService
  
  Revision  ChangesPath
  1.20  +3 -5  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CounterConfig.java13 Feb 2004 01:39:06 -  1.19
  +++ CounterConfig.java22 Feb 2004 19:17:22 -  1.20
  @@ -26,7 +26,6 @@
   import org.apache.jmeter.testelement.AbstractTestElement;
   import org.apache.jmeter.testelement.property.BooleanProperty;
   import org.apache.jmeter.testelement.property.IntegerProperty;
  -import org.apache.jmeter.threads.JMeterContextService;
   import org.apache.jmeter.threads.JMeterVariables;
   import org.apache.jorphan.logging.LoggingManager;
   import org.apache.log.Logger;
  @@ -52,8 +51,7 @@
*/
   public synchronized void iterationStart(LoopIterationEvent event)
   {
  -JMeterVariables variables =
  -JMeterContextService.getContext().getVariables();
  +JMeterVariables variables = getThreadContext().getVariables();
   int start = getStart(), end = getEnd(), increment = getIncrement();
   if (!isPerUser())
   {
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers UserParameters.java

2004-02-22 Thread sebb 
sebb2004/02/22 11:17:45

  Modified:src/components/org/apache/jmeter/modifiers
UserParameters.java
  Log:
  For speed, use getThreadContext() instead of JMeterContextService
  
  Revision  ChangesPath
  1.22  +4 -6  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
  
  Index: UserParameters.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- UserParameters.java   13 Feb 2004 01:39:06 -  1.21
  +++ UserParameters.java   22 Feb 2004 19:17:45 -  1.22
  @@ -30,7 +30,6 @@
   import org.apache.jmeter.testelement.property.BooleanProperty;
   import org.apache.jmeter.testelement.property.CollectionProperty;
   import org.apache.jmeter.testelement.property.PropertyIterator;
  -import org.apache.jmeter.threads.JMeterContextService;
   import org.apache.jmeter.threads.JMeterVariables;
   import org.apache.jorphan.logging.LoggingManager;
   import org.apache.log.Logger;
  @@ -108,7 +107,7 @@
   if (threadValues.size() > 0)
   {
   return (CollectionProperty) threadValues.get(
  -JMeterContextService.getContext().getThreadNum()
  +getThreadContext().getThreadNum()
   % threadValues.size());
   }
   else
  @@ -149,8 +148,7 @@
}
   PropertyIterator namesIter = getNames().iterator();
   PropertyIterator valueIter = getValues().iterator();
  -JMeterVariables jmvars =
  -JMeterContextService.getContext().getVariables();
  +JMeterVariables jmvars = getThreadContext().getVariables();
   while (namesIter.hasNext() && valueIter.hasNext())
   {
   String name = namesIter.next().getStringValue();
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers CounterConfig.java

2004-03-23 Thread sebb 
sebb2004/03/23 06:23:27

  Modified:src/components/org/apache/jmeter/modifiers
CounterConfig.java
  Log:
  Cannot use getThreadContext() here
  
  Revision  ChangesPath
  1.21  +6 -3  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CounterConfig.java22 Feb 2004 19:17:22 -  1.20
  +++ CounterConfig.java23 Mar 2004 14:23:27 -  1.21
  @@ -26,6 +26,7 @@
   import org.apache.jmeter.testelement.AbstractTestElement;
   import org.apache.jmeter.testelement.property.BooleanProperty;
   import org.apache.jmeter.testelement.property.IntegerProperty;
  +import org.apache.jmeter.threads.JMeterContextService;
   import org.apache.jmeter.threads.JMeterVariables;
   import org.apache.jorphan.logging.LoggingManager;
   import org.apache.log.Logger;
  @@ -51,7 +52,9 @@
*/
   public synchronized void iterationStart(LoopIterationEvent event)
   {
  -JMeterVariables variables = getThreadContext().getVariables();
  + // Cannot use getThreadContext() as not cloned per thread
  +JMeterVariables variables = 
  + JMeterContextService.getContext().getVariables();
   int start = getStart(), end = getEnd(), increment = getIncrement();
   if (!isPerUser())
   {
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers UserParameters.java

2004-06-19 Thread sebb 
sebb2004/06/19 17:53:16

  Modified:src/components/org/apache/jmeter/modifiers Tag: rel-2_0
UserParameters.java
  Log:
  Comments describing lock field
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.22.2.1  +19 -11
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
  
  Index: UserParameters.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- UserParameters.java   22 Feb 2004 19:17:45 -  1.22
  +++ UserParameters.java   20 Jun 2004 00:53:16 -  1.22.2.1
  @@ -46,6 +46,15 @@
   public static final String NAMES = "UserParameters.names";
   public static final String THREAD_VALUES = "UserParameters.thread_values";
   public static final String PER_ITERATION = "UserParameters.per_iteration";
  +
  +/*
  + * Although the lock appears to be an instance lock, in fact
  + * the lock is shared between all threads in a thread group, but different
  + * thread groups have different locks - see the clone() method below
  + * 
  + * The lock ensures that all the variables are processed together, which is
  + * important for functions such as __CSVRead and _StringFromFile.
  +*/
   private Integer lock = new Integer(0);
   
   public CollectionProperty getNames()
  @@ -177,21 +186,20 @@
   }
   }
   
  -/* This method doesn't appear to be used anymore.
  - * [EMAIL PROTECTED]  03 May 2003
  - * 
  - * @see ThreadListener#setJMeterVariables(JMeterVariables)
  -public void setJMeterVariables(JMeterVariables jmVars)
  -{}
  - */
  -
   /* (non-Javadoc)
  + * A new instance is created for each thread group, and the
  + * clone() method is then called to create copies for each thread
  + * in a thread group.
  + * This means that the lock object is common to a thread group;
  + * separate thread groups have separate locks.
  + * If this is not intended, the lock object could be made static.
  + * 
* @see java.lang.Object#clone()
*/
   public Object clone()
   {
   UserParameters up = (UserParameters) super.clone();
  -up.lock = lock;
  +up.lock = lock; // ensure that clones share the same lock object
   return up;
   }
   
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers CounterConfig.java

2004-10-23 Thread sebb 
sebb2004/10/23 18:08:47

  Modified:src/components/org/apache/jmeter/modifiers Tag: rel-2_0
CounterConfig.java
  Log:
  Remove redundant fetch
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.21.2.1  +2 -3  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- CounterConfig.java23 Mar 2004 14:23:27 -  1.21
  +++ CounterConfig.java24 Oct 2004 01:08:47 -  1.21.2.1
  @@ -71,7 +71,6 @@
   if (value == null)
   {
   variables.put(getVarName(), Integer.toString(start));
  -value = variables.get(getVarName());
   }
   else
   {
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers - New directory

2002-08-17 Thread mstover1 

mstover12002/08/17 20:11:13

  jakarta-jmeter/src/components/org/apache/jmeter/modifiers - New directory

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui CounterConfigGui.java

2004-05-20 Thread sebb 
sebb2004/05/20 17:22:53

  Modified:src/components/org/apache/jmeter/modifiers/gui Tag: rel-2_0
CounterConfigGui.java
  Log:
  Bug 22820  max value on counter cannot be cleared
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.11.2.1  +3 -3  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
  
  Index: CounterConfigGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- CounterConfigGui.java 5 Mar 2004 01:33:13 -   1.11
  +++ CounterConfigGui.java 21 May 2004 00:22:53 -  1.11.2.1
  @@ -65,7 +65,7 @@
   {
   CounterConfig config = (CounterConfig) c;
   config.setStart(startField.getText());
  -if (endField.getText().length() > 0)
  +//Bug 22820 if (endField.getText().length() > 0)
   {
   config.setEnd(endField.getText());
   }
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui CounterConfigGui.java

2005-03-10 Thread sebb 
sebb2005/03/10 17:56:18

  Modified:src/components/org/apache/jmeter/modifiers/gui Tag: rel-2_0
CounterConfigGui.java
  Log:
  Bug 33919 - increase counter field sizes
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.11.2.2  +5 -5  
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
  
  Index: CounterConfigGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- CounterConfigGui.java 21 May 2004 00:22:53 -  1.11.2.1
  +++ CounterConfigGui.java 11 Mar 2005 01:56:18 -  1.11.2.2
  @@ -93,10 +93,10 @@
   setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
   
   startField =
  -new JLabeledTextField(JMeterUtils.getResString("start"), 5);
  +new JLabeledTextField(JMeterUtils.getResString("start")+"
  ");//TODO proper alignment
   incrField =
  -new JLabeledTextField(JMeterUtils.getResString("increment"), 5);
  -endField = new JLabeledTextField(JMeterUtils.getResString("max"), 5);
  +new JLabeledTextField(JMeterUtils.getResString("increment"));
  +endField = new JLabeledTextField(JMeterUtils.getResString("max"));
   varNameField =
   new JLabeledTextField(JMeterUtils.getResString("var_name"));
   perUserField =
  
  
  

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui - New directory

2002-08-17 Thread mstover1 

mstover12002/08/17 20:11:24

  jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui - New directory

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

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui CounterConfigGui.java UserParametersGui.java

2004-02-12 Thread sebb 
sebb2004/02/12 17:39:07

  Modified:src/components/org/apache/jmeter/extractor/gui
RegexExtractorGui.java
   src/components/org/apache/jmeter/modifiers
CounterConfig.java UserParameters.java
   src/components/org/apache/jmeter/timers ConstantTimer.java
RandomTimer.java UniformRandomTimer.java
ConstantThroughputTimer.java
GaussianRandomTimer.java
ConstantThroughputTimerBeanInfo.java
   src/components/org/apache/jmeter/extractor
RegexExtractor.java
   src/components/org/apache/jmeter/timers/gui
UniformRandomTimerGui.java ConstantTimerGui.java
GaussianRandomTimerGui.java
   src/components/org/apache/jmeter/reporters
MailerResultCollector.java MailerModel.java
   src/components/org/apache/jmeter/modifiers/gui
CounterConfigGui.java UserParametersGui.java
  Log:
  ASF L V2
  
  Revision  ChangesPath
  1.9   +19 -1 
jakarta-jmeter/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
  
  Index: RegexExtractorGui.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RegexExtractorGui.java20 Oct 2003 23:56:21 -  1.8
  +++ RegexExtractorGui.java13 Feb 2004 01:39:06 -  1.9
  @@ -1,3 +1,21 @@
  +// $Header$
  +/*
  + * Copyright 2003-2004 The Apache Software Foundation.
  + *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + * 
  +*/
  +
   package org.apache.jmeter.extractor.gui;
   
   import java.awt.BorderLayout;
  
  
  
  1.19  +19 -1 
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java
  
  Index: CounterConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/CounterConfig.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CounterConfig.java5 Oct 2003 01:08:40 -   1.18
  +++ CounterConfig.java13 Feb 2004 01:39:06 -  1.19
  @@ -1,3 +1,21 @@
  +// $Header$
  +/*
  + * Copyright 2002-2004 The Apache Software Foundation.
  + *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the specific language governing permissions and
  + * limitations under the License.
  + * 
  +*/
  +
   package org.apache.jmeter.modifiers;
   
   import java.io.Serializable;
  
  
  
  1.21  +19 -1 
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
  
  Index: UserParameters.java
  ===
  RCS file: 
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- UserParameters.java   30 Oct 2003 21:54:20 -  1.20
  +++ UserParameters.java   13 Feb 2004 01:39:06 -  1.21
  @@ -1,3 +1,21 @@
  +// $Header$
  +/*
  + * Copyright 2002-2004 The Apache Software Foundation.
  + *
  + * Licensed under the Apache License, Version 2.0 (the "License");
  + * you may not use this file except in compliance with the License.
  + * You may obtain a copy of the License at
  + *
  + *   http://www.apache.org/licenses/LICENSE-2.0
  + *
  + * Unless required by applicable law or agreed to in writing, software
  + * distributed under the License is distributed on an "AS IS" BASIS,
  + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + * See the License for the s

cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/modifiers CSVDataSetResources.properties CSVDataSet.java CSVDataSetBeanInfo.java

2004-10-01 Thread mstover1 
mstover12004/10/01 09:25:08

  Modified:bin  jmeter
  Added:   xdocs/extending notes_on_extending.txt
   src/components/org/apache/jmeter/modifiers
CSVDataSetResources.properties CSVDataSet.java
CSVDataSetBeanInfo.java
  Log:
  Beginnings of new CSVDataSet component
  
  Revision  ChangesPath
  1.25  +7 -5  jakarta-jmeter/bin/jmeter
  
  Index: jmeter
  ===
  RCS file: /home/cvs/jakarta-jmeter/bin/jmeter,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- jmeter16 Feb 2004 13:34:10 -  1.24
  +++ jmeter1 Oct 2004 16:25:08 -   1.25
  @@ -43,7 +43,7 @@
   
   # This ratio and target have been proven OK in tests with a specially high
   # amount of per-sample objects (the HtmlParserHTMLParser tests):
  -SURVIVOR="-XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=50%"
  +# SURVIVOR="-XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=50%"
   
   # Think about it: trying to keep per-run objects in tenuring definitely
   # represents a cost, but where's the benefit? They won't disappear before
  @@ -61,7 +61,7 @@
   # memory in a short period of time, such as loading tests or listener data files.
   # Increase it if you experience OutOfMemory problems during those operations
   # without having gone through a lot of Full GC-ing just before the OOM:
  -EVACUATION="-XX:MaxLiveObjectEvacuationRatio=20%"
  +# EVACUATION="-XX:MaxLiveObjectEvacuationRatio=20%"
   
   # Avoid the RMI-induced Full GCs to run too frequently -- once every ten minutes
   # should be more than enough:
  @@ -73,6 +73,8 @@
   # Finally, some tracing to help in case things go astray:
   DEBUG="-verbose:gc -XX:+PrintTenuringDistribution"
   
  -ARGS="$HEAP $NEW $SURVIVOR $TENURING $EVACUATION $RMIGC $PERM $DEBUG"
  +SERVER="-server"
   
  -java $ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"
  +ARGS="$SERVER $HEAP $NEW $SURVIVOR $TENURING $EVACUATION $RMIGC $PERM $DEBUG"
  +
  +/usr/java/j2sdk1.4.2_05/jre/bin/java $ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"
  
  
  
  1.1  jakarta-jmeter/xdocs/extending/notes_on_extending.txt
  
  Index: notes_on_extending.txt
  ===
  Making a TestBean Plugin For JMeter
  
  This component will be a CSV file reading element that will let users easily vary 
their input 
  data using csv files.
  
  1. Pick a package and make three files:
- [ComponentName].java (CSVDataSet.java)
- [ComponentName]BeanInfo.java (CSVDataSetBeanInfo.java)
- [ComponentName]Resources.properties (CSVDataSetResources.properties)

  2. CSVDataSet.java must implement the TestBean interface.  In addition, it will 
extend 
  AbstractTestElement, and implement PreProcessor, TestListener and 
LoopIterationListener.
- TestBean is a marker interface, so there are no methods to implement.
  
  3. CSVDataSetBeanInfo.java should extend org.apache.jmeter.testbeans.BeanInfoSupport
- create a zero-parameter constructor in which we call super(CSVDataSet.class);
- we'll come back to this.
  
  4. CSVDataSetResources.properties - blank for now
  
  5. Implement your special logic for you plugin class.  
- The CSVDataSet will read a single CSV file and will store the values it 
finds into
JMeter's running context.  The user will define the file, define the variable 
names for
each "column".  The CSVDataSet will open the file when the test starts, and 
close it
when the test ends (thus we implement TestListener).  The CSVDataSet will 
update the
contents of the variables for every test thread, and for each iteration 
through its
parent controller, by reading new lines in the file.  When we reach the end of 
the file,
we'll start again at the beginning.

- When implementing a TestBean, pay careful attention to your properties.  
These
properties will become the basis of a gui form by which users will configure 
the CSVDataSet
element.

- Your element will be cloned by JMeter when the test starts.  Each thread 
will get it's own instance.  However, you will
have a chance to control how the cloning is done - we'll be taking advantage 
of this for CSVDataSet (since we don't want to open the file X number of times from X 
number of threads).

a. Properties: filename, variableNames.  With public getters and setters.
- filename is self-explanatory, it will hold the name of the CSV file 
we'll read
- variableNames is a String which will allow a user to enter the names 
of 
the variables we'll ass

svn commit: r697271 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java

2008-09-19 Thread sebb 
Author: sebb
Date: Fri Sep 19 15:34:57 2008
New Revision: 697271

URL: http://svn.apache.org/viewvc?rev=697271&view=rev
Log:
Minor tidyup

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=697271&r1=697270&r2=697271&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Fri Sep 19 15:34:57 2008
@@ -18,7 +18,6 @@
 
 package org.apache.jmeter.modifiers;
 
-import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 
@@ -32,10 +31,12 @@
 import org.apache.jmeter.threads.JMeterVariables;
 
 /**
- * Provides a counter per-thread/user or globally
- * The long value can be
+ * Provides a counter per-thread(user) or per-thread group.
  */
-public class CounterConfig extends AbstractTestElement implements 
Serializable, LoopIterationListener, NoThreadClone {
+public class CounterConfig extends AbstractTestElement 
+implements Serializable, LoopIterationListener, NoThreadClone {
+
+private static final long serialVersionUID = 233L;
 
 private final static String START = "CounterConfig.start"; // $NON-NLS-1$
 
@@ -69,7 +70,7 @@
 init();
 }
 
-private Object readResolve() throws ObjectStreamException{
+private Object readResolve(){
 init();
 return this;
 }



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

svn commit: r701742 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

2008-10-04 Thread sebb 
Author: sebb
Date: Sat Oct  4 18:34:00 2008
New Revision: 701742

URL: http://svn.apache.org/viewvc?rev=701742&view=rev
Log:
Make lock a simple Object (was Integer(0) !)

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=701742&r1=701741&r2=701742&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 Sat Oct  4 18:34:00 2008
@@ -51,7 +51,7 @@
  * The lock ensures that all the variables are processed together, which is
  * important for functions such as __CSVRead and _StringFromFile.
  */
-private Integer lock = new Integer(0);
+private Object lock = new Object();
 
 public CollectionProperty getNames() {
 return (CollectionProperty) getProperty(NAMES);



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

svn commit: r701903 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

2008-10-05 Thread sebb 
Author: sebb
Date: Sun Oct  5 16:56:49 2008
New Revision: 701903

URL: http://svn.apache.org/viewvc?rev=701903&view=rev
Log:
Object is not serializable

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=701903&r1=701902&r2=701903&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 Sun Oct  5 16:56:49 2008
@@ -51,7 +51,7 @@
  * The lock ensures that all the variables are processed together, which is
  * important for functions such as __CSVRead and _StringFromFile.
  */
-private Object lock = new Object();
+private transient Object lock = new Object();
 
 public CollectionProperty getNames() {
 return (CollectionProperty) getProperty(NAMES);



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

svn commit: r714000 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

2008-11-14 Thread sebb 
Author: sebb
Date: Fri Nov 14 05:33:25 2008
New Revision: 714000

URL: http://svn.apache.org/viewvc?rev=714000&view=rev
Log:
Ensure lock object is created on deserialisation

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=714000&r1=713999&r2=714000&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 Fri Nov 14 05:33:25 2008
@@ -37,6 +37,8 @@
 public class UserParameters extends AbstractTestElement implements 
Serializable, PreProcessor, LoopIterationListener {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
+private static final long serialVersionUID = 233L;
+
 public static final String NAMES = "UserParameters.names";// $NON-NLS-1$
 
 public static final String THREAD_VALUES = 
"UserParameters.thread_values";// $NON-NLS-1$
@@ -53,6 +55,11 @@
  */
 private transient Object lock = new Object();
 
+private Object readResolve(){ // Lock object must exist
+lock = new Object();
+return this;
+}
+
 public CollectionProperty getNames() {
 return (CollectionProperty) getProperty(NAMES);
 }



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

svn commit: r398043 - in /jakarta/jmeter/branches/rel-2-1: src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/modifiers/gui/ src/core/org/apache/jmeter/resources/ xdocs/ xdoc

2006-04-28 Thread sebb 
Author: sebb
Date: Fri Apr 28 17:18:11 2006
New Revision: 398043

URL: http://svn.apache.org/viewcvs?rev=398043&view=rev
Log:
Allow Counter value to be formatted

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-1/xdocs/images/screenshots/counter.png
jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=398043&r1=398042&r2=398043&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Fri Apr 28 17:18:11 2006
@@ -18,6 +18,7 @@
 package org.apache.jmeter.modifiers;
 
 import java.io.Serializable;
+import java.text.DecimalFormat;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
@@ -27,26 +28,34 @@
 import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
 
 /**
- * @version $Revision$
+ * Provides a counter per-thread/user or globally
+ * The long value can be 
  */
 public class CounterConfig extends AbstractTestElement implements 
Serializable, LoopIterationListener, NoThreadClone {
-   private static Logger log = LoggingManager.getLoggerForClass();
 
-   public final static String START = "CounterConfig.start";
+   public final static String START = "CounterConfig.start"; // $NON-NLS-1$
 
-   public final static String END = "CounterConfig.end";
+   public final static String END = "CounterConfig.end"; // $NON-NLS-1$
 
-   public final static String INCREMENT = "CounterConfig.incr";
+   public final static String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
 
-   public final static String PER_USER = "CounterConfig.per_user";
+   private final static String FORMAT = "CounterConfig.format"; // 
$NON-NLS-1$
 
-   public final static String VAR_NAME = "CounterConfig.name";
+public final static String PER_USER = "CounterConfig.per_user"; // 
$NON-NLS-1$
 
-   private long globalCounter = -1;
+   public final static String VAR_NAME = "CounterConfig.name"; // 
$NON-NLS-1$
+
+   // This class is not cloned per thread, so this is shared
+   private long globalCounter = Long.MIN_VALUE;
+
+// Used for per-thread/user numbers
+private ThreadLocal perTheadNumber = new ThreadLocal() {
+protected synchronized Object initialValue() {
+return new Long(getStart());
+}
+};
 
/**
 * @see LoopIterationListener#iterationStart(LoopIterationEvent)
@@ -56,30 +65,36 @@
JMeterVariables variables = 
JMeterContextService.getContext().getVariables();
long start = getStart(), end = getEnd(), increment = 
getIncrement();
if (!isPerUser()) {
-   if (globalCounter == -1 || globalCounter > end) {
+   if (globalCounter == Long.MIN_VALUE || globalCounter > 
end) {
globalCounter = start;
}
-   variables.put(getVarName(), 
Long.toString(globalCounter));
+   variables.put(getVarName(), 
formatNumber(globalCounter));
globalCounter += increment;
} else {
-   String value = variables.get(getVarName());
-   if (value == null) {
-   variables.put(getVarName(), 
Long.toString(start));
-   } else {
-   try {
-   long current = Long.parseLong(value);
-   current += increment;
-   if (current > end) {
-   current = start;
-   }
-   variables.put(getVarName(), 
Long.toString(current));
-

svn commit: r713460 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java

2008-11-12 Thread sebb 
Author: sebb
Date: Wed Nov 12 11:20:56 2008
New Revision: 713460

URL: http://svn.apache.org/viewvc?rev=713460&view=rev
Log:
Use a customised HeaderAsPropertyRenderer to deal with resource names that have 
a suffix.

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=713460&r1=713459&r2=713460&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
 Wed Nov 12 11:20:56 2008
@@ -36,6 +36,7 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.table.TableCellEditor;
 
+import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
 import org.apache.jmeter.gui.util.PowerTableModel;
 import org.apache.jmeter.gui.util.VerticalPanel;
 import org.apache.jmeter.modifiers.UserParameters;
@@ -48,9 +49,12 @@
 import org.apache.log.Logger;
 
 public class UserParametersGui extends AbstractPreProcessorGui {
+
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private String THREAD_COLUMNS_PREFIX = JMeterUtils.getResString("user") + 
"_"; // $NON-NLS-1$ $NON-NLS-2$
+private static final String NAME_COL_RESOURCE = "name"; // $NON-NLS-1$
+private static final String USER_COL_RESOURCE = "user"; // $NON-NLS-1$
+private static final String UNDERSCORE = "_"; // $NON-NLS-1$
 
 private JTable paramTable;
 
@@ -84,7 +88,7 @@
 }
 int count = 2;
 while (iter.hasNext()) {
-String colName = THREAD_COLUMNS_PREFIX + count;
+String colName = getUserColName(count);
 tableModel.addNewColumn(colName, String.class);
 tableModel.setColumnData(count, (List) 
iter.next().getObjectValue());
 count++;
@@ -111,18 +115,18 @@
 if (paramTable.isEditing()) {
 paramTable.getCellEditor().stopCellEditing();
 }
-((UserParameters) params).setNames(new 
CollectionProperty(UserParameters.NAMES, tableModel
-.getColumnData(JMeterUtils.getResString("name"; // 
$NON-NLS-1$
+UserParameters userParams = ((UserParameters) params);
+userParams.setNames(new CollectionProperty(UserParameters.NAMES, 
tableModel.getColumnData(NAME_COL_RESOURCE)));
 CollectionProperty threadLists = new 
CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList());
-log.debug("making threadlists from gui = " + threadLists);
-for (int x = 1; x < tableModel.getColumnCount(); x++) {
-threadLists.addItem(tableModel.getColumnData(THREAD_COLUMNS_PREFIX 
+ x));
-log.debug("Adding column to threadlist: " + 
tableModel.getColumnData(THREAD_COLUMNS_PREFIX + x));
+log.debug("making threadlists from gui");
+for (int col = 1; col < tableModel.getColumnCount(); col++) {
+threadLists.addItem(tableModel.getColumnData(getUserColName(col)));
+log.debug("Adding column to threadlist: " + 
tableModel.getColumnData(getUserColName(col)));
 log.debug("Threadlists now = " + threadLists);
 }
 log.debug("In the end, threadlists = " + threadLists);
-((UserParameters) params).setThreadLists(threadLists);
-((UserParameters) 
params).setPerIteration(perIterationCheck.isSelected());
+userParams.setThreadLists(threadLists);
+userParams.setPerIteration(perIterationCheck.isSelected());
 super.configureTestElement(params);
 }
 
@@ -134,9 +138,25 @@
 
 initTableModel();
 paramTable.setModel(tableModel);
+HeaderAsPropertyRenderer defaultRenderer = new 
HeaderAsPropertyRenderer(){
+protected String getText(Object value, int row, int column) {
+if (column >= 1){ // Don't process the NAME column
+String val = value.toString();
+if (val.startsWith(USER_COL_RESOURCE+UNDERSCORE)){
+return 
JMeterUtils.getResString(USER_COL_RESOURCE)+val.substring(val.indexOf(UNDERSCORE));
+}
+}
+return super.getText(value, row, column);
+}
+};
+paramTable.getTableHeader().setDefaultRenderer(defaultRenderer);
 perIterationCheck.setSelected(false);
 }
 
+private String getUserColName(int user){
+return USER_COL_RESOURCE+UNDERSCORE+user;
+}
+
 private void init() {
 setBorde

DO NOT REPLY [Bug 29884] - modifiers not working with the new jakarta commons http client

2004-07-02 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=29884>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29884

modifiers not working with the new jakarta commons http client





--- Additional Comments From [EMAIL PROTECTED]  2004-07-02 14:04 ---
Created an attachment (id=12013)
Fixes the problem.

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

DO NOT REPLY [Bug 29884] - modifiers not working with the new jakarta commons http client

2004-07-02 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=29884>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29884

modifiers not working with the new jakarta commons http client

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |ASSIGNED



--- Additional Comments From [EMAIL PROTECTED]  2004-07-03 02:10 ---
Thanks for the report and the patch, which has been applied to Rel 2.0 and the 
main CVS.

Leaving the Bug open as other areas of JMeter need to be updated to deal with 
the new HTTP Sampler, for example the Proxy Server. I'm working on those.

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

DO NOT REPLY [Bug 29884] - modifiers not working with the new jakarta commons http client

2005-09-06 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://issues.apache.org/bugzilla/show_bug.cgi?id=29884


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2005-09-07 02:34 ---
Original bug has been fixed.

Other related stuff transferred to bug 36531

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 29884] New: - modifiers not working with the new jakarta commons http client

2004-07-02 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=29884>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29884

modifiers not working with the new jakarta commons http client

   Summary: modifiers not working with the new jakarta commons http
client
   Product: JMeter
   Version: Nightly (Please specify date)
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: HTTP
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Modifiers in the package org.apache.jmeter.protocol.http.modifier aren't generic
enough to run with the new jakarta commons http sampler. It's easily seen, if
you try to use them with the new http request sampler alpha.

I'll provide a patch, which fixes that. The following classes are affected:
AnchorModifier.java, HtmlParsingUtils.java, ParamModifier.java,
URLRewritingModifier.java, UserParameterModifier.java.

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

svn commit: r586484 - in /jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers: CounterConfig.java gui/CounterConfigGui.java

2007-10-19 Thread sebb 
Author: sebb
Date: Fri Oct 19 07:42:56 2007
New Revision: 586484

URL: http://svn.apache.org/viewvc?rev=586484&view=rev
Log:
Privatise constants/use access methods from GUI

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=586484&r1=586483&r2=586484&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Fri Oct 19 07:42:56 2007
@@ -37,11 +37,11 @@
  */
 public class CounterConfig extends AbstractTestElement implements 
Serializable, LoopIterationListener, NoThreadClone {
 
-   public final static String START = "CounterConfig.start"; // $NON-NLS-1$
+   private final static String START = "CounterConfig.start"; // 
$NON-NLS-1$
 
-   public final static String END = "CounterConfig.end"; // $NON-NLS-1$
+   private final static String END = "CounterConfig.end"; // $NON-NLS-1$
 
-   public final static String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
+   private final static String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
 
private final static String FORMAT = "CounterConfig.format"; // 
$NON-NLS-1$
 
@@ -123,6 +123,10 @@
return getPropertyAsLong(START);
}
 
+   public String getStartAsString() {
+   return getPropertyAsString(START);
+   }
+
public void setEnd(long end) {
setProperty(new LongProperty(END, end));
}
@@ -143,6 +147,10 @@
return propertyAsLong;
}
 
+   public String getEndAsString(){
+   return getPropertyAsString(END);
+   }
+
public void setIncrement(long inc) {
setProperty(new LongProperty(INCREMENT, inc));
}
@@ -153,6 +161,10 @@
 
public long getIncrement() {
return getPropertyAsLong(INCREMENT);
+   }
+
+   public String getIncrementAsString() {
+   return getPropertyAsString(INCREMENT);
}
 
public void setIsPerUser(boolean isPer) {

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?rev=586484&r1=586483&r2=586484&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 Fri Oct 19 07:42:56 2007
@@ -88,9 +88,9 @@
public void configure(TestElement element) {
super.configure(element);
CounterConfig config = (CounterConfig) element;
-   
startField.setText(config.getPropertyAsString(CounterConfig.START));
-   endField.setText(config.getPropertyAsString(CounterConfig.END));
-   
incrField.setText(config.getPropertyAsString(CounterConfig.INCREMENT));
+   startField.setText(config.getStartAsString());
+   endField.setText(config.getEndAsString());
+   incrField.setText(config.getIncrementAsString());
 formatField.setText(config.getFormat());
varNameField.setText(config.getVarName());
perUserField.setSelected(config.isPerUser());



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

svn commit: r671937 - in /jakarta/jmeter/trunk/src/components/org/apache/jmeter: extractor/BSFPostProcessorResources.properties modifiers/BSFPreProcessorResources.properties

2008-06-26 Thread sebb 
Author: sebb
Date: Thu Jun 26 09:36:07 2008
New Revision: 671937

URL: http://svn.apache.org/viewvc?rev=671937&view=rev
Log:
Correct the list of objects actually defined

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties?rev=671937&r1=671936&r2=671937&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
 Thu Jun 26 09:36:07 2008
@@ -17,7 +17,7 @@
 scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, 
jexl)
 scriptLanguage.displayName=Language
 scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, 
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log OUT)
+scripting.displayName=Script (variables: ctx vars props prev sampler log Label 
Filename Parameters args[] OUT)
 script.displayName=Script
 script.shortDescription=Script in the appropriate BSF language
 parameterGroup.displayName=Parameters to be passed to script (=> String 
Parameters and String []args)

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties?rev=671937&r1=671936&r2=671937&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
 Thu Jun 26 09:36:07 2008
@@ -17,7 +17,7 @@
 scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, 
jexl)
 scriptLanguage.displayName=Language
 scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, 
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log OUT)
+scripting.displayName=Script (variables: ctx vars props prev sampler log Label 
Filename Parameters args[] OUT)
 script.displayName=Script
 script.shortDescription=Script in the appropriate BSF language
 parameterGroup.displayName=Parameters to be passed to script (=> String 
Parameters and String []args)



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

svn commit: r829144 - in /jakarta/jmeter/trunk/src/components/org/apache/jmeter: extractor/JSR223PostProcessor.java modifiers/JSR223PreProcessor.java

2009-10-23 Thread sebb 
Author: sebb
Date: Fri Oct 23 17:49:25 2009
New Revision: 829144

URL: http://svn.apache.org/viewvc?rev=829144&view=rev
Log:
Unused imports
Tidy error handling

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java?rev=829144&r1=829143&r2=829144&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
 Fri Oct 23 17:49:25 2009
@@ -37,19 +37,14 @@
 
 public void process() {

-   ScriptEngineManager sem = null;
-   try {
-   sem = getManager();
-   } catch(Exception e) {
-   e.printStackTrace();
-   }
-   
-   if(sem == null) { return; }
-   try {
+try {
+   ScriptEngineManager sem = getManager();
+   if(sem == null) { return; }
processFileOrScript(sem);
-   } catch (Exception e) {
-   e.printStackTrace();
+} catch (ScriptException e) {
+log.warn("Problem in JSR223 script "+e);
+   } catch (IOException e) {
+log.warn("Problem in JSR223 script "+e);
}
-
 }
 }

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java?rev=829144&r1=829143&r2=829144&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
 Fri Oct 23 17:49:25 2009
@@ -18,7 +18,10 @@
 
 package org.apache.jmeter.modifiers;
 
+import java.io.IOException;
+
 import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 
 import org.apache.jmeter.processor.PreProcessor;
 import org.apache.jmeter.testbeans.TestBean;
@@ -38,8 +41,10 @@
ScriptEngineManager sem = getManager();
if(sem == null) { return; }
processFileOrScript(sem);
-} catch (Exception e) {
-   log.warn("Problem in JSR223 script " + e);
+} catch (ScriptException e) {
+log.warn("Problem in JSR223 script "+e);
+} catch (IOException e) {
+log.warn("Problem in JSR223 script "+e);
}
 }
 }



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

svn commit: r391726 - /jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

2006-04-05 Thread sebb 
Author: sebb
Date: Wed Apr  5 12:09:59 2006
New Revision: 391726

URL: http://svn.apache.org/viewcvs?rev=391726&view=rev
Log:
Ensure the transient object is recreated by the server

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?rev=391726&r1=391725&r2=391726&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 Wed Apr  5 12:09:59 2006
@@ -45,11 +45,23 @@
 // can be specified in jmeter.properties
 private static final String INIT_FILE = "beanshell.preprocessor.init"; 
//$NON-NLS-1$
 
-public BeanShellPreProcessor() throws ClassNotFoundException {
+public BeanShellPreProcessor() {
 super();
-bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
+init();
 }
 
+   private void init() {
+   try {
+   bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
+   } catch (ClassNotFoundException e) {
+   log.error(e.getLocalizedMessage());
+   }
+   }
+
+private Object readResolve() {
+   init();
+   return this;
+}
 
 public void process(){
 JMeterContext jmctx = JMeterContextService.getContext();



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

svn commit: r398125 - /jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java

2006-04-29 Thread sebb 
Author: sebb
Date: Sat Apr 29 05:06:30 2006
New Revision: 398125

URL: http://svn.apache.org/viewcvs?rev=398125&view=rev
Log:
Don't serialise ThreadLocal

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=398125&r1=398124&r2=398125&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Sat Apr 29 05:06:30 2006
@@ -51,7 +51,7 @@
private long globalCounter = Long.MIN_VALUE;
 
 // Used for per-thread/user numbers
-private ThreadLocal perTheadNumber = new ThreadLocal() {
+transient private ThreadLocal perTheadNumber = new ThreadLocal() {
 protected synchronized Object initialValue() {
 return new Long(getStart());
 }



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

svn commit: r453054 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java

2006-10-04 Thread sebb 
Author: sebb
Date: Wed Oct  4 15:40:45 2006
New Revision: 453054

URL: http://svn.apache.org/viewvc?view=rev&rev=453054
Log:
Fix NPE in Remote mode (transient field was not set up)

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java?view=diff&rev=453054&r1=453053&r2=453054
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Wed Oct  4 15:40:45 2006
@@ -17,6 +17,7 @@
 
 package org.apache.jmeter.modifiers;
 
+import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 
@@ -51,12 +52,26 @@
private long globalCounter = Long.MIN_VALUE;
 
 // Used for per-thread/user numbers
-transient private ThreadLocal perTheadNumber = new ThreadLocal() {
-protected synchronized Object initialValue() {
-return new Long(getStart());
-}
-};
+transient private ThreadLocal perTheadNumber;
 
+private void init() {
+perTheadNumber = new ThreadLocal() {
+protected synchronized Object initialValue() {
+return new Long(getStart());
+}
+};
+}
+
+
+public CounterConfig() {
+super();
+init();
+}
+
+private Object readResolve() throws ObjectStreamException{
+init();
+return this;
+}
/**
 * @see LoopIterationListener#iterationStart(LoopIterationEvent)
 */



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

svn commit: r818343 - in /jakarta/jmeter/trunk/src/components/org/apache/jmeter: assertions/ extractor/ modifiers/gui/ visualizers/

2009-09-23 Thread sebb 
Author: sebb
Date: Thu Sep 24 02:00:56 2009
New Revision: 818343

URL: http://svn.apache.org/viewvc?rev=818343&view=rev
Log:
Enclose log parameter calculations in if (log.isDebugEnabled()) block

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=818343&r1=818342&r2=818343&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
 Thu Sep 24 02:00:56 2009
@@ -87,14 +87,16 @@
 // create parser
 Tidy tidy = null;
 try {
-log.debug("HTMLAssertions.getResult(): Setup tidy ...");
-log.debug("doctype: " + getDoctype());
-log.debug("errors only: " + isErrorsOnly());
-log.debug("error threshold: " + getErrorThreshold());
-log.debug("warning threshold: " + getWarningThreshold());
-log.debug("html mode: " + isHTML());
-log.debug("xhtml mode: " + isXHTML());
-log.debug("xml mode: " + isXML());
+if (log.isDebugEnabled()){
+log.debug("HTMLAssertions.getResult(): Setup tidy ...");
+log.debug("doctype: " + getDoctype());
+log.debug("errors only: " + isErrorsOnly());
+log.debug("error threshold: " + getErrorThreshold());
+log.debug("warning threshold: " + getWarningThreshold());
+log.debug("html mode: " + isHTML());
+log.debug("xhtml mode: " + isXHTML());
+log.debug("xml mode: " + isXML());
+}
 tidy = new Tidy();
 tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
 tidy.setQuiet(false);
@@ -106,13 +108,13 @@
 } else if (isXML()) {
 tidy.setXmlTags(true);
 }
-log.debug("err file: " + getFilename());
 tidy.setErrfile(getFilename());
 
 if (log.isDebugEnabled()) {
+log.debug("err file: " + getFilename());
 log.debug("getParser : tidy parser created - " + tidy);
+log.debug("HTMLAssertions.getResult(): Tidy instance 
created!");
 }
-log.debug("HTMLAssertions.getResult(): Tidy instance created!");
 
 } catch (Exception e) {//TODO replace with proper Exception
 log.error("Unable to instantiate tidy parser", e);
@@ -137,10 +139,10 @@
 Node node = tidy.parse(new 
ByteArrayInputStream(inResponse.getResponseData()), os);
 if (log.isDebugEnabled()) {
 log.debug("node : " + node);
+log.debug("End   : parse");
+log.debug("HTMLAssertions.getResult(): parsing with tidy 
done!");
+log.debug("Output: " + os.toString());
 }
-log.debug("End   : parse");
-log.debug("HTMLAssertions.getResult(): parsing with tidy done!");
-log.debug("Output: " + os.toString());
 
 // write output to file
 writeOutput(errbuf.toString());
@@ -148,8 +150,10 @@
 // evaluate result
 if ((tidy.getParseErrors() > getErrorThreshold())
 || (!isErrorsOnly() && (tidy.getParseWarnings() > 
getWarningThreshold( {
-log.debug("HTMLAssertions.getResult(): errors/warnings 
detected:");
-log.debug(errbuf.toString());
+if (log.is

DO NOT REPLY [Bug 48348] JDBC Request Results clears HTTP URL Re-writing Modifiers and other variables

2009-12-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48348

eware0...@yahoo.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from eware0...@yahoo.com 2009-12-08 08:30:31 UTC ---
This report can be deleted. It is resolved. Our application has some
architectural features that consume the org.apache.struts.taglib.html.TOKEN and
prevents further processing.  Bug marked as resolved.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 48348] JDBC Request Results clears HTTP URL Re-writing Modifiers and other variables

2009-12-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48348

Sebb  changed:

   What|Removed |Added

 Resolution|FIXED   |INVALID

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r385618 - in /jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter: extractor/ modifiers/

2006-03-13 Thread sebb 
Author: sebb
Date: Mon Mar 13 10:59:40 2006
New Revision: 385618

URL: http://svn.apache.org/viewcvs?rev=385618&view=rev
Log:
Initial stubs for additional BeanShell test elements
Note: they do nothing except fail at present

Added:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorResources.properties

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifier.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierResources.properties

Added: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java?rev=385618&view=auto
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java
 (added)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java
 Mon Mar 13 10:59:40 2006
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *  
+ */
+
+package org.apache.jmeter.extractor;
+
+import java.io.Serializable;
+
+import org.apache.jmeter.processor.PostProcessor;
+import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.threads.JMeterContext;
+import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jmeter.util.BeanShellInterpreter;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JMeterException;
+import org.apache.log.Logger;
+
+public class BeanShellExtractor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
+private static final Logger log = LoggingManager.getLoggerForClass();
+
+private static final long serialVersionUID = 2;
+
+private String script;
+
+transient private BeanShellInterpreter bshInterpreter = null;
+
+// can be specified in jmeter.properties
+private static final String INIT_FILE = "beanshell.timer.init"; 
//$NON-NLS-1$
+
+public BeanShellExtractor() throws ClassNotFoundException {
+super();
+bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
+}
+
+/*
+* (non-Javadoc)
+* 
+* @see org.apache.jmeter.timers.Timer#delay()
+*/
+ long xdelay() {
+String ret="";
+try {
+// Add variables for access to context and variables
+JMeterContext jmctx = JMeterContextService.getContext();
+JMeterVariables vars = jmctx.getVariables();
+bshInterpreter.set("ctx", jmctx);//$NON-NLS-1$
+bshInterpreter.set("vars", vars);//$NON-NLS-1$
+ret = bshInterpreter.eval(script).toString();
+} catch (JMeterException e) {
+log.warn("Problem in BeanShell script "+e);
+}
+   return Long.decode(ret).longValue();
+   }
+
+   public Object clone() {
+BeanShellExtractor o = (BeanShellExtractor) super.clone();
+o.script = script;
+   return o;
+   }
+
+public String getScript(){
+return script;
+}
+
+public void setScript(String s){
+script=s;
+}
+
+   public void process() {
+   throw new Error("Not yet implemented");
+   }
+}

Added: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorBeanInfo.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorBeanInfo.java?rev=385618&view=auto
==

svn commit: r385855 - in /jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter: extractor/ modifiers/

2006-03-14 Thread sebb 
Author: sebb
Date: Tue Mar 14 10:57:55 2006
New Revision: 385855

URL: http://svn.apache.org/viewcvs?rev=385855&view=rev
Log:
Rename BSH test elements. Include basic process() code.
TODO: add file handling and script arguments

Added:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorResources.properties

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifier.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
  - copied, changed from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierResources.properties
Removed:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractorResources.properties

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifier.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellModifierResources.properties

Copied: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (from r385618, 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java)
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?p2=jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java&p1=jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java&r1=385618&r2=385855&rev=385855&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellExtractor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Tue Mar 14 10:57:55 2006
@@ -20,6 +20,7 @@
 import java.io.Serializable;
 
 import org.apache.jmeter.processor.PostProcessor;
+import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.threads.JMeterContext;
@@ -31,7 +32,7 @@
 import org.apache.jorphan.util.JMeterException;
 import org.apache.log.Logger;
 
-public class BeanShellExtractor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
+public class BeanShellPostProcessor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
 private static final long serialVersionUID = 2;
@@ -41,35 +42,36 @@
 transient private BeanShellInterpreter bshInterpreter = null;
 
 // can be specified in jmeter.properties
-private static final String INIT_FILE = "beanshell.timer.init"; 
//$NON-NLS-1$
+private static final String INIT_FILE = "beanshell.postprocessor.init"; 
//$NON-NLS-1$
 
-public BeanShellExtractor() throws ClassNotFoundException {
+public BeanShellPostProcessor() throws ClassNotFoundException {
 super();
 bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
 }
 
-/*
-* (non-Javadoc)
-* 
-* @see org.apache.jmeter.timers.Timer#delay()
-*/
- long xdelay() {
-String ret="";
+

svn commit: r535563 - /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

2007-05-05 Thread sebb 
Author: sebb
Date: Sat May  5 13:57:50 2007
New Revision: 535563

URL: http://svn.apache.org/viewvc?view=rev&rev=535563
Log:
Fix GUI alignment

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?view=diff&rev=535563&r1=535562&r2=535563
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 Sat May  5 13:57:50 2007
@@ -27,9 +27,6 @@
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.apache.jorphan.gui.layout.VerticalLayout;
 
-/**
- * @version $Revision$ on $Date$
- */
 public class CounterConfigGui extends AbstractPreProcessorGui {
private JLabeledTextField startField, incrField, endField, 
varNameField, formatField;
 
@@ -41,7 +38,7 @@
}
 
public String getLabelResource() {
-   return "counter_config_title";
+   return "counter_config_title";//$NON-NLS-1$
}
 
/**
@@ -101,16 +98,14 @@
 
private void init() {
setBorder(makeBorder());
-   setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+   setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
 
-   startField = new 
JLabeledTextField(JMeterUtils.getResString("start") + "  ");// TODO
-   

// proper
-   

// alignment
-   incrField = new 
JLabeledTextField(JMeterUtils.getResString("increment"));
-   endField = new 
JLabeledTextField(JMeterUtils.getResString("max"));
-   varNameField = new 
JLabeledTextField(JMeterUtils.getResString("var_name"));
-formatField = new 
JLabeledTextField(JMeterUtils.getResString("format"));
-   perUserField = new 
JCheckBox(JMeterUtils.getResString("counter_per_user"));
+   startField = new 
JLabeledTextField(JMeterUtils.getResString("start"));//$NON-NLS-1$
+   incrField = new 
JLabeledTextField(JMeterUtils.getResString("increment"));//$NON-NLS-1$
+   endField = new 
JLabeledTextField(JMeterUtils.getResString("max"));//$NON-NLS-1$
+   varNameField = new 
JLabeledTextField(JMeterUtils.getResString("var_name"));//$NON-NLS-1$
+formatField = new 
JLabeledTextField(JMeterUtils.getResString("format"));//$NON-NLS-1$
+   perUserField = new 
JCheckBox(JMeterUtils.getResString("counter_per_user"));//$NON-NLS-1$
 
add(makeTitlePanel());
add(startField);



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

svn commit: r656055 [2/2] - in /jakarta/jmeter/trunk/docs/api/org/apache/jmeter: assertions/ extractor/ modifiers/ util/

2008-05-13 Thread sebb 
Added: 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/modifiers/BSFPreProcessor.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/api/org/apache/jmeter/modifiers/BSFPreProcessor.html?rev=656055&view=auto
==
--- 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/modifiers/BSFPreProcessor.html 
(added)
+++ 
jakarta/jmeter/trunk/docs/api/org/apache/jmeter/modifiers/BSFPreProcessor.html 
Tue May 13 16:23:30 2008
@@ -0,0 +1,294 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+
+
+
+BSFPreProcessor (Apache JMeter API)
+
+
+
+
+
+
+
+function windowTitle()
+{
+parent.document.title="BSFPreProcessor (Apache JMeter API)";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  Overview 
+  Package 
+    Class 
+  Tree 
+  Deprecated 
+  Index 
+  Help 
+  
+
+
+
+Apache JMeter
+
+
+
+
+
+ PREV CLASS 
+ NEXT CLASS
+
+  FRAMES   
+ NO FRAMES   
+ 
+  <!--
+  if(window==top) {
+document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All 
Classes</B></A>');
+  }
+  //-->
+
+
+  All Classes
+
+
+
+
+
+
+  SUMMARY: NESTED | FIELD | CONSTR | METHOD
+
+DETAIL: FIELD | CONSTR | METHOD
+
+
+
+
+
+
+
+
+
+org.apache.jmeter.modifiers
+
+Class BSFPreProcessor
+
+http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html"; 
title="class or interface in java.lang">java.lang.Object
+  org.apache.jmeter.testelement.AbstractTestElement
+  org.apache.jmeter.util.BSFTestElement
+  org.apache.jmeter.modifiers.BSFPreProcessor
+
+
+All Implemented Interfaces: http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Cloneable.html"; 
title="class or interface in java.lang">Cloneable, PreProcessor, http://java.sun.com/j2se/1.4.2/docs/api/java/io/Serializable.html"; 
title="class or interface in java.io">Serializable, TestBean, TestElement
+
+
+
+public class BSFPreProcessorextends BSFTestElementimplements http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Cloneable.html"; 
title="class or interface in java.lang">Cloneable, PreProcessor, TestBean
+
+
+
+See Also:Serialized
 Form
+
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+
+ 
+
+
+Fields inherited from interface org.apache.jmeter.testelement.TestElement
+
+
+COMMENTS,
 ENABLED,
 GUI_CLASS,
 NAME,
 TEST_CLASS
+
+
+ 
+
+
+
+
+
+
+Constructor Summary
+
+
+BSFPreProcessor()
+
+
+   
+
+
+ 
+
+
+
+
+
+
+Method Summary
+
+
+
+ void
+process()
+
+
+   
+
+
+ 
+
+
+Methods inherited from class org.apache.jmeter.util.BSFTestElement
+
+
+clone,
 getFilename,
 getManager,
 getParameters,
 getScript,
 getScriptLanguage,
 initManager,
 processFileOrScript,
 setFilename,
 setParameters,
 setScript,
 setScriptLanguage
+
+
+ 
+
+
+Methods inherited from class org.apache.jmeter.testelement.AbstractTestElement
+
+
+addProperty,
 addTestElement,
 canRemove,
 clear,
 clearTemporary,
 emptyTemporary,
 equals,
 getComment, getName,
 getProperty,
 getPropertyAsBoolean,
 getPropertyAsBoolean, getPropertyAsDouble,
 getPropertyAsFloat,
 getPropertyAsInt,
 getPropertyAsLong,
 getPropertyAsString,
 getPropertyAsString, getThreadContext,
 getThreadName,
 hashCode,
 isEnabled,
 isRunningVersion,
 isTemporary,
 logProperties,
 mergeIn,
 propertyIterator,
 recoverRunningVersion,
 removeProperty,
 setComment,
 setName, setProperty,
 setProperty, setProperty, setProperty, setRunningVersion,
 setTemporary,
 setThreadContext, setThreadName,
 traverse,
 traverseCollection, 
traverseMap, traversePropert
 y
+
+
+ 
+
+
+Methods inherited from class java.lang.http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html"; 
title="class or interface in java.lang">Object
+
+
+http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#finalize()" 
title="class or interface in java.lang">finalize, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#getClass()" 
title="class or interface in java.lang">getClass, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#notify()" 
title="class or interface in java.lang">notify, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#notifyAll()"
 title="class or interface in java.lang">notifyAll, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#toString()" 
title="class or interface in java.lang">toString, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#wait()" 
title="class or interface in java.lang">wait, http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html#wait(long)" 
title="class or interface in java.lang">wait, http://java.sun.com/j2se/
 1.4.2/docs/api/java/lang/Object.html#wait(long, int)" title="class or 
interface in java.lang">wait
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+Constru

DO NOT REPLY [Bug 48348] New: JDBC Request Results clears HTTP URL Re-writing Modifiers and other variables

2009-12-07 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48348

   Summary: JDBC Request Results clears HTTP URL Re-writing
Modifiers and other variables
   Product: JMeter
   Version: 2.3.4
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: HTTP
AssignedTo: jmeter-dev@jakarta.apache.org
ReportedBy: eware0...@yahoo.com


The scripts I've developed use HTTP URL Re-writing Modifiers  to capture
request-specific attributes generated by the application being tested,
specifically org.apache.struts.taglib.html.TOKEN. The modifiers are defined at
the Thread level.  A JDBC Request is inserted as a peer after an HTTP sample.
The JDBC Request is an query (SQL Server 2008) that successfully extracts a
backend data element and creates a jmeter variable that is needed in a
subsequent HTTP Request.  However, where ever the JDBC Request is inserted the
subsequent HTTP Request fails. Viewing the failed Request shows that the
Re-writing Modifiers are set to null, while database variable was properly
inserted into the failed request,

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

svn commit: r388915 - in /jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter: extractor/ modifiers/ timers/ visualizers/

2006-03-26 Thread sebb 
Author: sebb
Date: Sun Mar 26 07:29:58 2006
New Revision: 388915

URL: http://svn.apache.org/viewcvs?rev=388915&view=rev
Log:
Use TextArea for scripts

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java?rev=388915&r1=388914&r2=388915&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
 Sun Mar 26 07:29:58 2006
@@ -20,6 +20,7 @@
 import java.beans.PropertyDescriptor;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
+import org.apache.jmeter.testbeans.gui.TextAreaEditor;
 
 public class BeanShellPostProcessorBeanInfo extends BeanInfoSupport {
 
@@ -34,6 +35,8 @@
PropertyDescriptor p = property("script");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, "");
+p.setPropertyEditorClass(TextAreaEditor.class);
+
}
 
 }

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java?rev=388915&r1=388914&r2=388915&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java
 Sun Mar 26 07:29:58 2006
@@ -20,6 +20,7 @@
 import java.beans.PropertyDescriptor;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
+import org.apache.jmeter.testbeans.gui.TextAreaEditor;
 
 public class BeanShellPreProcessorBeanInfo extends BeanInfoSupport {
 
@@ -34,6 +35,8 @@
PropertyDescriptor p = property("script");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, "");
+p.setPropertyEditorClass(TextAreaEditor.class);
+
}
 
 }

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java?rev=388915&r1=388914&r2=388915&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java
 Sun Mar 26 07:29:58 2006
@@ -20,6 +20,7 @@
 import java.beans.PropertyDescriptor;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
+import org.apache.jmeter.testbeans.gui.TextAreaEditor;
 
 public class BeanShellTimerBeanInfo extends BeanInfoSupport {
 
@@ -34,6 +35,8 @@
PropertyDescriptor p = property("script");
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, "");
+p.setPropertyEditorClass(TextAreaEditor.class);
+
}
 
 }

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java?rev=388915&r1=388914&r2=388915&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java
 Sun Mar 26 07:29:58 2006
@@ -20,6 +20,7 @@
 import java.beans.PropertyDescriptor;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
+import org.apache.jmeter.testbeans.gui.TextAreaEditor;
 
 public class BeanShellListen

svn commit: r481872 - in /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter: extractor/BeanShellPostProcessor.java modifiers/BeanShellPreProcessor.java

2006-12-03 Thread sebb 
Author: sebb
Date: Sun Dec  3 12:05:14 2006
New Revision: 481872

URL: http://svn.apache.org/viewvc?view=rev&rev=481872
Log:
Better behaviour when BeanShell jar is missing
Update serialVerId

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -35,7 +35,7 @@
 public class BeanShellPostProcessor extends AbstractTestElement implements 
PostProcessor, Serializable, TestBean {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private static final long serialVersionUID = 2;
+private static final long serialVersionUID = 3;
 
 private String script;
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?view=diff&rev=481872&r1=481871&r2=481872
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 Sun Dec  3 12:05:14 2006
@@ -36,7 +36,7 @@
 public class BeanShellPreProcessor extends AbstractTestElement implements 
PreProcessor, Serializable, TestBean {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private static final long serialVersionUID = 2;
+private static final long serialVersionUID = 3;
 
 private String script;
 
@@ -54,7 +54,7 @@
try {
bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
} catch (ClassNotFoundException e) {
-   log.error(e.getLocalizedMessage());
+   log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
}
}
 
@@ -64,6 +64,9 @@
 }
 
 public void process(){
+if (bshInterpreter == null) {
+return;
+}
 JMeterContext jmctx = JMeterContextService.getContext();
 JMeterVariables vars = jmctx.getVariables();
Sampler sam = jmctx.getCurrentSampler();



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

svn commit: r479794 - in /jakarta/jmeter/branches/rel-2-2: src/components/org/apache/jmeter/modifiers/CounterConfig.java xdocs/usermanual/component_reference.xml

2006-11-27 Thread sebb 
Author: sebb
Date: Mon Nov 27 14:46:29 2006
New Revision: 479794

URL: http://svn.apache.org/viewvc?view=rev&rev=479794
Log:
40804 - Change Counter default to max = Long.MAX_VALUE

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java?view=diff&rev=479794&r1=479793&r2=479794
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Mon Nov 27 14:46:29 2006
@@ -130,8 +130,16 @@
setProperty(END, end);
}
 
+/**
+ * 
+ * @return counter upper limit (default Long.MAX_VALUE)
+ */
public long getEnd() {
-   return getPropertyAsLong(END);
+   long propertyAsLong = getPropertyAsLong(END);
+   if (propertyAsLong == 0 && 
"".equals(getProperty(END).getStringValue())) {
+  propertyAsLong = Long.MAX_VALUE;
+   }
+   return propertyAsLong;
}
 
public void setIncrement(long inc) {

Modified: 
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml?view=diff&rev=479794&r1=479793&r2=479794
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml 
(original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml 
Mon Nov 27 14:46:29 2006
@@ -2793,7 +2793,9 @@
 number during the first iteration.
 How much to increment the 
counter by after each
 iteration.
-If the counter exceeds the 
maximum, then it is reset to the Start value.
+If the counter exceeds the 
maximum, then it is reset to the Start value.
+Since version 2.2.1, the default is Long.MAX_VALUE (previously it was 
0).
+
 Optional format, e.g. 000 will 
format as 001, 002 etc. 
 This is passed to DecimalFormat, so any valid formats can be used.
 If there is a problem interpreting the format, then it is ignored.



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

svn commit: r549917 - in /jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter: extractor/BeanShellPostProcessorResources.properties modifiers/BeanShellPreProcessorResources.properties vis

2007-06-22 Thread sebb 
Author: sebb
Date: Fri Jun 22 11:11:42 2007
New Revision: 549917

URL: http://svn.apache.org/viewvc?view=rev&rev=549917
Log:
Correct variable name jmctx => ctx

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties?view=diff&rev=549917&r1=549916&r2=549917
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
 Fri Jun 22 11:11:42 2007
@@ -1,4 +1,4 @@
 displayName=BeanShell PostProcessor
-scripting.displayName=BeanShell (variables: jmctx vars prev data)
+scripting.displayName=BeanShell (variables: ctx vars prev data)
 script.displayName=Script
 script.shortDescription=Beanshell script

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties?view=diff&rev=549917&r1=549916&r2=549917
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
 Fri Jun 22 11:11:42 2007
@@ -1,4 +1,4 @@
 displayName=BeanShell PreProcessor
-scripting.displayName=BeanShell (variables: jmctx vars prev sampler)
+scripting.displayName=BeanShell (variables: ctx vars prev sampler)
 script.displayName=Script
 script.shortDescription=Beanshell script

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties?view=diff&rev=549917&r1=549916&r2=549917
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties
 Fri Jun 22 11:11:42 2007
@@ -1,4 +1,4 @@
 displayName=BeanShell Listener
-scripting.displayName=BeanShell (variables: jmctx vars sampleEvent 
sampleResult)
+scripting.displayName=BeanShell (variables: ctx vars sampleEvent sampleResult)
 script.displayName=Script
 script.shortDescription=Beanshell script



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

svn commit: r378794 - in /jakarta/jmeter/branches/rel-2-1: src/components/org/apache/jmeter/modifiers/CounterConfig.java xdocs/changes.xml xdocs/usermanual/component_reference.xml

2006-02-18 Thread sebb 
Author: sebb
Date: Sat Feb 18 15:16:13 2006
New Revision: 378794

URL: http://svn.apache.org/viewcvs?rev=378794&view=rev
Log:
Bug 36430 - Counter now uses long rather than int to increase the range

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=378794&r1=378793&r2=378794&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Sat Feb 18 15:16:13 2006
@@ -1,6 +1,5 @@
-// $Header$
 /*
- * Copyright 2002-2004 The Apache Software Foundation.
+ * Copyright 2002-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +24,7 @@
 import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.testelement.AbstractTestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jorphan.logging.LoggingManager;
@@ -47,7 +46,7 @@
 
public final static String VAR_NAME = "CounterConfig.name";
 
-   private int globalCounter = -1;
+   private long globalCounter = -1;
 
/**
 * @see LoopIterationListener#iterationStart(LoopIterationEvent)
@@ -55,25 +54,25 @@
public synchronized void iterationStart(LoopIterationEvent event) {
// Cannot use getThreadContext() as not cloned per thread
JMeterVariables variables = 
JMeterContextService.getContext().getVariables();
-   int start = getStart(), end = getEnd(), increment = 
getIncrement();
+   long start = getStart(), end = getEnd(), increment = 
getIncrement();
if (!isPerUser()) {
if (globalCounter == -1 || globalCounter > end) {
globalCounter = start;
}
-   variables.put(getVarName(), 
Integer.toString(globalCounter));
+   variables.put(getVarName(), 
Long.toString(globalCounter));
globalCounter += increment;
} else {
String value = variables.get(getVarName());
if (value == null) {
-   variables.put(getVarName(), 
Integer.toString(start));
+   variables.put(getVarName(), 
Long.toString(start));
} else {
try {
-   int current = Integer.parseInt(value);
+   long current = Long.parseLong(value);
current += increment;
if (current > end) {
current = start;
}
-   variables.put(getVarName(), 
Integer.toString(current));
+   variables.put(getVarName(), 
Long.toString(current));
} catch (NumberFormatException e) {
log.info("Bad number in Counter 
config", e);
}
@@ -81,40 +80,40 @@
}
}
 
-   public void setStart(int start) {
-   setProperty(new IntegerProperty(START, start));
+   public void setStart(long start) {
+   setProperty(new LongProperty(START, start));
}
 
public void setStart(String start) {
setProperty(START, start);
}
 
-   public int getStart() {
-   return getPropertyAsInt(START);
+   public long getStart() {
+   return getPropertyAsLong(START);
}
 
-   public void setEnd(int end) {
-   setProperty(new IntegerProperty(END, end));
+   public void setEnd(long end) {
+   setProperty(new LongProperty(END, end));
}
 
public void setEnd(String end) {
setProperty(END, end);
}
 
-   public int getEnd() {
-   retu

svn commit: r697305 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java src/core/org/apache/jmeter/reporters/gui/SummariserGui.java xdocs/changes.xml

2008-09-19 Thread sebb 
Author: sebb
Date: Fri Sep 19 17:38:20 2008
New Revision: 697305

URL: http://svn.apache.org/viewvc?rev=697305&view=rev
Log:
Counter is a Config item, not PreProcessor
Summariser is a Listener, not a PostProcessor

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?rev=697305&r1=697304&r2=697305&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 Fri Sep 19 17:38:20 2008
@@ -20,14 +20,14 @@
 
 import javax.swing.JCheckBox;
 
+import org.apache.jmeter.config.gui.AbstractConfigGui;
 import org.apache.jmeter.modifiers.CounterConfig;
-import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
 import org.apache.jorphan.gui.layout.VerticalLayout;
 
-public class CounterConfigGui extends AbstractPreProcessorGui {
+public class CounterConfigGui extends AbstractConfigGui {
 private JLabeledTextField startField, incrField, endField, varNameField, 
formatField;
 
 private JCheckBox perUserField;

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java?rev=697305&r1=697304&r2=697305&view=diff
==
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
 Fri Sep 19 17:38:20 2008
@@ -21,17 +21,14 @@
 import java.awt.BorderLayout;
 
 import org.apache.jmeter.reporters.Summariser;
-import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.visualizers.gui.AbstractListenerGui;
 
 /**
- * Create a summariser test element.
- *
- * Note: This is not really a PostProcessor, but that seems to be the closest 
of
- * the existing types.
+ * Create a summariser test element GUI.
  *
  */
-public class SummariserGui extends AbstractPostProcessorGui {
+public class SummariserGui extends AbstractListenerGui {
 
 public SummariserGui() {
 super();

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=697305&r1=697304&r2=697305&view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Sep 19 17:38:20 2008
@@ -68,12 +68,17 @@
 
 Incompatible changes
 
-The test element "Save Results to a file" is now shown as a Listener.
-It was previously shown as a Post-Processor, even though it was in fact a 
Listener.
-This change only affects the icon that is displayed and the location in the 
Gui pop-up menus.
-It does not affect test plans or test behaviour.
+The test elements "Save Results to a file" and "" are now shown as Listeners.
+They were previously shown as Post-Processors, even though they are 
implemented as Listeners.
+
+
+The Counter element is now shown as a Configuration element.
+It was previously shown as a Pre-Processor, even though it is implemented as a 
Config item.
+
+
+The above changes only affect the icons that are displayed and the locations 
in the GUI pop-up menus.
+They do not affect test plans or test behaviour.
 
-
 
 Moved the Scoping Rules sub-section from Section 3. "Building a Test Plan"  to 
Section 4. "Elements of a test plan"
 
@@ -114,6 +119,7 @@
 
 Introduce AbstractListenerGui class to make it easier to create Listeners 
with no visual output
 Assertions run after PostProcessors; change order of pop-up menus 
accordingly
+Remove unnecessary clone() methods from function classes
 
  
  



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

svn commit: r632680 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/config/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/sa

2008-03-01 Thread sebb 
Author: sebb
Date: Sat Mar  1 16:12:38 2008
New Revision: 632680

URL: http://svn.apache.org/viewvc?rev=632680&view=rev
Log:
Bug 44487 - German translation

Added:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSamplerResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimerResources_de.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties
   (with props)
Modified:

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties?rev=632680&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties
 Sat Mar  1 16:12:38 2008
@@ -0,0 +1,14 @@
+csv_data.displayName=Einstellungen der CSV Quellen
+delimiter.displayName=Trennzeichen ('\\t' f\u00FCr Tab)
+delimiter.shortDescription=Geben sie ein Trennzeichen ein ('\\t' f\u00FCr Tab)
+displayName=CSV Einstellungen
+fileEncoding.displayName=Zeichensatz der Datei
+fileEncoding.shortDescription=Der, in der Datei, benutzte Zeichensatz
+filename.displayName=Dateiname
+filename.shortDescription=Name der Datei, die die CSV Daten enth\u00E4lt 
(relativer oder absoluter Pfadname m\u00F6glich)
+recycle.displayName=Datei erneut einlesen?
+recycle.shortDescription=Soll die Datei nach dem erreichen des Dateiendes 
erneut eingelesen werden?
+stopThread.displayName=Thread stoppen?
+stopThread.shortDescription=Bei erreichen des Dateiende den Thread stoppen?
+variableNames.displayName=Variablenname (getrennt durch Komma)
+variableNames.shortDescription=Geben sie die Variablennamen, durch Komma 
getrennt, ein, die den Spalten ihrer CSV Datei entsprechen. Die Variablennamen 
m\u00FCssen der Reihenfolge der CVS Datei entsprechen\!

Propchange: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_de.properties
--
svn:eol-style = native

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties?rev=632680&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
 Sat Mar  1 16:12:38 2008
@@ -0,0 +1,9 @@
+filename.displayName=Dateiname
+filename.shortDescription=BeanShell Script Datei (Vorrang vor Script)
+filenameGroup.displayName=Script Datei (Vorrang vor Script)
+parameterGroup.displayName=Parameter die der BeanShell \u00FCbergeben werden 
sollen ("String parameter, String []bsh.args")
+parameters.displayName=Parameter
+parameters.shortDescription=Parameter die der BeanShell \u00FCbergeben werden 
sollen (Datei oder Script)
+script.displayName=BeanShell Script
+script.shortDescription=BeanShell Script
+scripting.displayName=Script (Variablen\: ctx vars prev data log)

Propchange: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
--
svn:eol-style = native

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorResources_de.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessorRe

svn commit: r655121 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/control/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/contr

2008-05-10 Thread sebb 
Author: sebb
Date: Sat May 10 09:13:49 2008
New Revision: 655121

URL: http://svn.apache.org/viewvc?rev=655121&view=rev
Log:
Standardise placing of transient marker

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java?rev=655121&r1=655120&r2=655121&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/InterleaveControl.java
 Sat May 10 09:13:49 2008
@@ -33,7 +33,7 @@
 
private boolean skipNext;
 
-   transient private TestElement searchStart = null;
+   private transient TestElement searchStart = null;
 
private boolean currentReturnedAtLeastOne;
 

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=655121&r1=655120&r2=655121&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
 Sat May 10 09:13:49 2008
@@ -53,7 +53,7 @@
private long globalCounter = Long.MIN_VALUE;
 
 // Used for per-thread/user numbers
-transient private ThreadLocal perTheadNumber;
+private transient ThreadLocal perTheadNumber;
 
 private void init() {
 perTheadNumber = new ThreadLocal() {

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
 Sat May 10 09:13:49 2008
@@ -53,7 +53,7 @@
 
protected transient GraphAccum graph;
 
-   transient protected JPanel legendPanel;
+   protected transient JPanel legendPanel;
 
/**
 * Constructor.

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?rev=655121&r1=655120&r2=655121&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisu

svn commit: r655879 - in /jakarta/jmeter/trunk: docs/ docs/usermanual/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/timers/

2008-05-13 Thread sebb 
Author: sebb
Date: Tue May 13 07:27:13 2008
New Revision: 655879

URL: http://svn.apache.org/viewvc?rev=655879&view=rev
Log:
Give Beanshell test elements access to JMeter Properties via "props" object

Modified:
jakarta/jmeter/trunk/docs/changes.html
jakarta/jmeter/trunk/docs/usermanual/component_reference.html

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=655879&r1=655878&r2=655879&view=diff
==
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Tue May 13 07:27:13 2008
@@ -678,6 +678,11 @@


 
+   

+   Give Beanshell 
test elements access to JMeter Properties via "props" object
+   
+   
+




Non-functional 
changes
@@ -2507,6 +2512,7 @@




 The JMeter.BAT file no longer changes directory to JMeter home, but runs from 
the current working directory.
+
 The jmeter-n.bat and jmeter-t.bat files change to the directory containing the 
input file.
 

@@ -3080,7 +3086,6 @@
Bug 39533 - 
StatCalculator added wrong items


-
 


Bug 39599 - 
ConcurrentModificationException

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=655879&r1=655878&r2=655879&view=diff
==
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Tue May 13 
07:27:13 2008
@@ -2822,6 +2822,11 @@
vars - 
JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2&qu

svn commit: r804399 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/config/ components/org/apache/jmeter/modifiers/ core/org/apache/jmeter/functio

2009-08-14 Thread sebb 
Author: sebb
Date: Fri Aug 14 22:37:19 2009
New Revision: 804399

URL: http://svn.apache.org/viewvc?rev=804399&view=rev
Log:
Make ThreadLocal variables type-safe

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java

jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java

jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java

jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=804399&r1=804398&r2=804399&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 Fri Aug 14 22:37:19 2009
@@ -97,13 +97,13 @@
 = JMeterUtils.getPropDefault("assertion.equals_diff_delta_end", 
"]]]");
 
 public ResponseAssertion() {
-setProperty(new CollectionProperty(TEST_STRINGS, new ArrayList()));
+setProperty(new CollectionProperty(TEST_STRINGS, new 
ArrayList()));
 }
 
 @Override
 public void clear() {
 super.clear();
-setProperty(new CollectionProperty(TEST_STRINGS, new ArrayList()));
+setProperty(new CollectionProperty(TEST_STRINGS, new 
ArrayList()));
 }
 
 private void setTestField(String testField) {

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java?rev=804399&r1=804398&r2=804399&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
 Fri Aug 14 22:37:19 2009
@@ -39,9 +39,9 @@
 private static final char NEW_LINE = '\n'; // $NON-NLS-1$
 
 // one builder for all requests in a thread
-private static final ThreadLocal myBuilder = new ThreadLocal() {
+private static final ThreadLocal myBuilder = new 
ThreadLocal() {
 @Override
-protected Object initialValue() {
+protected SAXBuilder initialValue() {
 return new SAXBuilder();
 }
 };
@@ -64,7 +64,7 @@
 // the result data
 String resultData = new String(getResultBody(responseData)); // TODO - 
charset?
 
-SAXBuilder builder = (SAXBuilder) myBuilder.get();
+SAXBuilder builder = myBuilder.get();
 
 try {
 builder.build(new StringReader(resultData));

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=804399&r1=804398&r2=804399&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
 Fri Aug 14 22:37:19 2009
@@ -55,12 +55,12 @@
 
 // Used for per-thread/user numbers
 // Cannot be static, as random numbers are not to be shared between 
instances
-private transient ThreadLocal perThreadRandom = initThreadLocal();
+private transient ThreadLocal perThreadRandom = initThreadL

svn commit: r810000 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/control/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/teste

2009-09-01 Thread sebb 
Author: sebb
Date: Tue Sep  1 12:25:55 2009
New Revision: 81

URL: http://svn.apache.org/viewvc?rev=81&view=rev
Log:
Generics fixes

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=81&r1=80&r2=81&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
 Tue Sep  1 12:25:55 2009
@@ -109,7 +109,7 @@
 setProperty(new CollectionProperty(NODE_PATH, nodePath));
 }
 
-public List getNodePath() {
+public List getNodePath() {
 JMeterProperty prop = getProperty(NODE_PATH);
 if (!(prop instanceof NullProperty)) {
 return (List) ((CollectionProperty) prop).getObjectValue();

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=81&r1=80&r2=81&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 Tue Sep  1 12:25:55 2009
@@ -73,7 +73,7 @@
  * the same order as the sub lists that are given to
  * {...@link #setThreadLists(Collection)}.
  */
-public void setNames(Collection list) {
+public void setNames(Collection list) {
 setProperty(new CollectionProperty(NAMES, list));
 }
 
@@ -92,7 +92,7 @@
  * values can be supplied in this fashion to cause JMeter to set different
  * values to variables for different test threads.
  */
-public void setThreadLists(Collection threadLists) {
+public void setThreadLists(Collection threadLists) {
 setProperty(new CollectionProperty(THREAD_VALUES, threadLists));
 }
 

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=81&r1=80&r2=81&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
 Tue Sep  1 12:25:55 2009
@@ -167,7 +167,7 @@
 Number fifty = p_model.getPercentPoint(0.50);
 
 int total = p_model.getCount();
-Collection values = p_model.getDistribution().values();
+Collection values = p_model.getDistribution().values();
 Object[] objval = new Object[values.size()];
 objval = values.toArray(objval);
 // we sort the objects

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=81&r1=80&r2=81&view=diff
==
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
 (original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
 Tue Sep  1 12:25:55 2009
@@ -78,7 +78,7 @@
 this.runningVersion = runningVersion;
 }
 
-protected PropertyIterator getIterator(Collection values) {
+protected PropertyIterator getIterator(Collection values) {
 return new PropertyIteratorImpl(values);
 }
 
@@ -246,13 +246,13 @@
  * Get the property type for this property. Used to convert raw values into
  * JMeterProperties.
  */
-protected Class getPropertyType() {
+protected Class getPropertyType() {
 return getClass();

svn commit: r829133 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/uti

2009-10-23 Thread sebb 
Author: sebb
Date: Fri Oct 23 17:18:19 2009
New Revision: 829133

URL: http://svn.apache.org/viewvc?rev=829133&view=rev
Log:
Bug47952 - Initial JSR223 test element implementation

Added:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorBeanInfo.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerBeanInfo.java
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties
   (with props)
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java 
  (with props)

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java?rev=829133&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
 Fri Oct 23 17:18:19 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.jmeter.extractor;
+
+import java.io.IOException;
+
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.jmeter.processor.PostProcessor;
+import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.util.JSR223TestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+public class JSR223PostProcessor extends JSR223TestElement implements 
Cloneable, PostProcessor, TestBean
+{
+private static final Logger log = LoggingManager.getLoggerForClass();
+
+private static final long serialVersionUID = 232L;
+
+public void process() {
+   
+   ScriptEngineManager sem = null;
+   try {
+   sem = getManager();
+   } catch(Exception e) {
+   e.printStackTrace();
+   }
+   
+   if(sem == null) { return; }
+   try {
+   processFileOrScript(sem);
+   } catch (Exception e) {
+   e.printStackTrace();
+   }
+
+}
+}

Propchange: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
--
svn:eol-style = native

Propchange: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
--
svn:keywords = Author Date Id Revision

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java?rev=829133&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorBeanInfo.java
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProce

svn commit: r909130 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/

2010-02-11 Thread sebb 
Author: sebb
Date: Thu Feb 11 20:19:06 2010
New Revision: 909130

URL: http://svn.apache.org/viewvc?rev=909130&view=rev
Log:
Bug 48714 -  add new French messages

Added:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties
   (with props)

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_fr.properties
   (with props)
Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jakarta/jmeter/trunk/xdocs/changes.xml

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties?rev=909130&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties
 Thu Feb 11 20:19:06 2010
@@ -0,0 +1,29 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+#Stored by I18NEdit, may be edited!
+displayName=Assertion JSR223
+filename.displayName=Nom de fichier 
+filename.shortDescription=Fichier de script (remplace le script)
+filenameGroup.displayName=Fichier de script (remplace le script)
+parameterGroup.displayName=Param\u00E8tres \u00E0 passer au script (\=> String 
Parameters and String []args)
+parameters.displayName=Param\u00E8tres
+parameters.shortDescription=Param\u00E8tres \u00E0 passer au fichier ou au 
script
+script.displayName=Script
+script.shortDescription=Script dans le langage JSR223 appropri\u00E9
+scriptLanguage.displayName=Langage 
+scriptLanguage.shortDescription=Nom du langage JSR223, i.e. groovy, jython, 
jruby, etc.
+scripting.displayName=Script (variables\: ctx vars props SampleResult (avant 
prev) AssertionResult sampler log Label Filename Parameters args[] OUT)
+scriptingLanguage.displayName=Langage de script (i.e. groovy, javascript, 
jexl, etc.)

Propchange: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties
--
svn:eol-style = native

Added: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties?rev=909130&view=auto
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties
 (added)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties
 Thu Feb 11 20:19:06 2010
@@ -0,0 +1,29 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations u

svn commit: r577345 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/timers/ src/components/org/apac

2007-09-19 Thread sebb 
Author: sebb
Date: Wed Sep 19 09:29:45 2007
New Revision: 577345

URL: http://svn.apache.org/viewvc?rev=577345&view=rev
Log:
Add support for Parameters and scriptfile to BeanShell TestBean Gui elements

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorBeanInfo.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerBeanInfo.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListener.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerBeanInfo.java

jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jakarta/jmeter/trunk/xdocs/images/screenshots/beanshell_listener.png
jakarta/jmeter/trunk/xdocs/images/screenshots/beanshell_postprocessor.png
jakarta/jmeter/trunk/xdocs/images/screenshots/beanshell_preprocessor.png
jakarta/jmeter/trunk/xdocs/images/screenshots/timers/beanshell_timer.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=577345&r1=577344&r2=577345&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Wed Sep 19 09:29:45 2007
@@ -35,7 +35,7 @@
 {
 private static final Logger log = LoggingManager.getLoggerForClass();
 
-private static final long serialVersionUID = 3;
+private static final long serialVersionUID = 4;
 
 // can be specified in jmeter.properties
 private static final String INIT_FILE = "beanshell.postprocessor.init"; 
//$NON-NLS-1$
@@ -50,6 +50,7 @@
 SampleResult prev = jmctx.getPreviousResult();
final BeanShellInterpreter bshInterpreter = 
getBeanShellInterpreter();
if (prev == null || bshInterpreter == null) {
+   log.error("BeanShell not found");
return;
}
 
@@ -60,7 +61,7 @@
 bshInterpreter.set("vars", vars);//$NON-NLS-1$
 bshInterpreter.set("prev", prev);//$NON-NLS-1$
 bshInterpreter.set("data", prev.getResponseData());//$NON-NLS-1$
-bshInterpreter.eval(getScript());
+processFileOrScript(bshInterpreter);
 } catch (JMeterException e) {
 log.warn("Problem in BeanShell script "+e);
 }

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java?rev=577345&r1=577344&r2=577345&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorBeanInfo.java
 Wed Sep 19 09:29:45 2007
@@ -18,23 +18,12 @@
 
 package org.apache.jmeter.extractor;
 
-import java.beans.PropertyDescriptor;
+import org.apache.jmeter.util.BeanShellBeanInfoSupport;
 
-import org.apache.jmeter.testbeans.BeanInfoSupport;
-import org.apache.jmeter.testbeans.gui.TextAreaEditor;
-
-public class BeanShellPostProcessorBeanInfo extends BeanInfoSupport {
+public class BeanShellPostProcessorBeanInfo extends BeanShellBeanInfoSupport {
 
public BeanShellPostProcessorBeanInfo() {
super(BeanShellPostProcessor.class);
-
-createPropertyGroup("scripting", new String[] { "script" });
-
-   PropertyDescriptor p = property("script");
-   p.setValue(NOT_UND

svn commit: r670532 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/core/org/apache

2008-06-23 Thread sebb 
Author: sebb
Date: Mon Jun 23 05:14:40 2008
New Revision: 670532

URL: http://svn.apache.org/viewvc?rev=670532&view=rev
Log:
Document OUT variable for BSF test elements

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties

jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BSFTestElement.java
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties?rev=670532&r1=670531&r2=670532&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertionResources.properties
 Mon Jun 23 05:14:40 2008
@@ -17,7 +17,7 @@
 scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, 
jexl)
 scriptLanguage.displayName=Language
 scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, 
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log 
SampleResult AssertionResult)
+scripting.displayName=Script (variables: ctx vars props prev sampler log 
SampleResult AssertionResult OUT)
 script.displayName=Script
 script.shortDescription=Script in the appropriate BSF language
 parameterGroup.displayName=Parameters to be passed to script (=> String 
Parameters and String []args)

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties?rev=670532&r1=670531&r2=670532&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessorResources.properties
 Mon Jun 23 05:14:40 2008
@@ -17,7 +17,7 @@
 scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, 
jexl)
 scriptLanguage.displayName=Language
 scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, 
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log)
+scripting.displayName=Script (variables: ctx vars props prev sampler log OUT)
 script.displayName=Script
 script.shortDescription=Script in the appropriate BSF language
 parameterGroup.displayName=Parameters to be passed to script (=> String 
Parameters and String []args)

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties?rev=670532&r1=670531&r2=670532&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessorResources.properties
 Mon Jun 23 05:14:40 2008
@@ -17,7 +17,7 @@
 scriptingLanguage.displayName=Script language (e.g. beanshell, javascript, 
jexl)
 scriptLanguage.displayName=Language
 scriptLanguage.shortDescription=Name of BSF language, e.g. beanshell, 
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log)
+scripting.displayName=Script (variables: ctx vars props prev sampler log OUT)
 script.displayName=Script
 script.shortDescription=Script in the appropriate BSF language
 parameterGroup.displayName=Parameters to be passed to script (=> String 
Parameters and String []args)

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=670532&r1=670531&r2=670532&view=diff
==
--- 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
Mon Jun 23 05:14:40 2008
@@ -87,7 +87,7 @@
 bind=Thread Bind
 browse=Browse...
 bsf_s

svn commit: r405497 - in /jakarta/jmeter/branches/rel-2-1/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/control/ components/org/apache/jmeter/modifiers/ components/org/apa

2006-05-09 Thread sebb 
Author: sebb
Date: Tue May  9 11:46:38 2006
New Revision: 405497

URL: http://svn.apache.org/viewcvs?rev=405497&view=rev
Log:
Remove unnecessary elses

Modified:

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ModuleController.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ThroughputController.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/modifiers/UserParameters.java

jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java

jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/IfController.java

jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/RunTime.java

jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/control/WhileController.java

jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/FunctionParser.java

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=405497&r1=405496&r2=405497&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 Tue May  9 11:46:38 2006
@@ -204,9 +204,8 @@
JMeterProperty type = getProperty(TEST_TYPE);
if (type instanceof NullProperty) {
return CONTAINS;
-   } else {
-   return type.getIntValue();
}
+   return type.getIntValue();
}
 

/***

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java?rev=405497&r1=405496&r2=405497&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/ForeachController.java
 Tue May  9 11:46:38 2006
@@ -109,10 +109,9 @@
if (context.getVariables().get(inputVariable) != null) {
log.debug("ForEach resultstring eofArgs= false");
return false;
-   } else {
-   log.debug("ForEach resultstring eofArgs= true");
-   return true;
}
+   log.debug("ForEach resultstring eofArgs= true");
+   return true;
}
 
// Prevent entry if nothing to do
@@ -134,10 +133,9 @@
String inputVariable = getInputVal() + getSeparator() + "1";
if (context.getVariables().get(inputVariable) != null) {
return false;
-   } else {
-   log.debug("No entries found - null first entry: " + 
inputVariable);
-   return true;
}
+   log.debug("No entries found - null first entry: " + 
inputVariable);
+   return true;
}
 
/*
@@ -151,9 +149,8 @@
// setDone(true);
resetLoopCount();
return null;
-   } else {
-   return next();
}
+   return next();
}
 
protected void incrementLoopCount() {

Modified: 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java
URL: 
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java?rev=405497&r1=405496&r2=405497&view=diff
==
--- 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/control/InterleaveControl.java
 Tue May  9 11:46:38 2006
@@ -95,16 +95,15 @@
if (sampler ==

svn commit: r545946 - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/a

2007-06-10 Thread sebb 
Author: sebb
Date: Sun Jun 10 14:26:49 2007
New Revision: 545946

URL: http://svn.apache.org/viewvc?view=rev&rev=545946
Log:
Suppress default logging of failed listener invocations

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=545946&r1=545945&r2=545946
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 Sun Jun 10 14:26:49 2007
@@ -179,7 +179,7 @@
public void threadStarted() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("threadStarted()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("threadStarted()"); // 
$NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}
@@ -188,7 +188,7 @@
public void threadFinished() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("threadFinished()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("threadFinished()"); // 
$NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}   
@@ -197,7 +197,7 @@
public void testEnded() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("testEnded()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("testEnded()"); // $NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}   
@@ -222,7 +222,7 @@
public void testStarted() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("testStarted()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("testStarted()"); // 
$NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}   

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=545946&r1=545945&r2=545946
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Jun 10 14:26:49 2007
@@ -105,7 +105,7 @@
public void threadStarted() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("threadStarted()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("threadStarted()"); // 
$NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}
@@ -114,7 +114,7 @@
public void threadFinished() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("threadFinished()"); // $NON-NLS-1$
+   bshInterpreter.evalNoLog("threadFinished()"); // 
$NON-NLS-1$
} catch (JMeterException ignored) {
log.debug(ignored.getLocalizedMessage());
}   
@@ -123,7 +123,7 @@
public void testEnded() {
if (bshInterpreter == null) return;
try {
-   bshInterpreter.eval("testEnded()"); // $NON-NLS-1$
+

svn commit: r545952 - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/a

2007-06-10 Thread sebb 
Author: sebb
Date: Sun Jun 10 14:55:11 2007
New Revision: 545952

URL: http://svn.apache.org/viewvc?view=rev&rev=545952
Log:
Simplify BeanShell init and logging

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java

jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=545952&r1=545951&r2=545952
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 Sun Jun 10 14:55:11 2007
@@ -67,17 +67,9 @@
 
private void init(){
try {
-   bshInterpreter = new BeanShellInterpreter();
-   String init = JMeterUtils.getProperty(INIT_FILE);
-   try {
-   bshInterpreter.init(init, log);
-   } catch (IOException e) {
-   log.warn("Could not initialise interpreter", e);
-   } catch (JMeterException e) {
-   log.warn("Could not initialise interpreter", e);
-   }
+   bshInterpreter = new BeanShellInterpreter(INIT_FILE, 
log);
} catch (ClassNotFoundException e) {
-   log.error("Could not establish BeanShellInterpreter: " 
+ e);
+   log.error("Cannot find BeanShell: "+e.toString());
}   
}
public String getScript() {

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=545952&r1=545951&r2=545952
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
 Sun Jun 10 14:55:11 2007
@@ -59,7 +59,7 @@
try {
bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
} catch (ClassNotFoundException e) {
-   log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
+   log.error("Cannot find BeanShell: "+e.toString());
}
    }
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?view=diff&rev=545952&r1=545951&r2=545952
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
 Sun Jun 10 14:55:11 2007
@@ -60,7 +60,7 @@
try {
bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log);
} catch (ClassNotFoundException e) {
-   log.error("Cannot find BeanShell: 
"+e.getLocalizedMessage());
+   log.error("Cannot find BeanShell: "+e.toString());
}
}
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java?view=diff&am

svn commit: r549919 - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/a

2007-06-22 Thread sebb 
Author: sebb
Date: Fri Jun 22 11:15:33 2007
New Revision: 549919

URL: http://svn.apache.org/viewvc?view=rev&rev=549919
Log:
Bug 42660 - BeanShell* : add property to specify if "testStarted" etc methods 
should be called   

Added:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellTestElement.java
   (with props)
Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=549919&r1=549918&r2=549919
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 Fri Jun 22 11:15:33 2007
@@ -18,21 +18,13 @@
 
 package org.apache.jmeter.assertions;
 
-import java.io.IOException;
-import java.io.Serializable;
-
-import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.TestListener;
-import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jmeter.util.BeanShellInterpreter;
-import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.util.BeanShellTestElement;
 import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JMeterException;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
@@ -40,38 +32,24 @@
  * A sampler which understands BeanShell
  * 
  */
-public class BeanShellAssertion extends AbstractTestElement implements 
Serializable, Assertion, ThreadListener, TestListener {
+public class BeanShellAssertion extends BeanShellTestElement implements 
Assertion {
private static final Logger log = LoggingManager.getLoggerForClass();
 
+private static final long serialVersionUID = 3;
+
public static final String FILENAME = "BeanShellAssertion.filename"; 
//$NON-NLS-1$
 
public static final String SCRIPT = "BeanShellAssertion.query"; 
//$NON-NLS-1$
 
public static final String PARAMETERS = 
"BeanShellAssertion.parameters"; //$NON-NLS-1$
 
-   // Not serialised - recreated as needed
-   transient private BeanShellInterpreter bshInterpreter = null;
-
// can be specified in jmeter.properties
public static final String INIT_FILE = "beanshell.assertion.init"; 
//$NON-NLS-1$
 
-   public BeanShellAssertion() {
-   init();
-   }
-
-   // Ensure deserialisation works in server
-   private Object readResolve(){
-   init();
-   return this;
-   }
+protected String getInitFileProperty() {
+return INIT_FILE;
+}
 
-   private void init(){
-   try {
-   bshInterpreter = new 
BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);
-   } catch (ClassNotFoundException e) {
-   log.error("Cannot find BeanShell: "+e.toString());
-   }   
-   }
public String getScript() {
return getPropertyAsString(SCRIPT);
}
@@ -92,6 +70,7 @@
public AssertionResult getResult(SampleResult response) {
AssertionResult result = new AssertionResult(getName());
 
+   final BeanShellInterpreter bshInterpreter = 
getBeanShellInterpreter();
if (bshInterpreter == null) {
result.setFailure(true);
result.setError(true);
@@ -167,68 +146,4 @@
 
return result;
}
-
-   public void threadStarted() {
-   if (bshInterpreter == null) return;
-   try {
-   bshInterpreter.evalNoLog("threadStarted()"); // 
$NON-NLS-1$
-   } catch (JM

svn commit: r805173 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/modifiers/ monitor/model/org/apache/jmeter/monitor/model/ protocol/http/org/apache/jmeter/protocol/http/gui/ reports/or

2009-08-17 Thread sebb 
Author: sebb
Date: Mon Aug 17 22:06:50 2009
New Revision: 805173

URL: http://svn.apache.org/viewvc?rev=805173&view=rev
Log:
Fix up some raw types

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java

jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java

jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=805173&r1=805172&r2=805173&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
 Mon Aug 17 22:06:50 2009
@@ -111,7 +111,7 @@
 if (threadValues.size() > 0) {
 return (CollectionProperty) 
threadValues.get(getThreadContext().getThreadNum() % threadValues.size());
 }
-return new CollectionProperty("noname", new LinkedList());
+return new CollectionProperty("noname", new LinkedList());
 }
 
 public boolean isPerIteration() {

Modified: 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java?rev=805173&r1=805172&r2=805173&view=diff
==
--- 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java
 (original)
+++ 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java
 Mon Aug 17 22:06:50 2009
@@ -17,10 +17,13 @@
 
 package org.apache.jmeter.monitor.model;
 
+import java.util.List;
+
 /**
  * @version $Revision$
  */
 public interface Workers {
-java.util.List getWorker();
+
+List getWorker();
 
 }

Modified: 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java?rev=805173&r1=805172&r2=805173&view=diff
==
--- 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
 Mon Aug 17 22:06:50 2009
@@ -24,17 +24,17 @@
  * @version $Revision$
  */
 public class WorkersImpl implements Workers {
-private List worker = null;
+private final List worker;
 
 /**
  *
  */
 public WorkersImpl() {
 super();
-worker = new LinkedList();
+worker = new LinkedList();
 }
 
-public List getWorker() {
+public List getWorker() {
 return worker;
 }
 

Modified: 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java?rev=805173&r1=805172&r2=805173&view=diff
==
--- 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
 Mon Aug 17 22:06:50 2009
@@ -99,10 +99,10 @@
 @Override
 public TestElement createTestElement() {
 stopTableEditing();
-Iterator modelData = tableModel.iterator();
+Iterator modelData = (Iterator) 
tableModel.iterator();
 Arguments args = new Arguments();
 while (modelData.hasNext()) {
-HTTPArgument arg = (HTTPArgument) modelData.next();
+HTTPArgument arg = modelData.next();
 args.addArgument(arg);
 }
 this.configureTestElement(args);

Modified: 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java?rev=805173&r1=805172&r2=805173&view=diff
==
--- 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/ValueReplacer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/rep

svn commit: r545799 - in /jakarta/jmeter/branches/rel-2-2: bin/ src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src

2007-06-09 Thread sebb 
Author: sebb
Date: Sat Jun  9 14:51:13 2007
New Revision: 545799

URL: http://svn.apache.org/viewvc?view=rev&rev=545799
Log:
Add TestListener and ThreadListener support to BeanShell test elements

Added:
jakarta/jmeter/branches/rel-2-2/bin/BeanShellListeners.bshrc
Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml

Added: jakarta/jmeter/branches/rel-2-2/bin/BeanShellListeners.bshrc
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/BeanShellListeners.bshrc?view=auto&rev=545799
==
--- jakarta/jmeter/branches/rel-2-2/bin/BeanShellListeners.bshrc (added)
+++ jakarta/jmeter/branches/rel-2-2/bin/BeanShellListeners.bshrc Sat Jun  9 
14:51:13 2007
@@ -0,0 +1,29 @@
+# Example BeanShell Listener definitions
+
+# ThreadListener methods
+
+threadStarted(){
+print("threadStarted");
+}
+
+threadFinished(){
+print("threadFinished");
+}
+
+# TestListener methods
+
+testStarted(){
+print("testStarted");
+}
+
+testEnded(){
+print("testEnded");
+}
+
+testStarted(String s){
+print("testStarted "+s);
+}
+
+testEnded(String s){
+print("testEnded "+s);
+}
\ No newline at end of file

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=545799&r1=545798&r2=545799
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
 Sat Jun  9 14:51:13 2007
@@ -21,8 +21,11 @@
 import java.io.IOException;
 import java.io.Serializable;
 
+import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.TestListener;
+import org.apache.jmeter.testelement.ThreadListener;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
@@ -36,9 +39,8 @@
 /**
  * A sampler which understands BeanShell
  * 
- * @version $Revision$ Updated on: $Date$
  */
-public class BeanShellAssertion extends AbstractTestElement implements 
Serializable, Assertion {
+public class BeanShellAssertion extends AbstractTestElement implements 
Serializable, Assertion, ThreadListener, TestListener {
private static final Logger log = LoggingManager.getLoggerForClass();
 
public static final String FILENAME = "BeanShellAssertion.filename"; 
//$NON-NLS-1$
@@ -172,5 +174,69 @@
}
 
return result;
+   }
+
+   public void threadStarted() {
+   if (bshInterpreter == null) return;
+   try {
+   bshInterpreter.eval("threadStarted()"); // $NON-NLS-1$
+   } catch (JMeterException ignored) {
+   log.debug(ignored.getLocalizedMessage());
+   }
+   }
+
+   public void threadFinished() {
+   if (bshInterpreter == null) return;
+   try {
+   bshInterpreter.eval("threadFinished()"); // $NON-NLS-1$
+   } catch (JMeterException ignored) {
+   log.debug(ignored.getLocalizedMessage());
+   }   
+   }
+
+   public void testEnded() {
+   if (bshInterpreter == null) return;
+   try {
+   bshInterpreter.eval("testEnded()"); // $NON-NLS-1$
+   } catch (JMeterException ignored) {
+   log.debug(ignored.getLocalizedMessage());
+   }   
+   }
+
+   public void testEnded(String host) {
+   if (bshInterpreter == null) return;
+   try {
+   bshInterpreter.eval((new StringBuffer("testEnded(")) // 
$NON-NLS-1$
+   .append(host)
+

svn commit: r804543 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/modifiers/gui/ core/org/apache/jmeter/config/ core/org/apache/jmeter/reporters/ core/org/apache/jmeter/services/ core/o

2009-08-15 Thread sebb 
Author: sebb
Date: Sun Aug 16 01:31:37 2009
New Revision: 804543

URL: http://svn.apache.org/viewvc?rev=804543&view=rev
Log:
The "typing" continues ...

Modified:

jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java

jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
jakarta/jmeter/trunk/src/jorphan/org/apache/commons/jexl/bsf/JexlEngine.java

jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/ClassContext.java

jakarta/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java

jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLString.java

jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=804543&r1=804542&r2=804543&view=diff
==
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
 Sun Aug 16 01:31:37 2009
@@ -118,7 +118,7 @@
 }
 UserParameters userParams = ((UserParameters) params);
 userParams.setNames(new CollectionProperty(UserParameters.NAMES, 
tableModel.getColumnData(NAME_COL_RESOURCE)));
-CollectionProperty threadLists = new 
CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList());
+CollectionProperty threadLists = new 
CollectionProperty(UserParameters.THREAD_VALUES, new ArrayList());
 log.debug("making threadlists from gui");
 for (int col = 1; col < tableModel.getColumnCount(); col++) {
 threadLists.addItem(tableModel.getColumnData(getUserColName(col)));

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java?rev=804543&r1=804542&r2=804543&view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/Arguments.java Sun 
Aug 16 01:31:37 2009
@@ -40,7 +40,7 @@
  * Create a new Arguments object with no arguments.
  */
 public Arguments() {
-setProperty(new CollectionProperty(ARGUMENTS, new ArrayList()));
+setProperty(new CollectionProperty(ARGUMENTS, new 
ArrayList()));
 }
 
 /**
@@ -58,7 +58,7 @@
 @Override
 public void clear() {
 super.clear();
-setProperty(new CollectionProperty(ARGUMENTS, new ArrayList()));
+setProperty(new CollectionProperty(ARGUMENTS, new 
ArrayList()));
 }
 
 /**
@@ -67,7 +67,7 @@
  * @param arguments
  *the new arguments
  */
-public void setArguments(List arguments) {
+public void setArguments(List arguments) {
 setProperty(new CollectionProperty(ARGUMENTS, arguments));
 }
 

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=804543&r1=804542&r2=804543&view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java 
Sun Aug 16 01:31:37 2009
@@ -22,6 +22,8 @@
 import java.text.DecimalFormat;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.util.NoThreadClone;
@@ -88,7 +90,7 @@
  * This map allows summarisers with the same name to contribute to the 
same totals.
  */
 //@GuardedBy("accumulators")
-private static final Hash

svn commit: r535138 - in /jakarta/jmeter/branches/rel-2-2: src/components/org/apache/jmeter/assertions/gui/ src/components/org/apache/jmeter/extractor/gui/ src/components/org/apache/jmeter/modifiers/g

2007-05-04 Thread sebb 
Author: sebb
Date: Fri May  4 02:29:15 2007
New Revision: 535138

URL: http://svn.apache.org/viewvc?view=rev&rev=535138
Log:
Bug 40077 - Creating new Elements copies values from Existing elements
Applied patch 20129

Modified:

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java

jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java

jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?view=diff&rev=535138&r1=535137&r2=535138
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/o