Modified: ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java?rev=1359626&r1=1359625&r2=1359626&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java (original) +++ ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/event/WfsEventHandler.java Tue Jul 10 12:05:55 2012 @@ -109,7 +109,7 @@ public class WfsEventHandler implements // run simple method script to get a list of entities Document simpleDoc = UtilXml.readXmlDocument(xmlScript); Element simpleElem = simpleDoc.getDocumentElement(); - SimpleMethod meth = new SimpleMethod(simpleElem, null, null); + SimpleMethod meth = new SimpleMethod(simpleElem, null); MethodContext methodContext = new MethodContext(request, response, null); meth.exec(methodContext); //Need to check return string List<GenericValue> entityList = UtilGenerics.cast(request.getAttribute("entityList"));
Propchange: ofbiz/branches/release12.04/framework/webtools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Jul 10 12:05:55 2012 @@ -0,0 +1,6 @@ +/ofbiz/branches/addbirt/framework/webtools:831210-885099,885686-886087 +/ofbiz/branches/dojo1.4/framework/webtools:951708-952957 +/ofbiz/branches/jackrabbit20100709/framework/webtools:962442-1231517 +/ofbiz/branches/jquery/framework/webtools:952958-1044489 +/ofbiz/branches/multitenant20100310/framework/webtools:921280-927264 +/ofbiz/trunk/framework/webtools:1332097,1333885,1334201,1334336,1334427,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347762,1351778,1351999,1355660,1355801,1355859,1355975,1359599-1359600 Modified: ofbiz/branches/release12.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1359626&r1=1359625&r2=1359626&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original) +++ ofbiz/branches/release12.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Tue Jul 10 12:05:55 2012 @@ -84,8 +84,7 @@ public class ServiceArtifactInfo extends // we can do something with this! SimpleMethod simpleMethodToCall = null; try { - Map<String, SimpleMethod> simpleMethods = SimpleMethod.getSimpleMethods(this.modelService.location, null); - simpleMethodToCall = simpleMethods.get(this.modelService.invoke); + simpleMethodToCall = SimpleMethod.getSimpleMethod(this.modelService.location, this.modelService.invoke,null); } catch (MiniLangException e) { Debug.logWarning("Error getting Simple-method [" + this.modelService.invoke + "] in [" + this.modelService.location + "] referenced in service [" + this.modelService.name + "]: " + e.toString(), module); } @@ -145,8 +144,7 @@ public class ServiceArtifactInfo extends // we can do something with this! SimpleMethod simpleMethodToCall = null; try { - Map<String, SimpleMethod> simpleMethods = SimpleMethod.getSimpleMethods(this.modelService.location, null); - simpleMethodToCall = simpleMethods.get(this.modelService.invoke); + simpleMethodToCall = SimpleMethod.getSimpleMethod(this.modelService.location, this.modelService.invoke,null); } catch (MiniLangException e) { Debug.logWarning("Error getting Simple-method [" + this.modelService.invoke + "] in [" + this.modelService.location + "] referenced in service [" + this.modelService.name + "]: " + e.toString(), module); }