svn commit: r1521045 - in /tomcat/tc7.0.x/trunk: ./ java/javax/annotation/ java/javax/annotation/sql/ java/org/apache/catalina/startup/

[markt]

Author: markt
Date: Mon Sep  9 11:17:46 2013
New Revision: 1521045

URL: http://svn.apache.org/r1521045
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55534
Update for Commons Annotations 1.1

Added:
    tomcat/tc7.0.x/trunk/java/javax/annotation/ManagedBean.java
      - copied unchanged from r1521032, 
tomcat/trunk/java/javax/annotation/ManagedBean.java
    tomcat/tc7.0.x/trunk/java/javax/annotation/sql/
      - copied from r1521032, tomcat/trunk/java/javax/annotation/sql/
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/javax/annotation/Resource.java
    tomcat/tc7.0.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged 
/tomcat/trunk:r1521023,1521025,1521027,1521030,1521032,1521034,1521040,1521043

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=1521045&r1=1521044&r2=1521045&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:17:46 2013
@@ -38,4 +38,8 @@ public @interface Resource {
     public boolean shareable() default true;
     public String description() default "";
     public String mappedName() default "";
+    /**
+     * @since Common Annotations 1.1
+     */
+    public String lookup() default "";
 }

Modified: 
tomcat/tc7.0.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java?rev=1521045&r1=1521032&r2=1521045&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/annotation/sql/DataSourceDefinition.java 
Mon Sep  9 11:17:46 2013
@@ -27,5 +27,22 @@ import java.lang.annotation.Target;
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DataSourceDefinition {
-    String value();
+    String className();
+    String name();
+    String description() default "";
+    String url() default "";
+    String user() default "";
+    String password() default "";
+    String databaseName() default "";
+    int portNumber() default -1;
+    String serverName() default "localhost";
+    int isolationLevel() default -1;
+    boolean transactional() default true;
+    int initialPoolSize() default -1;
+    int maxPoolSize() default -1;
+    int minPoolSize() default -1;
+    int maxIdleTime() default -1;
+    int maxStatements() default -1;
+    String[] properties() default {};
+    int loginTimeout() default 0;
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1521045&r1=1521044&r2=1521045&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
Mon Sep  9 11:17:46 2013
@@ -369,8 +369,7 @@ public class WebAnnotationSet {
             if (annotation.authenticationType()
                     == Resource.AuthenticationType.CONTAINER) {
                 resource.setAuth("Container");
-            }
-            else if (annotation.authenticationType()
+            } else if (annotation.authenticationType()
                     == Resource.AuthenticationType.APPLICATION) {
                 resource.setAuth("Application");
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org