You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/11/20 20:19:19 UTC

svn commit: r1815844 - in /jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/ xdocs/usermanual/

Author: pmouawad
Date: Mon Nov 20 20:19:18 2017
New Revision: 1815844

URL: http://svn.apache.org/viewvc?rev=1815844&view=rev
Log:
Improve naming of JDBC elements

Modified:
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties?rev=1815844&r1=1815843&r2=1815844&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementResources.properties Mon Nov 20 20:19:18 2017
@@ -34,7 +34,7 @@ password.displayName=Password
 password.shortDescription=Password used to connect to database
 checkQuery.displayName=Validation Query
 checkQuery.shortDescription=A query used to validate a connection still works.  Only relevant if Validate connections is true.
-dataSource.displayName=Variable Name
+dataSource.displayName=Variable Name for created pool
 dataSource.shortDescription=Name of the JMeter variable that the pool will be bound to.
 timeout.displayName=Max Wait (ms)
 timeout.shortDescription=The pool blocks requests for connection until a connection is available. This is the maximum blocking time in milliseconds before an exception is returned.

Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties?rev=1815844&r1=1815843&r2=1815844&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties (original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties Mon Nov 20 20:19:18 2017
@@ -20,7 +20,7 @@ query.displayName=Query
 query.shortDescription=SQL Query to send to database
 queryType.displayName=Query Type
 queryType.shortDescription=Determines if the SQL statement should be run as a select statement or an update statement.
-dataSource.displayName=Variable Name
+dataSource.displayName=Variable Name of Pool declared in JDBC Connection Configuration
 dataSource.shortDescription=Name of the JMeter variable that the connection pool is bound to.
 queryArguments.displayName=Parameter values
 queryArguments.shortDescription=SQL parameter values (comma separated)

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1815844&r1=1815843&r2=1815844&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Nov 20 20:19:18 2017
@@ -520,7 +520,7 @@ the additional variables for rows four,
 
 <properties>
         <property name="Name" required="No">Descriptive name for this sampler that is shown in the tree.</property>
-        <property name="Variable Name" required="Yes">
+        <property name="Variable Name of Pool declared in <code>JDBC Connection Configuration</code>" required="Yes">
         Name of the JMeter variable that the connection pool is bound to.
         This must agree with the '<code>Variable Name</code>' field of a <complink name="JDBC Connection Configuration"/>.
         </property>
@@ -4017,7 +4017,7 @@ instead. (see figures 12 and 13).</p>
     </description>
     <properties>
         <property name="Name" required="No">Descriptive name for the connection configuration that is shown in the tree.</property>
-        <property name="Variable Name" required="Yes">The name of the variable the connection is tied to.  
+        <property name="Variable Name for created pool" required="Yes">The name of the variable the connection is tied to.  
         Multiple connections can be used, each tied to a different variable, allowing JDBC Samplers
         to select the appropriate connection.
         <note>Each name must be different. If there are two configuration elements using the same name,