Author: markt
Date: Mon Sep 9 10:26:16 2013
New Revision: 1521027
URL: http://svn.apache.org/r1521027
Log:
Revert change to authenticationType. I was working from the Javadoc which was
incorrect. The spec confirms that the correct attribute name is
authenticationType
Modified:
tomcat/trunk/java/javax/annotation/Resource.java
tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Modified: tomcat/trunk/java/javax/annotation/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resource.java?rev=1521027&r1=1521026&r2=1521027&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/trunk/java/javax/annotation/Resource.java Mon Sep 9 10:26:16 2013
@@ -34,8 +34,12 @@ public @interface Resource {
public String name() default "";
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
public Class type() default Object.class;
- public AuthenticationType authentication() default
AuthenticationType.CONTAINER;
+ public AuthenticationType authenticationType() default
AuthenticationType.CONTAINER;
public boolean shareable() default true;
public String description() default "";
public String mappedName() default "";
+ /**
+ * @since Common Annotations 1.1
+ */
+ public String lookup() default "";
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1521027&r1=1521026&r2=1521027&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Mon Sep
9 10:26:16 2013
@@ -366,10 +366,10 @@ public class WebAnnotationSet {
resource.setName(name);
resource.setType(type);
- if (annotation.authentication()
+ if (annotation.authenticationType()
== Resource.AuthenticationType.CONTAINER) {
resource.setAuth("Container");
- } else if (annotation.authentication()
+ } else if (annotation.authenticationType()
== Resource.AuthenticationType.APPLICATION) {
resource.setAuth("Application");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
