You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by im...@apache.org on 2005/07/06 08:05:01 UTC
svn commit: r209411 - in /jakarta/commons/proper/vfs/trunk: build.xml
project.xml
src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
Author: imario
Date: Tue Jul 5 23:04:58 2005
New Revision: 209411
URL: http://svn.apache.org/viewcvs?rev=209411&view=rev
Log:
revert back to httpclient 2.0.2 as it seems httpclient 3.0-rc3 and webdavlib are not compatible
Modified:
jakarta/commons/proper/vfs/trunk/build.xml
jakarta/commons/proper/vfs/trunk/project.xml
jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
Modified: jakarta/commons/proper/vfs/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/build.xml?rev=209411&r1=209410&r2=209411&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/build.xml (original)
+++ jakarta/commons/proper/vfs/trunk/build.xml Tue Jul 5 23:04:58 2005
@@ -199,7 +199,7 @@
</get>
<get dest="${libdir}/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar">
</get>
- <get dest="${libdir}/commons-httpclient-3.0-rc3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-3.0-rc3.jar">
+ <get dest="${libdir}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
</get>
<get dest="${libdir}/jsch-0.1.17.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.17.jar">
</get>
Modified: jakarta/commons/proper/vfs/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/project.xml?rev=209411&r1=209410&r2=209411&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/project.xml (original)
+++ jakarta/commons/proper/vfs/trunk/project.xml Tue Jul 5 23:04:58 2005
@@ -142,7 +142,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0-rc3</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java?rev=209411&r1=209410&r2=209411&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java (original)
+++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/webdav/WebdavConnectionManager.java Tue Jul 5 23:04:58 2005
@@ -3,7 +3,6 @@
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import java.io.IOException;
import java.io.InputStream;
@@ -12,8 +11,8 @@
* A connection manager that provides access to a single HttpConnection. This
* manager makes no attempt to provide exclusive access to the contained
* HttpConnection.
- *
- * ThreadLocal connection.
+ * <p/>
+ * imario@apache.org: Keep connection in ThreadLocal.
*
* @author <a href="mailto:imario@apache.org">Mario Ivankovits</a>
* @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
@@ -25,6 +24,26 @@
*/
public class WebdavConnectionManager implements HttpConnectionManager
{
+ private static class ConnectionParameters
+ {
+ private boolean staleCheck;
+
+ public boolean isStaleCheckingEnabled()
+ {
+ return staleCheck;
+ }
+
+ public void setStaleCheckingEnabled(boolean b)
+ {
+ staleCheck = b;
+ }
+
+ public void populateParameters(HttpConnection connection)
+ {
+ connection.setStaleCheckingEnabled(staleCheck);
+ }
+ }
+
/**
* Since the same connection is about to be reused, make sure the
* previous request was completely processed, and if not
@@ -64,7 +83,7 @@
/**
* Collection of parameters associated with this connection manager.
*/
- private HttpConnectionManagerParams params = new HttpConnectionManagerParams();
+ private ConnectionParameters params = new ConnectionParameters();
/**
* release the connection of the current thread
@@ -150,7 +169,7 @@
}
/**
- * @see HttpConnectionManager#getConnectionWithTimeout(HostConfiguration, long)
+ * @see HttpConnectionManager#getConnection(HostConfiguration, long)
* @since 3.0
*/
public HttpConnection getConnectionWithTimeout(
@@ -163,7 +182,7 @@
httpConnection = new HttpConnection(hostConfiguration);
setLocalHttpConnection(httpConnection);
httpConnection.setHttpConnectionManager(this);
- httpConnection.getParams().setDefaults(this.params);
+ this.params.populateParameters(httpConnection);
}
else
{
@@ -223,34 +242,6 @@
// track the time the connection was made idle
setIdleStartTime(System.currentTimeMillis());
- }
-
- /**
- * Returns {@link HttpConnectionManagerParams parameters} associated
- * with this connection manager.
- *
- * @see HttpConnectionManagerParams
- * @since 2.1
- */
- public HttpConnectionManagerParams getParams()
- {
- return this.params;
- }
-
- /**
- * Assigns {@link HttpConnectionManagerParams parameters} for this
- * connection manager.
- *
- * @see HttpConnectionManagerParams
- * @since 2.1
- */
- public void setParams(final HttpConnectionManagerParams params)
- {
- if (params == null)
- {
- throw new IllegalArgumentException("Parameters may not be null");
- }
- this.params = params;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org