svn commit: r890249 - in /ofbiz/branches/release4.0: ./ framework/service/src/org/ofbiz/service/ModelService.java mergefromtrunk.bat

Author: jleroux
Date: Mon Dec 14 09:41:42 2009
New Revision: 890249

URL: http://svn.apache.org/viewvc?rev=890249&view=rev
Log:
"Applied fix from trunk for revision: 890245  "
------------------------------------------------------------------------
r890245 | jleroux | 2009-12-14 10:35:15 +0100 (lun. 14 d‚c. 2009) | 2 lignes

A patch from Si Chen "wsdl generated is not correct for Apache Synapse and Visual Studio" (https://issues.apache.org/jira/browse/OFBIZ-3299) - OFBIZ-3299
The WSDL generated by ModelService is not correct for Visual Studio or Apache Synapse, causing Web services not to work properly. The soap:action tag is missing the URI for soapAction and needs to specify that this style is "rpc" for RPC/literal.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release4.0/   (props changed)
    ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ModelService.java
    ofbiz/branches/release4.0/mergefromtrunk.bat

Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 09:41:42 2009
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730
+/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443,738870,741491,808792,814731,827730,890245

Modified: ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ModelService.java?rev=890249&r1=890248&r2=890249&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/branches/release4.0/framework/service/src/org/ofbiz/service/ModelService.java Mon Dec 14 09:41:42 2009
@@ -1171,7 +1171,11 @@
         bindingOperation.setBindingInput(bindingInput);
 
         SOAPOperation soapOperation = new SOAPOperationImpl();
-        soapOperation.setSoapActionURI(""); // ?
+        // soapAction should be set to the location of the SOAP URI, or Visual Studio won't construct the correct SOAP message
+        soapOperation.setSoapActionURI(locationURI);
+        // this is the RPC/literal style.  See http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+        // this parameter is necessary or Apache Synapse won't recognize the WSDL
+        soapOperation.setStyle("rpc");
         bindingOperation.addExtensibilityElement(soapOperation);
 
         binding.addBindingOperation(bindingOperation);

Modified: ofbiz/branches/release4.0/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.bat?rev=890249&r1=890248&r2=890249&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Mon Dec 14 09:41:42 2009
@@ -2,9 +2,22 @@
 rem to use : launch and pass the trunk version number to merge in release
 
 echo off
+rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
+svn up
+
+rem version to merge
 set /p version=version to merge :
 set /a prevRev=%version% - 1
+
+rem build the comment
+echo "Applied fix from trunk for revision: %version%" > comment.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+copy comment.tmp + log.tmp = comment.tmp
+del log.tmp
+rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
+
+rem commit the backport to release with comment fom file
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
-svn commit -m "Applied fix from trunk for revision: %version%"
+svn commit -F comment.tmp
 pause