sebb 2005/08/17 15:35:36
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
Tag: rel-2-1 HTTPSampler2.java
src/core/org/apache/jmeter/junit Tag: rel-2-1
JMeterTest.java
src/protocol/http/org/apache/jmeter/protocol/http/control/gui
Tag: rel-2-1 HttpTestSampleGui2.java
Log:
Fix missing Help Entry for HTTPClient Sampler
Downgrade intrusive info log message
[Picking up changes from HEAD]
Revision Changes Path
No revision
No revision
1.20.2.1 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Index: HTTPSampler2.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- HTTPSampler2.java 12 Jul 2005 20:50:56 -0000 1.20
+++ HTTPSampler2.java 17 Aug 2005 22:35:35 -0000 1.20.2.1
@@ -536,11 +536,11 @@
}
public void threadStarted() {
- log.info("Thread Started");
+ log.debug("Thread Started");
}
public void threadFinished() {
- log.info("Thread Finished");
+ log.debug("Thread Finished");
if (httpConn != null)
httpConn.close();
}
No revision
No revision
1.63.2.1 +9 -10
jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
Index: JMeterTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -r1.63 -r1.63.2.1
--- JMeterTest.java 12 Jul 2005 20:50:50 -0000 1.63
+++ JMeterTest.java 17 Aug 2005 22:35:35 -0000 1.63.2.1
@@ -173,11 +173,14 @@
List components = ((Element)
sections.get(i)).getChildren("component");
for (int j = 0; j < components.size(); j++) {
Element comp = (Element) components.get(j);
- guiTitles.put(comp.getAttributeValue("name"),
Boolean.FALSE);
+ String nm=comp.getAttributeValue("name");
+ if (!nm.equals("SSL Manager")){// Not a true GUI component
+ guiTitles.put(nm.replace(' ','_'),
Boolean.FALSE);
+ }
}
}
// Add titles that don't need to be documented
- guiTitles.put("Root", Boolean.FALSE);
+ //guiTitles.put("Root", Boolean.FALSE);
guiTitles.put("Example Sampler", Boolean.FALSE);
}
@@ -235,10 +238,6 @@
while (i.hasNext()) {
Object key = i.next();
if (!m.get(key).equals(Boolean.TRUE)) {
- if (key.equals("SSL Manager"))// Not a true GUI
component
- {
- continue;
- }
if (unseen == 0)// first time
{
System.out.println("\nNames remaining
in " + t + " Map:");
@@ -332,13 +331,13 @@
*/
public void runGUITitle() throws Exception {
if (guiTitles.size() > 0) {
- String title = guiItem.getStaticLabel();
+ String title = guiItem.getDocAnchor();
boolean ct = guiTitles.containsKey(title);
if (ct)
guiTitles.put(title, Boolean.TRUE);// So we can
detect extra
// entries
if (// Is this a work in progress or an internal GUI
component?
- (title.length() > 0) // Will be "" for internal
components
+ (title != null && title.length() > 0) // Will be "" for
internal components
&&
(title.toUpperCase().indexOf("(ALPHA") == -1) &&
(title.toUpperCase().indexOf("(BETA") == -1)
&& (!title.equals("Example1")) // Skip
the example samplers
// ...
No revision
No revision
1.4.2.2 +8 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
Index: HttpTestSampleGui2.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- HttpTestSampleGui2.java 28 Jul 2005 01:31:36 -0000 1.4.2.1
+++ HttpTestSampleGui2.java 17 Aug 2005 22:35:35 -0000 1.4.2.2
@@ -38,6 +38,11 @@
}
public String getStaticLabel() {
- return super.getStaticLabel() + " HTTPCLient";
+ return super.getStaticLabel() + " HTTPClient";
}
+
+ public String getDocAnchor() {
+ return super.getStaticLabel().replace(' ', '_');
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
