Re: svn commit: r1730604 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/ src/protocol/http/org/apache/jmeter/protocol/http/util/ xdocs/ xdocs/usermanual/

Tue, 16 Feb 2016 13:10:25 -0800 

Am 15.02.2016 um 23:00 schrieb sebb:

On 15 February 2016 at 20:58, Philippe Mouawad
<[email protected]> wrote:

there might be 1 side effect that we need to think about.

Take 1 plan using an additional method.
Plan is opened in a new instance not having this configuration.
What to put in select box ?
That might not be easy to diagnose.
It's the same issue as for java sampler when class is not in jar.

Maybe it would be better to have an editable selech box.

+1

But I think we should preset the known values.

Might also be useful to allow new methods to be added via a property.
This would make it easier when new ones are added, and hopefully would
not be a problem with porting to other versions, so long as they have
the editable select box.
I have attached a simple version of it. With the patch one can choose any method and it will be treated as a valid webdav method. 

I haven't added the property, but that should be easy.
I think the webdav class can be removed, if it's used the way the patch makes it to be used. 

Should I open a new bug, or use the one for the search entry?

Regards,
 Felix




Regards

On Monday, February 15, 2016, Philippe Mouawad <[email protected]>
wrote:


ok for me

On Monday, February 15, 2016, Felix Schumacher <
[email protected]
<javascript:_e(%7B%7D,'cvml','[email protected]');>>
wrote:


Am 15.02.2016 um 21:40 schrieb Philippe Mouawad:


On Monday, February 15, 2016, Felix Schumacher <
[email protected]> wrote:

Am 15.02.2016 um 21:30 schrieb Philippe Mouawad:

Wouldn't a standard property (comma separated values) be better ?

Yes. That would be even better.

Merge them into the ones we already have, or replace them?


no firm opinion.
Merge might be safer ?


Merge is probably safer. So use the ones we have already as the base
stock?


Are you restricting it to webdav or to all methods ?


I think it should be free. Who knows what methods creep up in the future?


If all maybe we need to have a way to express if it can have a body or
not
?


If it is needed, we could add another comma separated list, that lists
those. But I think we can start without.

Felix




On Monday, February 15, 2016, Felix Schumacher <
[email protected]> wrote:

Am 15.02.2016 um 21:19 schrieb Philippe Mouawad:


Hi Felix,


There are other webdav methods that we don't support, should we add
them
all ?

I thought about putting the list of supported methods into a file, so


anyone could edit it, if a new method is needed.

What do you think about that?



Felix


Regards


On Monday, February 15, 2016, <[email protected]> wrote:

Author: fschumacher

Date: Mon Feb 15 20:08:25 2016

New Revision: 1730604

URL: http://svn.apache.org/viewvc?rev=1730604&view=rev
Log:
HTTP Sampler : Added WebDAV verb (SEARCH).

Bugzilla Id: 59005

Modified:




jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java




jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java
        jmeter/trunk/xdocs/changes.xml
        jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified:



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:



http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1730604&r1=1730603&r2=1730604&view=diff




==============================================================================
---



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Mon Feb 15 20:08:25 2016
@@ -96,7 +96,7 @@ import org.apache.oro.text.regex.Perl5Ma
     public abstract class HTTPSamplerBase extends AbstractSampler
         implements TestStateListener, TestIterationListener,
ThreadListener,
HTTPConstantsInterface {

-    private static final long serialVersionUID = 240L;
+    private static final long serialVersionUID = 241L;

         private static final Logger log =
LoggingManager.getLoggerForClass();

@@ -241,7 +241,8 @@ public abstract class HTTPSamplerBase ex
             HTTPConstants.LOCK,
             HTTPConstants.UNLOCK,
             HTTPConstants.REPORT,
-        HTTPConstants.MKCALENDAR
+        HTTPConstants.MKCALENDAR,
+        HTTPConstants.SEARCH
             };

         private static final List<String> METHODLIST =
Collections.unmodifiableList(Arrays.asList(METHODS));

Modified:



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java
URL:



http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java?rev=1730604&r1=1730603&r2=1730604&view=diff




==============================================================================
---



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java
(original)
+++



jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java
Mon Feb 15 20:08:25 2016
@@ -49,6 +49,7 @@ public interface HTTPConstantsInterface
         String CONNECT = "CONNECT"; // $NON-NLS-1$
         String REPORT = "REPORT"; // $NON-NLS-1$
         String MKCALENDAR = "MKCALENDAR"; // $NON-NLS-1$
