Author: pmouawad
Date: Tue Feb 23 20:19:39 2016
New Revision: 1731942
URL: http://svn.apache.org/viewvc?rev=1731942&view=rev
Log:
Bug 59055 - JMeter report generator : When generation is not launched from
jmeter/bin folder report-template is not found
Bugzilla Id: 59055
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java?rev=1731942&r1=1731941&r2=1731942&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
Tue Feb 23 20:19:39 2016
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.Map;
import java.util.TimeZone;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
@@ -29,8 +31,8 @@ import org.apache.commons.lang3.Validate
import org.apache.jmeter.report.config.ConfigurationException;
import org.apache.jmeter.report.config.ExporterConfiguration;
import org.apache.jmeter.report.config.GraphConfiguration;
-import org.apache.jmeter.report.config.SubConfiguration;
import org.apache.jmeter.report.config.ReportGeneratorConfiguration;
+import org.apache.jmeter.report.config.SubConfiguration;
import org.apache.jmeter.report.core.DataContext;
import org.apache.jmeter.report.core.TimeHelper;
import org.apache.jmeter.report.processor.ListResultData;
@@ -40,10 +42,9 @@ import org.apache.jmeter.report.processo
import org.apache.jmeter.report.processor.SampleContext;
import org.apache.jmeter.report.processor.ValueResultData;
import org.apache.jmeter.report.processor.graph.AbstractGraphConsumer;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
import freemarker.template.Configuration;
import freemarker.template.TemplateExceptionHandler;
@@ -80,8 +81,7 @@ public class HtmlTemplateExporter extend
// Template directory
private static final String TEMPLATE_DIR = "template_dir";
- private static final File TEMPLATE_DIR_DEFAULT = new File(
- "report-template");
+ private static final String TEMPLATE_DIR_NAME_DEFAULT = "report-template";
// Output directory
private static final String OUTPUT_DIR = "output_dir";
@@ -337,10 +337,10 @@ public class HtmlTemplateExporter extend
// Get template directory property value
File templateDirectory = getPropertyFromConfig(exportCfg, TEMPLATE_DIR,
- TEMPLATE_DIR_DEFAULT, File.class);
+ new File(JMeterUtils.getJMeterBinDir(),
TEMPLATE_DIR_NAME_DEFAULT), File.class);
if (!templateDirectory.isDirectory()) {
String message = String.format(INVALID_TEMPLATE_DIRECTORY_FMT,
- templateDirectory);
+ templateDirectory.getAbsolutePath());
LOG.error(message);
throw new ExportException(message);
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1731942&r1=1731941&r2=1731942&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Feb 23 20:19:39 2016
@@ -323,6 +323,7 @@ Summary
<li><bug>58952</bug>Report/Dashboard: Generation of aggregated series in
graphs does not work. Developed by Florent Sabbe (f dot sabbe at
ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
<li><bug>58931</bug>New Report/Dashboard : Getting font errors under
Firefox and Chrome (not Safari)</li>
<li><bug>58932</bug>Report / Dashboard: Document clearly and log what
report are not generated when saveservice options are not correct. Developed by
Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by
Ubik-Ingenierie</li>
+ <li><bug>59055</bug>JMeter report generator : When generation is not
launched from jmeter/bin folder report-template is not found</li>
</ul>
<!-- =================== Thanks =================== -->
