Author: alessio.soldano(a)jboss.com Date: 2012-12-19 05:06:05 -0500 (Wed, 19 Dec 2012) New Revision: 17136 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java Log: [JBWS-3573] More misc minor fixes.. Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2012-12-19 08:08:14 UTC (rev 17135) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2012-12-19 10:06:05 UTC (rev 17136) @@ -129,7 +129,7 @@ JaxWsImplementorInfo info = new JaxWsImplementorInfo(getImplementorClass()); wsdlLocation = info.getWsdlLocation(); } - wsdlPublisher.publishWsdlFiles(service.getName(), wsdlLocation, BusFactory.getThreadDefaultBus(false), service.getServiceInfos()); + wsdlPublisher.publishWsdlFiles(service.getName(), wsdlLocation, this.getBus(), service.getServiceInfos()); } catch (IOException ioe) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-12-19 08:08:14 UTC (rev 17135) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-12-19 10:06:05 UTC (rev 17136) @@ -67,7 +67,8 @@ { String deploymentName = dep.getCanonicalName(); File wsdlFile = getPublishLocation(serviceName.getLocalPart(), deploymentName, wsdlLocation); - wsdlFile.getParentFile().mkdirs(); + if (wsdlFile == null) return; + createParentDir(wsdlFile); try { // Write the wsdl def to file Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-12-19 08:08:14 UTC (rev 17135) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-12-19 10:06:05 UTC (rev 17136) @@ -85,7 +85,7 @@ { File tmpDir = IOUtils.createTempDirectory(); tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir); - Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); + Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile), "UTF-8"); try { writeTo(writer); @@ -114,7 +114,7 @@ public void writeTo(Writer writer) throws IOException { - writer.write("<beans " + + writer.write("<?xml version = \"1.0\" encoding = \"UTF-8\"?><beans " + "xmlns='http://www.springframework.org/schema/beans' " + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + "xmlns:beans='http://www.springframework.org/schema/beans' " +