[jboss-cvs] JBossAS SVN: r69607 - in trunk/testsuite/src: main/org/jboss/test/messagedriven/support and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-02-05 02:25:49 -0500 (Tue, 05 Feb 2008)
New Revision: 69607

Modified:
   trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java
   trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagementMBean.java
   trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
   trunk/testsuite/src/resources/messagedriven/sar/META-INF/jboss-service.xml
Log:
[JBAS-4637]

Modified: trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java	2008-02-05 07:24:44 UTC (rev 69606)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java	2008-02-05 07:25:49 UTC (rev 69607)
@@ -30,11 +30,12 @@
 import java.util.Properties;
 
 import javax.jms.Message;
-import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
+import org.jboss.deployment.EjbParsingDeployerMBean;
+import org.jboss.system.MissingAttributeException;
 import org.jboss.system.ServiceMBeanSupport;
 
 /**
@@ -49,6 +50,10 @@
    
    private TransactionManager tm;
    
+   private EjbParsingDeployerMBean ejbParsingDeployer;
+   
+   private Boolean previousValidationValue;
+   
    static
    {
       defaultProps.put("destination", "NotSpecified");
@@ -71,6 +76,17 @@
       tm = (TransactionManager) new InitialContext().lookup("java:/TransactionManager");
    }
    
+   public void setEjbParsingDeployer(EjbParsingDeployerMBean ejbParsingDeployer)
+   {
+	   this.ejbParsingDeployer = ejbParsingDeployer;
+   }
+   
+   public EjbParsingDeployerMBean getEjbParsingDeployer()
+   {
+	   return ejbParsingDeployer;
+   }
+   
+   
    public void initProperties(Properties props)
    {
       setProperties(defaultProps);
@@ -139,6 +155,20 @@
 		 }
 		return message;
 	}
+   
+   public void startService() throws Exception
+   {
+      if(this.ejbParsingDeployer == null)
+        throw new MissingAttributeException("EjbParsingDeployer");
+      
+      this.previousValidationValue = this.ejbParsingDeployer.isUseValidation();
+      this.ejbParsingDeployer.setUseValidation(Boolean.FALSE);
+   }
 	   
+   
+   public void stopService()
+   {
+      this.ejbParsingDeployer.setUseValidation(this.previousValidationValue);
+   }
 
 }

Modified: trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagementMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagementMBean.java	2008-02-05 07:24:44 UTC (rev 69606)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagementMBean.java	2008-02-05 07:25:49 UTC (rev 69607)
@@ -28,6 +28,7 @@
 import javax.management.ObjectName;
 import javax.transaction.Transaction;
 
+import org.jboss.deployment.EjbParsingDeployerMBean;
 import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.system.ServiceMBean;
 
@@ -41,6 +42,7 @@
 {
    static ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.test:service=TestMessageDrivenManagement");
    void initProperties(Properties props);
+   void setEjbParsingDeployer(EjbParsingDeployerMBean deployer);
    void addMessage(Message message);
    ArrayList getMessages();
    Transaction getTransaction();

Modified: trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2008-02-05 07:24:44 UTC (rev 69606)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2008-02-05 07:25:49 UTC (rev 69607)
@@ -308,12 +308,15 @@
       tidyup(props);
       initProperties(props);
       MBeanServerConnection server = getServer();
-      /*
-      Boolean previous = (Boolean) server.getAttribute(ejbParsingDeployer, "UseValidation");
-      server.setAttribute(ejbParsingDeployer, new Attribute("UseValidation", Boolean.FALSE));
+      // Boolean previous = (Boolean) server.getAttribute(ejbParsingDeployer, "UseValidation");
+      // server.setAttribute(ejbParsingDeployer, new Attribute("UseValidation", Boolean.FALSE));
+      
+      // UseValidation is set to Boolean.False in TestMessageDrivenMangagement startService
+      // and to previous on stopService
       try
       {
          deploy(getMDBDeployment());
+
          try
          {
             // FIXME Need to wait for asynchrounous bootstrap of container
@@ -328,9 +331,8 @@
       }
       finally
       {
-         server.setAttribute(ejbParsingDeployer, new Attribute("UseValidation", previous));
+//         server.setAttribute(ejbParsingDeployer, new Attribute("UseValidation", previous));
       }
-      */
    }
 
    protected void stopTest()

Modified: trunk/testsuite/src/resources/messagedriven/sar/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/messagedriven/sar/META-INF/jboss-service.xml	2008-02-05 07:24:44 UTC (rev 69606)
+++ trunk/testsuite/src/resources/messagedriven/sar/META-INF/jboss-service.xml	2008-02-05 07:25:49 UTC (rev 69607)
@@ -2,5 +2,7 @@
 
 <server>
   <mbean code="org.jboss.test.messagedriven.mbeans.TestMessageDrivenManagement"
-         name="jboss.test:service=TestMessageDrivenManagement"/>
+         name="jboss.test:service=TestMessageDrivenManagement">
+         <attribute name="EjbParsingDeployer"><inject bean="Ejb2ParsingDeployer"/></attribute>
+  </mbean>
 </server>