[Springframework-cvs] spring/tiger/test/org/springframework/transaction/annotation AnnotationTransactionNamespaceHandlerTests.java, 1.7, 1.8 annotationTransactionNamespaceHandlerTests.xml, 1.4, 1.5

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/tiger/test/org/springframework/transaction/annotation
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7683/tiger/test/org/springframework/transaction/annotation

Modified Files:
	AnnotationTransactionNamespaceHandlerTests.java 
	annotationTransactionNamespaceHandlerTests.xml 
Log Message:
added test for JMX export in combination with @Transactional

Index: AnnotationTransactionNamespaceHandlerTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AnnotationTransactionNamespaceHandlerTests.java	29 May 2008 17:29:12 -0000	1.7
--- AnnotationTransactionNamespaceHandlerTests.java	20 Oct 2008 21:08:22 -0000	1.8
***************
*** 17,29 ****
  package org.springframework.transaction.annotation;
  
  import java.util.Collection;
  import java.util.Map;
  
  import junit.framework.TestCase;
  
  import org.springframework.aop.support.AopUtils;
  import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
! import org.springframework.context.ApplicationContext;
  import org.springframework.context.support.ClassPathXmlApplicationContext;
  import org.springframework.stereotype.Service;
  import org.springframework.transaction.CallCountingTransactionManager;
--- 17,35 ----
  package org.springframework.transaction.annotation;
  
+ import java.lang.management.ManagementFactory;
  import java.util.Collection;
  import java.util.Map;
  
+ import javax.management.MBeanServer;
+ import javax.management.ObjectName;
+ 
  import junit.framework.TestCase;
  
  import org.springframework.aop.support.AopUtils;
  import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
! import org.springframework.context.ConfigurableApplicationContext;
  import org.springframework.context.support.ClassPathXmlApplicationContext;
+ import org.springframework.jmx.export.annotation.ManagedOperation;
+ import org.springframework.jmx.export.annotation.ManagedResource;
  import org.springframework.stereotype.Service;
  import org.springframework.transaction.CallCountingTransactionManager;
***************
*** 35,39 ****
  public class AnnotationTransactionNamespaceHandlerTests extends TestCase {
  
! 	private ApplicationContext context;
  
  	public void setUp() {
--- 41,45 ----
  public class AnnotationTransactionNamespaceHandlerTests extends TestCase {
  
! 	private ConfigurableApplicationContext context;
  
  	public void setUp() {
***************
*** 42,45 ****
--- 48,55 ----
  	}
  
+ 	protected void tearDown() {
+ 		this.context.close();
+ 	}
+ 
  	public void testIsProxy() throws Exception {
  		TransactionalTestBean bean = getTestBean();
***************
*** 84,87 ****
--- 94,103 ----
  	}
  
+ 	public void testMBeanExportAlsoWorks() throws Exception {
+ 		MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+ 		assertEquals("done",
+ 				server.invoke(ObjectName.getInstance("test:type=TestBean"), "doSomething", new Object[0], new String[0]));
+ 	}
+ 
  	private TransactionalTestBean getTestBean() {
  		return (TransactionalTestBean) context.getBean("testBean");
***************
*** 90,93 ****
--- 106,110 ----
  
  	@Service
+ 	@ManagedResource("test:type=TestBean")
  	public static class TransactionalTestBean {
  
***************
*** 99,103 ****
  		@Transactional
  		public void saveFoo() {
- 
  		}
  
--- 116,119 ----
***************
*** 107,111 ****
  		}
  
! 		public void doSomething() {
  		}
  		
--- 123,129 ----
  		}
  
! 		@ManagedOperation
! 		public String doSomething() {
! 			return "done";
  		}
  		

Index: annotationTransactionNamespaceHandlerTests.xml
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** annotationTransactionNamespaceHandlerTests.xml	9 Sep 2006 22:40:27 -0000	1.4
--- annotationTransactionNamespaceHandlerTests.xml	20 Oct 2008 21:08:22 -0000	1.5
***************
*** 3,9 ****
--- 3,11 ----
  	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  	   xmlns:aop="http://www.springframework.org/schema/aop"
+ 		 xmlns:context="http://www.springframework.org/schema/context"
  	   xmlns:tx="http://www.springframework.org/schema/tx"
  	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
         http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
  
***************
*** 15,17 ****
  		  class="org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests$TransactionalTestBean"/>
  
! </beans>
\ No newline at end of file
--- 17,21 ----
  		  class="org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests$TransactionalTestBean"/>
  
! 	<context:mbean-export/>
! 
! </beans>