You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2015/04/26 19:04:11 UTC
svn commit: r1676128 - in /jmeter/trunk/xdocs:
stylesheets/site_printable.vsl usermanual/component_reference.xml
Author: fschumacher
Date: Sun Apr 26 17:04:11 2015
New Revision: 1676128
URL: http://svn.apache.org/r1676128
Log:
Add code as a macro to the printable vsl. Correct the usage of entities by explicitly using source instead of pre tag.
Modified:
jmeter/trunk/xdocs/stylesheets/site_printable.vsl
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=1676128&r1=1676127&r2=1676128&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site_printable.vsl Sun Apr 26 17:04:11 2015
@@ -132,6 +132,10 @@ $value.content
<img src="$relativePath$value.getAttributeValue("src")" width="$!width" height="$!height" align="$!align"/>
#end
+#macro ( code $value)
+<tt class="code">$escape.getText($value.getText())</tt>
+#end
+
#macro ( source $value)
<div align="left">
<table cellspacing="4" cellpadding="0" border="0">
@@ -268,6 +272,8 @@ Contributed by $id.getAttributeValue("na
#example ($node)
#elseif ($node.getName().equals("source"))
#source ($node)
+#elseif ($node.getName().equals("code"))
+#code ($node)
#elseif ($node.getName().equals("table"))
#table ($node)
#elseif ($node.getName().equals("component"))
@@ -528,6 +534,9 @@ $comp.getAttributeValue("index")
#set ($id = $root.getAttributeValue("id"))
<title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
+<style>
+ .code { font-weight: bold; }
+</style>
</head>
<body bgcolor="$bodybg" text="$bodyfg" link="$bodylink">
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1676128&r1=1676127&r2=1676128&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Apr 26 17:04:11 2015
@@ -730,18 +730,18 @@ See <a href="build-ws-test-plan.html">Bu
<p><b>Note:</b> If you are using CSVDataSet, do not check "Memory Cache". If memory
cache is checked, it will not iterate to the next value. That means all the requests
will use the first value.</p>
- <p>Make sure you use &lt;soap:Envelope rather than &lt;Envelope. For example:</p>
- <pre>
-&lt;?xml version="1.0" encoding="utf-8"?>
-&lt;soap:Envelope
+ <p>Make sure you use <code><soap:Envelope</code> rather than <code><Envelope</code>. For example:</p>
+ <source>
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-&lt;soap:Body>
-&lt;foo xmlns="http://clients-xlmns"/>
-&lt;/soap:Body>
-&lt;/soap:Envelope>
-</pre>
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+<soap:Body>
+<foo xmlns="http://clients-xlmns"/>
+</soap:Body>
+</soap:Envelope>
+</source>
<note>The SOAP library that is used does not support SOAP 1.2, only SOAP 1.1.
Also the library does not provide access to the HTTP response code (e.g. 200) or message (e.g. OK).
To get round this, versions of JMeter after 2.3.2 check the returned message length.