On 09/09/2013 11:09, ma...@apache.org wrote: > Author: markt > Date: Mon Sep 9 10:09:36 2013 > New Revision: 1521023 > > URL: http://svn.apache.org/r1521023 > Log: > Fix wrongly named annotation attributes > > Modified: > tomcat/trunk/java/javax/annotation/Generated.java This one is OK.
> tomcat/trunk/java/javax/annotation/Resource.java This one I am less sure about. The JavaEE 5 Javadoc uses authentication but JavaEE 6 onwards uses authenticationType with no indication that there has been a change. I need to dig into the specifications to see what is going on. Mark > tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java > > Modified: tomcat/trunk/java/javax/annotation/Generated.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Generated.java?rev=1521023&r1=1521022&r2=1521023&view=diff > ============================================================================== > --- tomcat/trunk/java/javax/annotation/Generated.java (original) > +++ tomcat/trunk/java/javax/annotation/Generated.java Mon Sep 9 10:09:36 2013 > @@ -31,5 +31,5 @@ import java.lang.annotation.Target; > public @interface Generated { > public String[] value(); > public String date() default ""; > - public String comment() default ""; > + public String comments() default ""; > } > > Modified: tomcat/trunk/java/javax/annotation/Resource.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resource.java?rev=1521023&r1=1521022&r2=1521023&view=diff > ============================================================================== > --- tomcat/trunk/java/javax/annotation/Resource.java (original) > +++ tomcat/trunk/java/javax/annotation/Resource.java Mon Sep 9 10:09:36 2013 > @@ -34,7 +34,7 @@ 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 authenticationType() default > AuthenticationType.CONTAINER; > + public AuthenticationType authentication() default > AuthenticationType.CONTAINER; > public boolean shareable() default true; > public String description() default ""; > public String mappedName() 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=1521023&r1=1521022&r2=1521023&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:09:36 2013 > @@ -366,11 +366,10 @@ public class WebAnnotationSet { > resource.setName(name); > resource.setType(type); > > - if (annotation.authenticationType() > + if (annotation.authentication() > == Resource.AuthenticationType.CONTAINER) { > resource.setAuth("Container"); > - } > - else if (annotation.authenticationType() > + } else if (annotation.authentication() > == 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 > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
