You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/04/30 14:06:23 UTC

svn commit: r652352 - in /jakarta/jmeter/trunk: docs/changes.html docs/usermanual/component_reference.html src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java xdocs/changes.xml xdocs/usermanual/component_reference.xml

Author: sebb
Date: Wed Apr 30 05:06:22 2008
New Revision: 652352

URL: http://svn.apache.org/viewvc?rev=652352&view=rev
Log:
Webservice(SOAP) sampler can now load WSDL using file: protocol

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
    jakarta/jmeter/trunk/xdocs/changes.xml
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=652352&r1=652351&r2=652352&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Wed Apr 30 05:06:22 2008
@@ -598,6 +598,11 @@
 						</li>
 									
 
+												<li	>
+								Webservice(SOAP) Sampler can now load local WSDL files using the file: protocol
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Non-functional changes

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=652352&r1=652351&r2=652352&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Wed Apr 30 05:06:22 2008
@@ -1438,7 +1438,7 @@
 									
  
 												<p	>
-								By default, the webservice sampler set SOAPHTTPConnection.setMaintainSession
+								By default, the webservice sampler sets SOAPHTTPConnection.setMaintainSession
  (true). If you need to maintain the session, add a blank Header Manager. The
  sampler uses the Header Manager to store the SOAPHTTPConnection object, since
  there apache soap does provide a easy way to get and set the cookies.
@@ -1492,15 +1492,19 @@
 		</tr>
 			<tr>
 			<td>WSDL URL</td>
-			<td>						The WSDL URL with the service description.
+			<td>						The WSDL URL with the service description.
+        Versions of JMeter after 2.3.1 support the file: protocol for local WSDL files.
+        
 			</td>
 			<td>
 											No
 								</td>
 		</tr>
 			<tr>
-			<td>Webmethods</td>
-			<td>						The WSDL URL with the service description.
+			<td>Web Methods</td>
+			<td>						Will be populated from the WSDL when the Load WSDL button is pressed.
+        Select one of the methods and press the Configure button to populate the Protocol, Server, Port, Path and SOAPAction fields. 
+        
 			</td>
 			<td>
 											No

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java?rev=652352&r1=652351&r2=652352&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java Wed Apr 30 05:06:22 2008
@@ -22,6 +22,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
@@ -54,7 +55,7 @@
 
 	protected URL WSDLURL = null;
 
-	protected HttpURLConnection CONN = null;
+	protected URLConnection CONN = null;
 
 	protected Document WSDLDOC = null;
 
@@ -176,12 +177,12 @@
 	 */
 	protected void connect() throws IOException {
 		try {
-			CONN = (HttpURLConnection) WSDLURL.openConnection();
+			CONN = WSDLURL.openConnection();
 			// in the rare case the WSDL is protected and requires
 			// authentication, use the AuthManager to set the
 			// authorization. Basic and Digest authorization are
 			// pretty weak and don't provide real security.
-			if (this.AUTH != null && this.AUTH.getAuthHeaderForURL(this.WSDLURL) != null) {
+			if (CONN instanceof HttpURLConnection && this.AUTH != null && this.AUTH.getAuthHeaderForURL(this.WSDLURL) != null) {
 				CONN.setRequestProperty("Authorization", this.AUTH.getAuthHeaderForURL(this.WSDLURL));
 			}
 		} catch (IOException exception) {

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=652352&r1=652351&r2=652352&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Apr 30 05:06:22 2008
@@ -180,6 +180,7 @@
 Leading and trailing spaces are trimmed from variable names in function calls.
 For example, ${__Random(1,63, LOTTERY )} will use the variable 'LOTTERY' rather than ' LOTTERY '
 </li>
+<li>Webservice(SOAP) Sampler can now load local WSDL files using the file: protocol</li>
 </ul>
 
 <h4>Non-functional changes</h4>

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=652352&r1=652351&r2=652352&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Apr 30 05:06:22 2008
@@ -457,7 +457,7 @@
  left blank. If a sampler has values in the proxy host and port text field, it
  will use the ones provided by the user. This behavior may not be what users
  expect.</p>
- <p>By default, the webservice sampler set SOAPHTTPConnection.setMaintainSession
+ <p>By default, the webservice sampler sets SOAPHTTPConnection.setMaintainSession
  (true). If you need to maintain the session, add a blank Header Manager. The
  sampler uses the Header Manager to store the SOAPHTTPConnection object, since
  there apache soap does provide a easy way to get and set the cookies.</p>
@@ -481,8 +481,12 @@
 <properties>
         <property name="Name" required="No">Descriptive name for this sampler
          that is shown in the tree.</property>
-        <property name="WSDL URL" required="No">The WSDL URL with the service description.</property>
-        <property name="Webmethods" required="No">The WSDL URL with the service description.</property>
+        <property name="WSDL URL" required="No">The WSDL URL with the service description.
+        Versions of JMeter after 2.3.1 support the file: protocol for local WSDL files.
+        </property>
+        <property name="Web Methods" required="No">Will be populated from the WSDL when the Load WSDL button is pressed.
+        Select one of the methods and press the Configure button to populate the Protocol, Server, Port, Path and SOAPAction fields. 
+        </property>
         <property name="Protocol" required="Yes">HTTP or HTTPS are acceptable protocol.</property>
         <property name="Server Name or IP" required="Yes">The hostname or IP address.</property>
         <property name="Port Number" required="Yes">Port Number.</property>



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