You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/09/22 00:48:41 UTC

svn commit: r578310 - /ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh

Author: jleroux
Date: Fri Sep 21 15:48:39 2007
New Revision: 578310

URL: http://svn.apache.org/viewvc?rev=578310&view=rev
Log:
Reverted on David's advices

Modified:
    ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh

Modified: ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh?rev=578310&r1=578309&r2=578310&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh (original)
+++ ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh Fri Sep 21 15:48:39 2007
@@ -78,7 +78,7 @@
             runOnFailure.setAccessible(false);
 
             //extract actions
-            actions = curRuleClass.getDeclaredField("actionsAndSets");            
+            actions = curRuleClass.getDeclaredField("actions");            
             actions.setAccessible(true);
             actionsVal = actions.get(curRule);
             if(actionsVal != null){
@@ -474,17 +474,17 @@
     
     showWsdl = request.getParameter("show_wsdl");
     if(showWsdl == null || showWsdl.length() == 0){
-    	showWsdl = request.getAttribute("show_wsdl");
+      showWsdl = request.getAttribute("show_wsdl");
     }
     
     if(showWsdl != null && showWsdl.equals("true")) {
-    	try {
-    		wsdl = curServiceModel.toWSDL("http://" + request.getServerName() + ":" + UtilProperties.getPropertyValue("url.properties", "port.http", "80") + (String) request.getAttribute("_CONTROL_PATH_") + "/SOAPService");
-    		curServiceMap.put("wsdl", UtilXml.writeXmlDocument(wsdl));
-    	} catch (WSDLException ex) {
-    		curServiceMap.put("wsdl", ex.getLocalizedMessage());
-    	}
-    	context.put("showWsdl", Boolean.TRUE);
+      try {
+        wsdl = curServiceModel.toWSDL("http://" + request.getServerName() + ":" + UtilProperties.getPropertyValue("url.properties", "port.http", "80") + (String) request.getAttribute("_CONTROL_PATH_") + "/SOAPService");
+        curServiceMap.put("wsdl", UtilXml.writeXmlDocument(wsdl));
+      } catch (WSDLException ex) {
+        curServiceMap.put("wsdl", ex.getLocalizedMessage());
+      }
+      context.put("showWsdl", Boolean.TRUE);
     }
     context.put("selectedServiceMap", curServiceMap);
 }



Re: svn commit: r578310 - /ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh

Posted by Jacques Le Roux <ja...@les7arts.com>.
Sorry, some false changes have slipped in (ie just blanks or such), I checked dont worry.

Jacques

> Author: jleroux
> Date: Fri Sep 21 15:48:39 2007
> New Revision: 578310
>
> URL: http://svn.apache.org/viewvc?rev=578310&view=rev
> Log:
> Reverted on David's advices
>
> Modified:
>     ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
>
> Modified: ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
> URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh?rev=578310&r1=578309&r2=578310&view=diff
> ==============================================================================
> --- ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh (original)
> +++ ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh Fri Sep 21 15:48:39
2007
> @@ -78,7 +78,7 @@
>              runOnFailure.setAccessible(false);
>
>              //extract actions
> -            actions = curRuleClass.getDeclaredField("actionsAndSets");
> +            actions = curRuleClass.getDeclaredField("actions");
>              actions.setAccessible(true);
>              actionsVal = actions.get(curRule);
>              if(actionsVal != null){
> @@ -474,17 +474,17 @@
>
>      showWsdl = request.getParameter("show_wsdl");
>      if(showWsdl == null || showWsdl.length() == 0){
> -    showWsdl = request.getAttribute("show_wsdl");
> +      showWsdl = request.getAttribute("show_wsdl");
>      }
>
>      if(showWsdl != null && showWsdl.equals("true")) {
> -    try {
> -    wsdl = curServiceModel.toWSDL("http://" + request.getServerName() + ":" + UtilProperties.getPropertyValue("url.properties",
"port.http", "80") + (String) request.getAttribute("_CONTROL_PATH_") + "/SOAPService");
> -    curServiceMap.put("wsdl", UtilXml.writeXmlDocument(wsdl));
> -    } catch (WSDLException ex) {
> -    curServiceMap.put("wsdl", ex.getLocalizedMessage());
> -    }
> -    context.put("showWsdl", Boolean.TRUE);
> +      try {
> +        wsdl = curServiceModel.toWSDL("http://" + request.getServerName() + ":" +
UtilProperties.getPropertyValue("url.properties", "port.http", "80") + (String) request.getAttribute("_CONTROL_PATH_") +
"/SOAPService");
> +        curServiceMap.put("wsdl", UtilXml.writeXmlDocument(wsdl));
> +      } catch (WSDLException ex) {
> +        curServiceMap.put("wsdl", ex.getLocalizedMessage());
> +      }
> +      context.put("showWsdl", Boolean.TRUE);
>      }
>      context.put("selectedServiceMap", curServiceMap);
>  }
>
>