[jboss-cvs] JBossAS SVN: r111116 - in projects/jboss-jca/trunk/rhq/src: main/java/org/jboss/jca/rhq/ra and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 7 10:16:15 EDT 2011
Author: jeff.zhang
Date: 2011-04-07 10:16:15 -0400 (Thu, 07 Apr 2011)
New Revision: 111116
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceDiscoveryComponent.java
projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java
Log:
[JBJCA-500] parent resource component type for those resources discovered by this discovery component
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -26,6 +26,7 @@
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
@@ -33,8 +34,11 @@
* Discovery the root element of this plug-in.
*
* @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ *
+ * @param <P> the parent resource component type for those resources discovered by this discovery component
*/
-public class IronJacamarResourceDiscoveryComponent implements ResourceDiscoveryComponent<IronJacamarResourceComponent>
+public class IronJacamarResourceDiscoveryComponent<P extends ResourceComponent> implements ResourceDiscoveryComponent<P>
{
/**
* discoverResources
@@ -45,13 +49,13 @@
* @throws Exception Exception
*/
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<IronJacamarResourceComponent> context)
+ ResourceDiscoveryContext<P> context)
throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
- String resourceKey = "IronJacamar_AS7";
- String resourceName = "IronJacamar_AS7";
+ String resourceKey = "IronJacamar";
+ String resourceName = "IronJacamar";
String resourceVersion = "1.0.0";
String resourceDescription = "JCA Management Resources";
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -41,7 +41,7 @@
* @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
*/
-public class AoResourceDiscoveryComponent implements ResourceDiscoveryComponent<AoResourceComponent>
+public class AoResourceDiscoveryComponent implements ResourceDiscoveryComponent<RarResourceComponent>
{
/**
* discoverResources
@@ -53,7 +53,7 @@
*/
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<AoResourceComponent> context)
+ ResourceDiscoveryContext<RarResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -41,7 +41,7 @@
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
*/
public class CfResourceDiscoveryComponent
- implements ResourceDiscoveryComponent<CfResourceComponent>
+ implements ResourceDiscoveryComponent<RarResourceComponent>
{
/**
* discoverResources
@@ -53,7 +53,7 @@
*/
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<CfResourceComponent> context)
+ ResourceDiscoveryContext<RarResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -36,7 +36,7 @@
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
*/
public class McfResourceDiscoveryComponent
- implements ResourceDiscoveryComponent<McfResourceComponent>
+ implements ResourceDiscoveryComponent<CfResourceComponent>
{
/**
* discoverResources
@@ -49,14 +49,14 @@
@SuppressWarnings("unchecked")
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<McfResourceComponent> context)
+ ResourceDiscoveryContext<CfResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
DiscoveredResourceDetails mcfRes = new DiscoveredResourceDetails(context.getResourceType(),
"ManagedConnectionFactory", "ManagedConnectionFactory", null,
- "Managed Connection Factory", context.getDefaultPluginConfiguration(), null);
+ "Managed Connection Factories", context.getDefaultPluginConfiguration(), null);
result.add(mcfRes);
return result;
}
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -42,7 +42,7 @@
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
* @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
*/
-public class RaResourceDiscoveryComponent implements ResourceDiscoveryComponent<RaResourceComponent>
+public class RaResourceDiscoveryComponent implements ResourceDiscoveryComponent<RarResourceComponent>
{
/**
* discoverResources, RAR has 1 or 0 ResourceAdapter.
@@ -54,7 +54,7 @@
*/
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<RaResourceComponent> context)
+ ResourceDiscoveryContext<RarResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
@@ -70,7 +70,7 @@
String key = rarUniqueId + "#" + simpleName;
DiscoveredResourceDetails resRa = new DiscoveredResourceDetails(
context.getResourceType(), key, simpleName, "1.0.0",
- "Resource Adapter", context.getDefaultPluginConfiguration(),
+ "Resource Adapters", context.getDefaultPluginConfiguration(),
null);
result.add(resRa);
}
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceDiscoveryComponent.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceDiscoveryComponent.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -23,6 +23,7 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.rhq.core.IronJacamarResourceComponent;
import org.jboss.jca.rhq.core.ManagementRepositoryManager;
import java.util.HashSet;
@@ -42,7 +43,7 @@
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
*/
public class RarResourceDiscoveryComponent
- implements ResourceDiscoveryComponent<RarResourceComponent>
+ implements ResourceDiscoveryComponent<IronJacamarResourceComponent>
{
/** log */
private static final Logger logger = Logger.getLogger(RarResourceDiscoveryComponent.class);
@@ -50,14 +51,14 @@
/**
* discoverResources
*
- * @param jcaRarResourceComponentResourceDiscoveryContext ResourceDiscoveryContext<JCARarResourceComponent>
+ * @param context ResourceDiscoveryContext<JCARarResourceComponent>
* @return Set<DiscoveredResourceDetails> set of DiscoveredResourceDetails
* @throws InvalidPluginConfigurationException invalidPluginConfigurationException
* @throws Exception exception
*/
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<RarResourceComponent> jcaRarResourceComponentResourceDiscoveryContext)
+ ResourceDiscoveryContext<IronJacamarResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
@@ -70,8 +71,8 @@
String key = connector.getUniqueId();
String name = key;
DiscoveredResourceDetails resConnector = new DiscoveredResourceDetails(
- jcaRarResourceComponentResourceDiscoveryContext.getResourceType(), key, name, "1.0.0",
- "Resource Adapters", jcaRarResourceComponentResourceDiscoveryContext.getDefaultPluginConfiguration(),
+ context.getResourceType(), key, name, "1.0.0",
+ "Resource Adapter Archives", context.getDefaultPluginConfiguration(),
null);
result.add(resConnector);
}
Modified: projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-04-07 14:16:15 UTC (rev 111116)
@@ -347,7 +347,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <server name="IronJacamar_AS7" singleton="true"
+ <server name="IronJacamar (JCA)" singleton="true"
discovery="org.jboss.jca.rhq.core.IronJacamarResourceDiscoveryComponent"
class="org.jboss.jca.rhq.core.IronJacamarResourceComponent">
@@ -405,7 +405,7 @@
</service>
- <!-- Managed Connection Factories. Includes No Tx / Tx connection factories -->
+ <!-- Connection Factory -->
<service name="Connection Factory" discovery="org.jboss.jca.rhq.ra.CfResourceDiscoveryComponent"
class="org.jboss.jca.rhq.ra.CfResourceComponent">
@@ -441,7 +441,7 @@
</resource-configuration>
- <!-- Managed Connection Factories. Includes No Tx / Tx connection factories -->
+ <!-- Managed Connection Factoriy. -->
<service name="Managed Connection Factory" discovery="org.jboss.jca.rhq.ra.McfResourceDiscoveryComponent"
class="org.jboss.jca.rhq.ra.McfResourceComponent">
@@ -467,7 +467,7 @@
</service>
</service>
- <!-- Admin Objects -->
+ <!-- Admin Object -->
<service name="Admin Object" discovery="org.jboss.jca.rhq.ra.AoResourceDiscoveryComponent"
class="org.jboss.jca.rhq.ra.AoResourceComponent">
@@ -484,14 +484,7 @@
</resource-configuration>
</service>
-
- <!-- Connection Factories
- <service name="Connection Factories" discovery="org.jboss.jca.rhq.ds.ConnectionFactoryResourceDiscoveryComponent"
- class="org.jboss.jca.rhq.ds.ConnectionFactoryResourceComponent" supportsManualAdd="true">
- </service>
- -->
-
</service>
<!-- Datasource -->
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java 2011-04-07 14:07:45 UTC (rev 111115)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java 2011-04-07 14:16:15 UTC (rev 111116)
@@ -88,7 +88,7 @@
assertEquals(1, servers.size());
ServerDescriptor serverDesc = servers.get(0);
- assertEquals("IronJacamar_AS7", serverDesc.getName());
+ assertEquals("IronJacamar (JCA)", serverDesc.getName());
List<ServiceDescriptor> services = serverDesc.getServices();
assertEquals(2, services.size());
More information about the jboss-cvs-commits
mailing list