[jboss-cvs] JBossAS SVN: r110879 - 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
Thu Mar 10 05:55:17 EST 2011


Author: jeff.zhang
Date: 2011-03-10 05:55:17 -0500 (Thu, 10 Mar 2011)
New Revision: 110879

Added:
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.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/RaResourceComponent.java
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java
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/RarResourceComponent.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
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-500] add ra and cf ResourceDiscoveryComponent and ResourceComponent

Added: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java	                        (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.ra;
+
+import org.jboss.jca.rhq.core.AbstractResourceComponent;
+
+import org.jboss.logging.Logger;
+
+import org.rhq.core.domain.configuration.Configuration;
+
+/**
+ * CfResourceComponent represent the ManagedConnectionFactory in JCA container.
+ * 
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a> 
+ */
+public class CfResourceComponent extends AbstractResourceComponent
+{
+   /** log */
+   private static final Logger logger = Logger.getLogger(CfResourceComponent.class);
+
+   /**
+    * loadResourceConfiguration
+    * 
+    * 
+    * @return Configuration Configuration
+    * @throws Exception exception
+    */
+   @Override
+   public Configuration loadResourceConfiguration() throws Exception
+   {
+      Configuration config = new Configuration();
+
+      return config;
+   }
+}

Added: 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	                        (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.ra;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * Discovery Connection factories resources from JCA container.
+ * 
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a> 
+ */
+public class CfResourceDiscoveryComponent
+   implements ResourceDiscoveryComponent<CfResourceComponent>
+{
+   /**
+    * discoverResources
+    * 
+    * @param context ResourceDiscoveryContext<AdminObjectResourceComponent>
+    * @return Set<DiscoveredResourceDetails> set of DiscoveredResourceDetails
+    * @throws InvalidPluginConfigurationException invalidPluginConfigurationException
+    * @throws Exception exception
+    */
+   @Override
+   public Set<DiscoveredResourceDetails> discoverResources(
+      ResourceDiscoveryContext<CfResourceComponent> context)
+      throws InvalidPluginConfigurationException, Exception
+   {
+      Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
+
+      DiscoveredResourceDetails resConnector = new DiscoveredResourceDetails(
+            context.getResourceType(), "ConnectionFactory", "ConnectionFactory", "1.0.0",
+            "ConnectionFactory", context.getDefaultPluginConfiguration(),
+            null);
+      result.add(resConnector);
+      return result;
+   }
+
+}

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-03-10 10:37:47 UTC (rev 110878)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -61,15 +61,20 @@
       Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
 
       // the uniqueId is the key of parent component.
-      String rarUniqueId = context.getParentResourceContext().getResourceKey();
+      //String rarUniqueId = context.getParentResourceContext().getResourceKey();
+      String rarUniqueId = "xa.rar";
+      // FIXME: get rarUniqueId from parent of parent ResourceContext
 
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, rarUniqueId);
       
+      if (connector == null || connector.getManagedConnectionFactories() == null)
+         return result;
+      
       for (ManagedConnectionFactory mcf : connector.getManagedConnectionFactories())
       {
          javax.resource.spi.ManagedConnectionFactory jcaMcf = mcf.getManagedConnectionFactory();
-         // FIXME: jcaMcf is null due to weakreference.
+         
 
          Class<?> mcfCls = jcaMcf.getClass();
          String key = rarUniqueId + "#" + mcfCls.getName(); //IMPORTANT: make the key uniqueId#class name

Added: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java	                        (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.ra;
+
+import org.jboss.jca.core.api.management.ConfigProperty;
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.api.management.ResourceAdapter;
+import org.jboss.jca.rhq.core.AbstractResourceComponent;
+import org.jboss.jca.rhq.core.ManagementRepositoryManager;
+import org.jboss.jca.rhq.util.ManagementRepositoryHelper;
+
+import java.util.List;
+
+import org.jboss.logging.Logger;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertyList;
+
+
+/**
+ * Represent Resource Adpater in JCA container.
+ * 
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a> 
+ */
+public class RaResourceComponent extends AbstractResourceComponent
+{
+   /** log */
+   private static final Logger logger = Logger.getLogger(RaResourceComponent.class);
+
+   /**
+    * loadResourceConfiguration
+    * 
+    * @return Configuration configuration
+    * @throws Exception exception
+    */
+   @Override
+   public Configuration loadResourceConfiguration() throws Exception
+   {
+
+      Configuration config = new Configuration();
+      ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
+      Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, getRarUniqueId());
+
+      ResourceAdapter manResAdapter = connector.getResourceAdapter();
+      List<ConfigProperty> manResConfigProps = manResAdapter.getConfigProperties();
+      PropertyList configList = getConfigPropertiesList(manResAdapter.getResourceAdapter(), manResConfigProps);
+      config.put(configList);
+      return config;
+   }
+}

Added: 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	                        (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.ra;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * Discovery RaResourceDiscoveryComponent from JCA container.
+ * 
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a> 
+ */
+public class RaResourceDiscoveryComponent implements ResourceDiscoveryComponent<RaResourceComponent>
+{
+   /**
+    * discoverResources
+    * 
+    * @param context ResourceDiscoveryContext<AdminObjectResourceComponent>
+    * @return Set<DiscoveredResourceDetails> set of DiscoveredResourceDetails
+    * @throws InvalidPluginConfigurationException invalidPluginConfigurationException
+    * @throws Exception exception
+    */
+   @Override
+   public Set<DiscoveredResourceDetails> discoverResources(
+      ResourceDiscoveryContext<RaResourceComponent> context) 
+      throws InvalidPluginConfigurationException, Exception
+   {
+
+      Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
+      DiscoveredResourceDetails resConnector = new DiscoveredResourceDetails(
+            context.getResourceType(), "ResourceAdpater", "ResourceAdpater", "1.0.0",
+            "Resource Adapter", context.getDefaultPluginConfiguration(),
+            null);
+      result.add(resConnector);
+      return result;
+   }
+
+}

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceComponent.java	2011-03-10 10:37:47 UTC (rev 110878)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RarResourceComponent.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -21,13 +21,7 @@
  */
 package org.jboss.jca.rhq.ra;
 
-import org.jboss.jca.core.api.management.ConfigProperty;
-import org.jboss.jca.core.api.management.Connector;
-import org.jboss.jca.core.api.management.ManagementRepository;
-import org.jboss.jca.core.api.management.ResourceAdapter;
 import org.jboss.jca.rhq.core.AbstractResourceComponent;
-import org.jboss.jca.rhq.core.ManagementRepositoryManager;
-import org.jboss.jca.rhq.util.ManagementRepositoryHelper;
 
 import java.io.InputStream;
 import java.util.HashSet;
@@ -35,7 +29,6 @@
 import java.util.Set;
 
 import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertyList;
 import org.rhq.core.domain.content.PackageType;
 import org.rhq.core.domain.content.transfer.DeployPackageStep;
 import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
@@ -63,6 +56,7 @@
    {
       Configuration config = new Configuration();
 
+      /*
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, getRarUniqueId());
 
@@ -70,6 +64,7 @@
       List<ConfigProperty> manResConfigProps = manResAdapter.getConfigProperties();
       PropertyList configList = getConfigPropertiesList(manResAdapter.getResourceAdapter(), manResConfigProps);
       config.put(configList);
+      */
       return config;
    }
 

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-03-10 10:37:47 UTC (rev 110878)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml	2011-03-10 10:55:17 UTC (rev 110879)
@@ -365,38 +365,36 @@
             </content>
             
             <resource-configuration>
-                 <c:group name="general" displayName="General">
+                <c:group name="general" displayName="General">
                     <c:simple-property name="name" displayName="Display name" readOnly="true"/>
                     <c:simple-property name="jndi-name" displayName="JNDI name"/>
-                    <c:simple-property name="class-name" displayName="Class name" required="false" description="Class name of ResourceAdapter" />
-                    <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
                     <c:simple-property name="source-path" displayName="Source Path" description="RAR file path" readOnly="true"/>
-
                 </c:group>
-                
-	             <c:group name="ConfigProperties" displayName="All Config Properties">
-					&advancedResourceConfigProps;						
-                </c:group>
 			</resource-configuration>
 			
 
-            <!-- here are some resource configurations on the connector -->
+			<!-- Resource Adpater -->
+			<service name="Resource Adapter" discovery="org.jboss.jca.rhq.ra.RaResourceDiscoveryComponent" 
+			    class="org.jboss.jca.rhq.ra.RaResourceComponent" supportsManualAdd="true">
+				
+				<resource-configuration>
+	                 <c:group name="general" displayName="General">
+	                    <c:simple-property name="class-name" displayName="Class name" required="false" description="Class name of ResourceAdapter" />
+	                    <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
+	                 </c:group>
+		             <c:group name="ConfigProperties" displayName="All Config Properties">
+						&advancedResourceConfigProps;						
+	                </c:group>
+				</resource-configuration>
+				
+			</service>
 			
 			<!-- Managed Connection Factories. Includes No Tx / Tx connection factories  -->
-			<service name="Managed Connection Factories" discovery="org.jboss.jca.rhq.ra.McfResourceDiscoveryComponent"
-				class="org.jboss.jca.rhq.ra.McfResourceComponent" supportsManualAdd="true">
+			<service name="Connection Factory" discovery="org.jboss.jca.rhq.ra.CfResourceDiscoveryComponent"
+				class="org.jboss.jca.rhq.ra.CfResourceComponent" supportsManualAdd="true">
             
-            	&datasourceAndConnectionFactoryOperations;
-            
 				<resource-configuration>
 					 <c:group name="general" displayName="General">
-					    <c:simple-property name="jndi-name" displayName="JNDI Name"/>
-	                    <c:simple-property name="mcf-class-name" displayName="ManagedConnectionFactory class name"/>
-	                    <c:simple-property name="cf-interface-name" displayName="ConnectionFactory interface class name"/>
-	                    <c:simple-property name="cf-impl-name" displayName="ConnectionFactory implement class name"/>
-	                    <c:simple-property name="connection-interface-name" displayName="Connection interface class name"/>
-	                    <c:simple-property name="connection-impl-name" displayName="Connection implement class name"/>
-
 	                    <c:simple-property name="transaction-type" displayName="Transaction type" description="Transaction type">
 	                    	<c:property-options>
 				                <c:option name="No Transaction" value="no"/>
@@ -418,19 +416,36 @@
 					 		</c:property-options>
 					 	</c:simple-property>
 					 </c:group>
-					 
-					 <c:group name="conn_pool" displayName="Connection Pool">
-					 	 &datasourceAndConnectionFactoryConnectionResourceConfigProps;
-					 	 &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
-					 </c:group>
-					 
-		             <c:group name="ConfigProperties" displayName="All Config Properties">
-						&advancedResourceConfigProps;						
-	                </c:group>
+
 				</resource-configuration>
 				
+				<!-- Managed Connection Factories. Includes No Tx / Tx connection factories  -->
+				<service name="Managed Connection Factory" discovery="org.jboss.jca.rhq.ra.McfResourceDiscoveryComponent"
+					class="org.jboss.jca.rhq.ra.McfResourceComponent" supportsManualAdd="true">
+	            
+	            	&datasourceAndConnectionFactoryOperations;
+	            
+					<resource-configuration>
+						 <c:group name="general" displayName="General">
+						    <c:simple-property name="jndi-name" displayName="JNDI Name"/>
+		                    <c:simple-property name="mcf-class-name" displayName="ManagedConnectionFactory class name"/>
+		                    <c:simple-property name="cf-interface-name" displayName="ConnectionFactory interface class name"/>
+		                    <c:simple-property name="cf-impl-name" displayName="ConnectionFactory implement class name"/>
+		                    <c:simple-property name="connection-interface-name" displayName="Connection interface class name"/>
+		                    <c:simple-property name="connection-impl-name" displayName="Connection implement class name"/>
+						 </c:group>
+						 
+						 <c:group name="conn_pool" displayName="Connection Pool">
+						 	 &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+						 	 &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+						 </c:group>
+						 
+			             <c:group name="ConfigProperties" displayName="All Config Properties">
+							&advancedResourceConfigProps;						
+		                </c:group>
+					</resource-configuration>
 				
-				
+				</service>
 			</service>
 			
 			<!-- Admin Objects -->

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-03-10 10:37:47 UTC (rev 110878)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -99,9 +99,9 @@
       ConfigurationDescriptor resConfDesc = rarServiceDesc.getResourceConfiguration();
       assertNotNull(resConfDesc);
       
-      // 2 sub services in RAR service
+      // 3 sub services in RAR service
       List<ServiceDescriptor> subServiceDesc = rarServiceDesc.getServices();
-      assertEquals(2, subServiceDesc.size());
+      assertEquals(3, subServiceDesc.size());
       
    }
    

Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-03-10 10:37:47 UTC (rev 110878)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-03-10 10:55:17 UTC (rev 110879)
@@ -78,8 +78,8 @@
       
       Set<Resource> subRarServiceRes = rarServiceRes.getChildResources();
       
-      // one ManagedConnectionFactory and one adminObject
-      assertEquals(2, subRarServiceRes.size());
+      // connectionfactory, managedConnectionFactory and adminObject
+      assertEquals(3, subRarServiceRes.size());
       
    }
 



More information about the jboss-cvs-commits mailing list