juergen 2002/12/19 04:10:41
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
1) code for preemtive authentication usage [not in http commons yet]
2) send the body as a byte[], (http commons does a platform specific encoding)
Revision Changes Path
1.43 +19 -13
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
Index: TProcessors.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TProcessors.java 16 Dec 2002 15:48:29 -0000 1.42
+++ TProcessors.java 19 Dec 2002 12:10:41 -0000 1.43
@@ -582,6 +582,7 @@
((Integer)startUp.get("port") ).intValue());
state.setCredentials(null, cred);
client.setState(state);
+// client.setPreEmptiveAuthentication(true); for later use [jpl]
// System.out.println("############### user " + user);
// System.out.println("############### pwd " + password);
@@ -927,23 +928,28 @@
* @param List
*/
private HttpMethod fillBody (Element element, HttpMethod method) throws
Exception {
- if (method instanceof PutMethod && binaryReadRequest(element)) {
+ if (binaryReadRequest(element)) {
File input = new File(getFileReferenceName(element));
if (!input.exists()) throw new Exception("File " +
getFileReferenceName(element) + " does not exist");
method.setRequestHeader("Content-Length", ""+input.length());
- ((PutMethod)method).setRequestBody(input);
+ if (method instanceof HttpRequestBodyMethodBase) {
+ ((HttpRequestBodyMethodBase)method).setRequestBody(input);
+ } else if (method instanceof PutMethod) {
+ ((PutMethod)method).setRequestBody(input);
+ }
}
else {
try {
String source = replaceKnownVariable(element);
- if (method instanceof PutMethod) {
- byte[] input = source.getBytes(getFileEncoding(element));
- method.setRequestHeader("Content-Length", ""+input.length);
+ byte[] input = source.getBytes(getFileEncoding(element));
+// System.out.println("##### encoding " + getFileEncoding(element));
+// System.out.println("##### length " + input.length);
+// System.out.println("##### data " + source);
+ method.setRequestHeader("Content-Length", ""+input.length);
+ if (method instanceof HttpRequestBodyMethodBase) {
+ ((HttpRequestBodyMethodBase)method).setRequestBody(input);
+ } else if (method instanceof PutMethod) {
((PutMethod)method).setRequestBody(input);
- } else {
- if (method instanceof HttpRequestBodyMethodBase) {
- ((HttpRequestBodyMethodBase)method).setRequestBody(source);
- }
}
}
catch (UnsupportedEncodingException e) { throw new
Exception(e.toString());}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>