Author: markt
Date: Mon Sep 9 11:12:47 2013
New Revision: 1521040
URL: http://svn.apache.org/r1521040
Log:
Preparation for fixing BZ 55534
Add @since markers for common annotations
Fix a few spec non-compliance issues
- Generated#comment -> commnets
- DenyAll is permitted on classes
Modified:
tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java
tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/Generated.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation;
import java.lang.annotation.ElementType;
@@ -23,13 +21,15 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
- ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
+/**
+ * @since Common Annotations 1.0
+ */
+@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
+ ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
@Retention(RetentionPolicy.SOURCE)
-
public @interface Generated {
public String[] value();
public String date() default "";
- public String comment() default "";
+ public String comments() default "";
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/PostConstruct.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface PostConstruct {
// No attributes
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/PreDestroy.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface PreDestroy {
// No attributes
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface Resource {
public enum AuthenticationType {
CONTAINER,
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/Resources.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface Resources {
public Resource[] value();
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/DeclareRoles.java Mon
Sep 9 11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation.security;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface DeclareRoles {
public String[] value();
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/DenyAll.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation.security;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.METHOD})
+/**
+ * @since Common Annotations 1.0
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface DenyAll {
// No attributes
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/PermitAll.java Mon Sep
9 11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation.security;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface PermitAll {
// No attributes
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/RolesAllowed.java Mon
Sep 9 11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation.security;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface RolesAllowed {
public String[] value();
}
Modified: tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java?rev=1521040&r1=1521039&r2=1521040&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/security/RunAs.java Mon Sep 9
11:12:47 2013
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.annotation.security;
import java.lang.annotation.ElementType;
@@ -23,9 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * @since Common Annotations 1.0
+ */
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-
public @interface RunAs {
public String value();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
