Author: rgreig
Date: Wed Nov 29 09:33:10 2006
New Revision: 480649
URL: http://svn.apache.org/viewvc?view=rev&rev=480649
Log:
Fixed up clustering and a few tests that were failing.
Added:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
(with props)
Removed:
incubator/qpid/branches/new_persistence/java/broker/src/main/log4j.properties
Modified:
incubator/qpid/branches/new_persistence/java/broker/etc/log4j.xml
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
Modified: incubator/qpid/branches/new_persistence/java/broker/etc/log4j.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/etc/log4j.xml?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
--- incubator/qpid/branches/new_persistence/java/broker/etc/log4j.xml (original)
+++ incubator/qpid/branches/new_persistence/java/broker/etc/log4j.xml Wed Nov
29 09:33:10 2006
@@ -34,9 +34,9 @@
</layout>
</appender>
- <category name="org.apache.qpid.server.queue">
+ <!--<category name="org.apache.qpid.server.queue">
<priority value="debug"/>
- </category>
+ </category>-->
<root>
<priority value="info"/>
Modified:
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
(original)
+++
incubator/qpid/branches/new_persistence/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Wed Nov 29 09:33:10 2006
@@ -450,11 +450,6 @@
_deliveredToConsumer = true;
}
- /*public void registerQueue(AMQQueue queue)
- {
- _destinationQueues.add(queue);
- } */
-
private void deliver() throws AMQException
{
// first we allow the handle to know that the message has been fully
received. This is useful if it is
@@ -531,7 +526,7 @@
return buf;
}
-private ByteBuffer createEncodedReturnFrame(int channelId, int replyCode,
String replyText) throws AMQException
+ private ByteBuffer createEncodedReturnFrame(int channelId, int replyCode,
String replyText) throws AMQException
{
AMQFrame returnFrame = BasicReturnBody.createAMQFrame(channelId,
replyCode, replyText, getPublishBody().exchange,
getPublishBody().routingKey);
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/DefaultGroupManager.java
Wed Nov 29 09:33:10 2006
@@ -19,16 +19,10 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ClusterJoinBody;
-import org.apache.qpid.framing.ClusterLeaveBody;
-import org.apache.qpid.framing.ClusterMembershipBody;
-import org.apache.qpid.framing.ClusterPingBody;
-import org.apache.qpid.framing.ClusterSuspectBody;
-import org.apache.qpid.framing.AMQMethodBody;
+import org.apache.qpid.framing.*;
import org.apache.qpid.server.cluster.policy.StandardPolicies;
import org.apache.qpid.server.cluster.replay.ReplayManager;
import org.apache.qpid.server.cluster.util.LogMessage;
-import org.apache.qpid.server.cluster.util.InvokeMultiple;
import java.util.List;
@@ -93,7 +87,7 @@
Broker destination = findBroker(broker);
if(destination == null)
{
- _logger.warn(new LogMessage("Invalid destination sending {0}. {1}
not known", message, broker));
+ _logger.warn(new LogMessage("Invalid destination sending {0}. {1}
not known", message, broker));
}
else
{
@@ -114,7 +108,7 @@
ping.responseRequired = true;
ping.load = _loadTable.getLocalLoad();
BlockingHandler handler = new BlockingHandler();
- send(getLeader(), new SimpleSendable(ping), handler);
+ send(getLeader(), new SimpleBodySendable(ping), handler);
handler.waitForCompletion();
if (handler.failed())
{
@@ -157,7 +151,7 @@
_logger.info(new LogMessage("Connected to {0}. joining", leader));
ClusterJoinBody join = new ClusterJoinBody();
join.broker = _group.getLocal().getDetails();
- send(leader, new SimpleSendable(join));
+ send(leader, new SimpleBodySendable(join));
}
private Broker connectToLeader(MemberHandle member) throws AMQException
@@ -176,7 +170,7 @@
{
ClusterLeaveBody leave = new ClusterLeaveBody();
leave.broker = _group.getLocal().getDetails();
- send(getLeader(), new SimpleSendable(leave));
+ send(getLeader(), new SimpleBodySendable(leave));
}
private void suspect(MemberHandle broker) throws AMQException
@@ -197,7 +191,7 @@
{
ClusterSuspectBody suspect = new ClusterSuspectBody();
suspect.broker = broker.getDetails();
- send(getLeader(), new SimpleSendable(suspect));
+ send(getLeader(), new SimpleBodySendable(suspect));
}
}
@@ -220,7 +214,7 @@
ClusterJoinBody request = new ClusterJoinBody();
request.broker = member.getDetails();
Broker leader = getLeader();
- send(leader, new SimpleSendable(request));
+ send(leader, new SimpleBodySendable(request));
_logger.info(new LogMessage("Passed join request for {0} to {1}",
member, leader));
}
}
@@ -272,7 +266,7 @@
{
String membership =
SimpleMemberHandle.membersToString(_group.getMembers());
ClusterMembershipBody announce = createAnnouncement(membership);
- broadcast(new SimpleSendable(announce));
+ broadcast(new SimpleBodySendable(announce));
_logger.info(new LogMessage("Membership announcement sent: {0}",
membership));
}
Added:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java?view=auto&rev=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
(added)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
Wed Nov 29 09:33:10 2006
@@ -0,0 +1,45 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.qpid.server.cluster;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQBody;
+import org.apache.qpid.framing.AMQFrame;
+
+/**
+ */
+public class SimpleBodySendable implements Sendable
+{
+ private final AMQBody _body;
+
+ public SimpleBodySendable(AMQBody body)
+ {
+ _body = body;
+ }
+
+ public void send(int channel, Member member) throws AMQException
+ {
+ member.send(new AMQFrame(channel, _body));
+ }
+
+ public String toString()
+ {
+ return _body.toString();
+ }
+
+}
Propchange:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleBodySendable.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/SimpleSendable.java
Wed Nov 29 09:33:10 2006
@@ -18,36 +18,29 @@
package org.apache.qpid.server.cluster;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQBody;
import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.ContentBody;
+import org.apache.qpid.server.queue.AMQMessage;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Iterator;
public class SimpleSendable implements Sendable
{
- private final List<AMQBody> _bodies;
+ private final AMQMessage _message;
- public SimpleSendable(AMQBody body)
+ public SimpleSendable(AMQMessage message)
{
- this(Arrays.asList(body));
- }
-
- public SimpleSendable(List<AMQBody> bodies)
- {
- _bodies = bodies;
+ _message = message;
}
public void send(int channel, Member member) throws AMQException
{
- for (AMQBody body : _bodies)
+ member.send(new AMQFrame(channel, _message.getPublishBody()));
+ member.send(new AMQFrame(channel, _message.getContentHeaderBody()));
+ Iterator<ContentBody> it = _message.getContentBodyIterator();
+ while (it.hasNext())
{
- member.send(new AMQFrame(channel, body));
+ member.send(new AMQFrame(channel, it.next()));
}
- }
-
- public String toString()
- {
- return _bodies.toString();
}
}
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/cluster/handler/ReplicatingHandler.java
Wed Nov 29 09:33:10 2006
@@ -20,13 +20,8 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.server.cluster.BroadcastPolicy;
-import org.apache.qpid.server.cluster.ClusteredProtocolSession;
-import org.apache.qpid.server.cluster.GroupManager;
-import org.apache.qpid.server.cluster.GroupResponseHandler;
import org.apache.qpid.server.cluster.util.LogMessage;
-import org.apache.qpid.server.cluster.Member;
-import org.apache.qpid.server.cluster.SimpleSendable;
+import org.apache.qpid.server.cluster.*;
import org.apache.qpid.server.cluster.policy.StandardPolicies;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.protocol.AMQMethodEvent;
@@ -78,13 +73,13 @@
if (_policy == null)
{
//asynch delivery
- _groupMgr.broadcast(new SimpleSendable(evt.getMethod()));
+ _groupMgr.broadcast(new SimpleBodySendable(evt.getMethod()));
local(stateMgr, queues, exchanges, session, evt);
}
else
{
Callback callback = new Callback(stateMgr, queues, exchanges,
session, evt);
- _groupMgr.broadcast(new SimpleSendable(evt.getMethod()), _policy,
callback);
+ _groupMgr.broadcast(new SimpleBodySendable(evt.getMethod()),
_policy, callback);
}
_logger.debug(new LogMessage("Replicated {0} to peers",
evt.getMethod()));
}
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/ClusteredQueue.java
Wed Nov 29 09:33:10 2006
@@ -58,10 +58,10 @@
_subscriptions = ((ClusteredSubscriptionManager)
getSubscribers()).getAllSubscribers();
}
- public void deliver(AMQMessage message) throws AMQException
+ public void process(AMQMessage msg) throws AMQException
{
- _logger.info(new LogMessage("{0} delivered to clustered queue {1}",
message, this));
- super.deliver(message);
+ _logger.info(new LogMessage("{0} delivered to clustered queue {1}",
msg, this));
+ super.process(msg);
}
protected void autodelete() throws AMQException
@@ -74,7 +74,7 @@
//send deletion request to all other members:
QueueDeleteBody request = new QueueDeleteBody();
request.queue = getName();
- _groupMgr.broadcast(new SimpleSendable(request));
+ _groupMgr.broadcast(new SimpleBodySendable(request));
}
}
@@ -86,7 +86,7 @@
//signal other members:
BasicCancelBody request = new BasicCancelBody();
request.consumerTag = getName();
- _groupMgr.broadcast(new SimpleSendable(request));
+ _groupMgr.broadcast(new SimpleBodySendable(request));
}
public void addRemoteSubcriber(MemberHandle peer)
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/PrivateQueue.java
Wed Nov 29 09:33:10 2006
@@ -20,6 +20,7 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.server.cluster.SimpleSendable;
import org.apache.qpid.server.cluster.GroupManager;
+import org.apache.qpid.server.cluster.SimpleBodySendable;
import org.apache.qpid.framing.QueueDeleteBody;
import java.util.concurrent.Executor;
@@ -55,6 +56,6 @@
//send delete request to peers:
QueueDeleteBody request = new QueueDeleteBody();
request.queue = getName();
- _groupMgr.broadcast(new SimpleSendable(request));
+ _groupMgr.broadcast(new SimpleBodySendable(request));
}
}
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteQueueProxy.java
Wed Nov 29 09:33:10 2006
@@ -19,18 +19,13 @@
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQBody;
import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.server.cluster.ClusteredProtocolSession;
import org.apache.qpid.server.cluster.GroupManager;
-import org.apache.qpid.server.cluster.util.LogMessage;
import org.apache.qpid.server.cluster.MemberHandle;
import org.apache.qpid.server.cluster.SimpleSendable;
+import org.apache.qpid.server.cluster.util.LogMessage;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.Executor;
/**
@@ -90,17 +85,9 @@
void relay(AMQMessage msg) throws AMQException
{
BasicPublishBody publish = msg.getPublishBody();
- ContentHeaderBody header = msg.getContentHeaderBody();
- List<ContentBody> bodies = msg.getContentBodies();
-
- //(i) construct a new publishing block:
- publish.immediate = false;//can't as yet handle the immediate flag in
a cluster
- List<AMQBody> parts = new ArrayList<AMQBody>(2 + bodies.size());
- parts.add(publish);
- parts.add(header);
- parts.addAll(bodies);
+ publish.immediate = false; //can't as yet handle the immediate flag in
a cluster
- //(ii) send this on to the broker for which it is acting as proxy:
- _groupMgr.send(_target, new SimpleSendable(parts));
+ // send this on to the broker for which it is acting as proxy:
+ _groupMgr.send(_target, new SimpleSendable(msg));
}
}
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
Wed Nov 29 09:33:10 2006
@@ -49,7 +49,7 @@
{
try
{
- _groupMgr.send(_peer, new SimpleSendable(msg.getPayload()));
+ _groupMgr.send(_peer, new SimpleSendable(msg));
}
catch (AMQException e)
{
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerGroupTest.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/BrokerTest.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
+ * 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
*
- * Licensed 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
*
- * 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.
+ * 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.qpid.server.cluster;
@@ -42,7 +45,7 @@
new RecordingBroker("C", 3)
};
GroupResponseValidator handler = new GroupResponseValidator(new
TestMethod("response"), new ArrayList<Member>(Arrays.asList(brokers)));
- GroupRequest grpRequest = new GroupRequest(new SimpleSendable(new
TestMethod("request")), StandardPolicies.SYNCH_POLICY, handler);
+ GroupRequest grpRequest = new GroupRequest(new SimpleBodySendable(new
TestMethod("request")), StandardPolicies.SYNCH_POLICY, handler);
for (Broker b : brokers)
{
b.invoke(grpRequest);
@@ -67,7 +70,7 @@
RecordingBroker[] succeeded = new RecordingBroker[]{a, c};
GroupResponseValidator handler = new GroupResponseValidator(new
TestMethod("response"), new ArrayList<Member>(Arrays.asList(succeeded)));
- GroupRequest grpRequest = new GroupRequest(new SimpleSendable(new
TestMethod("request")), StandardPolicies.SYNCH_POLICY, handler);
+ GroupRequest grpRequest = new GroupRequest(new SimpleBodySendable(new
TestMethod("request")), StandardPolicies.SYNCH_POLICY, handler);
for (Broker broker : all)
{
@@ -96,7 +99,7 @@
RecordingBroker broker = new RecordingBroker("myhost", 1);
for (AMQBody msg : msgs)
{
- broker.send(new SimpleSendable(msg), null);
+ broker.send(new SimpleBodySendable(msg), null);
}
List<AMQDataBlock> sent = broker.getMessages();
assertEquals(msgs.length, sent.size());
@@ -112,7 +115,7 @@
{
RecordingBroker broker = new RecordingBroker("myhost", 1);
BlockingHandler handler = new BlockingHandler();
- broker.send(new SimpleSendable(new TestMethod("A")), handler);
+ broker.send(new SimpleBodySendable(new TestMethod("A")), handler);
List<AMQDataBlock> sent = broker.getMessages();
assertEquals(1, sent.size());
assertTrue(sent.get(0) instanceof AMQFrame);
@@ -128,7 +131,7 @@
{
RecordingBroker broker = new RecordingBroker("myhost", 1);
BlockingHandler handler = new BlockingHandler();
- broker.send(new SimpleSendable(new TestMethod("A")), handler);
+ broker.send(new SimpleBodySendable(new TestMethod("A")), handler);
List<AMQDataBlock> sent = broker.getMessages();
assertEquals(1, sent.size());
assertTrue(sent.get(0) instanceof AMQFrame);
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/ClusterCapabilityTest.java
Wed Nov 29 09:33:10 2006
@@ -1,29 +1,30 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import junit.framework.TestCase;
-public class ClusterCapabilityTest
+public class ClusterCapabilityTest extends TestCase
{
- @Test
- public void startWithNull()
+ public void testStartWithNull()
{
MemberHandle peer = new SimpleMemberHandle("myhost:9999");
String c = ClusterCapability.add(null, peer);
@@ -31,8 +32,7 @@
assertTrue(peer.matches(ClusterCapability.getPeer(c)));
}
- @Test
- public void startWithText()
+ public void testStartWithText()
{
MemberHandle peer = new SimpleMemberHandle("myhost:9999");
String c = ClusterCapability.add("existing text", peer);
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/InductionBufferTest.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBroker.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/RecordingBrokerFactory.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleClusterTest.java
Wed Nov 29 09:33:10 2006
@@ -1,23 +1,25 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
-import org.junit.Test;
import org.apache.qpid.AMQException;
import org.apache.qpid.url.URLSyntaxException;
import org.apache.qpid.client.AMQConnection;
@@ -25,10 +27,11 @@
import javax.jms.JMSException;
-public class SimpleClusterTest
+import junit.framework.TestCase;
+
+public class SimpleClusterTest extends TestCase
{
- @Test
- public void declareExchange() throws AMQException, JMSException,
URLSyntaxException
+ public void testDeclareExchange() throws AMQException, JMSException,
URLSyntaxException
{
AMQConnection con = new AMQConnection("localhost:9000", "guest",
"guest", "test", "/test");
AMQSession session = (AMQSession) con.createSession(false,
AMQSession.NO_ACKNOWLEDGE);
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/SimpleMemberHandleTest.java
Wed Nov 29 09:33:10 2006
@@ -1,39 +1,37 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import junit.framework.TestCase;
-public class SimpleMemberHandleTest
+public class SimpleMemberHandleTest extends TestCase
{
- @Test
- public void matches()
+ public void testMatches()
{
assertMatch(new SimpleMemberHandle("localhost", 8888), new
SimpleMemberHandle("localhost", 8888));
assertNoMatch(new SimpleMemberHandle("localhost", 8889), new
SimpleMemberHandle("localhost", 8888));
assertNoMatch(new SimpleMemberHandle("localhost", 8888), new
SimpleMemberHandle("localhost2", 8888));
}
-
- @Test
- public void resolve()
+ public void testResolve()
{
assertEquivalent(new SimpleMemberHandle("WGLAIBD8XGR0J:9000"), new
SimpleMemberHandle("localhost:9000"));
}
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBroker.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestBrokerFactory.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestReplayManager.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
(original)
+++
incubator/qpid/branches/new_persistence/java/cluster/src/test/java/org/apache/qpid/server/cluster/TestSession.java
Wed Nov 29 09:33:10 2006
@@ -1,18 +1,21 @@
/*
*
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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.
+ * 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.qpid.server.cluster;
Modified:
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java?view=diff&rev=480649&r1=480648&r2=480649
==============================================================================
---
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
(original)
+++
incubator/qpid/branches/new_persistence/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
Wed Nov 29 09:33:10 2006
@@ -59,6 +59,7 @@
protected void tearDown() throws Exception
{
super.tearDown();
+ TransportConnection.killAllVMBrokers();
}
/**
