[jboss-cvs] JBossAS SVN: r100135 - in projects/jboss-jca/trunk/fungal/src/main: java/org/jboss/jca/fungal/impl and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-01-29 11:28:37 -0500 (Fri, 29 Jan 2010)
New Revision: 100135

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
   projects/jboss-jca/trunk/fungal/src/main/resources/deployment.xsd
Log:
Support <null/> inside <parameter>

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2010-01-29 16:23:56 UTC (rev 100134)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2010-01-29 16:28:37 UTC (rev 100135)
@@ -293,6 +293,10 @@
                {
                   result.getContent().add(readInject(xmlStreamReader));
                }
+               else if ("null".equals(name))
+               {
+                  result.getContent().add(readNull(xmlStreamReader));
+               }
 
                break;
 

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-29 16:23:56 UTC (rev 100134)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-29 16:28:37 UTC (rev 100135)
@@ -637,7 +637,8 @@
 
                      if (pt.getClazz() == null)
                      {
-                        if (!(pt.getContent().get(0) instanceof InjectType))
+                        if ((!(pt.getContent().get(0) instanceof InjectType)) &&
+                            (!(pt.getContent().get(0) instanceof NullType)))
                            if (!SUPPORTED_TYPES.contains(parameterClass))
                               include = false;
                      }
@@ -695,7 +696,8 @@
 
                         if (pt.getClazz() == null)
                         {
-                           if (!(pt.getContent().get(0) instanceof InjectType))
+                           if ((!(pt.getContent().get(0) instanceof InjectType)) &&
+                               (!(pt.getContent().get(0) instanceof NullType)))
                               if (!SUPPORTED_TYPES.contains(parameterClass))
                                  include = false;
                         }
@@ -744,6 +746,10 @@
             {
                args[i] = getInjectValue((InjectType)v);
             }
+            else if (v instanceof NullType)
+            {
+               args[i] = null;
+            }
             else
             {
                args[i] = getValue((String)v, types[i], cl);

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2010-01-29 16:23:56 UTC (rev 100134)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2010-01-29 16:28:37 UTC (rev 100135)
@@ -65,7 +65,7 @@
 public class KernelImpl implements Kernel
 {
    /** Version information */
-   private static final String VERSION = "Fungal 0.5";
+   private static final String VERSION = "Fungal 0.5.1";
 
    /** Kernel configuration */
    private KernelConfiguration kernelConfiguration;

Modified: projects/jboss-jca/trunk/fungal/src/main/resources/deployment.xsd
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/resources/deployment.xsd	2010-01-29 16:23:56 UTC (rev 100134)
+++ projects/jboss-jca/trunk/fungal/src/main/resources/deployment.xsd	2010-01-29 16:28:37 UTC (rev 100135)
@@ -88,6 +88,7 @@
    <xsd:complexType name="parameterType" mixed="true">
      <xsd:sequence>
        <xsd:element name="inject" type="injectType" maxOccurs="1" minOccurs="0"/>
+       <xsd:element name="null" type="nullType" maxOccurs="1" minOccurs="0"/>
      </xsd:sequence>
      <xsd:attribute name="class" type="xsd:token"/>
    </xsd:complexType>