Author: markt
Date: Sat Dec 7 21:11:56 2013
New Revision: 1548970
URL: http://svn.apache.org/r1548970
Log:
Fix errors in Commons Annotations 1.0 and add some @since markers
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java
tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk:r1521040
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 7 21:11:56 2013
@@ -77,22 +77,6 @@ PATCHES PROPOSED TO BACKPORT:
+0: kkolinko: 1) Code in Tomcat 6 differs. A patch is needed. 2) +r1521693
-1:
-* Fix errors in Commons Annotations 1.0 and add some @since markers
- http://svn.apache.org/r1521040
- +1: markt, schultz
- +1: kkolinko: +1 to all changes, except this one:
- I think @Target change for @DenyAll is wrong.
- Looking at Geronimo, @DenyAll has "@Target({ElementType.METHOD})" in CA
1.0 there.
- It is "@Target({ElementType.TYPE, ElementType.METHOD})" starting with CA
1.1.
- markt:
- The CA 1.0 spec section 2.11 is explicit that DenyAll is permitted on
- classes. Geronimo and whatever source was used generate the official Java
- EE 5 Javadoc are wrong.
- kkolinko:
- Discussion ("Re: r1521817"):
http://tomcat.markmail.org/thread/zt6qng5bivbvrh43
- OK, let's go with it.
- -1:
-
* Better adherence to RFC2616 for content-length headers.
http://people.apache.org/~markt/patches/2013-09-11-tc6-content-length.patch
+1: markt
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java Sat Dec 7
21:11:56 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/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java Sat Dec 7
21:11:56 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,8 +21,10 @@ 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 {
}
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java Sat Dec 7
21:11:56 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,8 +21,10 @@ 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 {
}
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java Sat Dec 7
21:11:56 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/tc6.0.x/trunk/java/javax/annotation/Resources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java Sat Dec 7
21:11:56 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/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclareRoles.java Sat
Dec 7 21:11:56 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/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java Sat Dec 7
21:11:56 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,8 +21,10 @@ 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 {
}
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java Sat Dec
7 21:11:56 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,8 +21,10 @@ 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 {
}
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java Sat
Dec 7 21:11:56 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/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java Sat Dec 7
21:11:56 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();
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1548970&r1=1548969&r2=1548970&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Dec 7 21:11:56 2013
@@ -129,6 +129,10 @@
<a
href="http://www.apache.org/legal/src-headers.html#notice";>requirements
for NOTICE files</a>. (violetagg)
</fix>
+ <fix>
+ Add <code>@since</code> markers to the common annotations classes and
+ fix a few specification compliance issues. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
