svn commit: r770836 - in /ofbiz/trunk: applications/securityext/src/org/ofbiz/securityext/test/ framework/security/src/org/ofbiz/security/authz/ framework/service/src/org/ofbiz/service/job/ framework/webapp/src/org/ofbiz/webapp/control/

[jaz-3]

Author: jaz
Date: Fri May  1 21:53:29 2009
New Revision: 770836

URL: http://svn.apache.org/viewvc?rev=770836&view=rev
Log:
Renamed AbtractAuthorization to AbstractAuthorization (bad typo)

Added:
    ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java
      - copied, changed from r770771, ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbtractAuthorization.java
Removed:
    ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbtractAuthorization.java
Modified:
    ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java
    ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java

Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java?rev=770836&r1=770835&r2=770836&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java (original)
+++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java Fri May  1 21:53:29 2009
@@ -4,7 +4,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.security.SecurityConfigurationException;
-import org.ofbiz.security.authz.AbtractAuthorization;
+import org.ofbiz.security.authz.AbstractAuthorization;
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.security.authz.AuthorizationFactory;
 import org.ofbiz.service.testtools.OFBizTestCase;
@@ -23,7 +23,7 @@
         if (security == null) {
             security = AuthorizationFactory.getInstance(delegator);
         }
-        AbtractAuthorization.clearThreadLocal();
+        AbstractAuthorization.clearThreadLocal();
     }
                   
     public void testBasicAdminPermission() throws Exception {

Copied: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java (from r770771, ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbtractAuthorization.java)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java?p2=ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java&p1=ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbtractAuthorization.java&r1=770771&r2=770836&rev=770836&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbtractAuthorization.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/AbstractAuthorization.java Fri May  1 21:53:29 2009
@@ -30,9 +30,9 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
 
-public abstract class AbtractAuthorization implements Authorization {
+public abstract class AbstractAuthorization implements Authorization {
 
-    private static final String module = AbtractAuthorization.class.getName();
+    private static final String module = AbstractAuthorization.class.getName();
     
  /**
  * Used to manage Auto-Grant permissions for the current "request"

Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java?rev=770836&r1=770835&r2=770836&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java Fri May  1 21:53:29 2009
@@ -37,7 +37,7 @@
 import org.ofbiz.security.authz.da.DynamicAccessFactory;
 import org.ofbiz.security.authz.da.DynamicAccessHandler;
 
-public class EntityAuthorization extends AbtractAuthorization {
+public class EntityAuthorization extends AbstractAuthorization {
 
     private static final String module = EntityAuthorization.class.getName();
     

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java?rev=770836&r1=770835&r2=770836&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java Fri May  1 21:53:29 2009
@@ -25,6 +25,7 @@
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.security.authz.AbstractAuthorization;
 import org.ofbiz.service.config.ServiceConfigUtil;
 
 /**
@@ -215,7 +216,7 @@
         this.thread.interrupt();
         this.thread = null;
     }
-
+        
     public synchronized void run() {
         while (run) {
             Job job = jp.next();
@@ -269,6 +270,9 @@
                 // increment the count
                 count++;
                 if (Debug.verboseOn()) Debug.logVerbose("Invoker: " + thread.getName() + " (" + count + ") total.", module);
+                
+                // reset thread local security
+                AbstractAuthorization.clearThreadLocal();
             }
             long diff = (new Date().getTime() - this.getTime());
 

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=770836&r1=770835&r2=770836&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 Fri May  1 21:53:29 2009
@@ -54,7 +54,7 @@
 import org.ofbiz.security.Security;
 import org.ofbiz.security.SecurityConfigurationException;
 import org.ofbiz.security.SecurityFactory;
-import org.ofbiz.security.authz.AbtractAuthorization;
+import org.ofbiz.security.authz.AbstractAuthorization;
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.security.authz.AuthorizationFactory;
 import org.ofbiz.service.GenericDispatcher;
@@ -129,10 +129,7 @@
         if (disableCachedClassloader == null || !"Y".equalsIgnoreCase(disableCachedClassloader)) {
             Thread.currentThread().setContextClassLoader(localCachedClassLoader);
         }
-
-        // reset thread local security; used when thread pools don't clear
-        AbtractAuthorization.clearThreadLocal();
-        
+              
         // set the webSiteId in the session
         httpRequest.getSession().setAttribute("webSiteId", config.getServletContext().getAttribute("webSiteId"));
 
@@ -265,6 +262,9 @@
 
         // we're done checking; continue on
         chain.doFilter(request, response);
+        
+        // reset thread local security
+        AbstractAuthorization.clearThreadLocal();
     }
 
     /**