[jboss-cvs] JBossAS SVN: r61521 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: weston.price at jboss.com
Date: 2007-03-21 01:59:27 -0400 (Wed, 21 Mar 2007)
New Revision: 61521

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
Log:
[JBAS-1425] Added custom class adapter to support legacy type-mapping/metadata
XML structure in *-ds.xml file.

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2007-03-21 05:59:13 UTC (rev 61520)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2007-03-21 05:59:27 UTC (rev 61521)
@@ -30,6 +30,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.jboss.system.metadata.ServiceMetaData;
 
@@ -62,9 +63,6 @@
    @XmlElement(name="connection-definition")
    protected String connectionDefinition;
       
-   /** The typeMapping */
-   private String typeMapping;
-   
    /** The jmxInvokerName */
    @XmlElement(name="jmx-invoker-name")
    private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
@@ -103,16 +101,18 @@
    /** The securityMetaData */
    @XmlElements({@XmlElement(name="security-domain", type=SecurityDomainMetaData.class), @XmlElement(name="security-domain-and-application",type=SecurityDomainApplicationManagedMetaData.class), @XmlElement(name="application-managed-security",type=ApplicationManagedSecurityMetaData.class)})
    private SecurityMetaData securityMetaData = new SecurityMetaData();
-   
-   
+      
    @XmlElement(name="depends")
    private List<String> dependsNames = new ArrayList<String>();
    
    @XmlTransient
    private List<ServiceMetaData> dependsServices = new ArrayList<ServiceMetaData>();
 
+   @XmlElements({@XmlElement(name="metadata"), @XmlElement(name="type-mapping")})
+   @XmlJavaTypeAdapter(MetaDataTypeMappingAdapter.class)
+   private String typeMapping;
+
    
-   
    /**
     * Get the connectionDefinition.
     *