[jbossws-commits] JBossWS SVN: r16651 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment and 1 other directory.
Author: richard.opalka(a)jboss.com
Date: 2012-08-28 06:43:21 -0400 (Tue, 28 Aug 2012)
New Revision: 16651
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
Log:
Merged revisions 16636,16644 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16636 | richard.opalka(a)jboss.com | 2012-08-21 15:24:33 +0200 (Tue, 21 Aug 2012) | 1
line
[JBWS-3537] Upgrade netty 3.2.6 -> 3.4.5
.......
r16644 | richard.opalka(a)jboss.com | 2012-08-27 11:14:02 +0200 (Mon, 27 Aug 2012) | 1
line
[JBWS-3532] fixing WSDL file publishing when path contains white spaces
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
-
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-08-28
10:39:19 UTC (rev 16650)
+++
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-08-28
10:43:21 UTC (rev 16651)
@@ -25,6 +25,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
+import java.net.URLDecoder;
import java.util.LinkedList;
import java.util.List;
import java.util.ResourceBundle;
@@ -81,7 +82,7 @@
Document doc = getWsdlDocument(bus, def);
writeDocument(doc, wsdlFile);
- URL wsdlPublishURL = wsdlFile.toURI().toURL();
+ URL wsdlPublishURL = new
URL(URLDecoder.decode(wsdlFile.toURI().toURL().toExternalForm(), "UTF-8"));
log.info("WSDL published to: " + wsdlPublishURL);
// Process the wsdl imports