Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r954893 - in /activemq/trunk/activemq-core/src:
 main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
 test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
Date: Tue, 15 Jun 2010 14:06:43 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
Message-Id: <20100615140643.85A4823888E8@eris.apache.org>

Author: dejanb
Date: Tue Jun 15 14:06:43 2010
New Revision: 954893

URL: http://svn.apache.org/viewvc?rev=954893&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2770 - durable subscription mbean

Added:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java?rev=954893&r1=954892&r2=954893&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java Tue Jun 15 14:06:43 2010
@@ -142,4 +142,11 @@ public class DurableSubscriptionView ext
         }
         return false;
     }
+
+    @Override
+    public boolean isActive() {
+        return durableSub.isActive();
+    }
+    
+    
 }

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java?rev=954893&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ManagedDurableSubscriptionTest.java Tue Jun 15 14:06:43 2010
@@ -0,0 +1,119 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.usecases;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+
+import javax.jms.Connection;
+import javax.jms.Session;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+
+public class ManagedDurableSubscriptionTest extends org.apache.activemq.TestSupport {
+
+    BrokerService broker = null;
+    Connection connection = null;
+    ActiveMQTopic topic;
+
+    public void testJMXSubscriptions() throws Exception {
+        // create durable subscription
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        session.createDurableSubscriber(topic, "SubsId");
+        session.close();
+
+        // restart the broker
+        stopBroker();
+        startBroker();
+
+        MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+        ObjectName subscriptionObjectName = broker.getAdminView().getDurableTopicSubscribers()[0];
+
+        Object active = mbs.getAttribute(subscriptionObjectName, "Active");
+        assertTrue("Subscription is active.", Boolean.FALSE.equals(active));
+
+        // activate
+        session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        session.createDurableSubscriber(topic, "SubsId");
+
+        active = mbs.getAttribute(subscriptionObjectName, "Active");
+        assertTrue("Subscription is INactive.", Boolean.TRUE.equals(active));
+
+        // deactivate
+        connection.close();
+        connection = null;
+
+        active = mbs.getAttribute(subscriptionObjectName, "Active");
+        assertTrue("Subscription is active.", Boolean.FALSE.equals(active));
+
+    }
+
+    private void startBroker() throws Exception {
+        broker = BrokerFactory.createBroker("broker:(vm://localhost)");
+        broker.setKeepDurableSubsActive(false);
+        broker.setPersistent(true);
+        KahaPersistenceAdapter persistenceAdapter = new KahaPersistenceAdapter();
+        persistenceAdapter.setDirectory(new File("activemq-data/" + getName()));
+        broker.setPersistenceAdapter(persistenceAdapter);
+        broker.setUseJmx(true);
+        broker.setBrokerName(getName());
+        broker.start();
+
+        connection = createConnection();
+    }
+
+    private void stopBroker() throws Exception {
+        if (connection != null)
+            connection.close();
+        connection = null;
+        if (broker != null)
+            broker.stop();
+        broker = null;
+    }
+
+    protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
+        return new ActiveMQConnectionFactory("vm://" + getName() + "?waitForStart=5000&create=false");
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        topic = (ActiveMQTopic) createDestination();
+        startBroker();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        stopBroker();
+        super.tearDown();
+    }
+
+    @Override
+    protected Connection createConnection() throws Exception {
+        Connection rc = super.createConnection();
+        rc.setClientID(getName());
+        rc.start();
+        return rc;
+    }
+}