svn commit: r514119 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 02:39:09 2007
New Revision: 514119

URL: http://svn.apache.org/viewvc?view=revrev=514119
Log:
Remove unused private method

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java?view=diffrev=514119r1=514118r2=514119
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
 Sat Mar  3 02:39:09 2007
@@ -108,21 +108,4 @@
throw new Error(e.toString()); // Programming error: 
bail out.
}
}
-
-   /**
-* Utility method to obtain the value of a property in the given type.
-* p
-* I plan to get rid of this sooner than later, so please don't use it 
much.
-* 
-* @param property
-*Property to get the value of.
-* @param type
-*Type of the result.
-* @return an object of the given type if it is one of the known 
supported
-* types, or the value returned by property.getObjectValue
-* @deprecated
-*/
-   private static Object unwrapProperty(JMeterProperty property, Class 
type) {
-   return Converter.convert(property.getObjectValue(), type);
-   }
 }



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



svn commit: r514120 - in /jakarta/jmeter/branches/rel-2-2: src/protocol/http/org/apache/jmeter/protocol/http/modifier/ src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/ test/src/org/apache

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 02:40:45 2007
New Revision: 514120

URL: http://svn.apache.org/viewvc?view=revrev=514120
Log:
Remove unused imports

Modified:

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

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

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?view=diffrev=514120r1=514119r2=514120
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
 Sat Mar  3 02:40:45 2007
@@ -46,16 +46,14 @@
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 // For Unit tests, @see TestAnchorModifier
 
 /**
  * @author Michael Stover
- * @version $Revision$
  */
 public class AnchorModifier extends AbstractTestElement implements 