+    String SEARCH = "SEARCH"; // $NON-NLS-1$
         String HEADER_AUTHORIZATION = "Authorization"; //
$NON-NLS-1$
         String HEADER_COOKIE = "Cookie"; // $NON-NLS-1$
         String HEADER_CONNECTION = "Connection"; // $NON-NLS-1$

Modified: jmeter/trunk/xdocs/changes.xml
URL:



http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1730604&r1=1730603&r2=1730604&view=diff




==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Feb 15 20:08:25 2016
@@ -107,6 +107,7 @@ Summary
             This is the same behaviour as with <code>POST</code>
requests.</li>
         <li><bug>58860</bug>HTTP Request : Add automatic variable
generation
in HTTP parameters table by right click. Contributed by Benoit Wiart
(benoit dot wiart at gmail.com)</li>
         <li><bug>58923</bug>normalize URIs when downloading embedded
resources.</li>
+    <li><bug>59005</bug>HTTP Sampler : Added WebDAV verb
(SEARCH).</li>
         <li><bug>59006</bug>Change Default proxy recording port to
8888
to
align it with Recording Template. Contributed by Antonio Gomes
Rodrigues
(ra0077 at gmail.com)</li>
     </ul>


Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:



http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1730604&r1=1730603&r2=1730604&view=diff




==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Feb 15
20:08:25 2016
@@ -157,7 +157,8 @@ Latency is set to the time it takes to l
              </li>
              <li>It does not support virtual hosts.</li>
              <li>It does not support the following methods:
<code>COPY</code>, <code>LOCK</code>, <code>MKCOL</code>,
<code>MOVE</code>,
-             <code>PATCH</code>, <code>PROPFIND</code>,
<code>PROPPATCH</code>, <code>UNLOCK</code>, <code>REPORT</code>,
<code>MKCALENDAR</code>.</li>
+             <code>PATCH</code>, <code>PROPFIND</code>,
<code>PROPPATCH</code>, <code>UNLOCK</code>, <code>REPORT</code>,
+             <code>MKCALENDAR</code>, <code>SEARCH</code>.</li>
              <li>It does not support client based certificate
testing
with
Keystore Config.</li>
              </ul>
              <note>Note: the <code>FILE</code> protocol is intended
for
testing purposes only.
@@ -232,7 +233,8 @@ https.default.protocol=SSLv3
               <code>OPTIONS</code>, <code>PUT</code>,
<code>DELETE</code>,
<code>PATCH</code> (not supported for
               <code>JAVA</code> implementation). With
<code>HttpClient4</code>, the following methods related to WebDav
are
               also allowed: <code>COPY</code>, <code>LOCK</code>,
<code>MKCOL</code>, <code>MOVE</code>,
-          <code>PROPFIND</code>, <code>PROPPATCH</code>,
<code>UNLOCK</code>, <code>REPORT</code>,
<code>MKCALENDAR</code>.</property>
+          <code>PROPFIND</code>, <code>PROPPATCH</code>,
<code>UNLOCK</code>, <code>REPORT</code>, <code>MKCALENDAR</code>,
+          <code>SEARCH</code>.</property>
             <property name="Content Encoding" required="No">
             Content encoding to be used (for <code>POST</code>,
<code>PUT</code>, <code>PATCH</code> and <code>FILE</code>).
             This is the character encoding to be used, and is not
related
to
the Content-Encoding HTTP header.











diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
index 603a238..8637565 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
@@ -597,7 +597,7 @@ public class UrlConfigGui extends JPanel implements ChangeListener {
 
         if (notConfigOnly){
             method = new JLabeledChoice(JMeterUtils.getResString("method"), // $NON-NLS-1$
-                    HTTPSamplerBase.getValidMethodsAsArray());
+                    HTTPSamplerBase.getValidMethodsAsArray(), true);
         }
 
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java
index f7e4dbf..d2236f5 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java
@@ -67,6 +67,6 @@ public final class HttpWebdav extends HttpEntityEnclosingRequestBase {
      * @return <code>true</code> if method is a Webdav one
      */
     public static boolean isWebdavMethod(String method) {
-        return WEBDAV_METHODS.contains(method);
+        return true;
     }
 }

Reply via email to