svn commit: r507843 - in /incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn: ./ component/ jms/

[aco]

Author: aco
Date: Wed Feb 14 23:11:31 2007
New Revision: 507843

URL: http://svn.apache.org/viewvc?view=rev&rev=507843
Log:
https://issues.apache.org/activemq/browse/SM-840
Close JMS connections being used during component shutdown.

Modified:
    
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
    
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
    
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
    
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
    
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java

Modified: 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java?view=diff&rev=507843&r1=507842&r2=507843
==============================================================================
--- 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractCreatePullPoint.java
 Wed Feb 14 23:11:31 2007
@@ -54,6 +54,10 @@
     public void init() throws Exception {
         register();
     }
+
+    public void destroy() throws Exception {
+        unregister();
+    }
     
     @Override
     protected String createAddress() {

Modified: 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java?view=diff&rev=507843&r1=507842&r2=507843
==============================================================================
--- 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
 Wed Feb 14 23:11:31 2007
@@ -79,8 +79,13 @@
         anonymousPublisher = createPublisher("Anonymous");
         anonymousPublisher.register();
     }
-    
-       protected String createAddress() {
+
+    public void destroy() throws Exception {
+        anonymousPublisher.destroy();
+        unregister();
+    }
+
+    protected String createAddress() {
                return 
"http://servicemix.org/wsnotification/NotificationBroker/"; + getName();
        }
        

Modified: 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java?view=diff&rev=507843&r1=507842&r2=507843
==============================================================================
--- 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNLifeCycle.java
 Wed Feb 14 23:11:31 2007
@@ -76,8 +76,9 @@
 
        @Override
        protected void doShutDown() throws Exception {
-               // TODO Auto-generated method stub
-               super.doShutDown();
+               notificationBroker.destroy();
+        createPullPoint.destroy();
+        super.doShutDown();
        }
 
        @Override

Modified: 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java?view=diff&rev=507843&r1=507842&r2=507843
==============================================================================
--- 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsCreatePullPoint.java
 Wed Feb 14 23:11:31 2007
@@ -38,6 +38,13 @@
         }
         super.init();
     }
+
+    public void destroy() throws Exception {
+        if (connection != null) {
+            connection.close();
+        }
+        super.destroy();
+    }
     
     @Override
     protected AbstractPullPoint createPullPoint(String name) {

Modified: 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java?view=diff&rev=507843&r1=507842&r2=507843
==============================================================================
--- 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java
 (original)
+++ 
incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsNotificationBroker.java
 Wed Feb 14 23:11:31 2007
@@ -39,8 +39,15 @@
        }
        super.init();
     }
+
+    public void destroy() throws Exception {
+        if (connection != null) {
+            connection.close();
+        }
+        super.destroy();
+    }
        
-       @Override
+    @Override
        protected AbstractPublisher createPublisher(String name) {
                JmsPublisher publisher = createJmsPublisher(name);
                publisher.setManager(getManager());