PreProcessor, Serializable {
-   transient private static Logger log = 
LoggingManager.getLoggerForClass();
+   private static final Logger log = LoggingManager.getLoggerForClass();
 
private static Random rand = new Random();
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?view=diffrev=514120r1=514119r2=514120
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
 Sat Mar  3 02:40:45 2007
@@ -36,14 +36,11 @@
 import javax.swing.table.TableCellEditor;
 
 import org.apache.jmeter.config.gui.AbstractConfigGui;
-import org.apache.jmeter.config.gui.ArgumentsPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.PropertyIterator;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.ObjectTableModel;
-//import org.apache.jorphan.logging.LoggingManager;
 import org.apache.jorphan.reflect.Functor;
-//import org.apache.log.Logger;
 
 /**
  * A GUI panel allowing the user to enter name-value argument pairs. These

Modified: 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java?view=diffrev=514120r1=514119r2=514120
==
--- 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
 Sat Mar  3 02:40:45 2007
@@ -31,12 +31,7 @@
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jorphan.io.TextFile;
-import org.apache.jorphan.util.JOrphanUtils;
 
-/**
- * @author Michael Stover
- * @version $Revision$
- */
 public class TestAnchorModifier extends JMeterTestCase {
 private AnchorModifier parser = new AnchorModifier();
public TestAnchorModifier(String name) {



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



svn commit: r514121 - in /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter: gui/SavePropertyDialog.java save/converters/ConversionHelp.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 02:41:32 2007
New Revision: 514121

URL: http://svn.apache.org/viewvc?view=revrev=514121
Log:
Remove unused imports

Modified:

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

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?view=diffrev=514121r1=514120r2=514121
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
 Sat Mar  3 02:41:32 2007
@@ -24,7 +24,6 @@
 import java.awt.BorderLayout;
 import java.awt.Frame;
 import java.awt.GridLayout;
-// import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.lang.reflect.Method;
@@ -40,7 +39,6 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.jorphan.reflect.Functor;
-import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
 /**

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?view=diffrev=514121r1=514120r2=514121
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
 Sat Mar  3 02:41:32 2007
@@ -30,7 +30,6 @@
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;



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



svn commit: r514122 - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/extractor/ core/org/apache/jmeter/engine/util/ functions/org/apache

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 02:43:11 2007
New Revision: 514122

URL: http://svn.apache.org/viewvc?view=revrev=514122
Log:
Use Matcher and PatternCache from JMeterUtils instead of private versions

Modified:

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

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

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

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

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?view=diffrev=514122r1=514121r2=514122
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
 Sat Mar  3 02:43:11 2007
@@ -34,7 +34,6 @@
 import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 import org.apache.oro.text.MalformedCachePatternException;
-import org.apache.oro.text.PatternCacheLRU;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
@@ -79,14 +78,6 @@
 
private final static int EQUALS = 1  3;
 
-   private static ThreadLocal matcher = new ThreadLocal() {
-   protected Object initialValue() {
-   return new Perl5Matcher();
-   }
-   };
-
-   private static final PatternCacheLRU patternCache = new 
PatternCacheLRU(1000, new Perl5Compiler());
-
 private static final int  EQUALS_SECTION_DIFF_LEN
 = JMeterUtils.getPropDefault(assertion.equals_section_diff_len, 
100);
 
@@ -302,11 +293,11 @@

try {
// Get the Matcher for this thread
-   Perl5Matcher localMatcher = (Perl5Matcher) 
matcher.get();
+   Perl5Matcher localMatcher = JMeterUtils.getMatcher();
PropertyIterator iter = getTestStrings().iterator();
while (iter.hasNext()) {
String stringPattern = 
iter.next().getStringValue();
-   Pattern pattern = 
patternCache.getPattern(stringPattern, Perl5Compiler.READ_ONLY_MASK);
+   Pattern pattern = 
JMeterUtils.getPatternCache().getPattern(stringPattern, 
Perl5Compiler.READ_ONLY_MASK);
boolean found;
if (contains) {
found = localMatcher.contains(toCheck, 
pattern);

Modified: 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java?view=diffrev=514122r1=514121r2=514122
==
--- 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/RegexExtractor.java
 Sat Mar  3 02:43:11 2007
@@ -34,7 +34,6 @@
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 import org.apache.oro.text.MalformedCachePatternException;
-import org.apache.oro.text.PatternCacheLRU;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternMatcher;
@@ -86,14 +85,6 @@
 
 private Object[] template = null;
 
-   private static PatternCacheLRU patternCache = new PatternCacheLRU(1000, 
new Perl5Compiler());
-
-   private static ThreadLocal localMatcher = new ThreadLocal() {
-   protected Object initialValue() {
-   return new Perl5Matcher();
-   }
-   };
-
/**
 * Parses the response data using regular expressions and saving the 
results
 * into variables for use later in the test.
@@ -119,7 +110,7 @@
 vars.put(refName, defaultValue);
 }
 
-   Perl5Matcher matcher = (Perl5Matcher) localMatcher.get();
+   Perl5Matcher matcher = JMeterUtils.getMatcher();
String inputString = 
useUrl() ? previousResult.getUrlAsString() // Bug 39707 
:
@@ -135,7 +126,7 @@
  

svn commit: r514130 - in /jakarta/jmeter/branches/rel-2-2: bin/testfiles/ src/protocol/http/org/apache/jmeter/protocol/http/parser/ xdocs/

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 03:27:49 2007
New Revision: 514130

URL: http://svn.apache.org/viewvc?view=revrev=514130
Log:
Bug 40696 - retrieve embedded resources from STYLE URL() attributes

Modified:
jakarta/jmeter/branches/rel-2-2/bin/testfiles/HTMLParserTestCase.html

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-2/bin/testfiles/HTMLParserTestCase.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/testfiles/HTMLParserTestCase.html?view=diffrev=514130r1=514129r2=514130
==
--- jakarta/jmeter/branches/rel-2-2/bin/testfiles/HTMLParserTestCase.html 
(original)
+++ jakarta/jmeter/branches/rel-2-2/bin/testfiles/HTMLParserTestCase.html Sat 
Mar  3 03:27:49 2007
@@ -3,7 +3,7 @@
 /head
 body background=images/body.gif
 table background=images/table.gif
-tr background=images/tr.gif
+tr style=background url('images/tr.gif')
 td background=images/td.gifimg name=a src=images/image-a.gif 
align=top/td
 /tr
 /table

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?view=diffrev=514130r1=514129r2=514130
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
 Sat Mar  3 03:27:49 2007
@@ -41,6 +41,7 @@
 protected static final String ATT_HREF  = href;// $NON-NLS-1$
 protected static final String ATT_REL   = rel;// $NON-NLS-1$
 protected static final String ATT_SRC   = src;// $NON-NLS-1$
+protected static final String ATT_STYLE = style;// $NON-NLS-1$
 protected static final String ATT_TYPE  = type;// $NON-NLS-1$
 protected static final String ATT_IS_IMAGE  = image;// $NON-NLS-1$
 protected static final String TAG_APPLET= applet;// $NON-NLS-1$

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java?view=diffrev=514130r1=514129r2=514130
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
 Sat Mar  3 03:27:49 2007
@@ -1,187 +1,195 @@
-/*
- * 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.protocol.http.parser;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
-import org.htmlparser.Node;
-import org.htmlparser.Parser;
-import org.htmlparser.Tag;
-import org.htmlparser.tags.AppletTag;
-import org.htmlparser.tags.BaseHrefTag;
-import org.htmlparser.tags.BodyTag;
-import org.htmlparser.tags.CompositeTag;
-import org.htmlparser.tags.FrameTag;
-import org.htmlparser.tags.ImageTag;
-import org.htmlparser.tags.InputTag;
-import org.htmlparser.tags.LinkTag;
-import 

DO NOT REPLY [Bug 40696] - retieve all embeded resources from html pages for CSS images

2007-03-03 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=40696.
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=40696


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-03 03:30 ---
Now fixed in SVN. 

It will be in the next release and the next nightly build at:

http://people.apache.org/builds/jakarta-jmeter/nightly/

-- 
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]



svn commit: r514139 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterVersion.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 04:32:19 2007
New Revision: 514139

URL: http://svn.apache.org/viewvc?view=revrev=514139
Log:
Update copyright year

Modified:

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterVersion.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterVersion.java?view=diffrev=514139r1=514138r2=514139
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterVersion.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterVersion.java
 Sat Mar  3 04:32:19 2007
@@ -42,9 +42,9 @@
 * JMeterUtils This ensures that JMeterUtils always gets the correct
 * version, even if it is not re-compiled during the build.
 */
-   private static final String VERSION = 2.1.2;
+   private static final String VERSION = 2.2.1;
 
-   static final String COPYRIGHT = Copyright (c) 1998-2006 The Apache 
Software Foundation;
+   static final String COPYRIGHT = Copyright (c) 1998-2007 The Apache 
Software Foundation;
 
private JMeterVersion() // Not instantiable
{



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



svn commit: r514149 - in /jakarta/jmeter/branches/rel-2-2: src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSam

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 04:55:26 2007
New Revision: 514149

URL: http://svn.apache.org/viewvc?view=revrev=514149
Log:
Bug 41707 - HTTP Proxy XML-RPC support

Modified:

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?view=diffrev=514149r1=514148r2=514149
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
 Sat Mar  3 04:55:26 2007
@@ -246,8 +246,10 @@
sampler.setFileField(urlConfig.getFileFieldName());
sampler.setFilename(urlConfig.getFilename());
sampler.setMimetype(urlConfig.getMimeType());
+} else if (postData != null  postData.trim().startsWith(?)) {
+sampler.addNonEncodedArgument(, postData, ); //used when 
postData is pure xml (ex. an xml-rpc call)
} else {
-   sampler.parseArguments(postData);
+   sampler.parseArguments(postData); //standard name=value 
postData
}
 if (log.isDebugEnabled())
log.debug(sampler path =  + sampler.getPath());

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?view=diffrev=514149r1=514148r2=514149
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
 Sat Mar  3 04:55:26 2007
@@ -395,7 +395,13 @@
}
this.getArguments().addArgument(arg);
}
-
+
+public void addNonEncodedArgument(String name, String value, String 
metadata) {
+HTTPArgument arg = new HTTPArgument(name, value, metadata, false);
+arg.setAlwaysEncoded(false);
+this.getArguments().addArgument(arg);
+}
+
public void addArgument(String name, String value) {
this.getArguments().addArgument(new HTTPArgument(name, value));
}

Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diffrev=514149r1=514148r2=514149
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Mar  3 04:55:26 2007
@@ -71,6 +71,9 @@
 liBug 41253 - extend XPathExtractor to work with non-NodeList XPath 
expressions/li
 liBug 39717 - use icons in the results tree instead of colors/li
 liAdded __V variable function to resolve nested variable names/li
+liBug 41707 - HTTP Proxy XML-RPC support/li
+liBug 40381 - LDAP: more descriptive strings/li
+liBug 40369 (partial) Equals Response Assertion/li
 /ul
 
 h4Non-functional improvements:/h4
@@ -78,6 +81,7 @@
 liChange to htmlparser 2.0/li
 liUpdated to xstream 1.2.1/xpp3_min-1.1.3.4.O/li
 liFunctor calls can now be unit tested/li
+liReplace com.sun.net classes with javax.net/li
 /ul
 
 h4Bug fixes:/h4
@@ -100,13 +104,10 @@
 liFix NPE when saving thread counts in remote testing/li
 liBug 34261 - NPE in HtmlParser (allow for missing attributes)/li
 liBug 40100 - check FileServer type before calling close/li
-liReplace com.sun.net classes with javax.net/li
 liBug 39887 - jmeter.util.SSLManager: Couldn't load keystore error 
message/li
 liBug 41543 - exception when webserver returns 500 Internal Server Error 
and content-length is 0/li
 liBug 41416 - don't use chunked input for text-box input in SOAP-RPC 
sampler/li
 liBug 39827 - SOAP Sampler content length for files/li
-liBug 40381 - LDAP: more descriptive strings/li
-liBug 40369 (partial) Equals Response Assertion/li
 liFix Class cast exception in Clear.java/li
 liBug 40383 - don't set content-type if already set/li
 liMailer Visualiser test button now works if test plan has not yet been 
saved/li



-
To unsubscribe, e-mail: 

DO NOT REPLY [Bug 41707] - HTTP Proxy XML-RPC support

2007-03-03 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=41707.
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=41707


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-03-03 04:56 ---
Thanks!

Now fixed in SVN.

It will be in the next release and the next nightly build at:

http://people.apache.org/builds/jakarta-jmeter/nightly/



-- 
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]



