Ooops, it was not intentional (not for this commit), sorry for this (I am reverting that).
Thanks Jacopo On Jun 25, 2012, at 9:33 PM, Jacques Le Roux wrote: > Hi Jacopo, > > Is it intentionally that the 1st hunk was committed or did it slip in? > > Jacques > > From: <jaco...@apache.org> >> Author: jacopoc >> Date: Mon Jun 25 18:00:01 2012 >> New Revision: 1353686 >> >> URL: http://svn.apache.org/viewvc?rev=1353686&view=rev >> Log: >> Fixed a few wrong attribute names: authorization --> authz >> >> Modified: >> ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java >> >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java >> >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java >> >> Modified: >> ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1353686&r1=1353685&r2=1353686&view=diff >> ============================================================================== >> --- >> ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java >> (original) >> +++ >> ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java >> Mon Jun 25 18:00:01 2012 >> @@ -118,7 +118,7 @@ public class ServiceDispatcher { >> >> // make sure we haven't disabled these features from running >> if (enableJMS) { >> - this.jlf = JmsListenerFactory.getInstance(this); >> + this.jlf = new JmsListenerFactory(this); >> } >> >> if (enableSvcs) { >> >> Modified: >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1353686&r1=1353685&r2=1353686&view=diff >> ============================================================================== >> --- >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java >> (original) >> +++ >> ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java >> Mon Jun 25 18:00:01 2012 >> @@ -305,7 +305,7 @@ public class ContextFilter implements Fi >> config.getServletContext().setAttribute("delegator", >> delegator); >> >> // clear web context objects >> - >> config.getServletContext().setAttribute("authorization", null); >> + config.getServletContext().setAttribute("authz", null); >> config.getServletContext().setAttribute("security", null); >> config.getServletContext().setAttribute("dispatcher", >> null); >> >> @@ -420,7 +420,7 @@ public class ContextFilter implements Fi >> } >> >> protected Authorization getAuthz() { >> - Authorization authz = (Authorization) >> config.getServletContext().getAttribute("authorization"); >> + Authorization authz = (Authorization) >> config.getServletContext().getAttribute("authz"); >> if (authz == null) { >> Delegator delegator = (Delegator) >> config.getServletContext().getAttribute("delegator"); >> >> >> Modified: >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java?rev=1353686&r1=1353685&r2=1353686&view=diff >> ============================================================================== >> --- >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java >> (original) >> +++ >> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java >> Mon Jun 25 18:00:01 2012 >> @@ -212,7 +212,7 @@ public class ModelTreeCondition { >> String permission = permissionExdr.expandString(context); >> String action = actionExdr.expandString(context); >> >> - Authorization authz = (Authorization) >> context.get("authorization"); >> + Authorization authz = (Authorization) context.get("authz"); >> Security security = (Security) context.get("security"); >> if (UtilValidate.isNotEmpty(action)) { >> //Debug.logWarning("Deprecated method >> hasEntityPermission() was called; the action field should no longer be >> used", module); >>
