[jboss-cvs] JBossAS SVN: r68253 - in trunk/connector/src/main/org/jboss/resource: metadata/mcf and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2007-12-13 13:54:39 -0500 (Thu, 13 Dec 2007)
New Revision: 68253

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentGroup.java
Log:
JBAS-4671 use connection-factories as a root element for tx-connection-factory and no-tx-connection-factory and datasources as a root for datasource deployments

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2007-12-13 18:53:33 UTC (rev 68252)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2007-12-13 18:54:39 UTC (rev 68253)
@@ -29,6 +29,7 @@
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.JAXBElement;
 
 import org.jboss.deployers.spi.management.DeploymentTemplate;
 import org.jboss.deployers.spi.management.DeploymentTemplateInfo;
@@ -95,6 +96,7 @@
       ManagedObjectFactory mof = ManagedObjectFactoryBuilder.create();
       ManagedObject cfMO;
 
+      String rootElementName = "datasources";
       if(cfType.equals("local-tx-datasource"))
       {
          mcf = new LocalDataSourceDeploymentMetaData();
@@ -111,6 +113,7 @@
       }
       else if(cfType.equals("tx-connection-factory"))
       {
+         rootElementName = "connection-factories";
          mcf = new TxConnectionFactoryDeploymentMetaData();
          // TODO: add constants to the KnownComponentTypes
          cfMO = mof.initManagedObject(mcf,
@@ -119,6 +122,7 @@
       }
       else if(cfType.equals("no-tx-connection-factory"))
       {
+         rootElementName = "connection-factories";
          mcf = new NoTxConnectionFactoryDeploymentMetaData();
          // TODO: add constants to the KnownComponentTypes
          cfMO = mof.initManagedObject(mcf,
@@ -156,7 +160,12 @@
       Marshaller marshaller = context.createMarshaller();
       marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE);
 
+      JAXBElement<ManagedConnectionFactoryDeploymentGroup> root =
+         new JAXBElement(new javax.xml.namespace.QName(rootElementName),
+            ManagedConnectionFactoryDeploymentGroup.class,
+            null, group);
+
       FileWriter fw = new FileWriter(dsXml);
-      marshaller.marshal(group, fw);
+      marshaller.marshal(root, fw);
    }
 }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentGroup.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentGroup.java	2007-12-13 18:53:33 UTC (rev 68252)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentGroup.java	2007-12-13 18:54:39 UTC (rev 68253)
@@ -47,7 +47,6 @@
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @ManagementObject
- at XmlRootElement(name="datasources")
 public class ManagedConnectionFactoryDeploymentGroup implements Serializable
 {
    /** The serialVersionUID */