You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/01/22 08:48:50 UTC

svn commit: r902022 - in /geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec: ./ src/main/java/javax/resource/spi/

Author: djencks
Date: Fri Jan 22 07:48:47 2010
New Revision: 902022

URL: http://svn.apache.org/viewvc?rev=902022&view=rev
Log:
fix signature errors, build with java 5

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/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/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=902022&r1=902021&r2=902022&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 Fri Jan 22 07:48:47 2010
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java6-flava</artifactId>
+        <artifactId>genesis-java5-flava</artifactId>
         <version>2.0</version>
     </parent>
 

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=902022&r1=902021&r2=902022&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 Fri Jan 22 07:48:47 2010
@@ -44,6 +44,6 @@
 
     CredentialInterface credentialInterface() default CredentialInterface.PasswordCredential;
 
-    String[] description();
+    String[] description() default {};
 
 }

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=902022&r1=902021&r2=902022&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 Fri Jan 22 07:48:47 2010
@@ -27,19 +27,19 @@
 import java.lang.annotation.Documented;
 
 /**
- * @since 1.6
  * @version $Rev$ $Date$
+ * @since 1.6
  */
 @Documented
-@Retention(value= RetentionPolicy.RUNTIME)
-@Target(value= {ElementType.FIELD, ElementType.METHOD})
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface ConfigProperty {
 
     boolean confidential() default false;
 
     String defaultValue() default "";
 
-    String[] description();
+    String[] description() default {};
 
     boolean ignore() default false;
 

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=902022&r1=902021&r2=902022&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 Fri Jan 22 07:48:47 2010
@@ -35,7 +35,7 @@
 @Target(value = {})
 public @interface SecurityPermission {
 
-    String[] description();
+    String[] description() default {};
 
     String permissionSpec() default "";