You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/08/22 12:36:47 UTC
cvs commit: jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/taskdefs Delete.java
luetzkendorf 2004/08/22 03:36:47
Modified: webdavclient/ant/src/java/org/apache/webdav/ant Tag:
SLIDE_2_1_RELEASE_BRANCH CollectionScanner.java
Utils.java
webdavclient/ant/src/java/org/apache/webdav/ant/taskdefs
Tag: SLIDE_2_1_RELEASE_BRANCH Delete.java
Log:
redirects enabled
Revision Changes Path
No revision
No revision
1.3.2.2 +4 -3 jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/CollectionScanner.java
Index: CollectionScanner.java
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/CollectionScanner.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- CollectionScanner.java 15 Aug 2004 13:01:15 -0000 1.3.2.1
+++ CollectionScanner.java 22 Aug 2004 10:36:47 -0000 1.3.2.2
@@ -106,6 +106,7 @@
DepthSupport.DEPTH_1,
PropFindMethod.BY_NAME);
propFind.setPropertyNames(propertyNames.elements());
+ propFind.setFollowRedirects(true);
try {
this.client.executeMethod(propFind);
}
1.7.2.2 +12 -3 jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/Utils.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Utils.java 15 Aug 2004 13:01:15 -0000 1.7.2.1
+++ Utils.java 22 Aug 2004 10:36:47 -0000 1.7.2.2
@@ -129,6 +129,7 @@
throws IOException, HttpException
{
HeadMethod head = new HeadMethod(httpURL.getURI());
+ head.setFollowRedirects(true);
int status = client.executeMethod(head);
switch (status) {
@@ -179,6 +180,7 @@
props.add(GETLASTMODIFIED);
PropFindMethod propFind = new PropFindMethod(url.getURI(), 0);
propFind.setPropertyNames(props.elements());
+ propFind.setFollowRedirects(true);
int status = client.executeMethod(propFind);
switch (status) {
@@ -237,6 +239,7 @@
while(!toBeCreated.empty()) {
HttpURL newColl = Utils.createHttpURL(httpURL, (String)toBeCreated.pop());
MkcolMethod mkcol = new MkcolMethod(newColl.getURI());
+ mkcol.setFollowRedirects(true);
generateIfHeader(mkcol, lockToken);
int status = client.executeMethod(mkcol);
if (status != WebdavStatus.SC_CREATED) {
@@ -261,6 +264,7 @@
generateIfHeader(put, lockToken);
put.setRequestHeader("Content-Type", contentType);
put.setRequestBody(is);
+ put.setFollowRedirects(true);
int status = client.executeMethod(put);
switch (status) {
case WebdavStatus.SC_OK:
@@ -279,6 +283,7 @@
throws IOException, HttpException
{
GetMethod get = new GetMethod(url.toString());
+ get.setFollowRedirects(true);
int status = client.executeMethod(get);
switch (status) {
@@ -311,6 +316,7 @@
lock.setTimeout(timeout);
lock.setOwner(ownerInfo);
//lock.setDebug(1);
+ lock.setFollowRedirects(true);
int status = client.executeMethod(lock);
if (status == WebdavStatus.SC_OK) {
Header header = lock.getResponseHeader("Lock-Token");
@@ -336,6 +342,7 @@
throws IOException, HttpException
{
UnlockMethod unlock = new UnlockMethod(url.getURI(), lockToken);
+ unlock.setFollowRedirects(true);
int status = client.executeMethod(unlock);
switch (status) {
@@ -360,6 +367,7 @@
destination,
overwrite,
depth);
+ copy.setFollowRedirects(true);
int status = client.executeMethod(copy);
switch (status) {
case WebdavStatus.SC_OK:
@@ -380,6 +388,7 @@
throws IOException, HttpException
{
MoveMethod move = new MoveMethod(url.getURI(), destination, overwrite);
+ move.setFollowRedirects(true);
int status = client.executeMethod(move);
switch (status) {
case WebdavStatus.SC_OK:
No revision
No revision
1.5.2.2 +4 -3 jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/taskdefs/Delete.java
Index: Delete.java
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/ant/src/java/org/apache/webdav/ant/taskdefs/Delete.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- Delete.java 15 Aug 2004 13:01:15 -0000 1.5.2.1
+++ Delete.java 22 Aug 2004 10:36:47 -0000 1.5.2.2
@@ -81,6 +81,7 @@
validate();
log("Deleting " + logName, ifVerbose());
DeleteMethod delete = new DeleteMethod(url.getURI());
+ delete.setFollowRedirects(true);
if (this.locktoken != null) {
Utils.generateIfHeader(delete, this.locktoken);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org