mstover1 2003/06/13 09:29:41
Modified: . build.xml
src/core/org/apache/jmeter/config/gui LoginConfigGui.java
SimpleConfigGui.java
src/core/org/apache/jmeter/control/gui TestPlanGui.java
src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui
ParamModifierGui.java UserParameterModifierGui.java
src/protocol/java/org/apache/jmeter/protocol/java/config/gui
JavaConfigGui.java
src/protocol/java/org/apache/jmeter/protocol/java/control/gui
JavaTestSamplerGui.java
Added: extras JMeter Ant Task.html JMeter Ant Task.html.bak
ant-jmeter.jar jmeter-results-report.xsl
extras/JMeter JMeterResults.jpg
Log:
New Ant Task to run JMeter
Revision Changes Path
1.102 +2 -0 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- build.xml 13 Jun 2003 14:51:50 -0000 1.101
+++ build.xml 13 Jun 2003 16:29:40 -0000 1.102
@@ -68,6 +68,7 @@
<!-- Where the doc sources and results live -->
<property name="docs.src" value="xdocs"/>
<property name="docs.dest" value="docs"/>
+ <property name="extras.dir" value="extras"/>
<property name="printable_docs.dest" value="printable_docs"/>
<!-- Where the distribution packages will be created -->
@@ -356,6 +357,7 @@
<include name="${jar.dest}/"/> <!-- redundant but future-proof -->
<include name="${docs.dest}/"/>
<include name="${printable_docs.dest}/**"/>
+ <include name="${extras.dir}/**"/>
<exclude name="${docs.api.dest}/"/>
<exclude name="**/mail.jar"/>
<exclude name="**/activation.jar"/>
No revision
No revision
No revision
No revision
No revision
No revision
1.1 jakarta-jmeter/extras/ant-jmeter.jar
<<Binary file>>
1.1 jakarta-jmeter/extras/jmeter-results-report.xsl
Index: jmeter-results-report.xsl
===================================================================
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
<xsl:output method="html" indent="yes" encoding="US-ASCII"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:template match="testResults">
<html>
<head>
<title>Load Test Results</title>
<style type="text/css">
body {
font:normal 68% verdana,arial,helvetica;
color:#000000;
}
table tr td, table tr th {
font-size: 68%;
}
table.details tr th{
font-weight: bold;
text-align:left;
background:#a6caf0;
white-space: nowrap;
}
table.details tr td{
background:#eeeee0;
white-space: nowrap;
}
h1 {
margin: 0px 0px 5px; font: 165%
verdana,arial,helvetica
}
h2 {
margin-top: 1em; margin-bottom: 0.5em; font:
bold 125% verdana,arial,helvetica
}
h3 {
margin-bottom: 0.5em; font: bold 115%
verdana,arial,helvetica
}
.Failure {
font-weight:bold; color:red;
}
</style>
</head>
<body>
<xsl:call-template name="pageHeader" />
<xsl:call-template name="summary" />
<hr size="1" width="95%" align="left" />
<xsl:call-template name="pagelist" />
<hr size="1" width="95%" align="left" />
<xsl:call-template name="detail" />
</body>
</html>
</xsl:template>
<xsl:template name="pageHeader">
<h1>Load Test Results</h1>
<table width="100%">
<tr>
<td align="left"></td>
<td align="right">Designed for use with <a
href="http://jakarta.apache.org/jmeter";>JMeter</a> and <a
href="http://ant.apache.org";>Ant</a>.</td>
</tr>
</table>
<hr size="1" />
</xsl:template>
<xsl:template name="summary">
<h2>Summary</h2>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
<tr valign="top">
<th>Tests</th>
<th>Failures</th>
<th>Success Rate</th>
<th>Average Time</th>
<th>Min Time</th>
<th>Max Time</th>
</tr>
<tr valign="top">
<xsl:variable name="allCount"
select="count(/testResults/sampleResult)" />
<xsl:variable name="allFailureCount"
select="count(/testResults/sampleResult[attribute::success='false'])" />
<xsl:variable name="allSuccessCount"
select="count(/testResults/sampleResult[attribute::success='true'])" />
<xsl:variable name="allSuccessPercent"
select="$allSuccessCount div $allCount" />
<xsl:variable name="allTotalTime"
select="sum(/testResults/sampleResult/@time)" />
<xsl:variable name="allAverageTime" select="$allTotalTime div
$allCount" />
<xsl:variable name="allMinTime">
<xsl:call-template name="min">
<xsl:with-param name="nodes"
select="/testResults/sampleResult/@time" />
</xsl:call-template>
</xsl:variable>
<xsl:variable name="allMaxTime">
<xsl:call-template name="max">
<xsl:with-param name="nodes"
select="/testResults/sampleResult/@time" />
</xsl:call-template>
</xsl:variable>
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="$allFailureCount >
0">Failure</xsl:when>
</xsl:choose>
</xsl:attribute>
<td>
<xsl:value-of select="$allCount" />
</td>
<td>
<xsl:value-of select="$allFailureCount" />
</td>
<td>
<xsl:call-template name="display-percent">
<xsl:with-param name="value"
select="$allSuccessPercent" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$allAverageTime" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$allMinTime" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$allMaxTime" />
</xsl:call-template>
</td>
</tr>
</table>
</xsl:template>
<xsl:template name="pagelist">
<h2>Pages</h2>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
<tr valign="top">
<th>URL</th>
<th>Tests</th>
<th>Failures</th>
<th>Success Rate</th>
<th>Average Time</th>
<th>Min Time</th>
<th>Max Time</th>
</tr>
<xsl:for-each select="/testResults/sampleResult[not(@label =
preceding::*/@label)]">
<xsl:variable name="label" select="@label" />
<xsl:variable name="count" select="count(../[EMAIL PROTECTED]
= current()/@label])" />
<xsl:variable name="failureCount" select="count(../[EMAIL
PROTECTED] = current()/@label][attribute::success='false'])" />
<xsl:variable name="successCount" select="count(../[EMAIL
PROTECTED] = current()/@label][attribute::success='true'])" />
<xsl:variable name="successPercent" select="$successCount div
$count" />
<xsl:variable name="totalTime" select="sum(../[EMAIL
PROTECTED] = current()/@label]/@time)" />
<xsl:variable name="averageTime" select="$totalTime div
$count" />
<xsl:variable name="minTime">
<xsl:call-template name="min">
<xsl:with-param name="nodes" select="../[EMAIL
PROTECTED] = current()/@label]/@time" />
</xsl:call-template>
</xsl:variable>
<xsl:variable name="maxTime">
<xsl:call-template name="max">
<xsl:with-param name="nodes" select="../[EMAIL
PROTECTED] = current()/@label]/@time" />
</xsl:call-template>
</xsl:variable>
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="$failureCount >
0">Failure</xsl:when>
</xsl:choose>
</xsl:attribute>
<td>
<xsl:value-of select="$label" />
</td>
<td>
<xsl:value-of select="$count" />
</td>
<td>
<xsl:value-of select="$failureCount" />
</td>
<td>
<xsl:call-template name="display-percent">
<xsl:with-param name="value"
select="$successPercent" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$averageTime" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$minTime" />
</xsl:call-template>
</td>
<td>
<xsl:call-template name="display-time">
<xsl:with-param name="value"
select="$maxTime" />
</xsl:call-template>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:template>
<xsl:template name="detail">
<xsl:variable name="allFailureCount"
select="count(/testResults/sampleResult[attribute::success='false'])" />
<xsl:if test="$allFailureCount > 0">
<h2>Failure Detail</h2>
<xsl:for-each select="/testResults/sampleResult[not(@label =
preceding::*/@label)]">
<xsl:variable name="failureCount" select="count(../[EMAIL
PROTECTED] = current()/@label][attribute::success='false'])" />
<xsl:if test="$failureCount > 0">
<h3><xsl:value-of select="@label" /></h3>
<table class="details" border="0" cellpadding="5"
cellspacing="2" width="95%">
<tr valign="top">
<th>Response</th>
<th>Failure Message</th>
</tr>
<xsl:for-each select="/testResults/[EMAIL PROTECTED] =
current()/@label][attribute::success='false']">
<tr>
<td><xsl:value-of
select="@responseCode" /> - <xsl:value-of select="@responseMessage" /></td>
<td><xsl:value-of
select="assertionResult/@failureMessage" /></td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:for-each>
</xsl:if>
</xsl:template>
<xsl:template name="min">
<xsl:param name="nodes" select="/.." />
<xsl:choose>
<xsl:when test="not($nodes)">NaN</xsl:when>
<xsl:otherwise>
<xsl:for-each select="$nodes">
<xsl:sort data-type="number" />
<xsl:if test="position() = 1">
<xsl:value-of select="number(.)" />
</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="max">
<xsl:param name="nodes" select="/.." />
<xsl:choose>
<xsl:when test="not($nodes)">NaN</xsl:when>
<xsl:otherwise>
<xsl:for-each select="$nodes">
<xsl:sort data-type="number" order="descending" />
<xsl:if test="position() = 1">
<xsl:value-of select="number(.)" />
</xsl:if>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="display-percent">
<xsl:param name="value" />
<xsl:value-of select="format-number($value,'0.00%')" />
</xsl:template>
<xsl:template name="display-time">
<xsl:param name="value" />
<xsl:value-of select="format-number($value,'0 ms')" />
</xsl:template>
</xsl:stylesheet>
1.1 jakarta-jmeter/extras/JMeter
<<Binary file>>
1.7 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
Index: LoginConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoginConfigGui.java 11 May 2003 13:02:30 -0000 1.6
+++ LoginConfigGui.java 13 Jun 2003 16:29:40 -0000 1.7
@@ -114,7 +114,7 @@
/* Implements JMeterGUIComponent.getStaticLabel() */
public String getStaticLabel()
{
- return JMeterUtils.getResString("Login Config Element");
+ return JMeterUtils.getResString("login_config_element");
}
/**
1.6 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
Index: SimpleConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleConfigGui.java 11 May 2003 13:02:30 -0000 1.5
+++ SimpleConfigGui.java 13 Jun 2003 16:29:40 -0000 1.6
@@ -147,7 +147,7 @@
/* Implements JMeterGUIComponent.getStaticLabel() */
public String getStaticLabel()
{
- return JMeterUtils.getResString("Simple Config Element");
+ return JMeterUtils.getResString("simple_config_element");
}
/**
1.14 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Index: TestPlanGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/TestPlanGui.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestPlanGui.java 13 May 2003 17:42:56 -0000 1.13
+++ TestPlanGui.java 13 Jun 2003 16:29:40 -0000 1.14
@@ -104,7 +104,7 @@
/* Implements JMeterGUIComponent.getStaticLabel() */
public String getStaticLabel()
{
- return JMeterUtils.getResString("Test Plan");
+ return JMeterUtils.getResString("test_plan");
}
/**
1.18 +5 -5
jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ThreadGroupGui.java 11 Jun 2003 15:38:33 -0000 1.17
+++ ThreadGroupGui.java 13 Jun 2003 16:29:40 -0000 1.18
@@ -101,9 +101,9 @@
private JTextField threadInput;
private JTextField rampInput;
- private final static String SCHEDULER = "scheduler";
- private final static String START_TIME= "start_time";
- private final static String END_TIME= "end_time";
+ //private final static String SCHEDULER = "scheduler";
+ //private final static String START_TIME= "start_time";
+ //private final static String END_TIME= "end_time";
private JDateField start;
private JDateField end;
@@ -263,7 +263,7 @@
***************************************/
public String getStaticLabel()
{
- return JMeterUtils.getResString("ThreadGroup");
+ return JMeterUtils.getResString("threadgroup");
}
private void init()
1.9 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
Index: ParamModifierGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ParamModifierGui.java 8 May 2003 18:29:15 -0000 1.8
+++ ParamModifierGui.java 13 Jun 2003 16:29:41 -0000 1.9
@@ -57,7 +57,7 @@
***************************************/
public String getStaticLabel()
{
- return JMeterUtils.getResString("HTML Parameter Mask");
+ return JMeterUtils.getResString("html_parameter_mask");
}
/****************************************
@@ -225,7 +225,7 @@
private long checkTextField(FocusEvent evt, String defaultValue)
{
JTextField temp = (JTextField) evt.getSource();
- boolean pass = true;
+ //boolean pass = true;
long longVal = 0;
try
1.8 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
Index: UserParameterModifierGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UserParameterModifierGui.java 8 May 2003 18:29:15 -0000 1.7
+++ UserParameterModifierGui.java 13 Jun 2003 16:29:41 -0000 1.8
@@ -111,7 +111,7 @@
***********************************************************/
public void updateGui() {}
public String getStaticLabel() {
- return JMeterUtils.getResString("HTTP User Parameter Modifier");
+ return JMeterUtils.getResString("http_user_parameter_modifier");
}
public void configure(TestElement el)
1.14 +2 -2
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
Index: JavaConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaConfigGui.java 8 May 2003 21:03:38 -0000 1.13
+++ JavaConfigGui.java 13 Jun 2003 16:29:41 -0000 1.14
@@ -136,7 +136,7 @@
/* Implements JMeterGUIComponent.getStaticLabel() */
public String getStaticLabel()
{
- return JMeterUtils.getResString("Java Request Defaults");
+ return JMeterUtils.getResString("java_request_defaults");
}
/**
1.11 +2 -2
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
Index: JavaTestSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JavaTestSamplerGui.java 8 Jun 2003 11:03:26 -0000 1.10
+++ JavaTestSamplerGui.java 13 Jun 2003 16:29:41 -0000 1.11
@@ -89,7 +89,7 @@
/* Implements JMeterGuiComponent.getStaticLabel() */
public String getStaticLabel()
{
- return JMeterUtils.getResString("Java Request");
+ return JMeterUtils.getResString("java_request");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
