[jboss-svn-commits] JBL Code SVN: r18250 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src: test/java/org/jboss/soa/esb/actions/soap and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-02-01 10:22:15 -0500 (Fri, 01 Feb 2008)
New Revision: 18250

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/test-out-expected.wsdl
Log:
Merged fix for JBESB-1527

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2008-02-01 14:56:58 UTC (rev 18249)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/WebserviceContractPublisher.java	2008-02-01 15:22:15 UTC (rev 18250)
@@ -163,12 +163,7 @@
         execContext.setAttribute(WsdlTransformer.TARGET_PROTOCOL, targetProtocol);
         transformer.filter(new StreamSource(new StringReader(wsdl)), new StreamResult(writer), execContext);
 
-        wsdl = writer.toString().trim();
-        if(!wsdl.startsWith("<?xml")) {
-            wsdl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + wsdl;
-        }
-
-        return wsdl;
+        return writer.toString().trim();
     }
 
     protected void initializeTransform() throws ConfigurationException {

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/test-out-expected.wsdl
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/test-out-expected.wsdl	2008-02-01 14:56:58 UTC (rev 18249)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/services/soap/src/test/java/org/jboss/soa/esb/actions/soap/test-out-expected.wsdl	2008-02-01 15:22:15 UTC (rev 18250)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <definitions name="GoodbyeWorldWSService" targetNamespace="http://webservice_war1/goodbyeworld" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://webservice_war1/goodbyeworld" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <import location="http://127.0.0.1:8080/contract/contract.jsp?wsdl&amp;resource=MTOMEndpoint_PortType61314.wsdl&amp;serviceCat=myServiceCat&amp;serviceName=myServiceName&amp;protocol=socket" namespace="http://org.jboss.ws/xop/doclit"/>
     <types/>
@@ -53,4 +52,4 @@
             <soap:address location="socket://x.y.x:8989/"/>
         </port>
     </service>
-</definitions>
\ No newline at end of file
+</definitions>