juergen 2002/08/09 06:10:43
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
allow the user variable to be replaced with other variables.
Revision Changes Path
1.35 +25 -9
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- TProcessors.java 9 Aug 2002 07:14:48 -0000 1.34
+++ TProcessors.java 9 Aug 2002 13:10:42 -0000 1.35
@@ -105,9 +105,11 @@
/** user */
String defaultUser;
+ String currentUser;
/** password */
String defaultPassword;
+ String currentPassword;
/** url encoding */
@@ -148,6 +150,8 @@
port = System.getProperty("xdav.port");
defaultUser = System.getProperty("xdav.user");
defaultPassword = System.getProperty("xdav.password");
+ currentUser = defaultUser;
+ currentPassword = defaultPassword;
defaultUrlEncoding = System.getProperty("xdav.urlencoding");
tracingRequest = System.getProperty("xdav.tracingRequest", "none");
@@ -497,8 +501,15 @@
assignVariables(elt.getChildren("assign"));
- String user = replaceKnownVariable(elt.getChild("user"),
defaultUser);
- String password = replaceKnownVariable(elt.getChild("password"),
defaultPassword);
+ currentUser = defaultUser;
+ currentPassword = defaultPassword;
+
+ String user = replaceKnownVariable(elt.getChild("user"), defaultUser);
+ String password = replaceKnownVariable(elt.getChild("password"),
defaultPassword);
+
+ currentUser = user;
+ currentPassword = password;
+
HttpClient client = new HttpClient();
WebdavState state = new WebdavState();
state.setAuthenticateToken("Basic realm=xxx"); // currently only basic is
supported
@@ -506,7 +517,7 @@
state.setURLEncodingCharset(defaultUrlEncoding);
client.startSession((String)startUp.get("host"),
((Integer)startUp.get("port") ).intValue(),
- new Credentials(user, password));
+ new Credentials(currentUser, currentPassword));
client.setState(state);
if (tracingRequest.indexOf("client") != (-1)) {
client.setDebug(100);
@@ -1542,11 +1553,15 @@
if (key.startsWith("globalVariable") ||
key.equals("host")||
key.equals("port")||
- key.equals("user")||
- key.equals("password")||
key.equals("workdb") ) {
return System.getProperty("xdav." + key, "");
}
+ else if (key.equals("user")) {
+ return currentUser;
+ }
+ else if (key.equals("password")) {
+ return currentPassword;
+ }
else {
HashtableStack vars =
(HashtableStack)knownVarsByThread.get(Thread.currentThread().getName());
if (vars != null){
@@ -1629,6 +1644,7 @@
}
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
