Author: painter
Date: Wed Jan 2 16:48:10 2019
New Revision: 1850176
URL: http://svn.apache.org/viewvc?rev=1850176&view=rev
Log:
Updating copyright year in notice file
Modified:
turbine/core/trunk/NOTICE
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
Modified: turbine/core/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/NOTICE?rev=1850176&r1=1850175&r2=1850176&view=diff
==============================================================================
--- turbine/core/trunk/NOTICE (original)
+++ turbine/core/trunk/NOTICE Wed Jan 2 16:48:10 2019
@@ -1,5 +1,5 @@
-Apache Turbine
-Copyright 2001-2015 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+Apache Turbine
+Copyright 2001-2019 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Modified:
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1850176&r1=1850175&r2=1850176&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
Wed Jan 2 16:48:10 2019
@@ -92,7 +92,7 @@ public class AnnotationProcessor
* @param acl
* @return true if the execution is allowed
*/
- public static <A extends TurbineAccessControlList> boolean
isAuthorized(AccessibleObject object, A acl)
+ public static <A extends TurbineAccessControlList<?>> boolean
isAuthorized(AccessibleObject object, A acl)
{
return isAuthorized( object, acl, ConditionType.COMPOUND );
}
@@ -107,7 +107,7 @@ public class AnnotationProcessor
* or {@link RoleConditionType#SINGLE} : The method
will return true if one of the annotations allows execution
* @return true if the execution is allowed
*/
- public static <A extends TurbineAccessControlList> boolean
isAuthorized(AccessibleObject object, A acl, ConditionType conditonType)
+ public static <A extends TurbineAccessControlList<?>> boolean
isAuthorized(AccessibleObject object, A acl, ConditionType conditonType)
{
Annotation[] annotations = getAnnotations(object);
