[jboss-cvs] JBossAS SVN: r89197 - in projects/jboss-man/branches/Branch_2_1/managed/src: test/java/org/jboss/test/managed/factory/support/deployment and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed May 20 12:41:23 EDT 2009


Author: scott.stark at jboss.org
Date: 2009-05-20 12:41:23 -0400 (Wed, 20 May 2009)
New Revision: 89197

Modified:
   projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedOperation.java
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/JmsDestination.java
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/QueueDestination.java
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/AbstractManagedObjectFactoryUnitTestCase.java
Log:
JBMAN-81, Expand the ManagedOperation.Impact enum to identify lifecycle operations

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedOperation.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedOperation.java	2009-05-20 16:35:53 UTC (rev 89196)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/api/ManagedOperation.java	2009-05-20 16:41:23 UTC (rev 89197)
@@ -44,6 +44,8 @@
       ReadWrite,
       /** The impact is to modify the ManagedObject */
       WriteOnly,
+      /** The operation affects the component life-cycle/runtime state */
+      Lifecycle,
       /** The impact is not known */
       Unknown
    };

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/JmsDestination.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/JmsDestination.java	2009-05-20 16:35:53 UTC (rev 89196)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/JmsDestination.java	2009-05-20 16:41:23 UTC (rev 89197)
@@ -25,7 +25,9 @@
 
 import javax.management.ObjectName;
 
+import org.jboss.managed.api.ManagedOperation.Impact;
 import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementOperation;
 import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.annotation.RunStateProperty;
 import org.jboss.managed.api.annotation.ViewUse;
@@ -99,4 +101,15 @@
    {
       this.domain = domain;
    }
+
+   @ManagementOperation(description="start the destination", impact=Impact.Lifecycle)
+   public void start()
+   {
+      
+   }
+   @ManagementOperation(description="stop the destination", impact=Impact.Lifecycle)
+   public void stop()
+   {
+      
+   }
 }

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/QueueDestination.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/QueueDestination.java	2009-05-20 16:35:53 UTC (rev 89196)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/support/deployment/QueueDestination.java	2009-05-20 16:41:23 UTC (rev 89197)
@@ -27,6 +27,7 @@
 
 import javax.management.ObjectName;
 
+import org.jboss.managed.api.ManagedOperation.Impact;
 import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementOperation;
@@ -43,7 +44,7 @@
 {
    private static final long serialVersionUID = 1;
 
-   @ManagementOperation(description="List all undelivered msgs")
+   @ManagementOperation(description="List all undelivered msgs", impact=Impact.ReadOnly)
    @MetaMapping(MessageListMapper.class)
    public List listAllMessages()
    {
@@ -52,7 +53,7 @@
       return msgs;
    }
 
-   @ManagementOperation(description="List all undelivered msgs")
+   @ManagementOperation(description="List all undelivered msgs", impact=Impact.ReadOnly)
    @MetaMapping(MessageListMapper.class)
    public List listAllMessages(@MetaMapping(StringObjectNameMetaMapper.class) ObjectName x)
    {

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/AbstractManagedObjectFactoryUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/AbstractManagedObjectFactoryUnitTestCase.java	2009-05-20 16:35:53 UTC (rev 89196)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/AbstractManagedObjectFactoryUnitTestCase.java	2009-05-20 16:41:23 UTC (rev 89197)
@@ -39,6 +39,7 @@
 import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedParameter;
 import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.api.ManagedOperation.Impact;
 import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
@@ -271,7 +272,7 @@
       assertEquals("java:/jaas/JMS2", q1.getDomain().getDomain());
    }
    
-   public void testManagedObjectReturnType()
+   public void testManagedOperationReturnType()
    {
       QueueDestination q1 = new QueueDestination();
       q1.setJndiName("queues/Q1");
@@ -288,7 +289,7 @@
       assertTrue(returnTypeMapper instanceof MessageListMapper);
    }
 
-   public void testManagedObjectParamsType()
+   public void testManagedOperationParamsType()
    {
       QueueDestination q1 = new QueueDestination();
       q1.setJndiName("queues/Q1");
@@ -308,6 +309,25 @@
       assertTrue(mapper instanceof StringObjectNameMetaMapper);
    }
 
+   public void testManagedOperationImpact()
+   {
+      QueueDestination q1 = new QueueDestination();
+      q1.setJndiName("queues/Q1");
+      q1.setDomain(new SecurityDomain("java:/jaas/JMS"));
+
+      ManagedObject q1MO = initManagedObject(q1);
+      Set<ManagedOperation> ops = q1MO.getOperations();
+      ManagedOperation listAllMessages = ManagedOperationMatcher.findOperation(ops, "listAllMessages", SimpleMetaType.STRING);
+      assertNotNull(listAllMessages);
+      Impact lamImpact = listAllMessages.getImpact();
+      assertEquals(Impact.ReadOnly, lamImpact);
+
+      ManagedOperation start = ManagedOperationMatcher.findOperation(ops, "start");
+      assertNotNull(start);
+      Impact startImpact = start.getImpact();
+      assertEquals(Impact.Lifecycle, startImpact);      
+   }
+
    /**
     * Test the transformer value of the ManagementRuntimeRef annotation when
     * there is a custom ICF




More information about the jboss-cvs-commits mailing list