Author: markt
Date: Mon Sep 9 11:15:33 2013
New Revision: 1521043
URL: http://svn.apache.org/r1521043
Log:
Whoops. Put the elements in the right annotation.
Modified:
tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java
tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
Modified: tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java?rev=1521043&r1=1521042&r2=1521043&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java (original)
+++ tomcat/trunk/java/javax/annotation/sql/DataSourceDefinition.java Mon Sep 9
11:15:33 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/trunk/java/javax/annotation/sql/DataSourceDefinitions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java?rev=1521043&r1=1521042&r2=1521043&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java (original)
+++ tomcat/trunk/java/javax/annotation/sql/DataSourceDefinitions.java Mon Sep
9 11:15:33 2013
@@ -27,22 +27,5 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
public @interface DataSourceDefinitions {
- 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;
+ DataSourceDefinition[] value();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
