mstover1 2005/09/01 14:31:12
Modified: src/core/org/apache/jmeter/testbeans/gui TestBeanGUI.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config
DataSourceElement.java
bin upgrade.properties
Added: lib/junit test.jar
Log:
MERGE from 2-1
Revision Changes Path
1.23 +27 -4
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
Index: TestBeanGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TestBeanGUI.java 12 Jul 2005 20:51:01 -0000 1.22
+++ TestBeanGUI.java 1 Sep 2005 21:31:12 -0000 1.23
@@ -38,6 +38,7 @@
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.assertions.gui.AbstractAssertionGui;
import org.apache.jmeter.config.ConfigElement;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.config.gui.AbstractConfigGui;
import org.apache.jmeter.control.Controller;
import org.apache.jmeter.control.gui.AbstractControllerGui;
@@ -48,6 +49,7 @@
import org.apache.jmeter.processor.PreProcessor;
import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
+import org.apache.jmeter.reporters.AbstractListenerElement;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jmeter.testbeans.BeanInfoSupport;
@@ -134,7 +136,7 @@
}
// Dummy for JUnit test
- public TestBeanGUI() {
+ TestBeanGUI() {
log.warn("Only for use in testing");
}
@@ -267,7 +269,28 @@
{
return MenuFactory.getDefaultTimerMenu();
}
- return MenuFactory.getDefaultControllerMenu();
+ else if(Sampler.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultSamplerMenu();
+ }
+ else if(ConfigTestElement.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultConfigElementMenu();
+ }
+ else if(Assertion.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultAssertionMenu();
+ }
+ else if(PostProcessor.class.isAssignableFrom(testBeanClass) ||
+ PreProcessor.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultExtractorMenu();
+ }
+ else
if(AbstractListenerElement.class.isAssignableFrom(testBeanClass))
+ {
+ return MenuFactory.getDefaultVisualizerMenu();
+ }
+ else return MenuFactory.getDefaultControllerMenu();
}
/*
1.2 +14 -0 jakarta-jmeter/lib/junit/test.jar
<<Binary file>>
1.7 +3 -0
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Index: DataSourceElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataSourceElement.java 12 Jul 2005 20:51:05 -0000 1.6
+++ DataSourceElement.java 1 Sep 2005 21:31:12 -0000 1.7
@@ -22,6 +22,7 @@
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testbeans.TestBeanHelper;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jorphan.logging.LoggingManager;
@@ -89,6 +90,8 @@
public void testStarted() {
if (!started[0]) {
try {
+ this.setRunningVersion(true);
+ TestBeanHelper.prepare(this);
initPool();
} catch (Exception e) {
log.error("Unable to start database connection
pool.", e);
1.8 +19 -2 jakarta-jmeter/bin/upgrade.properties
Index: upgrade.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/upgrade.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upgrade.properties 16 Jun 2005 22:34:28 -0000 1.7
+++ upgrade.properties 1 Sep 2005 21:31:12 -0000 1.8
@@ -36,4 +36,21 @@
org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
-org.apache.jmeter.protocol.http.control.Header/TestElement.name=Header.name
\ No newline at end of file
+org.apache.jmeter.protocol.http.control.Header/TestElement.name=Header.name
+
+# Upgrade AccessLogSampler
+org.apache.jmeter.protocol.http.control.gui.AccessLogSamplerGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.log_file=logFile
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.port=portString
+#Is the following used now?
+#org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.generator_class_name=
+#Looks to be a new field
+#filterClassName
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.domain=domain
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/AccessLogSampler.parser_class_name=parserClassName
+org.apache.jmeter.protocol.http.sampler.AccessLogSampler/HTTPSampler.image_parser=imageParsing
+
+# Upgrade JDBC sampler
+org.apache.jmeter.protocol.jdbc.config.gui.DbConfigGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
+org.apache.jmeter.config.ConfigTestElement/JDBCSampler.query=query
+# More needed
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
