svn commit: r922843 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Mar 14 13:41:26 2010
New Revision: 922843
URL: http://svn.apache.org/viewvc?rev=922843view=rev
Log:
Run 3rdparty check later, so still works if called after download_jars
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=922843r1=922842r2=922843view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Mar 14 13:41:26 2010
@@ -941,16 +941,18 @@ run JMeter unless all the JMeter jars ar
/target
!-- Check that the 3rd party libraries are present --
- condition property=3rdparty.present
-and
-!-- No need to check all jars; just check a few --
-available classpathref=classpath
classname=org.apache.bsf.BSFEngine/
-available classpathref=classpath classname=org.htmlparser.Parser/
-available classpathref=classpath
classname=com.thoughtworks.xstream.XStream/
-/and
- /condition
+ target name=_check_3rdparty
+condition property=3rdparty.present
+ and
+ !-- No need to check all jars; just check a few --
+ available classpathref=classpath
classname=org.apache.bsf.BSFEngine/
+ available classpathref=classpath
classname=org.htmlparser.Parser/
+ available classpathref=classpath
classname=com.thoughtworks.xstream.XStream/
+ /and
+/condition
+ /target
- target name=_message_3rdParty unless=3rdparty.present
+ target name=_message_3rdParty depends=_check_3rdparty
unless=3rdparty.present
echoCannot find all the required 3rd party libraries./echo
echoIf building from a release, you can get most of them from the binary
archive./echo
echoUse ant download_jars to download any missing jars./echo
@@ -1290,7 +1292,7 @@ run JMeter unless all the JMeter jars ar
depends=_gump_properties,clean,install
description=Build JMeter
property name=dist.name value=jakarta-jmeter-${jmeter.version}/
- available file=${velocity.jar} property=3rdparty.present/
+ available file=${velocity.jar} property=velocity.present/
!-- No need to create the archives for Gump
antcall target=_pack-binaries/
antcall target=_pack-libraries/
@@ -1525,6 +1527,7 @@ run JMeter unless all the JMeter jars ar
overview=${src.docs}/overview.html
additionalparam=-breakiterator
destdir=${dest.docs.api}
+ verbose=false
protected=yes
version=yes
doctitle=Apache JMeter API
@@ -2040,7 +2043,7 @@ run JMeter unless all the JMeter jars ar
/target
!-- Download jars only needed by Gump (unless already done) --
-target name=_process_gump_jars unless=3rdparty.present
+target name=_process_gump_jars unless=velocity.present
process_jarfile jarname=excalibur-datasource/
process_jarfile jarname=excalibur-instrument/
process_jarfile jarname=excalibur-logger/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r922862 - /jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Author: sebb
Date: Sun Mar 14 14:22:40 2010
New Revision: 922862
URL: http://svn.apache.org/viewvc?rev=922862view=rev
Log:
Javadoc fixes
Modified:
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Modified:
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?rev=922862r1=922861r2=922862view=diff
==
---
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
Sun Mar 14 14:22:40 2010
@@ -252,14 +252,14 @@ implements ChangeListener, ActionListene
errorCode.setText(JMeterUtils.getResString(junit_error_default_code));
//$NON-NLS-1$
}
-/** @{inheritDoc} */
+/** {...@inheritdoc} */
@Override
public void clearGui() {
super.clearGui();
initGui();
}
-/** @{inheritDoc} */
+/** {...@inheritdoc} */
public TestElement createTestElement()
{
JUnitSampler sampler = new JUnitSampler();
@@ -267,7 +267,7 @@ implements ChangeListener, ActionListene
return sampler;
}
-/** @{inheritDoc} */
+/** {...@inheritdoc} */
public void modifyTestElement(TestElement el)
{
JUnitSampler sampler = (JUnitSampler)el;
@@ -298,7 +298,7 @@ implements ChangeListener, ActionListene
sampler.setJunit4(junit4.isSelected());
}
-/** @{inheritDoc} */
+/** {...@inheritdoc} */
@Override
public void configure(TestElement el)
{
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Bug report for JMeter [2010/03/14]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |11536|Ass|Enh|2002-08-07|Graph Results's throughput calculation includes id| |15468|New|Enh|2002-12-18|Variable expansion in posted files in HTTPSampler | |15999|New|Enh|2003-01-12|Show Results Tree is too HTTP-centric | |16370|New|Enh|2003-01-23|HTTP Request log | |16886|New|Enh|2003-02-07|Recorded requests shouldn't duplicate info in HTTP| |17248|New|Enh|2003-02-20|Graph Improvements| |17252|Ass|Enh|2003-02-20|HTML Link Parser seems not work properly. | |21695|New|Enh|2003-07-17|Unix jmeter start script assumes it is on PATH, no| |22076|New|Enh|2003-08-01|global search and replace functionality | |22510|New|Maj|2003-08-18|SSL Manager does not handle multiple client certif| |24480|New|Enh|2003-11-06|There is no good way to set checkbox based items u| |25209|New|Min|2003-12-04|missed refresh of horizontal scrollbar when switch| |25430|New|Enh|2003-12-11|Recording Controller to populate HTTP Authorisatio| |27112|New|Enh|2004-02-20|User Parameters should use scrollbars | |27895|New|Enh|2004-03-24|badly formatted JDBC output (a regression w.r.t. 1| |28502|New|Enh|2004-04-20|HTTP Resource Cache | |29331|New|Enh|2004-06-01|how to load test java applet using JMeter | |29352|New|Enh|2004-06-03|Use external store to hold samples during distribu| |29603|New|Enh|2004-06-16|Custom component developers need own resource bund| |29708|New|Enh|2004-06-21|startup delay by JMeterThread initialization | |30563|New|Enh|2004-08-10|Thread Group should have a restart loop option on | |31666|New|Enh|2004-10-12|writing sampleresults to databases| |32494|New|Enh|2004-12-02|Enhancement - scheduler should be added to Test Pl| |33305|New|Enh|2005-01-31|Visual diff and merge functionality for JMeter scr| |33878|New|Enh|2005-03-07|Function caching as option| |33940|Opn|Nor|2005-03-09|Throughput value and Graph Results Graphing don'| |34321|New|Enh|2005-04-06|password encryption for HTTP Authorization Manager| |35059|New|Maj|2005-05-25|RuntimeController not working correctly | |35593|New|Enh|2005-07-03|Commons chain sampler | |35670|New|Enh|2005-07-09|Default parameters not displayed | |35915|New|Enh|2005-07-28|MonitorResults does not write results n CSV format| |36378|New|Enh|2005-08-26|[PATCH] A Thread Watcher Listener | |36694|New|Enh|2005-09-17|substitute a value in the input XML for webservice| |36721|New|Enh|2005-09-20|webMethods Sampling Protocol Extensions | |36931|New|Enh|2005-10-05|Printable Version of the Users Manual | |37073|New|Enh|2005-10-13|Lacking Poisson timer | |37124|New|Enh|2005-10-17|Need error feedback in the GUI, noticed this by ac| |37155|New|Enh|2005-10-19|Testplan: Stop... Continue| |37156|New|Enh|2005-10-19|Formatted view of Request in Results Tree | |37160|New|Enh|2005-10-19|Scalable distributed testing | |37525|New|Enh|2005-11-16|Web service sampler does not support multipart req| |38115|Inf|Nor|2006-01-04|decode from encoded string by IE | |38387|Ass|Enh|2006-01-25|allow to read(/send) mail messages encrypted/signe| |38832|New|Nor|2006-03-02|webservice request sampler adding xmlns:xmlns | |39219|New|Nor|2006-04-06|HTTP Server: You can't stop it after File-Open | |39642|New|Enh|2006-05-23|Need a sampler forJMX mbean-servers. | |39812|New|Nor|2006-06-14|Problem with Webservice(SOAP)Request over https | |40011|New|Enh|2006-07-11|New Elements for use in JMeter| |40181|Ass|Enh|2006-08-03|Add a new Session Bean protocol extension | |40424|New|Enh|2006-09-06|Web Services proxy| |40499|New|Enh|2006-09-13|Need to be able to simulate abortive connection re|
