[jboss-cvs] JBossAS SVN: r86116 - in projects/jboss-jca/trunk/core/src: main/java/org/jboss/jca/core/mdr and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 19 14:30:15 EDT 2009
Author: jesper.pedersen
Date: 2009-03-19 14:30:14 -0400 (Thu, 19 Mar 2009)
New Revision: 86116
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/MetaDataRepository.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/MetaDataRepositoryImpl.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java
Log:
[JBJCA-6] Use MDR as the foundation for the JCA metadata repository
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/MetaDataRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/MetaDataRepository.java 2009-03-19 18:18:14 UTC (rev 86115)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/MetaDataRepository.java 2009-03-19 18:30:14 UTC (rev 86116)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.api;
+import org.jboss.metadata.rar.jboss.RARDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
/**
* MetaDataRepository API
@@ -35,26 +35,26 @@
public interface MetaDataRepository
{
/**
- * Add connector metadata
+ * Add RAR deployment metadata
* @param name The name
- * @param cmd The connector metadata
+ * @param rdmd The RAR deployment metadata
* @return The previous value
*/
- public ConnectorMetaData addConnectorMetaData(String name, ConnectorMetaData cmd);
+ public RARDeploymentMetaData addRARDeploymentMetaData(String name, RARDeploymentMetaData rdmd);
/**
- * Get connector metadata
+ * Get RAR deployment metadata
* @param name The name
- * @return The connector metadata
+ * @return The RAR deployment metadata
*/
- public ConnectorMetaData getConnectorMetaData(String name);
+ public RARDeploymentMetaData getRARDeploymentMetaData(String name);
/**
- * Remove connector metadata
+ * Remove RAR deployment metadata
* @param name The name
- * @return True if the metadata was removed; otherwise
+ * @return True if the metadata was removed; otherwise false
*/
- public boolean removeConnectorMetaData(String name);
+ public boolean removeRARDeploymentMetaData(String name);
/**
* Add managed connecton metadata
@@ -75,7 +75,7 @@
/**
* Remove managed connection metadata
* @param name The name
- * @return True if the metadata was removed; otherwise
+ * @return True if the metadata was removed; otherwise false
*/
public boolean removeManagedConnectionFactoryDeploymentGroup(String name);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/MetaDataRepositoryImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/MetaDataRepositoryImpl.java 2009-03-19 18:18:14 UTC (rev 86115)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/mdr/MetaDataRepositoryImpl.java 2009-03-19 18:30:14 UTC (rev 86116)
@@ -27,8 +27,8 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
+import org.jboss.metadata.rar.jboss.RARDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
@@ -60,12 +60,12 @@
}
/**
- * Add connector metadata
+ * Add RAR deployment metadata
* @param name The name
- * @param cmd The connector metadata
+ * @param cmd The RAR deployment metadata
* @return The previous value
*/
- public ConnectorMetaData addConnectorMetaData(String name, ConnectorMetaData cmd)
+ public RARDeploymentMetaData addRARDeploymentMetaData(String name, RARDeploymentMetaData cmd)
{
if (name == null)
throw new IllegalArgumentException("Null name");
@@ -75,25 +75,25 @@
ScopeKey scopeKey = new ScopeKey(CommonLevels.JVM, name);
MutableMetaDataLoader loader = new MemoryMetaDataLoader(scopeKey);
- loader.addMetaData(cmd, ConnectorMetaData.class);
+ loader.addMetaData(cmd, RARDeploymentMetaData.class);
MetaDataRetrieval r = mdr.addMetaDataRetrieval(loader);
if (r != null)
{
MetaDataRetrievalToMetaDataBridge b = new MetaDataRetrievalToMetaDataBridge(r);
- return b.getMetaData(ConnectorMetaData.class);
+ return b.getMetaData(RARDeploymentMetaData.class);
}
return null;
}
/**
- * Get connector metadata
+ * Get RAR deployment metadata
* @param name The name
- * @return The connector metadata
+ * @return The RAR deployment metadata
*/
- public ConnectorMetaData getConnectorMetaData(String name)
+ public RARDeploymentMetaData getRARDeploymentMetaData(String name)
{
if (name == null)
throw new IllegalArgumentException("Null name");
@@ -104,18 +104,18 @@
if (r != null)
{
MetaDataRetrievalToMetaDataBridge b = new MetaDataRetrievalToMetaDataBridge(r);
- return b.getMetaData(ConnectorMetaData.class);
+ return b.getMetaData(RARDeploymentMetaData.class);
}
return null;
}
/**
- * Remove connector metadata
+ * Remove RAR deployment metadata
* @param name The name
- * @return True if the metadata was removed; otherwise
+ * @return True if the metadata was removed; otherwise false
*/
- public boolean removeConnectorMetaData(String name)
+ public boolean removeRARDeploymentMetaData(String name)
{
if (name == null)
throw new IllegalArgumentException("Null name");
@@ -181,7 +181,7 @@
/**
* Remove managed connection metadata
* @param name The name
- * @return True if the metadata was added; otherwise
+ * @return True if the metadata was added; otherwise false
*/
public boolean removeManagedConnectionFactoryDeploymentGroup(String name)
{
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java 2009-03-19 18:18:14 UTC (rev 86115)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/mdr/unit/MetaDataRepositoryTestCase.java 2009-03-19 18:30:14 UTC (rev 86116)
@@ -28,8 +28,8 @@
import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
import org.jboss.logging.Logger;
+import org.jboss.metadata.rar.jboss.RARDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.metadata.rar.spec.ConnectorMetaData;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -77,11 +77,11 @@
}
/**
- * Test null name for addConnectorMetaData
+ * Test null name for addRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testAddConnectorMetaDataNullName() throws Throwable
+ public void testAddRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
@@ -90,7 +90,7 @@
try
{
- ConnectorMetaData cmd = mdr.addConnectorMetaData(null, null);
+ RARDeploymentMetaData rdmd = mdr.addRARDeploymentMetaData(null, null);
fail("Null name");
}
catch (Throwable t)
@@ -100,11 +100,11 @@
}
/**
- * Test null cmd for addConnectorMetaData
+ * Test null rdmd for addRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testAddConnectorMetaDataNullCMD() throws Throwable
+ public void testAddRARDeploymentMetaDataNullRDMD() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
@@ -113,8 +113,8 @@
try
{
- ConnectorMetaData cmd = mdr.addConnectorMetaData("test", null);
- fail("Null cmd");
+ RARDeploymentMetaData rdmd = mdr.addRARDeploymentMetaData("test", null);
+ fail("Null rdmd");
}
catch (Throwable t)
{
@@ -123,29 +123,29 @@
}
/**
- * Test for addConnectorMetaData
+ * Test for addRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testAddConnectorMetaData() throws Throwable
+ public void testAddRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
- ConnectorMetaData cmd = new ConnectorMetaData();
- cmd = mdr.addConnectorMetaData("test", cmd);
+ RARDeploymentMetaData rdmd = new RARDeploymentMetaData();
+ rdmd = mdr.addRARDeploymentMetaData("test", rdmd);
- mdr.removeConnectorMetaData("test");
+ mdr.removeRARDeploymentMetaData("test");
}
/**
- * Test null name for getConnectorMetaData
+ * Test null name for getRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testGetConnectorMetaDataNullName() throws Throwable
+ public void testGetRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
@@ -154,7 +154,7 @@
try
{
- ConnectorMetaData cmd = mdr.getConnectorMetaData(null);
+ RARDeploymentMetaData rdmd = mdr.getRARDeploymentMetaData(null);
fail("Null name");
}
catch (Throwable t)
@@ -164,50 +164,50 @@
}
/**
- * Test undefined name for getConnectorMetaData
+ * Test undefined name for getRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testGetConnectorMetaDataUndefinedName() throws Throwable
+ public void testGetRARDeploymentMetaDataUndefinedName() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
- ConnectorMetaData cmd = mdr.getConnectorMetaData("test");
- assertNull(cmd);
+ RARDeploymentMetaData rdmd = mdr.getRARDeploymentMetaData("test");
+ assertNull(rdmd);
}
/**
- * Test for getConnectorMetaData
+ * Test for getRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testGetConnectorMetaData() throws Throwable
+ public void testGetRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
- ConnectorMetaData cmd1 = new ConnectorMetaData();
- mdr.addConnectorMetaData("test", cmd1);
+ RARDeploymentMetaData rdmd1 = new RARDeploymentMetaData();
+ mdr.addRARDeploymentMetaData("test", rdmd1);
- ConnectorMetaData cmd2 = mdr.getConnectorMetaData("test");
- assertNotNull(cmd2);
+ RARDeploymentMetaData rdmd2 = mdr.getRARDeploymentMetaData("test");
+ assertNotNull(rdmd2);
- assertEquals("Objects are not the same", cmd1, cmd2);
+ assertEquals("Objects are not the same", rdmd1, rdmd2);
- mdr.removeConnectorMetaData("test");
+ mdr.removeRARDeploymentMetaData("test");
}
/**
- * Test null name for removeConnectorMetaData
+ * Test null name for removeRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testRemoveConnectorMetaDataNullName() throws Throwable
+ public void testRemoveRARDeploymentMetaDataNullName() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
@@ -216,7 +216,7 @@
try
{
- boolean result = mdr.removeConnectorMetaData(null);
+ boolean result = mdr.removeRARDeploymentMetaData(null);
fail("Null name");
}
catch (Throwable t)
@@ -226,36 +226,36 @@
}
/**
- * Test undefined name for removeConnectorMetaData
+ * Test undefined name for removeRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testRemoveConnectorMetaDataUndefinedName() throws Throwable
+ public void testRemoveRARDeploymentMetaDataUndefinedName() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
- assertFalse(mdr.removeConnectorMetaData("test"));
+ assertFalse(mdr.removeRARDeploymentMetaData("test"));
}
/**
- * Test for removeConnectorMetaData
+ * Test for removeRARDeploymentMetaData
* @throws Throwable throwable exception
*/
@Test
- public void testRemoveConnectorMetaData() throws Throwable
+ public void testRemoveRARDeploymentMetaData() throws Throwable
{
MetaDataRepository mdr =
bootstrap.lookup("MetaDataRepository", MetaDataRepository.class);
assertNotNull(mdr);
- ConnectorMetaData cmd = new ConnectorMetaData();
- mdr.addConnectorMetaData("test", cmd);
+ RARDeploymentMetaData rdmd = new RARDeploymentMetaData();
+ mdr.addRARDeploymentMetaData("test", rdmd);
- assertTrue(mdr.removeConnectorMetaData("test"));
+ assertTrue(mdr.removeRARDeploymentMetaData("test"));
}
/**
@@ -272,7 +272,7 @@
try
{
- ManagedConnectionFactoryDeploymentGroup cmd = mdr.addManagedConnectionFactoryDeploymentGroup(null, null);
+ ManagedConnectionFactoryDeploymentGroup group = mdr.addManagedConnectionFactoryDeploymentGroup(null, null);
fail("Null name");
}
catch (Throwable t)
More information about the jboss-cvs-commits
mailing list