svn commit: r514163 - in /jakarta/jmeter/branches/rel-2-2: bin/testfiles/BatchTestLocal.csv bin/testfiles/BatchTestLocal.jmx bin/testfiles/BatchTestLocal.xml build.xml

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 06:52:06 2007
New Revision: 514163

URL: http://svn.apache.org/viewvc?view=revrev=514163
Log:
Initial very simple batch test task and script
TODO: add more elements to the test plan

Added:
jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.csv
jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.jmx
jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.xml
Modified:
jakarta/jmeter/branches/rel-2-2/build.xml

Added: jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.csv
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.csv?view=autorev=514163
==
--- jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.csv (added)
+++ jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.csv Sat Mar  3 
06:52:06 2007
@@ -0,0 +1,4 @@
+label,responseCode,responseMessage,threadName,dataType,success,failureMessage,bytes,grpThreads,allThreads,URL,Filename,Encoding
+Java 1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,ISO-8859-1
+Java 1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,ISO-8859-1
+Java 1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,ISO-8859-1

Added: jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.jmx
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.jmx?view=autorev=514163
==
--- jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.jmx (added)
+++ jakarta/jmeter/branches/rel-2-2/bin/testfiles/BatchTestLocal.jmx Sat Mar  3 
06:52:06 2007
@@ -0,0 +1,186 @@
+jmeterTestPlan version=1.2 properties=1.8
+  hashTree
+TestPlan guiclass=TestPlanGui testclass=TestPlan 
testname=BatchTestLocal enabled=true
+  elementProp name=TestPlan.user_defined_variables 
elementType=Arguments guiclass=ArgumentsPanel testclass=Arguments 
testname=User Defined Variables enabled=true
+collectionProp name=Arguments.arguments/
+  /elementProp
+  stringProp name=TestPlan.user_define_classpath/stringProp
+  boolProp name=TestPlan.serialize_threadgroupsfalse/boolProp
+  boolProp name=TestPlan.functional_modefalse/boolProp
+  stringProp name=TestPlan.commentsBatch Test using only local 
resources. Single-threaded to make it repeatable/stringProp
+/TestPlan
+hashTree
+  ThreadGroup guiclass=ThreadGroupGui testclass=ThreadGroup 
testname=Thread Group enabled=true
+longProp name=ThreadGroup.start_time117292290/longProp
+stringProp name=ThreadGroup.delay/stringProp
+stringProp name=ThreadGroup.duration/stringProp
+stringProp name=ThreadGroup.num_threads1/stringProp
+boolProp name=ThreadGroup.schedulerfalse/boolProp
+elementProp name=ThreadGroup.main_controller 
elementType=LoopController guiclass=LoopControlPanel 
testclass=LoopController testname=Loop Controller enabled=true
+  stringProp name=LoopController.loops1/stringProp
+  boolProp name=LoopController.continue_foreverfalse/boolProp
+/elementProp
+longProp name=ThreadGroup.end_time117292290/longProp
+stringProp name=ThreadGroup.on_sample_errorcontinue/stringProp
+stringProp name=ThreadGroup.ramp_time1/stringProp
+  /ThreadGroup
+  hashTree
+LoopController guiclass=LoopControlPanel testclass=LoopController 
testname=Loop3 enabled=true
+  stringProp name=LoopController.loops3/stringProp
+  boolProp name=LoopController.continue_forevertrue/boolProp
+/LoopController
+hashTree
+  JavaSampler guiclass=JavaTestSamplerGui testclass=JavaSampler 
testname=Java 1 enabled=true
+elementProp name=arguments elementType=Arguments 
guiclass=ArgumentsPanel testclass=Arguments enabled=true
+  collectionProp name=Arguments.arguments
+elementProp name=Sleep_Time elementType=Argument
+  stringProp name=Argument.metadata=/stringProp
+  stringProp name=Argument.value100/stringProp
+  stringProp name=Argument.nameSleep_Time/stringProp
+/elementProp
+elementProp name=Sleep_Mask elementType=Argument
+  stringProp name=Argument.metadata=/stringProp
+  stringProp name=Argument.value0xFF/stringProp
+  stringProp name=Argument.nameSleep_Mask/stringProp
+/elementProp
+elementProp name=Label elementType=Argument
+  stringProp name=Argument.metadata=/stringProp
+  stringProp name=Argument.value/stringProp
+  stringProp name=Argument.nameLabel/stringProp
+/elementProp
+elementProp name=ResponseCode elementType=Argument
+  stringProp name=Argument.metadata=/stringProp
+

svn commit: r514235 - in /jakarta/jmeter/branches/rel-2-2: ./ lib/ xdocs/

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 12:27:00 2007
New Revision: 514235

URL: http://svn.apache.org/viewvc?view=revrev=514235
Log:
Updated various jars
Changed build to use a properties file and specific jar versions

Added:
jakarta/jmeter/branches/rel-2-2/build.properties   (with props)
jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util-1.6.jar   (with props)
jakarta/jmeter/branches/rel-2-2/lib/bsf-2.4.0.jar   (with props)
jakarta/jmeter/branches/rel-2-2/lib/commons-collections-3.2.jar   (with 
props)
jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.1.jar   (with props)
jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar   (with props)
Removed:
jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util.jar
jakarta/jmeter/branches/rel-2-2/lib/bsf-2.3.0.jar
jakarta/jmeter/branches/rel-2-2/lib/commons-collections.jar
jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.0.jar
jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4-dev.jar
Modified:
jakarta/jmeter/branches/rel-2-2/build.xml
jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Added: jakarta/jmeter/branches/rel-2-2/build.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.properties?view=autorev=514235
==
--- jakarta/jmeter/branches/rel-2-2/build.properties (added)
+++ jakarta/jmeter/branches/rel-2-2/build.properties Sat Mar  3 12:27:00 2007
@@ -0,0 +1,39 @@
+# External jars (not built as part of JMeter)
+
+apache-bsf.jar  = ${lib.dir}/bsf-2.4.0.jar
+avalon-framework.jar= ${lib.dir}/avalon-framework-4.1.4.jar
+batik-awt-util.jar  = ${lib.dir}/batik-awt-util-1.6.jar
+
+commons-codec.jar   = ${lib.dir}/commons-codec-1.3.jar
+commons-collections.jar = ${lib.dir}/commons-collections-3.2.jar
+commons-httpclient.jar  = ${lib.dir}/commons-httpclient-3.0.1.jar
+commons-jexl.jar= ${lib.dir}/commons-jexl-1.1.jar
+commons-logging.jar = ${lib.dir}/commons-logging-1.1.jar
+
+excalibur-compatibility.jar = ${lib.dir}/excalibur-compatibility-1.1.jar
+excalibur-datasource.jar= ${lib.dir}/excalibur-datasource-1.1.1.jar
+excalibur-i18n.jar  = ${lib.dir}/excalibur-i18n-1.1.jar
+excalibur-instrument.jar= ${lib.dir}/excalibur-instrument-1.0.jar
+excalibur-logger.jar= ${lib.dir}/excalibur-logger-1.1.jar
+excalibur-pool.jar  = ${lib.dir}/excalibur-pool-1.2.jar
+
+htmlparser.jar  = ${lib.dir}/htmlparser-2.0-20060923.jar
+htmllexer.jar   = ${lib.dir}/htmllexer-2.0-20060923.jar
+jakarta-oro.jar = ${lib.dir}/jakarta-oro-2.0.8.jar
+jcharts.jar = ${lib.dir}/jCharts-0.7.5.jar
+jdom.jar= ${lib.dir}/jdom-1.0.jar
+js_rhino.jar= ${lib.dir}/js_rhino1_6R5.jar
+junit.jar   = ${lib.dir}/junit.jar
+logkit.jar  = ${lib.dir}/logkit-1.2.jar
+soap.jar= ${lib.dir}/soap.jar
+tidy.jar= ${lib.dir}/Tidy.jar
+xstream.jar = ${lib.dir}/xstream-1.2.1.jar
+xpp3.jar= ${lib.dir}/xpp3_min-1.1.3.4.O.jar
+
+# The following 3 jars are probably optional for JDK 1.4+
+xalan.jar   = ${lib.dir}/xalan.jar
+xerces.jar  = ${lib.dir}/xercesImpl.jar
+xml-apis.jar= ${lib.dir}/xml-apis.jar
+
+# The following jar is only needed for source distributions
+velocity.jar   = ${lib.dir}/velocity-1.4.jar
\ No newline at end of file

