Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EF73F40F1 for ; Thu, 2 Jun 2011 10:24:50 +0000 (UTC) Received: (qmail 8881 invoked by uid 500); 2 Jun 2011 10:24:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 8854 invoked by uid 500); 2 Jun 2011 10:24:50 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 8847 invoked by uid 99); 2 Jun 2011 10:24:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 10:24:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 10:24:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 65C5A23888C2; Thu, 2 Jun 2011 10:24:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1130469 - in /activemq/trunk/activemq-core/src/test: java/org/apache/activemq/network/NetworkRestartPlainTest.java java/org/apache/activemq/network/NetworkRestartTest.java resources/org/apache/activemq/network/localBroker-plain.xml Date: Thu, 02 Jun 2011 10:24:29 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110602102429.65C5A23888C2@eris.apache.org> Author: dejanb Date: Thu Jun 2 10:24:28 2011 New Revision: 1130469 URL: http://svn.apache.org/viewvc?rev=1130469&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3347 - network connector restart/re-add Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java?rev=1130469&view=auto ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java (added) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java Thu Jun 2 10:24:28 2011 @@ -0,0 +1,24 @@ +/** + * 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.network; + +public class NetworkRestartPlainTest extends NetworkRestartTest { + @Override + protected String getLocalBrokerURI() { + return "org/apache/activemq/network/localBroker-plain.xml"; + } +} Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java?rev=1130469&r1=1130468&r2=1130469&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java Thu Jun 2 10:24:28 2011 @@ -72,6 +72,37 @@ public class NetworkRestartTest extends } + public void testConnectorReAdd() throws Exception { + MessageConsumer remoteConsumer = remoteSession.createConsumer(included); + MessageProducer localProducer = localSession.createProducer(included); + + localProducer.send(localSession.createTextMessage("before")); + Message before = remoteConsumer.receive(1000); + assertNotNull(before); + assertEquals("before", ((TextMessage)before).getText()); + + // restart connector + + NetworkConnector connector = localBroker.getNetworkConnectorByName("networkConnector"); + + LOG.info("Removing connector"); + connector.stop(); + localBroker.removeNetworkConnector(connector); + + Thread.sleep(5000); + LOG.info("Re-adding connector"); + localBroker.addNetworkConnector(connector); + connector.start(); + + Thread.sleep(5000); + + + localProducer.send(localSession.createTextMessage("after")); + Message after = remoteConsumer.receive(1000); + assertNotNull(after); + assertEquals("after", ((TextMessage)after).getText()); + } + protected void setUp() throws Exception { super.setUp(); Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml?rev=1130469&view=auto ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml (added) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml Thu Jun 2 10:24:28 2011 @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + \ No newline at end of file