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 ju...@apache.org on 2002/12/17 11:32:09 UTC

cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods XMLResponseMethodBase.java

juergen     2002/12/17 02:32:09

  Modified:    src/webdav/client/src/org/apache/webdav/lib/methods
                        XMLResponseMethodBase.java
  Log:
  UrlUtil is not available any more in httpClient: Use the decoder from Slide.
  
  Revision  Changes    Path
  1.35      +22 -32    jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java
  
  Index: XMLResponseMethodBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- XMLResponseMethodBase.java	16 Dec 2002 15:17:28 -0000	1.34
  +++ XMLResponseMethodBase.java	17 Dec 2002 10:32:09 -0000	1.35
  @@ -64,48 +64,38 @@
   
   package org.apache.webdav.lib.methods;
   
  -import java.io.FilterInputStream;
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   import java.io.StringWriter;
  -import java.io.UnsupportedEncodingException;
  -
  -import java.text.DateFormat;
  -import java.text.ParseException;
  -import java.text.SimpleDateFormat;
  -
  -import java.util.Date;
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  -import java.util.Locale;
  -
  -import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.DocumentBuilder;
  -import javax.xml.parsers.FactoryConfigurationError;
  +import javax.xml.parsers.DocumentBuilderFactory;
   import javax.xml.parsers.ParserConfigurationException;
  -
  -import org.apache.commons.httpclient.*;
  -//import org.apache.commons.httpclient.log.Log;
  -//import org.apache.commons.httpclient.log.LogSource;
  -
  -import org.apache.webdav.lib.Property;
  -import org.apache.webdav.lib.BaseProperty;
  -import org.apache.webdav.lib.ResponseEntity;
  -
  -import org.apache.webdav.lib.properties.*;
  -
  -import org.apache.util.WebdavStatus;
  +import org.apache.commons.httpclient.HttpConnection;
  +import org.apache.commons.httpclient.HttpException;
  +import org.apache.commons.httpclient.HttpState;
   import org.apache.util.DOMUtils;
   import org.apache.util.DOMWriter;
  -
  +import org.apache.util.URLUtil;
  +import org.apache.util.WebdavStatus;
  +import org.apache.webdav.lib.BaseProperty;
  +import org.apache.webdav.lib.Property;
  +import org.apache.webdav.lib.ResponseEntity;
  +import org.apache.webdav.lib.properties.AclProperty;
  +import org.apache.webdav.lib.properties.CurrentUserPrivilegeSetProperty;
  +import org.apache.webdav.lib.properties.GetLastModifiedProperty;
  +import org.apache.webdav.lib.properties.LockDiscoveryProperty;
  +import org.apache.webdav.lib.properties.OwnerProperty;
  +import org.apache.webdav.lib.properties.PrincipalCollectionSetProperty;
  +import org.apache.webdav.lib.properties.ResourceTypeProperty;
  +import org.apache.webdav.lib.properties.SupportedLockProperty;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  -
   import org.xml.sax.InputSource;
  -import org.xml.sax.SAXException;
   
   /**
    * Utility class for XML response parsing.
  @@ -540,7 +530,7 @@
           public String getHref() {
               Element href = getFirstElement("DAV:", "href");
               if (href != null) {
  -                return URIUtil.decode(DOMUtils.getTextValue(href));
  +                return URLUtil.URLDecode(DOMUtils.getTextValue(href));
               } else {
                   return "";
               }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>