gcasper 2004/03/22 09:05:29
Modified: src/blocks/webdav/java/org/apache/cocoon/components/source/impl
WebDAVSource.java
src/blocks/webdav/java/org/apache/cocoon/transformation
DASLTransformer.java
lib jars.xml
Added: src/blocks/webdav/lib jakarta-slide-webdavlib-2.0beta1.jar
Removed: src/blocks/webdav/lib slide-webdavlib-20030711.jar
Log:
Updated SWCL to 2.0beta1
Revision Changes Path
1.1
cocoon-2.1/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.0beta1.jar
<<Binary file>>
1.21 +8 -11
cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java
Index: WebDAVSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WebDAVSource.java 5 Mar 2004 13:02:26 -0000 1.20
+++ WebDAVSource.java 22 Mar 2004 17:05:28 -0000 1.21
@@ -42,13 +42,13 @@
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.cocoon.components.source.InspectableSource;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.httpclient.HttpURL;
import org.apache.commons.httpclient.HttpException;
import org.apache.excalibur.source.ModifiableTraversableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.TimeStampValidity;
-import org.apache.util.HttpURL;
import org.apache.webdav.lib.WebdavResource;
import org.apache.webdav.lib.methods.DepthSupport;
import org.apache.webdav.lib.Property;
@@ -84,10 +84,6 @@
private static final String COLLECTION_NAME = "collection";
- static {
- WebdavResource.setGetUseDisk(false);
- }
-
private String systemId;
private String location;
@@ -117,7 +113,7 @@
this.systemId = "http://"; + location;
HttpURL httpURL = new HttpURL(this.systemId);
- httpURL.setUserInfo(principal, password);
+ httpURL.setUserinfo(principal, password);
if (createNew) {
this.resource = new WebdavResource(httpURL,
@@ -170,15 +166,17 @@
/**
* Constructor used by the Traversable methods to build children.
*/
- private WebDAVSource (WebdavResource source)
+ private WebDAVSource (WebdavResource source, String principal, String
password)
throws HttpException, IOException {
this.resource = source;
this.systemId = source.getHttpURL().getURI();
+ source.getHttpURL().setUserinfo(principal, password);
//fix trailing slash
if (this.resource.isCollection() && (this.systemId.endsWith("/") ==
false)) {
this.systemId = this.systemId+"/";
HttpURL httpURL = new HttpURL(this.systemId);
+ httpURL.setUserinfo(principal, password);
this.resource.setHttpURL(httpURL);
}
}
@@ -396,7 +394,7 @@
if (sourcecredential == null) return;
try {
HttpURL httpURL = new HttpURL(this.systemId);
- httpURL.setUserInfo(
+ httpURL.setUserinfo(
sourcecredential.getPrincipal(),
sourcecredential.getPassword());
this.resource = new WebdavResource(httpURL);
@@ -435,7 +433,6 @@
protected WebDAVSourceOutputStream(WebdavResource resource) {
this.resource = resource;
- WebdavResource.setGetUseDisk(false);
}
public void close() throws IOException {
@@ -607,7 +604,7 @@
try {
WebdavResource[] resources = this.resource.listWebdavResources();
for (int i = 0; i < resources.length; i++) {
- WebDAVSource src = new WebDAVSource(resources[i]);
+ WebDAVSource src = new WebDAVSource(resources[i],
this.principal, this.password);
children.add(src);
}
} catch (HttpException e) {
1.7 +1 -1
cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java
Index: DASLTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DASLTransformer.java 17 Mar 2004 12:09:52 -0000 1.6
+++ DASLTransformer.java 22 Mar 2004 17:05:28 -0000 1.7
@@ -210,7 +210,7 @@
url.getUser(),
url.getPassword()));
HttpConnection conn = new HttpConnection(url.getHost(),
url.getPort());
- WebdavResource resource = new WebdavResource(new
org.apache.util.HttpURL(this.targetUrl));
+ WebdavResource resource = new WebdavResource(new
HttpURL(this.targetUrl));
if(!resource.exists()) {
throw new SAXException("The WebDAV resource don't exist");
}
1.191 +2 -2 cocoon-2.1/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- jars.xml 20 Mar 2004 01:51:00 -0000 1.190
+++ jars.xml 22 Mar 2004 17:05:29 -0000 1.191
@@ -764,7 +764,7 @@
<title>Slide WebDAV Client library</title>
<description>The Jakarta Slide WebDAV client library.</description>
<used-by>WebDAV block</used-by>
- <lib>webdav/lib/slide-webdavlib-20030711.jar</lib>
+ <lib>webdav/lib/jakarta-slide-webdavlib-2.0beta1.jar</lib>
<homepage>http://jakarta.apache.org/slide/</homepage>
</file>
