[jboss-cvs] JBossAS SVN: r111333 - 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
Wed May 11 04:37:46 EDT 2011
Author: gaol
Date: 2011-05-11 04:37:46 -0400 (Wed, 11 May 2011)
New Revision: 111333
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.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-562] move 'stop' operation to RaResourceComponent.
Modified: 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 2011-05-10 22:55:52 UTC (rev 111332)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java 2011-05-11 08:37:46 UTC (rev 111333)
@@ -38,6 +38,7 @@
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+import org.rhq.core.pluginapi.operation.OperationResult;
/**
@@ -104,4 +105,23 @@
}
updateResourceConfiguration.setStatus(ConfigurationUpdateStatus.SUCCESS);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public OperationResult invokeOperation(String s, Configuration configuration) throws InterruptedException, Exception
+ {
+ OperationResult result = new OperationResult();
+ if ("stop".equals(s))
+ {
+ ResourceAdapter ra = getResourceAdapter();
+ ra.getResourceAdapter().stop();
+ }
+ else
+ {
+ throw new IllegalStateException("Wrong operation: " + s);
+ }
+ return result;
+ }
}
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-05-10 22:55:52 UTC (rev 111332)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-05-11 08:37:46 UTC (rev 111333)
@@ -406,18 +406,6 @@
</c:group>
</plugin-configuration>
- <operation name="start"
- description="start this RAR"/>
-
- <operation name="stop"
- description="stop this RAR"/>
-
- <operation name="restart"
- description="stop and restart this RAR"/>
-
- <operation name="suspend"
- description="suspend this RAR"/>
-
<content name="rar-file" displayName="RAR File" category="deployable" isCreationType="true">
<configuration>
<c:simple-property name="override" displayName="Override?" required="false" type="boolean" defaultValue="true"/>
@@ -436,10 +424,13 @@
<!-- Resource Adpater -->
<service name="Resource Adapter" discovery="org.jboss.jca.rhq.ra.RaResourceDiscoveryComponent"
class="org.jboss.jca.rhq.ra.RaResourceComponent">
-
+
+ <operation name="stop"
+ description="Stop this Resource Adapter"/>
+
<resource-configuration>
<c:group name="general" displayName="General">
- <c:simple-property name="class-name" displayName="Class name" readOnly="true" required="false" description="Class name of ResourceAdapter" />
+ <c:simple-property name="class-name" displayName="Class name" readOnly="true" description="Class name of ResourceAdapter" />
</c:group>
<c:group name="ConfigProperties" displayName="All Config Properties">
&advancedResourceConfigProps;
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-05-10 22:55:52 UTC (rev 111332)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java 2011-05-11 08:37:46 UTC (rev 111333)
@@ -41,7 +41,6 @@
import org.junit.Test;
import org.rhq.core.clientapi.descriptor.configuration.ConfigurationDescriptor;
-import org.rhq.core.clientapi.descriptor.plugin.OperationDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.ResourceCreateDeletePolicy;
import org.rhq.core.clientapi.descriptor.plugin.ResourceCreationData;
@@ -106,10 +105,6 @@
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);
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-05-10 22:55:52 UTC (rev 111332)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-05-11 08:37:46 UTC (rev 111333)
@@ -60,6 +60,8 @@
import org.rhq.core.pc.plugin.FileSystemPluginFinder;
import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+import org.rhq.core.pluginapi.operation.OperationFacet;
+import org.rhq.core.pluginapi.operation.OperationResult;
import static org.junit.Assert.*;
@@ -446,6 +448,34 @@
}
/**
+ * Tests Resource Adapter stop operation
+ *
+ * @throws Throwable the exception.
+ */
+ @Test
+ public void testRaOperationStop() throws Throwable
+ {
+ Resource raResource = getSubResource(RA_JNDI_NAME);
+ assertNotNull(raResource);
+ PluginContainer pc = PluginContainer.getInstance();
+ InventoryManager im = pc.getInventoryManager();
+ OperationFacet facet = (OperationFacet)im.getResourceComponent(raResource);
+ OperationResult result = facet.invokeOperation("stop", null);
+ assertNotNull(result);
+ assertNull(result.getErrorMessage());
+ try
+ {
+ facet.invokeOperation("unknown operation", null);
+ fail("Fail.");
+ }
+ catch (Exception e)
+ {
+ assertTrue(e.getClass().equals(IllegalStateException.class));
+ assertEquals("Wrong operation: unknown operation", e.getMessage());
+ }
+ }
+
+ /**
* Tests ConfigProperties dynamic and confidential attributes in management model.
*
*/
More information about the jboss-cvs-commits
mailing list