svn commit: r1356834 - in /cxf/branches/2.6.x-fixes: ./ tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java

[sergeyb]

Author: sergeyb
Date: Tue Jul  3 17:01:57 2012
New Revision: 1356834

URL: http://svn.apache.org/viewvc?rev=1356834&view=rev
Log:
Merged revisions 1356832 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1356832 | sergeyb | 2012-07-03 17:59:30 +0100 (Tue, 03 Jul 2012) | 1 line
  
  Updating WadlToJava container to read the WADL files using UTF-8
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1356832

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java?rev=1356834&r1=1356833&r2=1356834&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
 Tue Jul  3 17:01:57 2012
@@ -21,6 +21,8 @@ package org.apache.cxf.tools.wadlto.jaxr
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.URL;
 import java.util.Collections;
 import java.util.HashSet;
@@ -29,6 +31,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.xml.sax.InputSource;
+
 import org.apache.cxf.common.util.URIParserUtil;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.tools.common.AbstractCXFToolContainer;
@@ -178,7 +181,8 @@ public class JAXRSContainer extends Abst
     protected String readWadl(String wadlURI) {
         try {
             URL url = new URL(wadlURI);
-            return IOUtils.toString(url.openStream());
+            Reader reader = new InputStreamReader(url.openStream(), "UTF-8");
+            return IOUtils.toString(reader);
         } catch (IOException e) {
             throw new ToolException(e);
         }