mstover1 02/04/24 09:44:24
Modified: src_1/org/apache/jmeter/junit/protocol/http/config
UrlConfigTest.java
src_1/org/apache/jmeter/junit/protocol/http/parser
HtmlParserTester.java
src_1/org/apache/jmeter/protocol/http/modifier
AnchorModifier.java
src_1/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java HTTPSamplerFull.java
MultipartFormSampler.java
MultipartFormSamplerFull.java
Added: src_1/org/apache/jmeter/images Delete24.down.gif
Delete24.gif Delete24.off.gif Delete24.on.gif
Delete24.over.gif Edit24.down.gif Edit24.gif
Edit24.off.gif Edit24.on.gif Edit24.over.gif
New24.down.gif New24.gif New24.off.gif New24.on.gif
New24.over.gif Open24.down.gif Open24.gif
Open24.off.gif Open24.on.gif Open24.over.gif
SaveAll24.down.gif SaveAll24.gif SaveAll24.off.gif
SaveAll24.on.gif SaveAll24.over.gif about.down.gif
about.off.gif about.on.gif about.over.gif
beaker.gif clear.down.gif clear.off.gif
clear.on.gif clear.over.gif clipboard.gif ear.gif
feather.gif knob.gif leafnode.gif
smallthread.disabled.gif smallthread.enabled.gif
smallthread.idle.gif start.down.gif start.off.gif
start.on.gif start.over.gif stop.down.gif
stop.off.gif stop.on.gif stop.over.gif
thread.disabled.gif thread.enabled.gif thread.gif
thread.idle.gif timer.gif
Log:
fixing compiling errors
Revision Changes Path
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Delete24.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Delete24.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Delete24.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Delete24.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Delete24.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Edit24.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Edit24.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Edit24.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Edit24.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Edit24.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/New24.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/New24.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/New24.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/New24.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/New24.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Open24.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Open24.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Open24.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Open24.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/Open24.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/SaveAll24.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/SaveAll24.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/SaveAll24.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/SaveAll24.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/SaveAll24.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/about.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/about.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/about.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/about.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/beaker.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/clear.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/clear.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/clear.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/clear.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/clipboard.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/ear.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/feather.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/knob.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/leafnode.gif
<<Binary file>>
1.1
jakarta-jmeter/src_1/org/apache/jmeter/images/smallthread.disabled.gif
<<Binary file>>
1.1
jakarta-jmeter/src_1/org/apache/jmeter/images/smallthread.enabled.gif
<<Binary file>>
1.1
jakarta-jmeter/src_1/org/apache/jmeter/images/smallthread.idle.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/start.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/start.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/start.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/start.over.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/stop.down.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/stop.off.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/stop.on.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/stop.over.gif
<<Binary file>>
1.1
jakarta-jmeter/src_1/org/apache/jmeter/images/thread.disabled.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/thread.enabled.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/thread.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/thread.idle.gif
<<Binary file>>
1.1 jakarta-jmeter/src_1/org/apache/jmeter/images/timer.gif
<<Binary file>>
1.2 +12 -11
jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/config/UrlConfigTest.java
Index: UrlConfigTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/config/UrlConfigTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UrlConfigTest.java 19 Apr 2002 02:24:10 -0000 1.1
+++ UrlConfigTest.java 24 Apr 2002 16:44:23 -0000 1.2
@@ -117,6 +117,7 @@
import org.apache.jmeter.protocol.http.config.UrlConfig;
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
@@ -176,13 +177,13 @@
config.setName("Full Config");
- config.setProperty(config.DOMAIN,"www.lazer.com");
+ config.setProperty(HTTPSampler.DOMAIN,"www.lazer.com");
- config.setProperty(config.PATH,"login.jsp");
+ config.setProperty(HTTPSampler.PATH,"login.jsp");
- config.setProperty(config.METHOD,config.POST);
+ config.setProperty(HTTPSampler.METHOD,HTTPSampler.POST);
- config.setProperty(config.ARGUMENTS,args);
+ config.setProperty(HTTPSampler.ARGUMENTS,args);
@@ -190,17 +191,17 @@
defaultConfig.setName("default");
- defaultConfig.setProperty(config.DOMAIN,"www.xerox.com");
+ defaultConfig.setProperty(HTTPSampler.DOMAIN,"www.xerox.com");
- defaultConfig.setProperty(config.PATH,"default.html");
+ defaultConfig.setProperty(HTTPSampler.PATH,"default.html");
partialConfig = new UrlConfig();
- partialConfig.setProperty(config.PATH,"main.jsp");
+ partialConfig.setProperty(HTTPSampler.PATH,"main.jsp");
- partialConfig.setProperty(config.METHOD,config.GET);
+ partialConfig.setProperty(HTTPSampler.METHOD,HTTPSampler.GET);
}
@@ -220,10 +221,10 @@
public void testOverRide()
{
- this.assertNull(partialConfig.getProperty(config.DOMAIN));
+ this.assertNull(partialConfig.getProperty(HTTPSampler.DOMAIN));
partialConfig.addTestElement(defaultConfig);
-
assertEquals(partialConfig.getProperty(config.DOMAIN),"www.xerox.com");
- assertEquals(partialConfig.getProperty(config.PATH),"main.jsp");
+
assertEquals(partialConfig.getProperty(HTTPSampler.DOMAIN),"www.xerox.com");
+ assertEquals(partialConfig.getProperty(HTTPSampler.PATH),"main.jsp");
}
1.2 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
Index: HtmlParserTester.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HtmlParserTester.java 19 Apr 2002 02:24:10 -0000 1.1
+++ HtmlParserTester.java 24 Apr 2002 16:44:23 -0000 1.2
@@ -149,7 +149,7 @@
{
HTTPSampler config = makeUrlConfig(".*index.html");
config.getArguments().addArgument("test","g.*");
- config.setMethod(UrlConfig.POST);
+ config.setMethod(HTTPSampler.POST);
URL context = new URL("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<form action=\"index.html\" method=\"POST\"><input
type=\"checkbox\" name=\"test\""+
1.3 +4 -4
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Index: AnchorModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnchorModifier.java 19 Apr 2002 02:08:48 -0000 1.2
+++ AnchorModifier.java 24 Apr 2002 16:44:23 -0000 1.3
@@ -80,7 +80,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/19 02:08:48 $
+ *@created $Date: 2002/04/24 16:44:23 $
*@version 1.0
***********************************************************/
@@ -133,7 +133,7 @@
UrlConfig url =
(UrlConfig)potentialLinks.get(rand.nextInt(potentialLinks.size()));
sampler.setDomain(url.getDomain());
sampler.setPath(url.getPath());
- if(url.getMethod().equals(UrlConfig.POST))
+ if(url.getMethod().equals(HTTPSampler.POST))
{
Iterator iter = sampler.getArguments().iterator();
while(iter.hasNext())
@@ -206,7 +206,7 @@
UrlConfig newUrl = (UrlConfig)iter.next();
try
{
- newUrl.setMethod(UrlConfig.POST);
+ newUrl.setMethod(HTTPSampler.POST);
if(HtmlParser.isAnchorMatched(newUrl,config))
{
potentialLinks.add(newUrl);
@@ -235,7 +235,7 @@
try
{
UrlConfig newUrl =
HtmlParser.createUrlFromAnchor(hrefStr, (URL)result.getValue(HTTPSampler.URL));
- newUrl.setMethod(UrlConfig.GET);
+ newUrl.setMethod(HTTPSampler.GET);
if (HtmlParser.isAnchorMatched(newUrl, config))
{
potentialLinks.add(newUrl);
1.3 +7 -7
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTTPSampler.java 19 Apr 2002 02:08:49 -0000 1.2
+++ HTTPSampler.java 24 Apr 2002 16:44:23 -0000 1.3
@@ -83,8 +83,8 @@
* HTTP requests, including cookies and authentication.
*
*@author Michael Stover
- *@created $Date: 2002/04/19 02:08:49 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/24 16:44:23 $
+ *@version $Revision: 1.3 $
***************************************/
public class HTTPSampler extends AbstractSampler
{
@@ -392,7 +392,7 @@
SSLManager.getInstance().setContext(conn);
}
conn.setFollowRedirects(false);
- conn.setRequestMethod((String)url.getProperty(UrlConfig.METHOD));
+ conn.setRequestMethod((String)url.getProperty(HTTPSampler.METHOD));
setConnectionHeaders(conn, u, getHeaderManager());
setConnectionCookie(conn, u, getCookieManager());
setConnectionAuthorization(conn, u, getAuthManager());
@@ -411,7 +411,7 @@
***************************************/
protected void writeToStream(boolean redirected, UrlConfig url,
HttpURLConnection conn) throws IOException
{
- if(!redirected &&
url.getProperty(UrlConfig.METHOD).equals(UrlConfig.POST))
+ if(!redirected &&
url.getProperty(HTTPSampler.METHOD).equals(HTTPSampler.POST))
{
sendPostData(conn, url);
}
@@ -609,9 +609,9 @@
}
}
URL newUrl = new URL(loc);
- urlConfig.setProperty(UrlConfig.DOMAIN, newUrl.getHost());
- urlConfig.setProperty(UrlConfig.PATH, newUrl.getFile());
- urlConfig.setProperty(UrlConfig.ARGUMENTS, new Arguments());
+ urlConfig.setProperty(HTTPSampler.DOMAIN, newUrl.getHost());
+ urlConfig.setProperty(HTTPSampler.PATH, newUrl.getFile());
+ urlConfig.setProperty(HTTPSampler.ARGUMENTS, new Arguments());
}
/****************************************
1.3 +4 -4
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
Index: HTTPSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTTPSamplerFull.java 19 Apr 2002 02:08:49 -0000 1.2
+++ HTTPSamplerFull.java 24 Apr 2002 16:44:23 -0000 1.3
@@ -82,7 +82,7 @@
*
* @author Khor Soon Hin
* @version 1.0
- * @created $Date: 2002/04/19 02:08:49 $
+ * @created $Date: 2002/04/24 16:44:23 $
*/
public class HTTPSamplerFull extends HTTPSampler
{
@@ -349,7 +349,7 @@
// to determine the HTTP method to get the url. In this case, we are
// loading binaries so the method has to be GET.
UrlConfig urlConfig = new UrlConfig();
- urlConfig.setMethod(UrlConfig.GET);
+ urlConfig.setMethod(HTTPSampler.GET);
HttpURLConnection conn = null;
try
{
@@ -548,7 +548,7 @@
{
catClass.debug("Start : setUp1");
hsf = new HTTPSamplerFull();
- hsf.setMethod(UrlConfig.GET);
+ hsf.setMethod(HTTPSampler.GET);
hsf.setProtocol("file");
// urlConfigFull.setPort(8080);
// urlConfigFull.setDomain("jakarta.apache.org");
@@ -574,7 +574,7 @@
public void testGetUrlConfig()
{
catClass.debug("Start : testGetUrlConfig1");
- assertEquals(UrlConfig.GET, hsf.getMethod());
+ assertEquals(HTTPSampler.GET, hsf.getMethod());
assertEquals("file", hsf.getProtocol());
// assertEquals(8080, urlConfig.getPort());
// assertEquals("jakarta.apache.org", urlConfig.getDomain());
1.3 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSampler.java
Index: MultipartFormSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSampler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartFormSampler.java 19 Apr 2002 02:08:49 -0000 1.2
+++ MultipartFormSampler.java 24 Apr 2002 16:44:23 -0000 1.3
@@ -95,7 +95,7 @@
protected void writeToStream(boolean redirected, UrlConfig url,
HttpURLConnection conn,
Entry entry) throws IOException
{
- if (!redirected &&
url.getProperty(UrlConfig.METHOD).equals(UrlConfig.POST))
+ if (!redirected &&
url.getProperty(HTTPSampler.METHOD).equals(HTTPSampler.POST))
{
sendPostData(conn, url);
}
1.3 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSamplerFull.java
Index: MultipartFormSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSamplerFull.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartFormSamplerFull.java 19 Apr 2002 02:08:49 -0000 1.2
+++ MultipartFormSamplerFull.java 24 Apr 2002 16:44:23 -0000 1.3
@@ -358,7 +358,7 @@
// to determine the HTTP method to get the url. In this case, we are
// loading binaries so the method has to be GET.
UrlConfig urlConfig = new UrlConfig();
- urlConfig.setMethod(UrlConfig.GET);
+ urlConfig.setMethod(HTTPSampler.GET);
HttpURLConnection conn = null;
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
