Author: dkulp
Date: Thu Feb 4 16:15:53 2010
New Revision: 906547
URL: http://svn.apache.org/viewvc?rev=906547&view=rev
Log:
[CXF-2632] Make sure the string passed into uri.resolve is fully escaped
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=906547&r1=906546&r2=906547&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
(original)
+++
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
Thu Feb 4 16:15:53 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/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=906547&r1=906546&r2=906547&view=diff
==============================================================================
---
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
(original)
+++
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java
Thu Feb 4 16:15:53 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 {
