Author: markt
Date: Mon Sep 9 10:51:36 2013
New Revision: 1521035
URL: http://svn.apache.org/r1521035
Log:
Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=55534
Commons Annotations 1.2 changes
Added:
tomcat/trunk/java/javax/annotation/Priority.java (with props)
Modified:
tomcat/trunk/java/javax/annotation/Resource.java
Added: tomcat/trunk/java/javax/annotation/Priority.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Priority.java?rev=1521035&view=auto
==============================================================================
--- tomcat/trunk/java/javax/annotation/Priority.java (added)
+++ tomcat/trunk/java/javax/annotation/Priority.java Mon Sep 9 10:51:36 2013
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @since Common Annotations 1.2
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Priority {
+ int value();
+}
Propchange: tomcat/trunk/java/javax/annotation/Priority.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/javax/annotation/Resource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/Resource.java?rev=1521035&r1=1521034&r2=1521035&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/Resource.java (original)
+++ tomcat/trunk/java/javax/annotation/Resource.java Mon Sep 9 10:51:36 2013
@@ -32,8 +32,10 @@ public @interface Resource {
APPLICATION
}
public String name() default "";
- @SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
- public Class type() default Object.class;
+ /**
+ * Uses generics since Common Annotations 1.2.
+ */
+ public Class<?> type() default Object.class;
public AuthenticationType authenticationType() default
AuthenticationType.CONTAINER;
public boolean shareable() default true;
public String description() default "";
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