Propchange: jakarta/jmeter/branches/rel-2-2/build.properties
--
svn:eol-style = native

Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diffrev=514235r1=514234r2=514235
==
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Sat Mar  3 12:27:00 2007
@@ -299,39 +299,7 @@
   property name=encoding value=UTF-8/
 
   !-- 3rd party libraries to be included in the binary distribution --
-  property name=avalon-framework.jar 
value=${lib.dir}/avalon-framework-4.1.4.jar/
-  property name=apache-bsf.jar value=${lib.dir}/bsf-2.3.0.jar/
-  property name=jakarta-oro.jar value=${lib.dir}/jakarta-oro-2.0.8.jar/
-  property name=commons-codec.jar value=${lib.dir}/commons-codec-1.3.jar/
-  property name=commons-collections.jar 
value=${lib.dir}/commons-collections.jar/
-  property name=commons-httpclient.jar 
value=${lib.dir}/commons-httpclient-3.0.1.jar/
-  property name=commons-jexl.jar value=${lib.dir}/commons-jexl-1.0.jar/
-  property name=commons-logging.jar 
value=${lib.dir}/commons-logging-1.1.jar/
-  property name=excalibur-logger.jar 
value=${lib.dir}/excalibur-logger-1.1.jar/
-  

svn commit: r514236 - /jakarta/jmeter/branches/rel-2-2/eclipse.classpath

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 12:29:49 2007
New Revision: 514236

URL: http://svn.apache.org/viewvc?view=revrev=514236
Log:
Updated jar versions

Modified:
jakarta/jmeter/branches/rel-2-2/eclipse.classpath

Modified: jakarta/jmeter/branches/rel-2-2/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/eclipse.classpath?view=diffrev=514236r1=514235r2=514236
==
--- jakarta/jmeter/branches/rel-2-2/eclipse.classpath (original)
+++ jakarta/jmeter/branches/rel-2-2/eclipse.classpath Sat Mar  3 12:29:49 2007
@@ -20,12 +20,12 @@
classpathentry kind=src output=build/monitor/components 
path=src/monitor/components/
classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/
classpathentry kind=lib path=lib/avalon-framework-4.1.4.jar/
-   classpathentry kind=lib path=lib/batik-awt-util.jar/
-   classpathentry kind=lib path=lib/bsf-2.3.0.jar/
+   classpathentry kind=lib path=lib/batik-awt-util-1.6.jar/
+   classpathentry kind=lib path=lib/bsf-2.4.0.jar/
classpathentry kind=lib path=lib/commons-codec-1.3.jar/
-   classpathentry kind=lib path=lib/commons-collections.jar/
+   classpathentry kind=lib path=lib/commons-collections-3.2.jar/
classpathentry kind=lib path=lib/commons-httpclient-3.0.1.jar/
-   classpathentry kind=lib path=lib/commons-jexl-1.0.jar/
+   classpathentry kind=lib path=lib/commons-jexl-1.1.jar/
classpathentry kind=lib path=lib/commons-logging-1.1.jar/
classpathentry kind=lib path=lib/excalibur-datasource-1.1.1.jar/
classpathentry kind=lib path=lib/excalibur-instrument-1.0.jar/



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



svn commit: r514238 - /jakarta/jmeter/branches/rel-2-2/lib/

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 12:38:04 2007
New Revision: 514238

URL: http://svn.apache.org/viewvc?view=revrev=514238
Log:
Tidy exclusion list

Modified:
jakarta/jmeter/branches/rel-2-2/lib/   (props changed)

Propchange: jakarta/jmeter/branches/rel-2-2/lib/
--
--- svn:ignore (original)
+++ svn:ignore Sat Mar  3 12:38:04 2007
@@ -1,13 +1,8 @@
 ext
 opt
 jorphan.jar
+bshclient.jar
 activation.jar
-iaik_jce.jar
-imap.jar
 mail.jar
-mailapi.jar
-pop3.jar
-smtp.jar
-w3c_http.jar
-bsh*.jar
+bsh-*.jar
 jms*.jar



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



svn commit: r514282 - in /jakarta/jmeter/branches/rel-2-2/src: core/org/apache/jmeter/testelement/property/BooleanProperty.java protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 16:05:55 2007
New Revision: 514282

URL: http://svn.apache.org/viewvc?view=revrev=514282
Log:
Revert to Boolean.valueof()

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java?view=diffrev=514282r1=514281r2=514282
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
 Sat Mar  3 16:05:55 2007
@@ -57,7 +57,7 @@
 * @see JMeterProperty#getObjectValue()
 */
public Object getObjectValue() {
-   return JOrphanUtils.valueOf(value);
+   return Boolean.valueOf(value);
}
 
/**

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?view=diffrev=514282r1=514281r2=514282
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
 Sat Mar  3 16:05:55 2007
@@ -46,7 +46,6 @@
 import org.apache.jorphan.gui.JLabeledChoice;
 import org.apache.jorphan.gui.layout.VerticalLayout;
 import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
 /**
@@ -105,7 +104,7 @@
  * List of cookie policies.
  * 
  * These are used both for the display, and for setting the policy
- * TODO: use the getCookiePolicySpecs() method when it is implemented
+ * TODO: use the getRegisteredCookieSpecs() method when it is implemented
 */
 private final String[] policies = {
 CookiePolicy.BROWSER_COMPATIBILITY,
@@ -227,7 +226,7 @@
 
private void addCookieToTable(Cookie cookie) {
tableModel.addRow(new Object[] { cookie.getName(), 
cookie.getValue(), cookie.getDomain(), cookie.getPath(),
-   JOrphanUtils.valueOf(cookie.getSecure()) });
+   Boolean.valueOf(cookie.getSecure()) });
}
 
