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

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

Author: vicky.kak at jboss.com
Date: 2008-07-10 06:27:30 -0400 (Thu, 10 Jul 2008)
New Revision: 75600

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
Log:
JBAS-3415 changes.

Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java	2008-07-10 10:27:09 UTC (rev 75599)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java	2008-07-10 10:27:30 UTC (rev 75600)
@@ -47,6 +47,8 @@
 import org.jboss.resource.deployment.ResourceAdapterFactory;
 import org.jboss.resource.metadata.ConfigPropertyMetaData;
 import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.JBossRAMetaData;
+import org.jboss.resource.metadata.RARDeploymentMetaData;
 import org.jboss.resource.metadata.DescriptionGroupMetaData;
 import org.jboss.resource.metadata.MessageListenerMetaData;
 import org.jboss.system.ServiceDynamicMBeanSupport;
@@ -61,13 +63,13 @@
 public class RARDeployment extends ServiceDynamicMBeanSupport implements BootstrapContext
 {
    /** The RARDeploymentMetaData */
-   /* TODO protected RARDeploymentMetaData rdmd; */
+   protected RARDeploymentMetaData rdmd;
    
    /** The ConnectorMetaData */
    protected ConnectorMetaData cmd;
    
    /** The JBossRAMetaData */
-   /* TODO protected JBossRAMetaData ramd; */
+   protected JBossRAMetaData ramd;
    
    /** The resource adapter */
    protected ResourceAdapter resourceAdapter;
@@ -83,13 +85,13 @@
     * 
     * @param cmd the metadata
     */
-   public RARDeployment(ConnectorMetaData cmd)
+   public RARDeployment(RARDeploymentMetaData rdmd)
    {
-      if (cmd == null)
-         throw new IllegalArgumentException("Null metadata");
-      this.cmd = cmd;
-      /* TODO this.ramd = rdmd.getRaXmlMetaData(); */
-      
+	  if (rdmd == null)
+		  throw new IllegalArgumentException("Null metadata");
+	  this.rdmd = rdmd;
+	  this.cmd = rdmd.getConnectorMetaData(); 
+      this.ramd = rdmd.getRaXmlMetaData();      
    }
 
    public Timer createTimer() throws UnavailableException
@@ -139,14 +141,13 @@
 
    protected void startService() throws Exception
    {
-      URL url = cmd.getURL();
-      
+      URL url = cmd.getURL();      
       if (cmd.getLicense().getRequired())
-      {
-         log.info ("Required license terms exist, view " + ServerConfigUtil.shortUrlFromServerHome(url.toString()));
+      {    	  
+         log.info ("Required license terms exist, view " + ServerConfigUtil.shortUrlFromServerHome(url.toString()));         
          log.debug("License terms full URL: " + url);
-      }
-      resourceAdapter = ResourceAdapterFactory.createResourceAdapter(cmd);
+      }           
+      resourceAdapter = ResourceAdapterFactory.createResourceAdapter(rdmd);
       resourceAdapter.start(this);
    }