[jboss-cvs] JBossAS SVN: r57283 - in trunk/ejb3x/src/main/javax/annotation: . security
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 29 06:53:07 EDT 2006
Author: wolfc
Date: 2006-09-29 06:52:50 -0400 (Fri, 29 Sep 2006)
New Revision: 57283
Added:
trunk/ejb3x/src/main/javax/annotation/Generated.java
Modified:
trunk/ejb3x/src/main/javax/annotation/PostConstruct.java
trunk/ejb3x/src/main/javax/annotation/PreDestroy.java
trunk/ejb3x/src/main/javax/annotation/Resource.java
trunk/ejb3x/src/main/javax/annotation/Resources.java
trunk/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
trunk/ejb3x/src/main/javax/annotation/security/DenyAll.java
trunk/ejb3x/src/main/javax/annotation/security/PermitAll.java
trunk/ejb3x/src/main/javax/annotation/security/RolesAllowed.java
trunk/ejb3x/src/main/javax/annotation/security/RunAs.java
Log:
Merge JBCTS-308
Copied: trunk/ejb3x/src/main/javax/annotation/Generated.java (from rev 57262, branches/JEE5_TCK/ejb3x/src/main/javax/annotation/Generated.java)
Modified: trunk/ejb3x/src/main/javax/annotation/PostConstruct.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/PostConstruct.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/PostConstruct.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation;
+import java.lang.annotation.Documented;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import static java.lang.annotation.ElementType.*;
@@ -34,7 +35,9 @@
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
- at Target({METHOD}) @Retention(RUNTIME)
- public @interface PostConstruct
+ at Documented
+ at Target({METHOD})
+ at Retention(RUNTIME)
+public @interface PostConstruct
{
}
Modified: trunk/ejb3x/src/main/javax/annotation/PreDestroy.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/PreDestroy.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/PreDestroy.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation;
+import java.lang.annotation.Documented;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import static java.lang.annotation.ElementType.*;
@@ -33,7 +34,9 @@
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
- at Target({METHOD}) @Retention(RUNTIME)
- public @interface PreDestroy
+ at Documented
+ at Target({METHOD})
+ at Retention(RUNTIME)
+public @interface PreDestroy
{
}
Modified: trunk/ejb3x/src/main/javax/annotation/Resource.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/Resource.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/Resource.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,7 +21,7 @@
*/
package javax.annotation;
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -37,14 +37,12 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
- public @interface Resource
+ at Target({TYPE, FIELD, METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Resource
{
/**
* Enums for whether the container or bean is to perform authentication.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
*/
public enum AuthenticationType
{
Modified: trunk/ejb3x/src/main/javax/annotation/Resources.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/Resources.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/Resources.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -33,7 +34,9 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
+ at Documented
+ at Target({ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
public @interface Resources
{
Resource[] value();
Modified: trunk/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/security/DeclareRoles.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/security/DeclareRoles.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation.security;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -36,8 +37,10 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
- public @interface DeclareRoles
+ at Documented
+ at Target({ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface DeclareRoles
{
String[] value();
}
Modified: trunk/ejb3x/src/main/javax/annotation/security/DenyAll.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/security/DenyAll.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/security/DenyAll.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation.security;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -33,8 +34,10 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
- public @interface DenyAll
+ at Documented
+ at Target({ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface DenyAll
{
}
Modified: trunk/ejb3x/src/main/javax/annotation/security/PermitAll.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/security/PermitAll.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/security/PermitAll.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation.security;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -33,8 +34,10 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
- public @interface PermitAll
+ at Documented
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface PermitAll
{
}
Modified: trunk/ejb3x/src/main/javax/annotation/security/RolesAllowed.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/security/RolesAllowed.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/security/RolesAllowed.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation.security;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -34,8 +35,10 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
- public @interface RolesAllowed
+ at Documented
+ at Target({ElementType.TYPE, ElementType.METHOD})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface RolesAllowed
{
String[] value();
}
Modified: trunk/ejb3x/src/main/javax/annotation/security/RunAs.java
===================================================================
--- trunk/ejb3x/src/main/javax/annotation/security/RunAs.java 2006-09-29 10:50:51 UTC (rev 57282)
+++ trunk/ejb3x/src/main/javax/annotation/security/RunAs.java 2006-09-29 10:52:50 UTC (rev 57283)
@@ -21,6 +21,7 @@
*/
package javax.annotation.security;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -40,8 +41,10 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
- at Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)
- public @interface RunAs
+ at Documented
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface RunAs
{
String value();
}
More information about the jboss-cvs-commits
mailing list