/**



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



svn commit: r514283 - in /jakarta/jmeter/branches/rel-2-2/src: core/org/apache/jmeter/save/ core/org/apache/jmeter/save/converters/ protocol/http/org/apache/jmeter/protocol/http/util/

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 16:08:43 2007
New Revision: 514283

URL: http://svn.apache.org/viewvc?view=revrev=514283
Log:
Replace deprecated Xstream ClassMapper with Mapper

Modified:

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

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java?view=diffrev=514283r1=514282r2=514283
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 Sat Mar  3 16:08:43 2007
@@ -50,8 +50,8 @@
 import org.apache.log.Logger;
 
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.alias.CannotResolveClassException;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
 
@@ -176,12 +176,12 @@
try {
if 
(val.trim().equals(collection)) { // $NON-NLS-1$

saver.registerConverter((Converter) Class.forName(key).getConstructor(
-   
new Class[] { ClassMapper.class }).newInstance(
-   
new Object[] { saver.getClassMapper() }));
+   
new Class[] { Mapper.class }).newInstance(
+   
new Object[] { saver.getMapper() }));
} else if 
(val.trim().equals(mapping)) { // $NON-NLS-1$

saver.registerConverter((Converter) Class.forName(key).getConstructor(
-   
new Class[] { ClassMapper.class }).newInstance(
-   
new Object[] { saver.getClassMapper() }));
+   
new Class[] { Mapper.class }).newInstance(
+   
new Object[] { saver.getMapper() }));
} else {

saver.registerConverter((Converter) Class.forName(key).newInstance());
}

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?view=diffrev=514283r1=514282r2=514283
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
 Sat Mar  3 16:08:43 2007
@@ -21,7 +21,7 @@
 import org.apache.jmeter.save.converters.ConversionHelp;
 import org.apache.jorphan.collections.HashTree;
 
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import 

Thread Sinchronization

2007-03-03 Thread Juliano

I'm developing a new assertion listener.
it calculates the average of the sample times that arrive on* 
AssertionResult getResult(SampleResult) *method. Depending on the 
average time, it does something or not.


When the average time reaches the defined value a boolean is set to 
true, but the other threads take some delay to realize this happened and 
continue for a while.

For example:
If at the 5 delivered sampleResult the specified value was reached, it 
continues until all remaining threads realize that.


The method seems something like:

*public AssertionResult getResult(SampleResult response) {
 calculate(response);  // calculate the average. this is a 
synchronized method

 if( ! averageReached ){
 //do somethings
}

 return assertionResult;
}

*
I tried to synchronize the methods which set the boolean value. Tried to 
synchronize the whole getResult method. Tried to insert some 
Thread.delay() at the top. But still got no lucky.


The boolean value is a static field.

Any ideas are welcome.

Thanks


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



svn commit: r514316 - /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 17:35:00 2007
New Revision: 514316

URL: http://svn.apache.org/viewvc?view=revrev=514316
Log:
No point in this being serializable

Modified:

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java?view=diffrev=514316r1=514315r2=514316
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
 Sat Mar  3 17:35:00 2007
@@ -18,8 +18,6 @@
 
 package org.apache.jmeter.protocol.http.control;
 
-import java.io.Serializable;
-
 import org.apache.jmeter.config.ConfigElement;
 import org.apache.jmeter.control.GenericController;
 import org.apache.jmeter.testelement.property.IntegerProperty;
@@ -27,7 +25,7 @@
 
 //For unit tests, @see TestHttpMirrorControl
 
-public class HttpMirrorControl extends GenericController implements 
Serializable {
+public class HttpMirrorControl extends GenericController {
 
private transient HttpMirrorServer server;
 



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



svn commit: r514323 - /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 17:59:33 2007
New Revision: 514323

URL: http://svn.apache.org/viewvc?view=revrev=514323
Log:
No point in this being serializable

Modified:

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?view=diffrev=514323r1=514322r2=514323
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 Sat Mar  3 17:59:33 2007
@@ -18,7 +18,6 @@
 
 package org.apache.jmeter.protocol.http.proxy;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -70,7 +69,7 @@
 /**
  * Class handles storing of generated samples, etc
  */
