Update preview for Apache JMeter v5.2.1-rc2
diff --git a/rat/rat-report.txt b/rat/rat-report.txt
index 44497b1..216f180 100644
--- a/rat/rat-report.txt
+++ b/rat/rat-report.txt
@@ -2,7 +2,7 @@
*****************************************************
Summary
-------
-Generated at: 2019-11-12T21:45:15+01:00
+Generated at: 2019-11-14T20:10:23+01:00
Notes: 35
Binaries: 10
diff --git a/site/api/index-all.html b/site/api/index-all.html
index 2bacf18..0697221 100644
--- a/site/api/index-all.html
+++ b/site/api/index-all.html
@@ -9261,6 +9261,8 @@
<dd>
<div class="block">Gets a textual description about the pools configuration.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getConnectionProperties--">getConnectionProperties()</a></span> - Method in class org.apache.jmeter.protocol.jdbc.config.<a href="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html" title="class in org.apache.jmeter.protocol.jdbc.config">DataSourceElement</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.html#getConnectionsPerHost--">getConnectionsPerHost()</a></span> - Method in class org.apache.jmeter.protocol.mongodb.config.<a href="org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.html" title="class in org.apache.jmeter.protocol.mongodb.config">MongoSourceElement</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.html#getConnectionTimeout--">getConnectionTimeout()</a></span> - Method in class org.apache.jmeter.protocol.smtp.sampler.gui.<a href="org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.html" title="class in org.apache.jmeter.protocol.smtp.sampler.gui">SmtpPanel</a></dt>
@@ -25211,6 +25213,8 @@
<div class="block">Extracts all the required non-cookie headers for that particular URL request and
sets them in the <code>HttpMethod</code> passed in</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setConnectionProperties-java.lang.String-">setConnectionProperties(String)</a></span> - Method in class org.apache.jmeter.protocol.jdbc.config.<a href="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html" title="class in org.apache.jmeter.protocol.jdbc.config">DataSourceElement</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.html#setConnectionsPerHost-int-">setConnectionsPerHost(int)</a></span> - Method in class org.apache.jmeter.protocol.mongodb.config.<a href="org/apache/jmeter/protocol/mongodb/config/MongoSourceElement.html" title="class in org.apache.jmeter.protocol.mongodb.config">MongoSourceElement</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.html#setConnectionTimeout-java.lang.String-">setConnectionTimeout(String)</a></span> - Method in class org.apache.jmeter.protocol.smtp.sampler.gui.<a href="org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.html" title="class in org.apache.jmeter.protocol.smtp.sampler.gui">SmtpPanel</a></dt>
diff --git a/site/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html b/site/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html
index 990c1ce..51abeef 100644
--- a/site/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html
+++ b/site/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -222,138 +222,146 @@
</tr>
<tr id="i7" class="rowColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDataSource--">getDataSource</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getConnectionProperties--">getConnectionProperties</a></span>()</code> </td>
</tr>
<tr id="i8" class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDbUrl--">getDbUrl</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDataSource--">getDataSource</a></span>()</code> </td>
</tr>
<tr id="i9" class="rowColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDriver--">getDriver</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDbUrl--">getDbUrl</a></span>()</code> </td>
</tr>
<tr id="i10" class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getInitQuery--">getInitQuery</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getDriver--">getDriver</a></span>()</code> </td>
</tr>
<tr id="i11" class="rowColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getPassword--">getPassword</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getInitQuery--">getInitQuery</a></span>()</code> </td>
</tr>
<tr id="i12" class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getPoolMax--">getPoolMax</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getPassword--">getPassword</a></span>()</code> </td>
</tr>
<tr id="i13" class="rowColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTimeout--">getTimeout</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getPoolMax--">getPoolMax</a></span>()</code> </td>
</tr>
<tr id="i14" class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTransactionIsolation--">getTransactionIsolation</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTimeout--">getTimeout</a></span>()</code> </td>
</tr>
<tr id="i15" class="rowColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTrimInterval--">getTrimInterval</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTransactionIsolation--">getTransactionIsolation</a></span>()</code> </td>
</tr>
<tr id="i16" class="altColor">
<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getUsername--">getUsername</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getTrimInterval--">getTrimInterval</a></span>()</code> </td>
</tr>
<tr id="i17" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isAutocommit--">isAutocommit</a></span>()</code> </td>
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#getUsername--">getUsername</a></span>()</code> </td>
</tr>
<tr id="i18" class="altColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isKeepAlive--">isKeepAlive</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isAutocommit--">isAutocommit</a></span>()</code> </td>
</tr>
<tr id="i19" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isPreinit--">isPreinit</a></span>()</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isKeepAlive--">isKeepAlive</a></span>()</code> </td>
</tr>
<tr id="i20" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setAutocommit-boolean-">setAutocommit</a></span>(boolean autocommit)</code> </td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isPreinit--">isPreinit</a></span>()</code> </td>
</tr>
<tr id="i21" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setCheckQuery-java.lang.String-">setCheckQuery</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> checkQuery)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setAutocommit-boolean-">setAutocommit</a></span>(boolean autocommit)</code> </td>
</tr>
<tr id="i22" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setConnectionAge-java.lang.String-">setConnectionAge</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> connectionAge)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setCheckQuery-java.lang.String-">setCheckQuery</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> checkQuery)</code> </td>
</tr>
<tr id="i23" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDataSource-java.lang.String-">setDataSource</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> dataSource)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setConnectionAge-java.lang.String-">setConnectionAge</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> connectionAge)</code> </td>
</tr>
<tr id="i24" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDbUrl-java.lang.String-">setDbUrl</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> dbUrl)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setConnectionProperties-java.lang.String-">setConnectionProperties</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> connectionProperties)</code> </td>
</tr>
<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDriver-java.lang.String-">setDriver</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> driver)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDataSource-java.lang.String-">setDataSource</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> dataSource)</code> </td>
</tr>
<tr id="i26" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setInitQuery-java.lang.String-">setInitQuery</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> initQuery)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDbUrl-java.lang.String-">setDbUrl</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> dbUrl)</code> </td>
</tr>
<tr id="i27" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setKeepAlive-boolean-">setKeepAlive</a></span>(boolean keepAlive)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setDriver-java.lang.String-">setDriver</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> driver)</code> </td>
</tr>
<tr id="i28" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPassword-java.lang.String-">setPassword</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> password)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setInitQuery-java.lang.String-">setInitQuery</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> initQuery)</code> </td>
</tr>
<tr id="i29" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPoolMax-java.lang.String-">setPoolMax</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> poolMax)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setKeepAlive-boolean-">setKeepAlive</a></span>(boolean keepAlive)</code> </td>
</tr>
<tr id="i30" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPreinit-boolean-">setPreinit</a></span>(boolean preinit)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPassword-java.lang.String-">setPassword</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> password)</code> </td>
</tr>
<tr id="i31" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTimeout-java.lang.String-">setTimeout</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> timeout)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPoolMax-java.lang.String-">setPoolMax</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> poolMax)</code> </td>
</tr>
<tr id="i32" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTransactionIsolation-java.lang.String-">setTransactionIsolation</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> transactionIsolation)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setPreinit-boolean-">setPreinit</a></span>(boolean preinit)</code> </td>
</tr>
<tr id="i33" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTrimInterval-java.lang.String-">setTrimInterval</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> trimInterval)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTimeout-java.lang.String-">setTimeout</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> timeout)</code> </td>
</tr>
<tr id="i34" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setUsername-java.lang.String-">setUsername</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTransactionIsolation-java.lang.String-">setTransactionIsolation</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> transactionIsolation)</code> </td>
</tr>
<tr id="i35" class="rowColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setTrimInterval-java.lang.String-">setTrimInterval</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> trimInterval)</code> </td>
+</tr>
+<tr id="i36" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#setUsername-java.lang.String-">setUsername</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> username)</code> </td>
+</tr>
+<tr id="i37" class="rowColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#testEnded--">testEnded</a></span>()</code>
<div class="block">
Called once for all threads after the end of a test.</div>
</td>
</tr>
-<tr id="i36" class="altColor">
+<tr id="i38" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#testEnded-java.lang.String-">testEnded</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</code>
<div class="block">
Called once for all threads after the end of a test.</div>
</td>
</tr>
-<tr id="i37" class="rowColor">
+<tr id="i39" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#testStarted--">testStarted</a></span>()</code>
<div class="block">
Called just before the start of the test from the main engine thread.</div>
</td>
</tr>
-<tr id="i38" class="altColor">
+<tr id="i40" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#testStarted-java.lang.String-">testStarted</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> host)</code>
<div class="block">
@@ -1023,7 +1031,7 @@
<a name="setInitQuery-java.lang.String-">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>setInitQuery</h4>
<pre>public void setInitQuery(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> initQuery)</pre>
@@ -1033,6 +1041,32 @@
</dl>
</li>
</ul>
+<a name="getConnectionProperties--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getConnectionProperties</h4>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> getConnectionProperties()</pre>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the connectionProperties</dd>
+</dl>
+</li>
+</ul>
+<a name="setConnectionProperties-java.lang.String-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setConnectionProperties</h4>
+<pre>public void setConnectionProperties(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> connectionProperties)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>connectionProperties</code> - the connectionProperties to set</dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</li>
diff --git a/site/changes.html b/site/changes.html
index aec309c..afb7f24 100644
--- a/site/changes.html
+++ b/site/changes.html
@@ -273,6 +273,13 @@
<h3>Other samplers</h3>
<ul>
+
+<li>
+<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=63926">
+ Bug
+ 63926</a>
+ -
+ JDBC Connection Configuration: Add ability to set connection properties</li>
</ul>
diff --git a/site/usermanual/component_reference.html b/site/usermanual/component_reference.html
index 58d89e4..1a68704 100644
--- a/site/usermanual/component_reference.html
+++ b/site/usermanual/component_reference.html
@@ -10340,6 +10340,12 @@
<div class="description req-false">Password to connect with. (N.B. this is stored unencrypted in the test plan)</div>
<div class="required req-false">No</div>
</div>
+
+<div class="property">
+<div class="name req-false">Connection Properties</div>
+<div class="description req-false">Connection Properties to set when establishing connection (like <span class="code">internal_logon=sysdba</span> for Oracle for example)</div>
+<div class="required req-false">No</div>
+</div>
</div>
<p>Different databases and JDBC drivers require different JDBC settings.
