[jboss-cvs] JBossAS SVN: r108086 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/spi/mdr and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-09-09 14:04:43 -0400 (Thu, 09 Sep 2010)
New Revision: 108086

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/SimpleMetadataRepository.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/mdr/MetadataRepository.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
[JBJCA-404] Register IronJacamar metadata

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/SimpleMetadataRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/SimpleMetadataRepository.java	2010-09-09 17:10:56 UTC (rev 108085)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/SimpleMetadataRepository.java	2010-09-09 18:04:43 UTC (rev 108086)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.core.mdr;
 
+import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
 import org.jboss.jca.common.api.metadata.ra.Connector;
 import org.jboss.jca.core.spi.mdr.AlreadyExistsException;
 import org.jboss.jca.core.spi.mdr.MetadataRepository;
@@ -51,6 +52,9 @@
    /** Resource adapter roots */
    private ConcurrentMap<URL, File> raRoots;
 
+   /** IronJacamar metadata */
+   private Map<URL, IronJacamar> ironJacamar;
+
    /** JNDI mappings */
    private ConcurrentMap<URL, Map<String, List<String>>> jndiMappings;
 
@@ -61,13 +65,15 @@
    {
       this.raTemplates = new ConcurrentHashMap<URL, Connector>();
       this.raRoots = new ConcurrentHashMap<URL, File>();
+      this.ironJacamar = new HashMap<URL, IronJacamar>();
       this.jndiMappings = new ConcurrentHashMap<URL, Map<String, List<String>>>();
    }
 
    /**
     * {@inheritDoc}
     */
-   public void registerResourceAdapter(URL deployment, File root, Connector md) throws AlreadyExistsException
+   public void registerResourceAdapter(URL deployment, File root, Connector md, IronJacamar ijmd)
+      throws AlreadyExistsException
    {
       if (deployment == null)
          throw new IllegalArgumentException("Deployment is null");
@@ -80,6 +86,7 @@
 
       raTemplates.put(deployment, md);
       raRoots.put(deployment, root);
+      ironJacamar.put(deployment, ijmd);
    }
 
    /**
@@ -94,6 +101,8 @@
          throw new NotFoundException(deployment + " isn't registered");
 
       raTemplates.remove(deployment);
+      raRoots.remove(deployment);
+      ironJacamar.remove(deployment);
    }
 
    /**
@@ -138,6 +147,20 @@
    /**
     * {@inheritDoc}
     */
+   public IronJacamar getIronJacamar(URL deployment) throws NotFoundException
+   {
+      if (deployment == null)
+         throw new IllegalArgumentException("Deployment is null");
+
+      if (!ironJacamar.containsKey(deployment))
+         throw new NotFoundException(deployment + " isn't registered");
+
+      return ironJacamar.get(deployment);
+   }
+
+   /**
+    * {@inheritDoc}
+    */
    public void registerJndiMapping(URL deployment, String clz, String jndi)
    {
       if (deployment == null)

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/mdr/MetadataRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/mdr/MetadataRepository.java	2010-09-09 17:10:56 UTC (rev 108085)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/spi/mdr/MetadataRepository.java	2010-09-09 18:04:43 UTC (rev 108086)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.core.spi.mdr;
 
+import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
 import org.jboss.jca.common.api.metadata.ra.Connector;
 
 import java.io.File;
@@ -41,10 +42,12 @@
     * Register a resource adapter template
     * @param deployment The deployment
     * @param root The deployment root
-    * @param md The metadata
+    * @param md The connector metadata
+    * @param ijmd The IronJacamar metadata
     * @exception AlreadyExistsException Thrown if the deployment is already registered
     */
-   public void registerResourceAdapter(URL deployment, File root, Connector md) throws AlreadyExistsException;
+   public void registerResourceAdapter(URL deployment, File root, Connector md, IronJacamar ijmd) 
+      throws AlreadyExistsException;
 
    /**
     * Unregister a resource adapter template
@@ -76,6 +79,14 @@
    public File getRoot(URL deployment) throws NotFoundException;
 
    /**
+    * Get the IronJacamar metadata for a resource adapter deployment
+    * @param deployment The deployment
+    * @return The metadata
+    * @exception NotFoundException Thrown if the deployment isn't registered
+    */
+   public IronJacamar getIronJacamar(URL deployment) throws NotFoundException;
+
+   /**
     * Register a JNDI mapping for a deployment
     * @param deployment The deployment
     * @param clz The fully qualified class name

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-09-09 17:10:56 UTC (rev 108085)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-09-09 18:04:43 UTC (rev 108086)
@@ -577,7 +577,7 @@
          if (cmd != null)
          {
             // Register with MDR
-            getConfiguration().getMetadataRepository().registerResourceAdapter(url, root, cmd);
+            getConfiguration().getMetadataRepository().registerResourceAdapter(url, root, cmd, ijmd);
          }
 
          if (activateDeployment)