[jboss-cvs] JBossAS SVN: r68320 - trunk/connector/src/main/org/jboss/resource/deployers/management.

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

Author: alesj
Date: 2007-12-16 08:49:13 -0500 (Sun, 16 Dec 2007)
New Revision: 68320

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
Log:
Simple refactoring.

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-16 00:29:47 UTC (rev 68319)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2007-12-16 13:49:13 UTC (rev 68320)
@@ -25,29 +25,27 @@
 import java.io.FileWriter;
 import java.io.Serializable;
 import java.net.URI;
-import java.util.Map;
-
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
 import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
 
 import org.jboss.deployers.spi.management.DeploymentTemplate;
 import org.jboss.deployers.spi.management.DeploymentTemplateInfo;
 import org.jboss.deployers.spi.management.KnownComponentTypes;
 import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.logging.Logger;
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
-import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
 import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
 import org.jboss.virtual.VirtualFile;
-import org.jboss.logging.Logger;
 
 /**
  * The connection factory template implementation.
@@ -68,8 +66,7 @@
       URI dsXmlURI = new URI(root.toURI()+dsName);
       File dsXml = new File(dsXmlURI.getPath());
       writeTemplate(dsXml, values);
-      VirtualFile dsXmlVF = root.findChild(dsName);
-      return dsXmlVF;
+      return root.findChild(dsName);
    }
 
    public DeploymentTemplateInfo getInfo()
@@ -97,21 +94,21 @@
       ManagedObject cfMO;
 
       String rootElementName = "datasources";
-      if(cfType.equals("local-tx-datasource"))
+      if("local-tx-datasource".equals(cfType))
       {
          mcf = new LocalDataSourceDeploymentMetaData();
          cfMO = mof.initManagedObject(mcf,
             KnownComponentTypes.DataSourceTypes.LocalTx.getType().getType(),
             KnownComponentTypes.DataSourceTypes.LocalTx.getType().getSubtype());
       }
-      else if(cfType.equals("xa-datasource"))
+      else if("xa-datasource".equals(cfType))
       {
          mcf = new XADataSourceDeploymentMetaData();
          cfMO = mof.initManagedObject(mcf,
             KnownComponentTypes.DataSourceTypes.XA.getType().getType(),
             KnownComponentTypes.DataSourceTypes.XA.getType().getSubtype());
       }
-      else if(cfType.equals("tx-connection-factory"))
+      else if("tx-connection-factory".equals(cfType))
       {
          rootElementName = "connection-factories";
          mcf = new TxConnectionFactoryDeploymentMetaData();
@@ -120,7 +117,7 @@
             "ConnectionFactory",
             "XA");
       }
-      else if(cfType.equals("no-tx-connection-factory"))
+      else if("no-tx-connection-factory".equals(cfType))
       {
          rootElementName = "connection-factories";
          mcf = new NoTxConnectionFactoryDeploymentMetaData();
@@ -129,7 +126,7 @@
             "ConnectionFactory",
             "NoTx");
       }
-      else if(cfType.equals("no-tx-datasource"))
+      else if("no-tx-datasource".equals(cfType))
       {
          mcf = new NoTxDataSourceDeploymentMetaData();
          cfMO = mof.initManagedObject(mcf,
@@ -161,9 +158,11 @@
       marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE);
 
       JAXBElement<ManagedConnectionFactoryDeploymentGroup> root =
-         new JAXBElement(new javax.xml.namespace.QName(rootElementName),
-            ManagedConnectionFactoryDeploymentGroup.class,
-            null, group);
+            new JAXBElement<ManagedConnectionFactoryDeploymentGroup>(
+                  new javax.xml.namespace.QName(rootElementName),
+                  ManagedConnectionFactoryDeploymentGroup.class,
+                  null, group
+            );
 
       FileWriter fw = null;
       try