Fixed class defs so this is now 100% compliant with Annotations 1.0
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-annotation_1.0_spec@489255 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/javax/annotation/Generated.java b/src/main/java/javax/annotation/Generated.java
index aaa4605..dbac320 100644
--- a/src/main/java/javax/annotation/Generated.java
+++ b/src/main/java/javax/annotation/Generated.java
@@ -24,22 +24,32 @@
//
package javax.annotation;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD,
-ElementType.LOCAL_VARIABLE, ElementType.METHOD, ElementType.PACKAGE,
-ElementType.PARAMETER, ElementType.TYPE})
+@Target({
+ ElementType.PACKAGE,
+ ElementType.TYPE,
+ ElementType.ANNOTATION_TYPE,
+ ElementType.METHOD,
+ ElementType.CONSTRUCTOR,
+ ElementType.FIELD,
+ ElementType.LOCAL_VARIABLE,
+ ElementType.PARAMETER
+ })
@Retention(RetentionPolicy.SOURCE)
-
+@Documented
public @interface Generated {
String[] value();
+
String date() default "";
+
String comments() default "";
}
diff --git a/src/main/java/javax/annotation/PostConstruct.java b/src/main/java/javax/annotation/PostConstruct.java
index c3e8fb3..b0e151e 100644
--- a/src/main/java/javax/annotation/PostConstruct.java
+++ b/src/main/java/javax/annotation/PostConstruct.java
@@ -28,10 +28,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
/**
* @version $Rev$ $Date$
*/
+@Documented
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PostConstruct {
diff --git a/src/main/java/javax/annotation/PreDestroy.java b/src/main/java/javax/annotation/PreDestroy.java
index 66a3b6d..1231d5c 100644
--- a/src/main/java/javax/annotation/PreDestroy.java
+++ b/src/main/java/javax/annotation/PreDestroy.java
@@ -28,10 +28,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
/**
* @version $Rev$ $Date$
*/
+@Documented
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface PreDestroy {
diff --git a/src/main/java/javax/annotation/Resource.java b/src/main/java/javax/annotation/Resource.java
index 8fbabb9..8920cb6 100644
--- a/src/main/java/javax/annotation/Resource.java
+++ b/src/main/java/javax/annotation/Resource.java
@@ -28,11 +28,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
/**
* @version $Rev$ $Date$
*/
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Resource {
public enum AuthenticationType {
diff --git a/src/main/java/javax/annotation/Resources.java b/src/main/java/javax/annotation/Resources.java
index 98bc4b6..b22d48a 100644
--- a/src/main/java/javax/annotation/Resources.java
+++ b/src/main/java/javax/annotation/Resources.java
@@ -28,10 +28,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
/**
* @version $Rev$ $Date$
*/
+@Documented
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface Resources {