[jboss-cvs] JBossAS SVN: r111099 - in projects/jboss-jca/trunk/rhq/src: main/resources/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Apr 2 02:41:56 EDT 2011
Author: gaol
Date: 2011-04-02 02:41:53 -0400 (Sat, 02 Apr 2011)
New Revision: 111099
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ds/DsResourceDiscoveryComponent.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] Puts DsResourceComponent at same level as RarResourceComponent instead of child of the RarResourceComponent.
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ds/DsResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ds/DsResourceDiscoveryComponent.java 2011-04-02 04:58:11 UTC (rev 111098)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ds/DsResourceDiscoveryComponent.java 2011-04-02 06:41:53 UTC (rev 111099)
@@ -23,8 +23,8 @@
import org.jboss.jca.core.api.management.DataSource;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.rhq.core.IronJacamarResourceComponent;
import org.jboss.jca.rhq.core.ManagementRepositoryManager;
-import org.jboss.jca.rhq.ra.RarResourceComponent;
import java.util.HashSet;
import java.util.Set;
@@ -42,7 +42,7 @@
* @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
*/
public class DsResourceDiscoveryComponent
- implements ResourceDiscoveryComponent<RarResourceComponent>
+ implements ResourceDiscoveryComponent<IronJacamarResourceComponent>
{
/**
* discoverResources
@@ -54,7 +54,7 @@
*/
@Override
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<RarResourceComponent> context)
+ ResourceDiscoveryContext<IronJacamarResourceComponent> context)
throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
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-02 04:58:11 UTC (rev 111098)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-04-02 06:41:53 UTC (rev 111099)
@@ -492,50 +492,49 @@
</service>
-->
- <!-- XA Datasource -->
- <service name="Datasources" discovery="org.jboss.jca.rhq.ds.DsResourceDiscoveryComponent"
- class="org.jboss.jca.rhq.ds.DsResourceComponent">
+ </service>
+
+ <!-- Datasource -->
+ <service name="Datasources" discovery="org.jboss.jca.rhq.ds.DsResourceDiscoveryComponent"
+ class="org.jboss.jca.rhq.ds.DsResourceComponent">
- <plugin-configuration>
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="jndi-name" description="JNDI Name of the datasource" readOnly="true"/>
+ </c:group>
+ </plugin-configuration>
+
+ <resource-configuration>
<c:group name="general" displayName="General">
- <c:simple-property name="jndi-name" description="JNDI Name of the datasource" readOnly="true"/>
+ <c:simple-property name="jndi-name" displayName="JNDI Name"/>
+ <c:simple-property name="xa" type="boolean" displayName="Is XA datasource" required="true" />
+ <c:simple-property name="transaction-type" displayName="Transaction type" description="Transaction type">
+ <c:property-options>
+ <c:option name="No Transaction" value="no"/>
+ <c:option name="Local Transaction" value="local"/>
+ <c:option name="XA Transaction" value="xa"/>
+ </c:property-options>
+ </c:simple-property>
</c:group>
- </plugin-configuration>
- <resource-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="jndi-name" displayName="JNDI Name"/>
- <c:simple-property name="xa" type="boolean" displayName="Is XA datasource" required="true" />
- <c:simple-property name="transaction-type" displayName="Transaction type" description="Transaction type">
- <c:property-options>
- <c:option name="No Transaction" value="no"/>
- <c:option name="Local Transaction" value="local"/>
- <c:option name="XA Transaction" value="xa"/>
- </c:property-options>
- </c:simple-property>
- </c:group>
+ <c:group name="conn-pool" displayName="Connection Pool">
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ </c:group>
- <c:group name="conn-pool" displayName="Connection Pool">
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- </c:group>
-
- <c:group name="Authentication" displayName="Authentication">
- <c:simple-property name="re-auth-support" displayName="Reauthentication Support" type="boolean" description="Does this datasource support reauthentication?"></c:simple-property>
- <c:simple-property name="res-auth-src" displayName="Resource Authentication Source">
- <c:description>
- Is reauthentication application-based or container-based?
- </c:description>
- <c:property-options>
- <c:option name="Container" value="Container"></c:option>
- <c:option name="Application" value="Application"></c:option>
- </c:property-options>
- </c:simple-property>
- </c:group>
-
- </resource-configuration>
- </service>
+ <c:group name="Authentication" displayName="Authentication">
+ <c:simple-property name="re-auth-support" displayName="Reauthentication Support" type="boolean" description="Does this datasource support reauthentication?"></c:simple-property>
+ <c:simple-property name="res-auth-src" displayName="Resource Authentication Source">
+ <c:description>
+ Is reauthentication application-based or container-based?
+ </c:description>
+ <c:property-options>
+ <c:option name="Container" value="Container"></c:option>
+ <c:option name="Application" value="Application"></c:option>
+ </c:property-options>
+ </c:simple-property>
+ </c:group>
+ </resource-configuration>
</service>
-
</server>
</plugin>
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-02 04:58:11 UTC (rev 111098)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java 2011-04-02 06:41:53 UTC (rev 111099)
@@ -21,10 +21,6 @@
*/
package org.jboss.jca.rhq.test;
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
import org.jboss.jca.rhq.ds.DsResourceComponent;
import org.jboss.jca.rhq.ds.DsResourceDiscoveryComponent;
import org.jboss.jca.rhq.ra.AoResourceComponent;
@@ -37,6 +33,11 @@
import org.jboss.jca.rhq.ra.RaResourceDiscoveryComponent;
import org.jboss.jca.rhq.ra.RarResourceComponent;
import org.jboss.jca.rhq.ra.RarResourceDiscoveryComponent;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+
import org.junit.Test;
import org.rhq.core.clientapi.descriptor.configuration.ConfigurationDescriptor;
@@ -90,65 +91,72 @@
assertEquals("IronJacamar_AS7", serverDesc.getName());
List<ServiceDescriptor> services = serverDesc.getServices();
- assertEquals(1, services.size());
+ assertEquals(2, services.size());
- ServiceDescriptor rarServiceDesc = services.get(0);
- assertEquals("Resource Adapter Archive (RAR)", rarServiceDesc.getName());
- assertEquals(RarResourceDiscoveryComponent.class.getName(), rarServiceDesc.getDiscovery());
- assertEquals(RarResourceComponent.class.getName(), rarServiceDesc.getClazz());
- assertEquals(ResourceCreateDeletePolicy.BOTH, rarServiceDesc.getCreateDeletePolicy());
- assertEquals(ResourceCreationData.CONTENT, rarServiceDesc.getCreationDataType());
-
- // RAR service has the plugin configuration
- ConfigurationDescriptor pluginConfDesc = rarServiceDesc.getPluginConfiguration();
- assertNotNull(pluginConfDesc);
-
- // 4 operations for
- List<OperationDescriptor> rarOperDescs = rarServiceDesc.getOperation();
- assertEquals(4, rarOperDescs.size());
-
- // RAR service has resource configuration
- ConfigurationDescriptor resConfDesc = rarServiceDesc.getResourceConfiguration();
- assertNotNull(resConfDesc);
-
- // 4 sub services in RAR service
- List<ServiceDescriptor> subServiceDesc = rarServiceDesc.getServices();
- assertEquals(4, subServiceDesc.size());
-
- // test discovery and class definitions
- for (ServiceDescriptor sd : subServiceDesc)
+ for (ServiceDescriptor serviceDesc : services)
{
- if (sd.getName().equals("Resource Adapter"))
+ if (serviceDesc.getName().equals("Resource Adapter Archive (RAR)"))
{
- assertEquals(RaResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
- assertEquals(RaResourceComponent.class.getName(), sd.getClazz());
+ assertEquals(RarResourceDiscoveryComponent.class.getName(), serviceDesc.getDiscovery());
+ assertEquals(RarResourceComponent.class.getName(), serviceDesc.getClazz());
+ assertEquals(ResourceCreateDeletePolicy.BOTH, serviceDesc.getCreateDeletePolicy());
+ assertEquals(ResourceCreationData.CONTENT, serviceDesc.getCreationDataType());
+
+ // RAR service has the plugin configuration
+ ConfigurationDescriptor pluginConfDesc = serviceDesc.getPluginConfiguration();
+ assertNotNull(pluginConfDesc);
+
+ // 4 operations for
+ List<OperationDescriptor> rarOperDescs = serviceDesc.getOperation();
+ assertEquals(4, rarOperDescs.size());
+
+ // RAR service has resource configuration
+ ConfigurationDescriptor resConfDesc = serviceDesc.getResourceConfiguration();
+ assertNotNull(resConfDesc);
+
+ // 3 sub services in RAR service
+ List<ServiceDescriptor> subServiceDesc = serviceDesc.getServices();
+ assertEquals(3, subServiceDesc.size());
+
+ // test discovery and class definitions
+ for (ServiceDescriptor sd : subServiceDesc)
+ {
+ if (sd.getName().equals("Resource Adapter"))
+ {
+ assertEquals(RaResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+ assertEquals(RaResourceComponent.class.getName(), sd.getClazz());
+ }
+ else if (sd.getName().equals("Connection Factory"))
+ {
+ assertEquals(CfResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+ assertEquals(CfResourceComponent.class.getName(), sd.getClazz());
+ List<ServiceDescriptor> cfSubServices = sd.getServices();
+ assertEquals(1, cfSubServices.size());
+ ServiceDescriptor mcfServiceDescriptor = cfSubServices.get(0);
+ assertEquals(McfResourceDiscoveryComponent.class.getName(), mcfServiceDescriptor.getDiscovery());
+ assertEquals(McfResourceComponent.class.getName(), mcfServiceDescriptor.getClazz());
+ }
+ else if (sd.getName().equals("Admin Object"))
+ {
+ assertEquals(AoResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+ assertEquals(AoResourceComponent.class.getName(), sd.getClazz());
+ }
+ else
+ {
+ throw new IllegalStateException("Unkown ResourceDescriptor name: " + sd.getName());
+ }
+ }
}
- else if (sd.getName().equals("Connection Factory"))
+ else if (serviceDesc.getName().equals("Datasources"))
{
- assertEquals(CfResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
- assertEquals(CfResourceComponent.class.getName(), sd.getClazz());
- List<ServiceDescriptor> cfSubServices = sd.getServices();
- assertEquals(1, cfSubServices.size());
- ServiceDescriptor mcfServiceDescriptor = cfSubServices.get(0);
- assertEquals(McfResourceDiscoveryComponent.class.getName(), mcfServiceDescriptor.getDiscovery());
- assertEquals(McfResourceComponent.class.getName(), mcfServiceDescriptor.getClazz());
+ assertEquals(DsResourceDiscoveryComponent.class.getName(), serviceDesc.getDiscovery());
+ assertEquals(DsResourceComponent.class.getName(), serviceDesc.getClazz());
}
- else if (sd.getName().equals("Admin Object"))
- {
- assertEquals(AoResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
- assertEquals(AoResourceComponent.class.getName(), sd.getClazz());
- }
- else if (sd.getName().equals("Datasources"))
- {
- assertEquals(DsResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
- assertEquals(DsResourceComponent.class.getName(), sd.getClazz());
- }
else
{
- throw new IllegalStateException("Unkown ResourceDescriptor name: " + sd.getName());
+ throw new IllegalStateException("Unkown ResourceDescriptor name: " + serviceDesc.getName());
}
}
-
}
}
More information about the jboss-cvs-commits
mailing list