svn commit: r1089054 - in /ofbiz/trunk/framework/service: config/service.properties src/org/ofbiz/service/ModelService.java

Author: jleroux
Date: Tue Apr  5 14:06:10 2011
New Revision: 1089054

URL: http://svn.apache.org/viewvc?rev=1089054&view=rev
Log:
Revert r1088762, this is not a working solution, because wsdl2Java fails to generate stubs with these changes.

We have to fix this though. A temporary solution for clients using CXF underneath is to follow the point 2 at http://mail-archives.apache.org/mod_mbox/cxf-users/200901.mbox/%3C200901231332.03818.dkulp@...%3E

I think, as it has been already reported by Alexander Graf, it's related to http://www.ws-i.org/profiles/basicprofile-1.1.html#R2735, but this have to be checked... Following recommendations and example there should allow us to deliver WS-I Basic Profile compliant WSDL. Unfortunately I have not enough time for that at the moment.

Modified:
    ofbiz/trunk/framework/service/config/service.properties
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

Modified: ofbiz/trunk/framework/service/config/service.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/service.properties?rev=1089054&r1=1089053&r2=1089054&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/service.properties (original)
+++ ofbiz/trunk/framework/service/config/service.properties Tue Apr  5 14:06:10 2011
@@ -23,5 +23,3 @@ servicedispatcher.servicedebugmode=true
 remotedispatcher.exportall=false
 # complete answer from SOAP WSDL or only brief message "Problem processing the service" for security reason
 secureSoapAnswer=true
-# TargetNamespace for SOAP WSDL
-#TargetNamespace=http://ofbiz.apache.org/service/

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=1089054&r1=1089053&r2=1089054&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Tue Apr  5 14:06:10 2011
@@ -93,10 +93,7 @@ public class ModelService extends Abstra
     public static final String module = ModelService.class.getName();
 
     public static final String XSD = "http://www.w3.org/2001/XMLSchema";
-    // The line below allows to define an empty targetNameSpace by commenting out the  TargetNamespace property in service.properties
-    // To be compliant with CFX which uses JAX-WS and follow WS-I Basic Profile: http://en.wikipedia.org/wiki/WS-I_Basic_Profile
-    // see http://mail-archives.apache.org/mod_mbox/cxf-users/200901.mbox/%3C200901231332.03818.dkulp@...%3E for details
-    public static final String TNS = UtilProperties.getPropertyValue("service.properties", "TargetNamespace", "");
+    public static final String TNS = "http://ofbiz.apache.org/service/";
     public static final String OUT_PARAM = "OUT";
     public static final String IN_PARAM = "IN";
 
@@ -1192,7 +1189,7 @@ public class ModelService extends Abstra
         Definition def = factory.newDefinition();
         def.setTargetNamespace(TNS);
         def.addNamespace("xsd", XSD);
-        def.addNamespace("tns", "http://ofbiz.apache.org/service"); // This name space, used only in wsdl:definitions can be hardcoded
+        def.addNamespace("tns", TNS);
         def.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
         this.getWSDL(def, locationURI);
         return factory.newWSDLWriter().getDocument(def);