You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/11/11 14:40:23 UTC
svn commit: r1407984 -
/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/
Author: rmannibucau
Date: Sun Nov 11 13:40:22 2012
New Revision: 1407984
URL: http://svn.apache.org/viewvc?rev=1407984&view=rev
Log:
trying to better manage temp queues in our itests
Modified:
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbInvoker.java
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java Sun Nov 11 13:40:22 2012
@@ -26,6 +26,7 @@ import org.apache.openejb.test.stateless
import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
import org.apache.openejb.test.TestFailureException;
+import javax.annotation.PreDestroy;
import javax.ejb.EJB;
import javax.ejb.MessageDriven;
import javax.ejb.MessageDrivenContext;
@@ -113,6 +114,11 @@ public class AnnotatedFieldInjectionMdbB
}
}
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public void onMessage(Message message) {
try {
// System.out.println("\n" +
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java Sun Nov 11 13:40:22 2012
@@ -19,6 +19,7 @@ package org.apache.openejb.test.mdb;
import org.apache.openejb.test.ApplicationException;
import org.apache.openejb.test.object.OperationsPolicy;
+import javax.annotation.PreDestroy;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
import javax.ejb.MessageDrivenContext;
@@ -35,6 +36,10 @@ public class BasicMdbBean implements Bas
private static Hashtable allowedOperationsTable = new Hashtable();
protected MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException {
this.mdbContext = ctx;
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java Sun Nov 11 13:40:22 2012
@@ -29,6 +29,7 @@ import org.apache.openejb.test.stateful.
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
import org.apache.openejb.test.entity.bmp.BasicBmpObject;
+import javax.annotation.PreDestroy;
import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
@@ -55,6 +56,11 @@ public class ContextLookupMdbBean implem
private MessageDrivenContext mdbContext = null;
private MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException {
this.mdbContext = ctx;
try {
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java Sun Nov 11 13:40:22 2012
@@ -31,6 +31,7 @@ import org.apache.openejb.test.entity.bm
import junit.framework.Assert;
import junit.framework.AssertionFailedError;
+import javax.annotation.PreDestroy;
import javax.sql.DataSource;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -54,6 +55,11 @@ import java.rmi.RemoteException;
public class ContextLookupMdbPojoBean implements MessageListener {
private MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public ContextLookupMdbPojoBean() {
try {
ConnectionFactory connectionFactory = (ConnectionFactory) new InitialContext().lookup("java:comp/env/jms");
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java Sun Nov 11 13:40:22 2012
@@ -29,6 +29,7 @@ import org.apache.openejb.test.stateful.
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
import org.apache.openejb.test.entity.bmp.BasicBmpObject;
+import javax.annotation.PreDestroy;
import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
@@ -54,6 +55,11 @@ public class EncMdbBean implements EncMd
private MessageDrivenContext mdbContext = null;
private MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException {
this.mdbContext = ctx;
try {
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java Sun Nov 11 13:40:22 2012
@@ -26,6 +26,7 @@ import org.apache.openejb.test.stateless
import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
import org.apache.openejb.test.TestFailureException;
+import javax.annotation.PreDestroy;
import javax.ejb.CreateException;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
@@ -78,6 +79,10 @@ public class FieldInjectionMdbBean imple
private MessageDrivenContext mdbContext = null;
private MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException {
this.mdbContext = ctx;
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java Sun Nov 11 13:40:22 2012
@@ -19,6 +19,7 @@
package org.apache.openejb.test.mdb;
import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.EJBException;
@@ -59,6 +60,11 @@ public class InterceptorMdbBean implemen
@Resource(name="jms", type=javax.jms.QueueConnectionFactory.class)
private ConnectionFactory connectionFactory;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public void onMessage(Message msg) {
try {
classLevelBusinessMethodInterception = msg.getBooleanProperty("ClassLevelBusinessMethodInterception");
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbInvoker.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbInvoker.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbInvoker.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbInvoker.java Sun Nov 11 13:40:22 2012
@@ -138,7 +138,7 @@ public class MdbInvoker implements Messa
e.printStackTrace();
} finally {
MdbUtil.close(producer);
- destroy();
+ // destroy();
}
} catch (Throwable e) {
e.printStackTrace();
Modified: openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java?rev=1407984&r1=1407983&r2=1407984&view=diff
==============================================================================
--- openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java (original)
+++ openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java Sun Nov 11 13:40:22 2012
@@ -17,6 +17,7 @@
*/
package org.apache.openejb.test.mdb;
+import javax.annotation.PreDestroy;
import javax.ejb.CreateException;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
@@ -76,6 +77,11 @@ public class SetterInjectionMdbBean impl
private MessageDrivenContext mdbContext = null;
private MdbInvoker mdbInvoker;
+ @PreDestroy
+ protected void stop() {
+ mdbInvoker.destroy();
+ }
+
public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException {
this.mdbContext = ctx;
try {