[exo-jcr-commits] exo-jcr SVN: r2354 - in jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command: proppatch and 1 other directory.

[do-not-reply at jboss.org]

Author: dkatayev
Date: 2010-05-06 09:57:53 -0400 (Thu, 06 May 2010)
New Revision: 2354

Modified:
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/proppatch/PropPatchResponseEntity.java
Log:
EXOJCR-698 url difference fixed. Now all responces return decoder url

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java	2010-05-06 13:57:17 UTC (rev 2353)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java	2010-05-06 13:57:53 UTC (rev 2354)
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
+import java.net.URLDecoder;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -172,7 +173,7 @@
             xmlStreamWriter.writeStartElement("DAV:", "response");
 
             xmlStreamWriter.writeStartElement("DAV:", "href");
-            xmlStreamWriter.writeCharacters(resource.getIdentifier().toASCIIString());
+            xmlStreamWriter.writeCharacters(URLDecoder.decode(resource.getIdentifier().toASCIIString(), "UTF-8"));
             xmlStreamWriter.writeEndElement();
 
             PropstatGroupedRepresentation propstat = new PropstatGroupedRepresentation(resource, properties, false);

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/proppatch/PropPatchResponseEntity.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/proppatch/PropPatchResponseEntity.java	2010-05-06 13:57:17 UTC (rev 2353)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/proppatch/PropPatchResponseEntity.java	2010-05-06 13:57:53 UTC (rev 2354)
@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -155,7 +156,7 @@
 
          xmlStreamWriter.writeStartElement("DAV:", "response");
          xmlStreamWriter.writeStartElement("DAV:", "href");
-         xmlStreamWriter.writeCharacters(uri.toASCIIString());
+         xmlStreamWriter.writeCharacters(URLDecoder.decode(uri.toASCIIString(), "UTF-8"));
          xmlStreamWriter.writeEndElement();
 
          Map<String, Set<HierarchicalProperty>> propStats = getPropStat();