View | Details | Raw Unified | Return to bug 63513
Collapse All | Expand All

(-)xdocs/changes.xml (+5 lines)
Lines 182-187 Link Here
182
182
183
<h3>Documentation</h3>
183
<h3>Documentation</h3>
184
<ul>
184
<ul>
185
    <li><bug>63484</bug>Add apache velocity as JSR223 script language. Contributed by Ori Marko (orimarko at gmail.com)</li>
186
	<li><bug>6351</bug>Add MariaDB examples to JDBC documentation 
187
	</li>
185
</ul>
188
</ul>
186
189
187
<h3>General</h3>
190
<h3>General</h3>
Lines 201-206 Link Here
201
  <li>Xia Li</li>
204
  <li>Xia Li</li>
202
  <li>Naveen Nandwani (naveen.nandwani at india.nec.com)</li>
205
  <li>Naveen Nandwani (naveen.nandwani at india.nec.com)</li>
203
  <li>Artem Fedorov (artem.fedorov at blazemeter.com)</li>
206
  <li>Artem Fedorov (artem.fedorov at blazemeter.com)</li>
207
  <li>Ori Marko (orimarko at gmail.com)</li>
204
</ul>
208
</ul>
205
<p>We also thank bug reporters who helped us improve JMeter.</p>
209
<p>We also thank bug reporters who helped us improve JMeter.</p>
206
<ul>
210
<ul>
Lines 208-213 Link Here
208
    <li>Brian Tully (brian.tully at acquia.com)</li>
212
    <li>Brian Tully (brian.tully at acquia.com)</li>
209
    <li>Amer Ghazal (amerghazal at gmail.com)</li>
213
    <li>Amer Ghazal (amerghazal at gmail.com)</li>
210
    <li>(stefan at trilobyte-se.de)</li>
214
    <li>(stefan at trilobyte-se.de)</li>
215
	<li>Ori Marko (orimarko at gmail.com)</li>
211
</ul>
216
</ul>
212
<p>
217
<p>
213
Apologies if we have omitted anyone else.
218
Apologies if we have omitted anyone else.
(-)xdocs/usermanual/component_reference.xml (+12 lines)
Lines 1160-1165 Link Here
1160
    <property name="Scripting Language" required="Yes">Name of the JSR223 scripting language to be used.
1160
    <property name="Scripting Language" required="Yes">Name of the JSR223 scripting language to be used.
1161
      <note>There are other languages supported than those that appear in the drop-down list.
1161
      <note>There are other languages supported than those that appear in the drop-down list.
1162
        Others may be available if the appropriate jar is installed in the JMeter lib directory.
1162
        Others may be available if the appropriate jar is installed in the JMeter lib directory.
1163
		Notice that adding language as Velocity, you may need to use different syntax for JSR223 variables, e.g.
1164
		<source>$log.debug( "Hello " + $vars.get("a"));</source>	
1163
      </note>
1165
      </note>
1164
    </property>
1166
    </property>
1165
    <property name="Script File" required="No">Name of a file to be used as a JSR223 script, if a relative file path is used, then it will be relative to directory referenced by "<code>user.dir</code>" System property</property>
1167
    <property name="Script File" required="No">Name of a file to be used as a JSR223 script, if a relative file path is used, then it will be relative to directory referenced by "<code>user.dir</code>" System property</property>
Lines 4061-4066 Link Here
4061
    </dl>
4063
    </dl>
4062
  </dd>
4064
  </dd>
4063
</dl>
4065
</dl>
4066
  <dt>MariaDB</dt>
4067
  <dd>
4068
    <dl>
4069
      <dt>Driver class</dt>
4070
      <dd><code>org.mariadb.jdbc.Driver</code></dd>
4071
      <dt>Database URL</dt>
4072
      <dd><code>jdbc:mariadb://server[:port]/databaseName[;URLAttributes=value[;&hellip;]]</code></dd>
4073
    </dl>
4074
  </dd>
4075
</dl>
4064
<note>The above may not be correct - please check the relevant JDBC driver documentation.</note>
4076
<note>The above may not be correct - please check the relevant JDBC driver documentation.</note>
4065
</component>
4077
</component>
4066
4078

Return to bug 63513