[jboss-cvs] JBossAS SVN: r94163 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/fungal and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-09-30 10:25:21 -0400 (Wed, 30 Sep 2009)
New Revision: 94163

Modified:
   projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/AuthenticationMechanism.java
   projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/ConfigProperty.java
   projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/SecurityPermission.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
Log:
[JBJCA-181] Merge API changes from JCA 1.6 (20090926)

Modified: projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/AuthenticationMechanism.java
===================================================================
--- projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/AuthenticationMechanism.java	2009-09-30 14:15:50 UTC (rev 94162)
+++ projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/AuthenticationMechanism.java	2009-09-30 14:25:21 UTC (rev 94163)
@@ -84,7 +84,7 @@
     * any resource adapter specific requirement for the support of
     * security contract and authentication mechanism.
     */
-   String description() default "";
+   String[] description() default { };
    
    /**
     * Represents the interface that the resource adapter implementation

Modified: projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/ConfigProperty.java
===================================================================
--- projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/ConfigProperty.java	2009-09-30 14:15:50 UTC (rev 94162)
+++ projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/ConfigProperty.java	2009-09-30 14:25:21 UTC (rev 94163)
@@ -48,7 +48,7 @@
    /**
     * Description of the configuration property
     */
-   String description() default "";
+   String[] description() default { };
    
    /**
     * Inferred by the container for field based annotations if possible

Modified: projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/SecurityPermission.java
===================================================================
--- projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/SecurityPermission.java	2009-09-30 14:15:50 UTC (rev 94162)
+++ projects/jboss-jca/trunk/api/src/main/java/javax/resource/spi/SecurityPermission.java	2009-09-30 14:25:21 UTC (rev 94163)
@@ -46,7 +46,7 @@
     * Specifies an optional description to mention any specific reason that a
     * resource requires a given security permission.
     */
-   String description() default "";
+   String[] description() default { };
 
    /**
     * Specifies a security permission based on the Security policy file syntax.

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-09-30 14:15:50 UTC (rev 94162)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java	2009-09-30 14:25:21 UTC (rev 94163)
@@ -592,14 +592,22 @@
       cfgMeta.setValue(configProperty.defaultValue());
       cfgMeta.setType(configProperty.type().getName());
       cfgMeta.setIgnore(configProperty.ignore());
-      if (cfgMeta.getDescriptions() == null)
+
+      String[] description = configProperty.description();
+      if (description != null)
       {
-         DescriptionsImpl descsImpl = new DescriptionsImpl();
-         cfgMeta.setDescriptions(descsImpl);
+         if (cfgMeta.getDescriptions() == null)
+         {
+            DescriptionsImpl descsImpl = new DescriptionsImpl();
+            cfgMeta.setDescriptions(descsImpl);
+         }
+         for (String desc : description)
+         {
+            DescriptionImpl descImpl = new DescriptionImpl();
+            descImpl.setDescription(desc);
+            ((DescriptionsImpl)cfgMeta.getDescriptions()).add(descImpl);
+         }
       }
-      DescriptionImpl descImpl = new DescriptionImpl();
-      descImpl.setDescription(configProperty.description());
-      ((DescriptionsImpl)cfgMeta.getDescriptions()).add(descImpl);
       
       String attachedClassName = annotation.getClassName();
       ClassLoader cl = SecurityActions.getThreadContextClassLoader();
@@ -816,14 +824,21 @@
       }
       ammd.setCredentialInterfaceClass(credentialInterfaceClass);
       
-      if (ammd.getDescriptions() == null)
+      String[] description = authenticationmechanism.description();
+      if (description != null)
       {
-         DescriptionsImpl descsImpl = new DescriptionsImpl();
-         ammd.setDescriptions(descsImpl);
+         if (ammd.getDescriptions() == null)
+         {
+            DescriptionsImpl descsImpl = new DescriptionsImpl();
+            ammd.setDescriptions(descsImpl);
+         }
+         for (String desc : description)
+         {
+            DescriptionImpl descImpl = new DescriptionImpl();
+            descImpl.setDescription(desc);
+            ((DescriptionsImpl)ammd.getDescriptions()).add(descImpl);
+         }
       }
-      DescriptionImpl descImpl = new DescriptionImpl();
-      descImpl.setDescription(authenticationmechanism.description());
-      ((DescriptionsImpl)ammd.getDescriptions()).add(descImpl);
       
       md.getRa().getOutboundRa().getAuthMechanisms().add(ammd);