[jboss-cvs] JBossAS SVN: r68020 - 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-07 05:11:05 -0500 (Fri, 07 Dec 2007)
New Revision: 68020

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/XAConnectionPropertyMetaData.java
Log:
JBAS-4671 trying to make XADataSource template work

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-07 08:06:34 UTC (rev 68019)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2007-12-07 10:11:05 UTC (rev 68020)
@@ -46,6 +46,7 @@
 import org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
 import org.jboss.virtual.VirtualFile;
+import org.jboss.logging.Logger;
 
 /**
  * The connection factory template implementation.
@@ -56,6 +57,8 @@
 public class DsDataSourceTemplate
    implements DeploymentTemplate
 {
+   private static final Logger log = Logger.getLogger(DsDataSourceTemplate.class);
+
    private DeploymentTemplateInfo info;
 
    public VirtualFile applyTemplate(VirtualFile root, String deploymentBaseName, DeploymentTemplateInfo values) throws Exception
@@ -119,18 +122,18 @@
       else if(cfType.equals("tx-connection-factory"))
       {
          mcf = new TxConnectionFactoryDeploymentMetaData();
-         // TODO: is this correct?
+         // TODO: add constants to the KnownComponentTypes
          cfMO = mof.initManagedObject(mcf,
-            KnownComponentTypes.DataSourceTypes.LocalTx.getType().getType(),
-            KnownComponentTypes.DataSourceTypes.LocalTx.getType().getSubtype());
+            "ConnectionFactory",
+            "XA");
       }
       else if(cfType.equals("no-tx-connection-factory"))
       {
          mcf = new NoTxConnectionFactoryDeploymentMetaData();
-         // TODO: is this correct?
+         // TODO: add constants to the KnownComponentTypes
          cfMO = mof.initManagedObject(mcf,
-            KnownComponentTypes.DataSourceTypes.NoTx.getType().getType(),
-            KnownComponentTypes.DataSourceTypes.NoTx.getType().getSubtype());
+            "ConnectionFactory",
+            "NoTx");
       }
       else if(cfType.equals("no-tx-datasource"))
       {
@@ -145,11 +148,18 @@
 
       ManagedConnectionFactoryDeploymentGroup group = new ManagedConnectionFactoryDeploymentGroup();
       group.addManagedConnectionFactoryDeployment(mcf);
+      boolean logTrace = log.isTraceEnabled();
       for(ManagedProperty tempProp : values.getProperties().values())
       {
          ManagedProperty dsProp = cfMO.getProperty(tempProp.getName());
          if(dsProp != null)
+         {
+            if(logTrace)
+               log.trace("setting " + tempProp.getName() + "=" + tempProp.getValue());
             dsProp.setValue((Serializable)tempProp.getValue());
+         }
+         else if(logTrace)
+            log.trace("property not found: " + tempProp.getName());
       }
 
       Class[] classes = {ManagedConnectionFactoryDeploymentGroup.class};

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2007-12-07 08:06:34 UTC (rev 68019)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2007-12-07 10:11:05 UTC (rev 68020)
@@ -23,6 +23,7 @@
 
 import java.util.HashSet;
 import java.util.Map;
+import java.util.List;
 
 import org.jboss.managed.api.Fields;
 import org.jboss.managed.plugins.DefaultFieldsImpl;
@@ -32,6 +33,7 @@
 import org.jboss.metatype.api.types.ImmutableCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
+import org.jboss.metatype.api.types.MetaTypeFactory;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.profileservice.management.plugins.BasicDeploymentTemplateInfo;
@@ -135,6 +137,26 @@
       ManagedPropertyImpl connProps = new ManagedPropertyImpl(mo, f6);
       super.addProperty(connProps);
 
+      // XA properties
+      // The driver-class field info
+      DefaultFieldsImpl f = new DefaultFieldsImpl();
+      setFieldName("xa-datasource-class", f);
+      f.setDescription("The xa datasource class name");
+      f.setMandatory(true);
+      f.setMetaType(SimpleMetaType.STRING);
+      ManagedPropertyImpl xaDsClass = new ManagedPropertyImpl(mo, f);
+      super.addProperty(xaDsClass);
+      // The xa-datasource-propperty field info
+      f = new DefaultFieldsImpl();
+      setFieldName("xa-datasource-properties", f);
+      f.setDescription("The xa datasource properties");
+      f.setMandatory(false);
+      // TODO is this right?
+      f.setMetaType(MetaTypeFactory.getInstance().resolve(List.class));
+      ManagedPropertyImpl xaDsProps = new ManagedPropertyImpl(mo, f);
+      super.addProperty(xaDsProps);
+
+
       // The type of the datasource
       ManagedObjectImpl mo2 = new ManagedObjectImpl(dsTypeAttachmentName);
       DefaultFieldsImpl f21 = new DefaultFieldsImpl();

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/XAConnectionPropertyMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/XAConnectionPropertyMetaData.java	2007-12-07 08:06:34 UTC (rev 68019)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XAConnectionPropertyMetaData.java	2007-12-07 10:11:05 UTC (rev 68020)
@@ -8,5 +8,6 @@
  * @version $Revision: 1.1 $
  */
 public class XAConnectionPropertyMetaData extends DataSourceConnectionPropertyMetaData
+   implements java.io.Serializable
 {    
 }