mstover1 2005/08/15 14:02:42 Modified: xdocs changes.xml src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler JDBCSamplerBeanInfo.java JDBCSamplerResources_es.properties JDBCSamplerResources.properties JDBCSampler.java Log: MERGE from 2-1 Revision Changes Path 1.39 +3 -1 jakarta-jmeter/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/jakarta-jmeter/xdocs/changes.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- changes.xml 10 Aug 2005 14:28:31 -0000 1.38 +++ changes.xml 15 Aug 2005 21:02:42 -0000 1.39 @@ -56,6 +56,7 @@ <li>Bug 35525 - Added Spanish localisation</li> <li>Bug 30379 - allow server.rmi.port to be overridden</li> <li>CSVRead - allow "next" to be appended to column number</li> +<li>enhanced the monitor listener to save the calculated stats</li> </ul> <h4>Bug fixes:</h4> <ul> @@ -83,6 +84,7 @@ <li>Fixed screen borders for LDAP config GUI elements</li> <li>Bug 31184 - make sure encoding is specified in JDBC sampler</li> <li>TCP sampler - only share sockets with same host:port details; correct the manual</li> +<li>Extract src attribute for embed tags in JTidy and Html Parsers</li> </ul> <h3>Version 2.0.3</h3> 1.6 +5 -3 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java Index: JDBCSamplerBeanInfo.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JDBCSamplerBeanInfo.java 12 Jul 2005 20:50:54 -0000 1.5 +++ JDBCSamplerBeanInfo.java 15 Aug 2005 21:02:42 -0000 1.6 @@ -40,15 +40,17 @@ createPropertyGroup("varName", new String[] { "dataSource" }); - createPropertyGroup("sql", new String[] { "queryOnly", "query" }); + createPropertyGroup("sql", new String[] { "queryType", "query" }); PropertyDescriptor p = property("dataSource"); p.setValue(NOT_UNDEFINED, Boolean.TRUE); p.setValue(DEFAULT, ""); - p = property("queryOnly"); + p = property("queryType"); p.setValue(NOT_UNDEFINED, Boolean.TRUE); - p.setValue(DEFAULT, new Boolean(true)); + p.setValue(DEFAULT, JDBCSampler.SELECT); + p.setValue(NOT_OTHER,Boolean.TRUE); + p.setValue(TAGS,new String[]{JDBCSampler.SELECT,"Update Statement"}); p = property("query"); p.setValue(NOT_UNDEFINED, Boolean.TRUE); 1.2 +2 -2 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties Index: JDBCSamplerResources_es.properties =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources_es.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JDBCSamplerResources_es.properties 10 Jul 2005 19:23:47 -0000 1.1 +++ JDBCSamplerResources_es.properties 15 Aug 2005 21:02:42 -0000 1.2 @@ -4,7 +4,7 @@ displayName=Petici\u00F3n JDBC query.displayName=Query query.shortDescription=Query SQL a enviar a la base de datos -queryOnly.displayName=Solo Query -queryOnly.shortDescription=is true, se lanzar\u00E1 como una query y no como un update/inser. Si no, se lanza como update. +queryType.displayName=Solo Query +queryType.shortDescription=is true, se lanzar\u00E1 como una query y no como un update/inser. Si no, se lanza como update. sql.displayName=Query SQL varName.displayName=Nombre de Variable Ligada al Pool 1.4 +2 -2 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties Index: JDBCSamplerResources.properties =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerResources.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JDBCSamplerResources.properties 15 Apr 2005 19:55:37 -0000 1.3 +++ JDBCSamplerResources.properties 15 Aug 2005 21:02:42 -0000 1.4 @@ -3,7 +3,7 @@ sql.displayName=SQL Query query.displayName=Query query.shortDescription=SQL Query to send to database -queryOnly.displayName=Query Only -queryOnly.shortDescription=If true, will run as a query and not as an update/insert. Otherwise, run as update. +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.shortDescription=Name of the JMeter variable that the connection pool is bound to. \ No newline at end of file 1.38 +11 -11 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java Index: JDBCSampler.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- JDBCSampler.java 12 Jul 2005 20:50:54 -0000 1.37 +++ JDBCSampler.java 15 Aug 2005 21:02:42 -0000 1.38 @@ -44,12 +44,13 @@ private static Logger log = LoggingManager.getLoggerForClass(); public static final String QUERY = "query"; + public static final String SELECT = "Select Statement"; public String query = ""; public String dataSource = ""; - public boolean queryOnly = true; + public String queryType = SELECT; /** * Creates a JDBCSampler. @@ -80,7 +81,7 @@ stmt = conn.createStatement(); // Based on query return value, get results - if (isQueryOnly()) { + if (SELECT.equals(getQueryType())) { ResultSet rs = null; try { rs = stmt.executeQuery(getQuery()); @@ -195,17 +196,16 @@ } /** - * @return Returns the queryOnly. + * @return Returns the queryType. */ - public boolean isQueryOnly() { - return queryOnly; + public String getQueryType() { + return queryType; } /** - * @param queryOnly - * The queryOnly to set. + * @param queryType The queryType to set. */ - public void setQueryOnly(boolean queryOnly) { - this.queryOnly = queryOnly; + public void setQueryType(String queryType) { + this.queryType = queryType; } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]