geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r901922 - in /geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec: ./ src/main/java/javax/resource/cci/ src/main/java/javax/resource/spi/
Date Thu, 21 Jan 2010 23:25:52 GMT
Author: djencks
Date: Thu Jan 21 23:25:52 2010
New Revision: 901922

URL: http://svn.apache.org/viewvc?rev=901922&view=rev
Log:
fix some signature problems

Modified:
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSet.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml Thu Jan 21 23:25:52 2010
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java5-flava</artifactId>
+        <artifactId>genesis-java6-flava</artifactId>
         <version>2.0</version>
     </parent>
 

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSet.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSet.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSet.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSet.java
Thu Jan 21 23:25:52 2010
@@ -28,5 +28,5 @@
 /**
  * @version $Rev$ $Date$
  */
-public interface ResultSet extends Record, java.sql.ResultSet {
+public interface ResultSet extends Record, java.sql.ResultSet, java.sql.Wrapper {
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java
Thu Jan 21 23:25:52 2010
@@ -34,5 +34,5 @@
 @Retention(value= RetentionPolicy.RUNTIME)
 @Target(value= ElementType.TYPE)
 public @interface Activation {
-    Class[] messageListeners() default {};
+    Class[] messageListeners();
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java
Thu Jan 21 23:25:52 2010
@@ -27,13 +27,13 @@
 import java.lang.annotation.Documented;
 
 /**
- * @since 1.6
  * @version $Rev$ $Date$
+ * @since 1.6
  */
 
 @Documented
-@Retention(value= RetentionPolicy.RUNTIME)
-@Target(value= ElementType.TYPE)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = {})
 public @interface AuthenticationMechanism {
 
     public enum CredentialInterface {
@@ -44,6 +44,6 @@
 
     CredentialInterface credentialInterface() default CredentialInterface.PasswordCredential;
 
-    String description() default "";
-    
+    String[] description();
+
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java
Thu Jan 21 23:25:52 2010
@@ -39,7 +39,7 @@
 
     String defaultValue() default "";
 
-    String description() default "";
+    String[] description();
 
     boolean ignore() default false;
 

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java
Thu Jan 21 23:25:52 2010
@@ -59,8 +59,6 @@
 
     String[] smallIcon() default {};
 
-    String specVersion() default "1.6";
-
     TransactionSupport.TransactionSupportLevel transactionSupport() default TransactionSupport.TransactionSupportLevel.NoTransaction;
 
     String vendorName() default "";

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java?rev=901922&r1=901921&r2=901922&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java
(original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java
Thu Jan 21 23:25:52 2010
@@ -27,16 +27,16 @@
 import java.lang.annotation.Documented;
 
 /**
- * @since 1.6
  * @version $Rev$ $Date$
+ * @since 1.6
  */
 @Documented
-@Retention(value= RetentionPolicy.RUNTIME)
-@Target(value= ElementType.TYPE)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = {})
 public @interface SecurityPermission {
 
-    String description() default "";
+    String[] description();
 
     String permissionSpec() default "";
-    
+
 }



Mime
View raw message