You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/09/09 12:09:36 UTC
svn commit: r1521023 - in /tomcat/trunk/java:
javax/annotation/Generated.java javax/annotation/Resource.java
org/apache/catalina/startup/WebAnnotationSet.java
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
tomcat/trunk/java/javax/annotation/Resource.java
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java
javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2013/9/9 Mark Thomas <ma...@apache.org>:
> On 09/09/2013 11:20, Mark Thomas wrote:
>> On 09/09/2013 11:09, markt@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.
>
> The specification says authenticationType. I'll revert this change.
>
> It looks like a bug in whatever implementation was used to generate the
> Javadoc.
>
+1.
Geronimo uses authenticationType as well, in all versions of the
specification (1.0 - 1.2).
http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.2_spec/src/main/java/javax/annotation/
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java
javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
Posted by Mark Thomas <ma...@apache.org>.
On 09/09/2013 17:20, Nick Williams wrote:
>
> On Sep 9, 2013, at 5:24 AM, Mark Thomas wrote:
>
>> On 09/09/2013 11:20, Mark Thomas wrote:
>>> On 09/09/2013 11:09, markt@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.
>>
>> The specification says authenticationType. I'll revert this
>> change.
>>
>> It looks like a bug in whatever implementation was used to
>> generate the Javadoc.
>
> Is there somewhere you can/should/did report this problem with the
> Oracle-published EE 6 Javadoc? Seems like the published version
> should be corrected, but I'm not sure how easy it is to actually make
> that happen.
I didn't mainly due to past experience reporting Java bugs to Sun/Oracle
that simple got ignored. It didn't encourage me to do it again. I'll
ping the EG lead as they are also the Servlet EG lead.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
Posted by Nick Williams <ni...@nicholaswilliams.net>.
On Sep 9, 2013, at 5:24 AM, Mark Thomas wrote:
> On 09/09/2013 11:20, Mark Thomas wrote:
>> On 09/09/2013 11:09, markt@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.
>
> The specification says authenticationType. I'll revert this change.
>
> It looks like a bug in whatever implementation was used to generate the
> Javadoc.
Is there somewhere you can/should/did report this problem with the Oracle-published EE 6 Javadoc? Seems like the published version should be corrected, but I'm not sure how easy it is to actually make that happen.
Nick
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java
javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
Posted by Mark Thomas <ma...@apache.org>.
On 09/09/2013 11:20, Mark Thomas wrote:
> On 09/09/2013 11:09, markt@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.
The specification says authenticationType. I'll revert this change.
It looks like a bug in whatever implementation was used to generate the
Javadoc.
Sorry for the noise.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1521023 - in /tomcat/trunk/java: javax/annotation/Generated.java
javax/annotation/Resource.java org/apache/catalina/startup/WebAnnotationSet.java
Posted by Mark Thomas <ma...@apache.org>.
On 09/09/2013 11:09, markt@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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org