You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/11 00:27:37 UTC
svn commit: r1502030 - in /jmeter/trunk: bin/templates/
src/core/org/apache/jmeter/gui/action/
src/core/org/apache/jmeter/gui/action/template/ xdocs/
Author: sebb
Date: Wed Jul 10 22:27:37 2013
New Revision: 1502030
URL: http://svn.apache.org/r1502030
Log:
Template system should support relative fileName entries
Bugzilla Id: 55237
Modified:
jmeter/trunk/bin/templates/templates.xml
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/templates/templates.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/templates.xml?rev=1502030&r1=1502029&r2=1502030&view=diff
==============================================================================
--- jmeter/trunk/bin/templates/templates.xml (original)
+++ jmeter/trunk/bin/templates/templates.xml Wed Jul 10 22:27:37 2013
@@ -45,7 +45,7 @@
</template>
<template isTestPlan="true">
<name>JDBC Load Test</name>
- <fileName>/bin/templates/jdbc.jmx</fileName>
+ <fileName>jdbc.jmx</fileName>
<description>
<![CDATA[<h1>Template showing how to Load Test an SQL query on Database</h1>
<h2>JMeter Configuration</h2>
@@ -62,7 +62,7 @@
</template>
<template isTestPlan="false">
<name>BeanShell Sampler</name>
- <fileName>/bin/templates/BeanShellSampler.jmx</fileName>
+ <fileName>BeanShellSampler.jmx</fileName>
<description><![CDATA[
<h1>BeanShell Sampler with View Results Tree Listener</h1>
]]></description>
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java?rev=1502030&r1=1502029&r2=1502030&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java Wed Jul 10 22:27:37 2013
@@ -152,7 +152,10 @@ public class SelectTemplateDialog extend
}
}
ActionRouter.getInstance().doActionNow(new ActionEvent(actionEvent.getSource(), actionEvent.getID(), ActionNames.STOP_THREAD));
- final File fileToCopy = new File(JMeterUtils.getJMeterHome(), template.getFileName());
+ final File parent = template.getParent();
+ final File fileToCopy = parent != null
+ ? new File(parent, template.getFileName())
+ : new File(JMeterUtils.getJMeterHome(), template.getFileName());
Load.loadProjectFile(actionEvent, fileToCopy, !isTestPlan, false);
this.setVisible(false);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java?rev=1502030&r1=1502029&r2=1502030&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java Wed Jul 10 22:27:37 2013
@@ -18,6 +18,8 @@
package org.apache.jmeter.gui.action.template;
+import java.io.File;
+
/**
* Template Bean
* @since 2.10
@@ -27,6 +29,7 @@ public class Template {
private String name;
private String fileName;
private String description;
+ private transient File parent; // for relative links
/**
* @return the name
*/
@@ -69,4 +72,10 @@ public class Template {
public void setTestPlan(boolean isTestPlan) {
this.isTestPlan = isTestPlan;
}
+ public File getParent() {
+ return parent;
+ }
+ public void setParent(File parent) {
+ this.parent = parent;
+ }
}
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1502030&r1=1502029&r2=1502030&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java Wed Jul 10 22:27:37 2013
@@ -112,7 +112,14 @@ public class TemplateManager {
try {
if(f.exists() && f.canRead()) {
log.info("Reading templates from:"+f.getAbsolutePath());
- temps.putAll(((Templates) xstream.fromXML(f)).templates);
+ final File parent = f.getParentFile();
+ final LinkedHashMap<String, Template> templates = ((Templates) xstream.fromXML(f)).templates;
+ for(Template t : templates.values()) {
+ if (!t.getFileName().startsWith("/")) {
+ t.setParent(parent);
+ }
+ }
+ temps.putAll(templates);
} else {
log.warn("Ignoring template file:'"+f.getAbsolutePath()+"' as it does not exist or is not readable");
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502030&r1=1502029&r2=1502030&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Jul 10 22:27:37 2013
@@ -268,6 +268,7 @@ Transaction Controller now sets Response
<li><bugzilla>55202</bugzilla> - Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea</li>
<li><bugzilla>55175</bugzilla> - HTTPHC4Impl refactoring to allow better inheritance</li>
<li><bugzilla>55236</bugzilla> - Templates - provide button to reload template details</li>
+<li><bugzilla>55237</bugzilla> - Template system should support relative fileName entries</li>
</ul>
<h2>Non-functional changes</h2>
Re: svn commit: r1502030 - in /jmeter/trunk: bin/templates/ src/core/org/apache/jmeter/gui/action/
src/core/org/apache/jmeter/gui/action/template/ xdocs/
Posted by Milamber <mi...@apache.org>.
Le 10/07/2013 22:27, sebb@apache.org a ecrit :
> Author: sebb
> Date: Wed Jul 10 22:27:37 2013
> New Revision: 1502030
>
> URL: http://svn.apache.org/r1502030
> Log:
> Template system should support relative fileName entries
Thanks, It's a normal functionality for me.
> Bugzilla Id: 55237
>
> Modified:
> jmeter/trunk/bin/templates/templates.xml
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java
> jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/bin/templates/templates.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/templates.xml?rev=1502030&r1=1502029&r2=1502030&view=diff
> ==============================================================================
> --- jmeter/trunk/bin/templates/templates.xml (original)
> +++ jmeter/trunk/bin/templates/templates.xml Wed Jul 10 22:27:37 2013
> @@ -45,7 +45,7 @@
> </template>
> <template isTestPlan="true">
> <name>JDBC Load Test</name>
> - <fileName>/bin/templates/jdbc.jmx</fileName>
> + <fileName>jdbc.jmx</fileName>
> <description>
> <![CDATA[<h1>Template showing how to Load Test an SQL query on Database</h1>
> <h2>JMeter Configuration</h2>
> @@ -62,7 +62,7 @@
> </template>
> <template isTestPlan="false">
> <name>BeanShell Sampler</name>
> - <fileName>/bin/templates/BeanShellSampler.jmx</fileName>
> + <fileName>BeanShellSampler.jmx</fileName>
> <description><![CDATA[
> <h1>BeanShell Sampler with View Results Tree Listener</h1>
> ]]></description>
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java?rev=1502030&r1=1502029&r2=1502030&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplateDialog.java Wed Jul 10 22:27:37 2013
> @@ -152,7 +152,10 @@ public class SelectTemplateDialog extend
> }
> }
> ActionRouter.getInstance().doActionNow(new ActionEvent(actionEvent.getSource(), actionEvent.getID(), ActionNames.STOP_THREAD));
> - final File fileToCopy = new File(JMeterUtils.getJMeterHome(), template.getFileName());
> + final File parent = template.getParent();
> + final File fileToCopy = parent != null
> + ? new File(parent, template.getFileName())
> + : new File(JMeterUtils.getJMeterHome(), template.getFileName());
> Load.loadProjectFile(actionEvent, fileToCopy, !isTestPlan, false);
> this.setVisible(false);
> }
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java?rev=1502030&r1=1502029&r2=1502030&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/Template.java Wed Jul 10 22:27:37 2013
> @@ -18,6 +18,8 @@
>
> package org.apache.jmeter.gui.action.template;
>
> +import java.io.File;
> +
> /**
> * Template Bean
> * @since 2.10
> @@ -27,6 +29,7 @@ public class Template {
> private String name;
> private String fileName;
> private String description;
> + private transient File parent; // for relative links
> /**
> * @return the name
> */
> @@ -69,4 +72,10 @@ public class Template {
> public void setTestPlan(boolean isTestPlan) {
> this.isTestPlan = isTestPlan;
> }
> + public File getParent() {
> + return parent;
> + }
> + public void setParent(File parent) {
> + this.parent = parent;
> + }
> }
> \ No newline at end of file
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1502030&r1=1502029&r2=1502030&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java Wed Jul 10 22:27:37 2013
> @@ -112,7 +112,14 @@ public class TemplateManager {
> try {
> if(f.exists() && f.canRead()) {
> log.info("Reading templates from:"+f.getAbsolutePath());
> - temps.putAll(((Templates) xstream.fromXML(f)).templates);
> + final File parent = f.getParentFile();
> + final LinkedHashMap<String, Template> templates = ((Templates) xstream.fromXML(f)).templates;
> + for(Template t : templates.values()) {
> + if (!t.getFileName().startsWith("/")) {
> + t.setParent(parent);
> + }
> + }
> + temps.putAll(templates);
> } else {
> log.warn("Ignoring template file:'"+f.getAbsolutePath()+"' as it does not exist or is not readable");
> }
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502030&r1=1502029&r2=1502030&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml (original)
> +++ jmeter/trunk/xdocs/changes.xml Wed Jul 10 22:27:37 2013
> @@ -268,6 +268,7 @@ Transaction Controller now sets Response
> <li><bugzilla>55202</bugzilla> - Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea</li>
> <li><bugzilla>55175</bugzilla> - HTTPHC4Impl refactoring to allow better inheritance</li>
> <li><bugzilla>55236</bugzilla> - Templates - provide button to reload template details</li>
> +<li><bugzilla>55237</bugzilla> - Template system should support relative fileName entries</li>
> </ul>
>
> <h2>Non-functional changes</h2>
>
>
>