cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r906551 - in /cxf/branches/2.2.x-fixes: ./ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
Date Thu, 04 Feb 2010 16:21:33 GMT
Author: dkulp
Date: Thu Feb  4 16:21:33 2010
New Revision: 906551

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

........
  r906547 | dkulp | 2010-02-04 11:15:53 -0500 (Thu, 04 Feb 2010) | 1 line
  
  [CXF-2632] Make sure the string passed into uri.resolve is fully escaped
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
    cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java

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

Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=906551&r1=906550&r2=906551&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
(original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
Thu Feb  4 16:21:33 2010
@@ -24,6 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.cxf.tools.util.URIParserUtil;
+
 public class WsdlOption extends Option {
 
     /**
@@ -83,7 +85,8 @@
     public URI getWsdlURI(URI baseURI) {
         String wsdlLocation = getWsdl();
         File wsdlFile = new File(wsdlLocation);
-        return wsdlFile.exists() ? wsdlFile.toURI() : baseURI.resolve(wsdlLocation);
+        return wsdlFile.exists() ? wsdlFile.toURI() 
+            : baseURI.resolve(URIParserUtil.escapeChars(wsdlLocation));
     }
 
     public boolean isDefServiceName() {

Modified: cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=906551&r1=906550&r2=906551&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
(original)
+++ cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
Thu Feb  4 16:21:33 2010
@@ -225,7 +225,7 @@
         return KEYWORDS.contains(token);
     }
 
-    private static String escapeChars(String s) {
+    public static String escapeChars(String s) {
         StringBuilder b = new StringBuilder(s);
         int x = 0;
         do {



Mime
View raw message