svn commit: r1792901 - in /turbine/core/trunk/src/java/org/apache/turbine: modules/actions/AccessController.java services/rundata/DefaultTurbineRunData.java util/RunData.java

[gk]

Author: gk
Date: Thu Apr 27 14:08:57 2017
New Revision: 1792901

URL: http://svn.apache.org/viewvc?rev=1792901&view=rev
Log:
- using TurbineAccessControlList as required interface (symmetrical)

Modified:
    
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
    turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java?rev=1792901&r1=1792900&r2=1792901&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
 Thu Apr 27 14:08:57 2017
@@ -22,6 +22,7 @@ package org.apache.turbine.modules.actio
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.fulcrum.security.acl.AccessControlList;
+import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
 import org.apache.fulcrum.security.util.FulcrumSecurityException;
 import org.apache.turbine.Turbine;
 import org.apache.turbine.TurbineConstants;
@@ -114,6 +115,6 @@ public class AccessController
         }
 
         // Comply with Turbine 4.0 standards
-        pipelineData.get(Turbine.class).put(AccessControlList.class, 
data.getACL());
+        pipelineData.get(Turbine.class).put(TurbineAccessControlList.class, 
data.getACL());
     }
 }

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1792901&r1=1792900&r2=1792901&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
 Thu Apr 27 14:08:57 2017
@@ -42,6 +42,7 @@ import org.apache.fulcrum.parser.CookieP
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.fulcrum.pool.Recyclable;
 import org.apache.fulcrum.security.acl.AccessControlList;
+import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
 import org.apache.turbine.Turbine;
 import org.apache.turbine.TurbineConstants;
 import org.apache.turbine.om.security.User;
@@ -448,7 +449,7 @@ public class DefaultTurbineRunData
     public <A extends AccessControlList> A getACL()
     {
         @SuppressWarnings("unchecked")
-        A acl = (A)get(Turbine.class, AccessControlList.class);
+        A acl = (A)get(Turbine.class, TurbineAccessControlList.class);
         return acl;
     }
 
@@ -460,7 +461,7 @@ public class DefaultTurbineRunData
     @Override
     public void setACL(AccessControlList acl)
     {
-        get(Turbine.class).put(AccessControlList.class, acl);
+        get(Turbine.class).put(TurbineAccessControlList.class, acl);
     }
 
     /**

Modified: turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java?rev=1792901&r1=1792900&r2=1792901&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java Thu Apr 27 
14:08:57 2017
@@ -119,7 +119,7 @@ public interface RunData extends Pipelin
      *
      * @param acl an access control list.
      */
-    void setACL(AccessControlList acl);
+    <A extends AccessControlList> void setACL(A acl);
 
     /**
      * Whether or not an action has been defined.