-public class ProxyControl extends GenericController implements Serializable {
+public class ProxyControl extends GenericController {
 
 private static final Logger log = LoggingManager.getLoggerForClass();
 



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



svn commit: r514324 - /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:01:58 2007
New Revision: 514324

URL: http://svn.apache.org/viewvc?view=revrev=514324
Log:
Use JMeterUtils pattern Cache

Modified:

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java?view=diffrev=514324r1=514323r2=514324
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
 Sat Mar  3 18:01:58 2007
@@ -35,7 +35,6 @@
 import org.apache.oro.text.regex.PatternMatcherInput;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
-import org.apache.oro.text.regex.MalformedPatternException;
 
 /**
  * HtmlParser implementation using regular expressions.
@@ -114,11 +113,6 @@
private static final int NUM_BASE_GROUPS = 3;
 
/**
-* Compiled regular expression.
-*/
-   static Pattern pattern;
-
-   /**
 * Thread-local input:
 */
private static ThreadLocal localInput = new ThreadLocal() {
@@ -136,17 +130,6 @@
 */
protected RegexpHTMLParser() {
super();
-
-   // Compile the regular expression:
-   try {
-   Perl5Compiler c = new Perl5Compiler();
-   pattern = c.compile(REGEXP, 
Perl5Compiler.CASE_INSENSITIVE_MASK | Perl5Compiler.SINGLELINE_MASK
-   | Perl5Compiler.READ_ONLY_MASK);
-   } catch (MalformedPatternException mpe) {
-   log.error(Internal error compiling regular expression 
in ParseRegexp.);
-   log.error(MalformedPatternException -  + mpe);
-   throw new Error(mpe);
-   }
}
 
/*
@@ -163,6 +146,12 @@
// probably a new PatternMatcherInput working on a byte[] would 
do
// better.
input.setInput(new String(html));
+   Pattern pattern=JMeterUtils.getPatternCache().getPattern(
+   REGEXP, 
+   Perl5Compiler.CASE_INSENSITIVE_MASK 
+   | Perl5Compiler.SINGLELINE_MASK
+   | Perl5Compiler.READ_ONLY_MASK);
+   
while (matcher.contains(input, pattern)) {
MatchResult match = matcher.getMatch();
String s;



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



svn commit: r514325 - in /jakarta/jmeter/branches/rel-2-2/src: functions/org/apache/jmeter/functions/RegexFunction.java protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:03:30 2007
New Revision: 514325

URL: http://svn.apache.org/viewvc?view=revrev=514325
Log:
Catch CachePattern Exception instead of all Exceptions

Modified:

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

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java?view=diffrev=514325r1=514324r2=514325
==
--- 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/RegexFunction.java
 Sat Mar  3 18:03:30 2007
@@ -35,6 +35,7 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
+import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.MatchResult;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternMatcher;
@@ -120,7 +121,7 @@
if (values.length  5) {
name = ((CompoundVariable) values[values.length 
- 1]).execute();
}
-   } catch (Exception e) {
+   } catch (MalformedCachePatternException e) {
throw new InvalidVariableException(e.toString());
}
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?view=diffrev=514325r1=514324r2=514325
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
 Sat Mar  3 18:03:30 2007
@@ -23,6 +23,7 @@
 
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.oro.text.MalformedCachePatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.Perl5Compiler;
 
@@ -406,7 +407,7 @@
try {
return JMeterUtils.getPatternCache().getPattern(pattern,
Perl5Compiler.READ_ONLY_MASK | 
Perl5Compiler.SINGLELINE_MASK);
-   } catch (Exception exception) {
+   } catch (MalformedCachePatternException exception) {
exception.printStackTrace();
return null;
}



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



svn commit: r514330 - in /jakarta/jmeter/branches/rel-2-2: src/core/org/apache/jmeter/util/JMeterUtils.java test/src/org/apache/jmeter/util/TestJMeterUtils.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:17:52 2007
New Revision: 514330

URL: http://svn.apache.org/viewvc?view=revrev=514330
Log:
Remove deprecated JMeterUtils.split()

Modified:

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

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java?view=diffrev=514330r1=514329r2=514330
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
 Sat Mar  3 18:17:52 2007
@@ -810,52 +810,6 @@
return button;
}
 
-   /**
-* Takes a String and a tokenizer character, and returns a new array of
-* strings of the string split by the tokenizer character.
-* 
-* @param splittee
-*String to be split
-* @param splitChar
-*Character to split the string on
-* @param def
-*Default value to place between two split chars that have
-*nothing between them
-* @return Array of all the tokens.
- * @deprecated 
- * Use rewritten version in JOrphanUtils (handles leading/trailing 
delimiters better)
- * TODO: remove in version 2.2
- * 
-*/
-   public static String[] split(String splittee, String splitChar, String 
def) {
-   if (splittee == null || splitChar == null) {
-   return new String[0];
-   }
-   int spot;
-// Replace ## with #def# (where #=splitChar)
-if (def.length()  0 ) {// Prevent infinite loop
-   while ((spot = splittee.indexOf(splitChar + splitChar)) != -1) {
-   splittee = splittee.substring(0, spot + 
splitChar.length()) + def
-   + splittee.substring(spot + 1 * 
splitChar.length(), splittee.length());
-   }
-}
-   Vector returns = new Vector();
-   int start = 0;
-   int length = splittee.length();
-   spot = 0;
-   while (start  length  (spot = splittee.indexOf(splitChar, 
start))  -1) {
-   if (spot  0) {
-   returns.addElement(splittee.substring(start, 
spot));
-   }
-   start = spot + splitChar.length();
-   }
-   if (start  length) {
-   returns.add(splittee.substring(start));
-   }
-   String[] values = new String[returns.size()];
-   returns.copyInto(values);
-   return values;
-   }
 
/**
 * Report an error through a dialog box.

Modified: 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java?view=diffrev=514330r1=514329r2=514330
==
--- 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
 Sat Mar  3 18:17:52 2007
@@ -33,51 +33,5 @@
 public TestJMeterUtils(String arg0) {
 super(arg0);
 }
-
-
-public void testSplit1() {
-String in = a,bc,,; // Test ignore trailing split characters
-String out[] = JMeterUtils.split(in, ,,?);// with default
-assertEquals(3, out.length);
-assertEquals(a, out[0]);
-assertEquals(bc, out[1]);
-assertEquals(?, out[2]);
-}
-
-public void testSplit1a() {
-String in = a,bc,,; // Test ignore trailing split characters
-String out[] = JMeterUtils.split(in, ,,); // with no default
-assertEquals(3, out.length);
-assertEquals(a, out[0]);
-assertEquals(bc, out[1]);
-assertEquals(, out[2]);
-}
-
-public void testSplit2() {
-String in = ,,a,bc; // Test leading split characters with default
-String out[] = JMeterUtils.split(in, ,,?);
-assertEquals(3, out.length);
-assertEquals(?, out[0]);
-assertEquals(a, out[1]);
-assertEquals(bc, out[2]);
-}
-
-public void testSplit3() {
-String in = ,,a,bc; // Test leading split characters no default
-String out[] = JMeterUtils.split(in, ,,);
-assertEquals(3, 

svn commit: r514331 - /jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:18:10 2007
New Revision: 514331

URL: http://svn.apache.org/viewvc?view=revrev=514331
Log:
Remove deprecated JMeterUtils.split()

Modified:
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diffrev=514331r1=514330r2=514331
==
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Mar  3 18:18:10 2007
@@ -54,6 +54,10 @@
 Calulator and SamplingStatCalculator classes no longer provide any formatting 
of their data.
 Formatting should now be done using the jorphan.gui Renderer classes.
 /p
+p
+Removed deprecated method JMeterUtils.split() - use JOrphanUtils version 
instead.
+/p
+
 h4New functionality:/h4
 ul
 liAdded httpclient.parameters.file to allow HttpClient parameters to be 
defined/li



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



svn commit: r514335 - /jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:22:09 2007
New Revision: 514335

URL: http://svn.apache.org/viewvc?view=revrev=514335
Log:
Need at least one test..

Modified:

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java

Modified: 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java?view=diffrev=514335r1=514334r2=514335
==
--- 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java
 Sat Mar  3 18:22:09 2007
@@ -33,5 +33,8 @@
 public TestJMeterUtils(String arg0) {
 super(arg0);
 }
-//TODO add some tests now that split() has been removed
+//TODO add some real tests now that split() has been removed
+public void test1() throws Exception{
+   
+}
 }



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



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

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:31:22 2007
New Revision: 514336

URL: http://svn.apache.org/viewvc?view=revrev=514336
Log:
Updated version checks (XStream Mapper changes)

Modified:

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java?view=diffrev=514336r1=514335r2=514336
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
 Sat Mar  3 18:31:22 2007
@@ -290,27 +290,27 @@
 static boolean checkVersions() {
versionsOK = true;
checkVersion(BooleanPropertyConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(HashTreeConverter.class, 493779); // $NON-NLS-1$
+   checkVersion(HashTreeConverter.class, 514283); // $NON-NLS-1$
checkVersion(IntegerPropertyConverter.class, 493779); // 
$NON-NLS-1$
checkVersion(LongPropertyConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(MultiPropertyConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(SampleResultConverter.class, 501270); // 
$NON-NLS-1$
+   checkVersion(MultiPropertyConverter.class, 514283); // 
$NON-NLS-1$
+   checkVersion(SampleResultConverter.class, 514283); // 
$NON-NLS-1$
 
 // Not built until later, so need to use this method:
 try {
 checkVersion(
 
Class.forName(org.apache.jmeter.protocol.http.util.HTTPResultConverter), // 
$NON-NLS-1$
-493789); // $NON-NLS-1$
+514283); // $NON-NLS-1$
 } catch (ClassNotFoundException e) {
 versionsOK = false;
 log.warn(e.getLocalizedMessage());
 }
checkVersion(StringPropertyConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(TestElementConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(TestElementPropertyConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(ScriptWrapperConverter.class, 493779); // 
$NON-NLS-1$
-   checkVersion(TestResultWrapperConverter.class, 493779); // 
$NON-NLS-1$
-checkVersion(SampleSaveConfigurationConverter.class,493779); // 
$NON-NLS-1$
+   checkVersion(TestElementConverter.class, 514283); // 
$NON-NLS-1$
+   checkVersion(TestElementPropertyConverter.class, 514283); // 
$NON-NLS-1$
+   checkVersion(ScriptWrapperConverter.class, 514283); // 
$NON-NLS-1$
+   checkVersion(TestResultWrapperConverter.class, 514283); // 
$NON-NLS-1$
+checkVersion(SampleSaveConfigurationConverter.class,514283); // 
$NON-NLS-1$
 
 if (!PROPVERSION.equalsIgnoreCase(propertiesVersion)) {
log.warn(Bad _version - expected  + PROPVERSION + , 
found  + propertiesVersion + .);



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



svn commit: r514339 - in /jakarta/jmeter/branches/rel-2-2/src: core/org/apache/jmeter/engine/ core/org/apache/jmeter/testelement/property/ core/org/apache/jmeter/threads/ junit/org/apache/jmeter/proto

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:38:38 2007
New Revision: 514339

URL: http://svn.apache.org/viewvc?view=revrev=514339
Log:
Add serialVersionUIDs

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/MapProperty.java

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java

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

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

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?view=diffrev=514339r1=514338r2=514339
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
 Sat Mar  3 18:38:38 2007
@@ -52,6 +52,8 @@
 public class StandardJMeterEngine implements JMeterEngine, 
JMeterThreadMonitor, Runnable, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
 
+   private static final long serialVersionUID = 221L; // Remember to 
change this when the class changes ...
+   
private transient Thread runningThread;
 
private static long WAIT_TO_DIE = 5 * 1000; // 5 seconds

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?view=diffrev=514339r1=514338r2=514339
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
 Sat Mar  3 18:38:38 2007
@@ -24,10 +24,10 @@
 
 import org.apache.jmeter.testelement.TestElement;
 
-/**
- * @version $Revision$
- */
 public class CollectionProperty extends MultiProperty {
+
+   private static final long serialVersionUID = 221L; // Remember to 
change this when the class changes ...
+   
private Collection value;
 
transient private Collection savedValue;

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/MapProperty.java?view=diffrev=514339r1=514338r2=514339
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/MapProperty.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/property/MapProperty.java
 Sat Mar  3 18:38:38 2007
@@ -22,11 +22,11 @@
 
 import org.apache.jmeter.testelement.TestElement;
 
-/**
- * @version $Revision$
- */
 public class MapProperty extends MultiProperty {
-   private Map value;
+
+   private static final long serialVersionUID = 221L; // Remember to 
change this when the class changes ...
+   
+private Map value;
 
private transient Map savedValue = null;
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java?view=diffrev=514339r1=514338r2=514339
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
 Sat Mar  3 18:38:38 2007
@@ -57,6 +57,8 @@
 public class JMeterThread implements Runnable, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
 
+   private static final long serialVersionUID = 221L; // Remember to 
change this when the class changes ...
+   
// NOT USED private static Map samplers = new HashMap();
private int initialDelay = 0;
 

Modified: 
jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
URL: 

svn commit: r514340 - in /jakarta/jmeter/branches/rel-2-2: src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java test/src/org/apache/jorphan/collections/TestConfigurationTree.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 18:40:50 2007
New Revision: 514340

URL: http://svn.apache.org/viewvc?view=revrev=514340
Log:
Not used

Removed:

jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jorphan/collections/TestConfigurationTree.java


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



svn commit: r514343 - /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 19:17:42 2007
New Revision: 514343

URL: http://svn.apache.org/viewvc?view=revrev=514343
Log:
Remove a JDK 1.3 work-round

Modified:

jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?view=diffrev=514343r1=514342r2=514343
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
 Sat Mar  3 19:17:42 2007
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.logging.LoggingManager;
@@ -63,8 +64,6 @@
public final static String DEFAULT_PARSER = 
 org.apache.jmeter.protocol.http.parser.HtmlParserHTMLParser; // 
$NON-NLS-1$
 
-private static final String JAVA_UTIL_LINKED_HASH_SET = 
java.util.LinkedHashSet; // $NON-NLS-1$
-
/**
 * Protected constructor to prevent instantiation except from within
 * subclasses.
@@ -131,19 +130,7 @@
// them roughly in order, which should be a better model of 
browser
// behaviour.
 
-   Collection col;
-
-   // N.B. LinkedHashSet is Java 1.4
-   if (hasLinkedHashSet) {
-   try {
-   col = (Collection) 
Class.forName(JAVA_UTIL_LINKED_HASH_SET).newInstance();
-   } catch (Exception e) {
-   throw new Error(Should not happen: + 
e.toString());
-   }
-   } else {
-   col = new java.util.HashSet(); // TODO: improve JDK1.3 
solution
-   }
-
+   Collection col = new LinkedHashSet();
return getEmbeddedResourceURLs(html, baseUrl, new 
URLCollection(col));
 
// An additional note on using HashSets to store URLs: I just
@@ -158,20 +145,6 @@
// The above problem has now been addressed with the URLString 
and
// URLCollection classes.
 
-   }
-
-   // See whether we can use LinkedHashSet or not:
-   private static final boolean hasLinkedHashSet;
-
-   static {
-   boolean b;
-   try {
-   Class.forName(JAVA_UTIL_LINKED_HASH_SET);
-   b = true;
-   } catch (ClassNotFoundException e) {
-   b = false;
-   }
-   hasLinkedHashSet = b;
}
 
/**



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



svn commit: r514346 - /jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 19:37:36 2007
New Revision: 514346

URL: http://svn.apache.org/viewvc?view=revrev=514346
Log:
Fix up another test

Modified:

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java

Modified: 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java?view=diffrev=514346r1=514345r2=514346
==
--- 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
 Sat Mar  3 19:37:36 2007
@@ -40,8 +40,8 @@
}
 
public void setUp() {
-   testFile1 = // TODO: not used - why?
-   new File(System.getProperty(user.dir) + /testfiles, Test 
Plan.jmx);
+// testFile1 = // Old-style format; no longer used
+// new File(System.getProperty(user.dir) + /testfiles, Test 
Plan.jmx);
testFile2 = // TODO: not used - why?
new File(System.getProperty(user.dir) + /testfiles, 
Modification Manager.jmx);
testFile3 = new File(System.getProperty(user.dir) + 
/testfiles, proxy.jmx);
@@ -54,8 +54,17 @@
testFile10 = new File(System.getProperty(user.dir) + 
/testfiles, OnceOnlyTestPlan.jmx);
testFile11 = new File(System.getProperty(user.dir) + 
/testfiles, ProxyServerTestPlan.jmx);
testFile12 = new File(System.getProperty(user.dir) + 
/testfiles, SimpleTestPlan.jmx);
-   testFile13 = // TODO: not used - why?
-   new File(System.getProperty(user.dir) + /testfiles, 
URLRewritingExample.jmx);
+   // Incomplete file
+// testFile13 =
+// new File(System.getProperty(user.dir) + /testfiles, 
URLRewritingExample.jmx);
+   }
+
+// public void testFile1() throws Exception {
+// assertTree(getTree(testFile1));
+// }
+
+   public void testFile2() throws Exception {
+   assertTree(getTree(testFile2));
}
 
public void testFile3() throws Exception {
@@ -63,7 +72,10 @@
}
 
private void assertTree(HashTree tree) throws Exception {
-   assertTrue(tree.getArray()[0] instanceof 
org.apache.jmeter.testelement.TestPlan);
+   final Object object = tree.getArray()[0];
+   if (! (object instanceof 
org.apache.jmeter.testelement.TestPlan)){
+   fail(Hash tree should be TestPlan, but is 
+object.getClass().getName());
+   }
}
 
public void testFile4() throws Exception {
@@ -101,6 +113,10 @@
public void testFile12() throws Exception {
assertTree(getTree(testFile12));
}
+
+// public void testFile13() throws Exception {
+// assertTree(getTree(testFile13));
+// }
 
private HashTree getTree(File f) throws Exception {
HashTree tree = SaveService.loadTree(new FileInputStream(f));



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



svn commit: r514347 - /jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 19:38:32 2007
New Revision: 514347

URL: http://svn.apache.org/viewvc?view=revrev=514347
Log: (empty)

Modified:

jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java

Modified: 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java?view=diffrev=514347r1=514346r2=514347
==
--- 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/gui/action/TestLoad.java
 Sat Mar  3 19:38:32 2007
@@ -42,7 +42,7 @@
public void setUp() {
 // testFile1 = // Old-style format; no longer used
 // new File(System.getProperty(user.dir) + /testfiles, Test 
Plan.jmx);
-   testFile2 = // TODO: not used - why?
+   testFile2 =
new File(System.getProperty(user.dir) + /testfiles, 
Modification Manager.jmx);
testFile3 = new File(System.getProperty(user.dir) + 
/testfiles, proxy.jmx);
testFile4 = new File(System.getProperty(user.dir) + 
/testfiles, AssertionTestPlan.jmx);



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



svn commit: r514348 - in /jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control: Cookie.java CookieManager.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 19:39:11 2007
New Revision: 514348

URL: http://svn.apache.org/viewvc?view=revrev=514348
Log:
Document cookie flag

Modified:

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

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

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java?view=diffrev=514348r1=514347r2=514348
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
 Sat Mar  3 19:39:11 2007
@@ -193,7 +193,9 @@
public String toString() {
 StringBuffer sb=new StringBuffer(80);
 sb.append(getDomain());
-sb.append(TAB).append(TRUE); //TODO - what does this represent?
+// flag - if all machines within a given domain can access the 
variable.
+//(from http://www.cookiecentral.com/faq/ 3.5)
+sb.append(TAB).append(TRUE);
 sb.append(TAB).append(getPath());
 sb.append(TAB).append(JOrphanUtils.booleanToSTRING(getSecure())); 
 sb.append(TAB).append(getExpires());

Modified: 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?view=diffrev=514348r1=514347r2=514348
==
--- 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
 Sat Mar  3 19:39:11 2007
@@ -189,7 +189,9 @@
 private String cookieToString(Cookie c){
 StringBuffer sb=new StringBuffer(80);
 sb.append(c.getDomain());
-sb.append(TAB).append(TRUE); //TODO - what does this represent?
+//flag - if all machines within a given domain can access the variable.
+//(from http://www.cookiecentral.com/faq/ 3.5)
+sb.append(TAB).append(TRUE);  
 sb.append(TAB).append(c.getPath());
 sb.append(TAB).append(JOrphanUtils.booleanToSTRING(c.getSecure())); 
 sb.append(TAB).append(c.getExpires());



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



svn commit: r514349 - /jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java

2007-03-03 Thread sebb
Author: sebb
Date: Sat Mar  3 19:40:05 2007
New Revision: 514349

URL: http://svn.apache.org/viewvc?view=revrev=514349
Log:
Add hashCode() so Findbugs does not complain about derived classes
TODO: still needs to be fixed ...

Modified:

jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java

Modified: 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?view=diffrev=514349r1=514348r2=514349
==
--- 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
 (original)
+++ 
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
 Sat Mar  3 19:40:05 2007
@@ -90,6 +90,11 @@
}
}
 
+   // TODO temporary hack to avoid unnecessary bug reports for subclasses
+   
+   public int hashCode(){
+   return System.identityHashCode(this);
+   }
/*
 * URGENT: TODO - sort out equals and hashCode() - at present equal
 * instances can/will have different hashcodes - problem is, when a 
proper



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



[EMAIL PROTECTED]: Project jakarta-jmeter-22-svn (in module jakarta-jmeter-22) failed

2007-03-03 Thread Gump-build
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-jmeter-22-svn has an issue affecting its community integration.
This issue affects 2 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-jmeter-22-svn :  Pure Java load testing and performance 
measurement tool.
   ...
- jakarta-jmeter-22-test :  Pure Java load testing and performance 
measurement tool.
   ...


Full details are available at:

http://vmgump.apache.org/gump/public/jakarta-jmeter-22/jakarta-jmeter-22-svn/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_lib.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_lib.zip]
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_bin.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_bin.zip]
 -DEBUG- Output [NOTICE] identifier set to output basename: [NOTICE]
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_src.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_src.zip]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/core]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/jorphan]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/components]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/protocol/http]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/monitor/model]
 -INFO- Failed with reason build failed
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/jakarta-jmeter-22/jakarta-jmeter-22-svn/gump_work/build_jakarta-jmeter-22_jakarta-jmeter-22-svn.html
Work Name: build_jakarta-jmeter-22_jakarta-jmeter-22-svn (Type: Build)
Work ended in a state of : Failed
Elapsed: 3 secs
Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main 
-Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only 
'-Dversion.projectfile=$Revision: 512382 $' -Djmeter.version=2_1_03032007 
-Dgump.run=true '-Ddate.projectfile=$Date: 2007-02-27 12:42:35 -0800 (Tue, 27 
Feb 2007) $' gump-build 
[Working Directory: /usr/local/gump/public/workspace/jakarta-jmeter-22]
CLASSPATH: 

[EMAIL PROTECTED]: Project jakarta-jmeter-22-svn (in module jakarta-jmeter-22) failed

2007-03-03 Thread Gump-build
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-jmeter-22-svn has an issue affecting its community integration.
This issue affects 2 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-jmeter-22-svn :  Pure Java load testing and performance 
measurement tool.
   ...
- jakarta-jmeter-22-test :  Pure Java load testing and performance 
measurement tool.
   ...


Full details are available at:

http://vmgump.apache.org/gump/public/jakarta-jmeter-22/jakarta-jmeter-22-svn/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_lib.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_lib.zip]
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_bin.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_bin.zip]
 -DEBUG- Output [NOTICE] identifier set to output basename: [NOTICE]
 -DEBUG- Output [jakarta-jmeter-2_1_03032007_src.zip] identifier set to output 
basename: [jakarta-jmeter-2_1_03032007_src.zip]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/core]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/jorphan]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/components]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/protocol/http]
 -INFO- Made directory 
[/usr/local/gump/public/workspace/jakarta-jmeter-22/build/monitor/model]
 -INFO- Failed with reason build failed
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/jakarta-jmeter-22/jakarta-jmeter-22-svn/gump_work/build_jakarta-jmeter-22_jakarta-jmeter-22-svn.html
Work Name: build_jakarta-jmeter-22_jakarta-jmeter-22-svn (Type: Build)
Work ended in a state of : Failed
Elapsed: 3 secs
Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main 
-Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only 
'-Dversion.projectfile=$Revision: 512382 $' -Djmeter.version=2_1_03032007 
-Dgump.run=true '-Ddate.projectfile=$Date: 2007-02-27 12:42:35 -0800 (Tue, 27 
Feb 2007) $' gump-build 
[Working Directory: /usr/local/gump/public/workspace/jakarta-jmeter-22]
CLASSPATH: