activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r382869 [3/4] - in /incubator/activemq/trunk: activemq-core/src/main/java/org/apache/activemq/ activemq-core/src/main/java/org/apache/activemq/advisory/ activemq-core/src/main/java/org/apache/activemq/broker/ activemq-core/src/main/java/org...
Date Fri, 03 Mar 2006 15:36:51 GMT
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java Fri Mar  3 07:36:38 2006
@@ -61,7 +61,7 @@
         return command;
     }
 
-    public Response visit(CommandVisitor visitor) throws Throwable {
+    public Response visit(CommandVisitor visitor) throws Exception {
         return visitor.processAddSession( this);
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java Fri Mar  3 07:36:38 2006
@@ -31,7 +31,7 @@
         return DATA_STRUCTURE_TYPE;
     }
 
-    public Response visit(CommandVisitor visitor) throws Throwable {
+    public Response visit(CommandVisitor visitor) throws Exception {
         return visitor.processShutdown( this );
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java Fri Mar  3 07:36:38 2006
@@ -86,7 +86,7 @@
         this.type = type;
     }
 
-    public Response visit(CommandVisitor visitor) throws Throwable {
+    public Response visit(CommandVisitor visitor) throws Exception {
         switch( type ) {
         case TransactionInfo.BEGIN:
             return visitor.processBeginTransaction(this);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java Fri Mar  3 07:36:38 2006
@@ -161,7 +161,7 @@
         this.tightEncodingEnabled = tightEncodingEnabled;
     }
 
-    public Response visit(CommandVisitor visitor) throws Throwable {
+    public Response visit(CommandVisitor visitor) throws Exception {
         return visitor.processWireFormat(this);
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java Fri Mar  3 07:36:38 2006
@@ -50,7 +50,7 @@
         this.authorizationMap = authorizationMap;
     }
     
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         final SecurityContext securityContext = (SecurityContext) context.getSecurityContext();
         if( securityContext == null )
             throw new SecurityException("User is not authenticated.");
@@ -67,7 +67,7 @@
         return super.addDestination(context, destination);
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         
         final SecurityContext securityContext = (SecurityContext) context.getSecurityContext();
         if( securityContext == null )
@@ -85,7 +85,7 @@
         super.removeDestination(context, destination, timeout);
     }
     
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         
         final SecurityContext subject = (SecurityContext) context.getSecurityContext();
         if( subject == null )
@@ -120,7 +120,7 @@
         super.addConsumer(context, info);
     }
     
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         
         SecurityContext subject = (SecurityContext) context.getSecurityContext();
         if( subject == null )
@@ -136,7 +136,7 @@
         super.addProducer(context, info);
     }
         
-    public void send(ConnectionContext context, Message messageSend) throws Throwable {
+    public void send(ConnectionContext context, Message messageSend) throws Exception {
         SecurityContext subject = (SecurityContext) context.getSecurityContext();
         if( subject == null )
             throw new SecurityException("User is not authenticated.");

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java Fri Mar  3 07:36:38 2006
@@ -60,7 +60,7 @@
         
     }
     
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
 
         if( context.getSecurityContext()==null ) {
             // Set the TCCL since it seems JAAS needs it to find the login module classes.
@@ -87,7 +87,7 @@
         super.addConnection(context, info);
     }
     
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         super.removeConnection(context, info, error);
         if( securityContexts.remove(context.getSecurityContext()) ) {
             context.setSecurityContext(null);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java Fri Mar  3 07:36:38 2006
@@ -45,7 +45,7 @@
         this.userGroups = userGroups;
     }
     
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
 
         if( context.getSecurityContext()==null ) {
             // Check the username and password.
@@ -66,7 +66,7 @@
         super.addConnection(context, info);
     }
     
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         super.removeConnection(context, info, error);
         if( securityContexts.remove(context.getSecurityContext()) ) {
             context.setSecurityContext(null);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java Fri Mar  3 07:36:38 2006
@@ -39,39 +39,39 @@
 
 public interface CommandVisitor {
 
-    Response processAddConnection(ConnectionInfo info) throws Throwable;
-    Response processAddSession(SessionInfo info) throws Throwable;
-    Response processAddProducer(ProducerInfo info) throws Throwable;
-    Response processAddConsumer(ConsumerInfo info) throws Throwable;
+    Response processAddConnection(ConnectionInfo info) throws Exception;
+    Response processAddSession(SessionInfo info) throws Exception;
+    Response processAddProducer(ProducerInfo info) throws Exception;
+    Response processAddConsumer(ConsumerInfo info) throws Exception;
     
-    Response processRemoveConnection(ConnectionId id) throws Throwable;
-    Response processRemoveSession(SessionId id) throws Throwable;
-    Response processRemoveProducer(ProducerId id) throws Throwable;
-    Response processRemoveConsumer(ConsumerId id) throws Throwable;
+    Response processRemoveConnection(ConnectionId id) throws Exception;
+    Response processRemoveSession(SessionId id) throws Exception;
+    Response processRemoveProducer(ProducerId id) throws Exception;
+    Response processRemoveConsumer(ConsumerId id) throws Exception;
     
-    Response processAddDestination(DestinationInfo info) throws Throwable;
-    Response processRemoveDestination(DestinationInfo info) throws Throwable;
-    Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Throwable;
+    Response processAddDestination(DestinationInfo info) throws Exception;
+    Response processRemoveDestination(DestinationInfo info) throws Exception;
+    Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Exception;
     
-    Response processMessage(Message send) throws Throwable;
-    Response processMessageAck(MessageAck ack) throws Throwable;
+    Response processMessage(Message send) throws Exception;
+    Response processMessageAck(MessageAck ack) throws Exception;
 
-    Response processBeginTransaction(TransactionInfo info) throws Throwable;
-    Response processPrepareTransaction(TransactionInfo info) throws Throwable;
-    Response processCommitTransactionOnePhase(TransactionInfo info) throws Throwable;
-    Response processCommitTransactionTwoPhase(TransactionInfo info) throws Throwable;
-    Response processRollbackTransaction(TransactionInfo info) throws Throwable;
+    Response processBeginTransaction(TransactionInfo info) throws Exception;
+    Response processPrepareTransaction(TransactionInfo info) throws Exception;
+    Response processCommitTransactionOnePhase(TransactionInfo info) throws Exception;
+    Response processCommitTransactionTwoPhase(TransactionInfo info) throws Exception;
+    Response processRollbackTransaction(TransactionInfo info) throws Exception;
 
-    Response processWireFormat(WireFormatInfo info) throws Throwable;
-    Response processKeepAlive(KeepAliveInfo info) throws Throwable;
-    Response processShutdown(ShutdownInfo info) throws Throwable;
-    Response processFlush(FlushCommand command) throws Throwable;
+    Response processWireFormat(WireFormatInfo info) throws Exception;
+    Response processKeepAlive(KeepAliveInfo info) throws Exception;
+    Response processShutdown(ShutdownInfo info) throws Exception;
+    Response processFlush(FlushCommand command) throws Exception;
 
-    Response processBrokerInfo(BrokerInfo info) throws Throwable;
-    Response processRecoverTransactions(TransactionInfo info) throws Throwable;
-    Response processForgetTransaction(TransactionInfo info) throws Throwable;
-    Response processEndTransaction(TransactionInfo info) throws Throwable;
-    Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Throwable;
+    Response processBrokerInfo(BrokerInfo info) throws Exception;
+    Response processRecoverTransactions(TransactionInfo info) throws Exception;
+    Response processForgetTransaction(TransactionInfo info) throws Exception;
+    Response processEndTransaction(TransactionInfo info) throws Exception;
+    Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Exception;
     
 }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Fri Mar  3 07:36:38 2006
@@ -144,7 +144,7 @@
         }
     }
 
-    public Response processAddDestination(DestinationInfo info) throws Throwable {
+    public Response processAddDestination(DestinationInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         if( info.getDestination().isTemporary() ) {
             cs.addTempDestination(info.getDestination());
@@ -152,7 +152,7 @@
         return TRACKED_RESPONSE_MARKER;
     }
 
-    public Response processRemoveDestination(DestinationInfo info) throws Throwable {
+    public Response processRemoveDestination(DestinationInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         if( info.getDestination().isTemporary() ) {
             cs.removeTempDestination(info.getDestination());
@@ -161,7 +161,7 @@
     }
 
 
-    public Response processAddProducer(ProducerInfo info) throws Throwable {
+    public Response processAddProducer(ProducerInfo info) throws Exception {
         SessionId sessionId = info.getProducerId().getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
@@ -170,7 +170,7 @@
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processRemoveProducer(ProducerId id) throws Throwable {
+    public Response processRemoveProducer(ProducerId id) throws Exception {
         SessionId sessionId = id.getParentId();
         ConnectionId connectionId = sessionId.getParentId();        
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
@@ -179,7 +179,7 @@
         return TRACKED_RESPONSE_MARKER;
     }
 
-    public Response processAddConsumer(ConsumerInfo info) throws Throwable {
+    public Response processAddConsumer(ConsumerInfo info) throws Exception {
         SessionId sessionId = info.getConsumerId().getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
@@ -188,7 +188,7 @@
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processRemoveConsumer(ConsumerId id) throws Throwable {
+    public Response processRemoveConsumer(ConsumerId id) throws Exception {
         SessionId sessionId = id.getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
@@ -197,64 +197,64 @@
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processAddSession(SessionInfo info) throws Throwable {
+    public Response processAddSession(SessionInfo info) throws Exception {
         ConnectionId connectionId = info.getSessionId().getParentId();
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
         cs.addSession(info);
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processRemoveSession(SessionId id) throws Throwable {        
+    public Response processRemoveSession(SessionId id) throws Exception {        
         ConnectionId connectionId = id.getParentId();
         ConnectionState cs = (ConnectionState) connectionStates.get(connectionId);
         cs.removeSession(id);
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processAddConnection(ConnectionInfo info) throws Throwable {
+    public Response processAddConnection(ConnectionInfo info) throws Exception {
         connectionStates.put(info.getConnectionId(), new ConnectionState(info));        
         return TRACKED_RESPONSE_MARKER;
     }
     
-    public Response processRemoveConnection(ConnectionId id) throws Throwable {
+    public Response processRemoveConnection(ConnectionId id) throws Exception {
         connectionStates.remove(id);
         return TRACKED_RESPONSE_MARKER;
     }
 
-    public Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Throwable {
+    public Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Exception {
         return null;
     }
-    public Response processMessage(Message send) throws Throwable {
+    public Response processMessage(Message send) throws Exception {
         return null;
     }
-    public Response processMessageAck(MessageAck ack) throws Throwable {
+    public Response processMessageAck(MessageAck ack) throws Exception {
         return null;
     }
-    public Response processBeginTransaction(TransactionInfo info) throws Throwable {
+    public Response processBeginTransaction(TransactionInfo info) throws Exception {
         return null;
     }
-    public Response processPrepareTransaction(TransactionInfo info) throws Throwable {
+    public Response processPrepareTransaction(TransactionInfo info) throws Exception {
         return null;
     }
-    public Response processCommitTransactionOnePhase(TransactionInfo info) throws Throwable {
+    public Response processCommitTransactionOnePhase(TransactionInfo info) throws Exception {
         return null;
     }
-    public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Throwable {
+    public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Exception {
         return null;
     }
-    public Response processRollbackTransaction(TransactionInfo info) throws Throwable {
+    public Response processRollbackTransaction(TransactionInfo info) throws Exception {
         return null;
     }
-    public Response processWireFormat(WireFormatInfo info) throws Throwable {
+    public Response processWireFormat(WireFormatInfo info) throws Exception {
         return null;
     }
-    public Response processKeepAlive(KeepAliveInfo info) throws Throwable {
+    public Response processKeepAlive(KeepAliveInfo info) throws Exception {
         return null;
     }
-    public Response processShutdown(ShutdownInfo info) throws Throwable {
+    public Response processShutdown(ShutdownInfo info) throws Exception {
         return null;
     }
-    public Response processBrokerInfo(BrokerInfo info) throws Throwable {
+    public Response processBrokerInfo(BrokerInfo info) throws Exception {
         return null;
     }
 
@@ -262,19 +262,19 @@
         return null;
     }
 
-    public Response processForgetTransaction(TransactionInfo info) throws Throwable {
+    public Response processForgetTransaction(TransactionInfo info) throws Exception {
         return null;
     }
 
-    public Response processEndTransaction(TransactionInfo info) throws Throwable {
+    public Response processEndTransaction(TransactionInfo info) throws Exception {
         return null;
     }
 
-    public Response processFlush(FlushCommand command) throws Throwable {
+    public Response processFlush(FlushCommand command) throws Exception {
         return null;
     }
     
-    public Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Throwable{
+    public Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Exception{
         return null;
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java Fri Mar  3 07:36:38 2006
@@ -22,7 +22,7 @@
  * @version $Revision: 1.4 $
  */
 public interface MessageRecoveryListener {
-    void recoverMessage(Message message) throws Throwable;
-    void recoverMessageReference(String messageReference) throws Throwable;
+    void recoverMessage(Message message) throws Exception;
+    void recoverMessageReference(String messageReference) throws Exception;
     void finished();
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java Fri Mar  3 07:36:38 2006
@@ -83,9 +83,9 @@
      * Recover any messages to be delivered.
      *
      * @param container
-     * @throws Throwable 
+     * @throws Exception 
      */
-    public void recover(MessageRecoveryListener container) throws Throwable;
+    public void recover(MessageRecoveryListener container) throws Exception;
 
     /**
      * The destination that the message store is holding messages for.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java Fri Mar  3 07:36:38 2006
@@ -45,7 +45,7 @@
     public Message getMessage(MessageId identity) throws IOException {
         return delegate.getMessage(identity);
     }
-    public void recover(MessageRecoveryListener listener) throws Throwable {
+    public void recover(MessageRecoveryListener listener) throws Exception {
         delegate.recover(listener);
     }
     public void removeAllMessages(ConnectionContext context) throws IOException {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -46,7 +46,7 @@
     public Message getMessage(MessageId identity) throws IOException {
         return delegate.getMessage(identity);
     }
-    public void recover(MessageRecoveryListener listener) throws Throwable {
+    public void recover(MessageRecoveryListener listener) throws Exception {
         delegate.recover(listener);
     }
     public void removeAllMessages(ConnectionContext context) throws IOException {
@@ -76,7 +76,7 @@
         delegate.deleteSubscription(clientId, subscriptionName);
     }
 
-    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Throwable {
+    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Exception {
         delegate.recoverSubscription(clientId, subscriptionName, listener);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -56,9 +56,9 @@
      * acknowledging any messages, we need to know the correct point from which to recover from.
      * @param subscription
      *
-     * @throws Throwable 
+     * @throws Exception 
      */
-    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Throwable;
+    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Exception;
 
     /**
      * Finds the subscriber entry for the given consumer info

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java Fri Mar  3 07:36:38 2006
@@ -45,13 +45,13 @@
     public abstract void doRemoveMessage(TransactionContext c, long seq) throws SQLException, IOException;
 
     public abstract void doRecover(TransactionContext c, ActiveMQDestination destination, JDBCMessageRecoveryListener listener)
-            throws Throwable;
+            throws Exception;
 
     public abstract void doSetLastAck(TransactionContext c, ActiveMQDestination destination, String clientId, String subscriptionName, long seq) throws SQLException,
             IOException;
 
     public abstract void doRecoverSubscription(TransactionContext c, ActiveMQDestination destination, String clientId,
-            String subscriptionName, JDBCMessageRecoveryListener listener) throws Throwable;
+            String subscriptionName, JDBCMessageRecoveryListener listener) throws Exception;
 
     public abstract void doSetSubscriberEntry(TransactionContext c, ActiveMQDestination destination, String clientId,
             String subscriptionName, String selector, boolean retroactive) throws SQLException, IOException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java Fri Mar  3 07:36:38 2006
@@ -16,14 +16,13 @@
  */
 package org.apache.activemq.store.jdbc;
 
-import java.io.IOException;
 
 
 /**
  * @version $Revision: 1.3 $
  */
 public interface JDBCMessageRecoveryListener {
-    void recoverMessage(long sequenceId, byte[] message) throws IOException, Throwable;
-    void recoverMessageReference(String reference) throws IOException, Throwable;
+    void recoverMessage(long sequenceId, byte[] message) throws Exception;
+    void recoverMessageReference(String reference) throws Exception;
     void finished();
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java Fri Mar  3 07:36:38 2006
@@ -143,19 +143,19 @@
         }
     }
 
-    public void recover(final MessageRecoveryListener listener) throws Throwable {
+    public void recover(final MessageRecoveryListener listener) throws Exception {
 
         // Get all the Message ids out of the database.
         TransactionContext c = persistenceAdapter.getTransactionContext();
         try {
             c = persistenceAdapter.getTransactionContext();
             adapter.doRecover(c, destination, new JDBCMessageRecoveryListener() {
-                public void recoverMessage(long sequenceId, byte[] data) throws Throwable {
+                public void recoverMessage(long sequenceId, byte[] data) throws Exception {
                     Message msg = (Message) wireFormat.unmarshal(new ByteArrayPacket(data));
                     msg.getMessageId().setBrokerSequenceId(sequenceId);
                     listener.recoverMessage(msg);
                 }
-                public void recoverMessageReference(String reference) throws IOException, Throwable {
+                public void recoverMessageReference(String reference) throws Exception {
                     listener.recoverMessageReference(reference);
                 }
                 public void finished(){

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -57,22 +57,22 @@
     }
 
     /**
-     * @throws Throwable
+     * @throws Exception
      * 
      */
     public void recoverSubscription(String clientId, String subscriptionName, final MessageRecoveryListener listener)
-            throws Throwable {
+            throws Exception {
 
         TransactionContext c = persistenceAdapter.getTransactionContext();
         try {
             adapter.doRecoverSubscription(c, destination, clientId, subscriptionName,
                     new JDBCMessageRecoveryListener() {
-                        public void recoverMessage(long sequenceId, byte[] data) throws Throwable {
+                        public void recoverMessage(long sequenceId, byte[] data) throws Exception {
                             Message msg = (Message) wireFormat.unmarshal(new ByteArrayPacket(data));
                             msg.getMessageId().setBrokerSequenceId(sequenceId);
                             listener.recoverMessage(msg);
                         }
-                        public void recoverMessageReference(String reference) throws IOException, Throwable {
+                        public void recoverMessageReference(String reference) throws Exception {
                             listener.recoverMessageReference(reference);
                         }
                         

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Fri Mar  3 07:36:38 2006
@@ -317,7 +317,7 @@
         }        
     }
     
-    public void doRecover(TransactionContext c, ActiveMQDestination destination, JDBCMessageRecoveryListener listener) throws Throwable {
+    public void doRecover(TransactionContext c, ActiveMQDestination destination, JDBCMessageRecoveryListener listener) throws Exception {
 //        printQuery(c, "Select * from ACTIVEMQ_MSGS", System.out);
 
         PreparedStatement s = null;
@@ -375,7 +375,7 @@
 
     }
 
-    public void doRecoverSubscription(TransactionContext c, ActiveMQDestination destination, String clientId, String subscriptionName, JDBCMessageRecoveryListener listener) throws Throwable {
+    public void doRecoverSubscription(TransactionContext c, ActiveMQDestination destination, String clientId, String subscriptionName, JDBCMessageRecoveryListener listener) throws Exception {
 //        dumpTables(c, destination.getQualifiedName(),clientId,subscriptionName);
 
         PreparedStatement s = null;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java Fri Mar  3 07:36:38 2006
@@ -95,7 +95,7 @@
             }
             transactionStore.addMessage(this, message, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message add commit for: "+id+", at: "+location);
                     synchronized( JournalMessageStore.this ) {
@@ -103,7 +103,7 @@
                         addMessage(message, location);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message add rollback for: "+id+", at: "+location);
                     synchronized( JournalMessageStore.this ) {
@@ -157,7 +157,7 @@
             }
             transactionStore.removeMessage(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message remove commit for: "+ack.getLastMessageId()+", at: "+location);
                     synchronized( JournalMessageStore.this ) {
@@ -165,7 +165,7 @@
                         removeMessage(ack, location);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message remove rollback for: "+ack.getLastMessageId()+", at: "+location);
                     synchronized( JournalMessageStore.this ) {
@@ -235,7 +235,7 @@
         }
 
         transactionTemplate.run(new Callback() {
-            public void execute() throws Throwable {
+            public void execute() throws Exception {
 
                 int size = 0;
                 
@@ -326,9 +326,9 @@
      * updated.
      * 
      * @param listener
-     * @throws Throwable 
+     * @throws Exception 
      */
-    public void recover(final MessageRecoveryListener listener) throws Throwable {
+    public void recover(final MessageRecoveryListener listener) throws Exception {
         peristenceAdapter.checkpoint(true, true);
         longTermStore.recover(listener);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -52,7 +52,7 @@
         this.longTermStore = checkpointStore;
     }
     
-    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Throwable {
+    public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener) throws Exception {
         this.peristenceAdapter.checkpoint(true, true);
         longTermStore.recoverSubscription(clientId, subscriptionName, listener);
     }
@@ -98,7 +98,7 @@
             }
             transactionStore.acknowledge(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted acknowledge commit for: "+messageId+", at: "+location);
                     synchronized (JournalTopicMessageStore.this) {
@@ -106,7 +106,7 @@
                         acknowledge(messageId, location, key);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted acknowledge rollback for: "+messageId+", at: "+location);
                     synchronized (JournalTopicMessageStore.this) {
@@ -154,7 +154,7 @@
         }
 
         return super.checkpoint( new Callback() {
-            public void execute() throws Throwable {
+            public void execute() throws Exception {
 
                 // Checkpoint the acknowledged messages.
                 Iterator iterator = cpAckedLastAckLocations.keySet().iterator();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java Fri Mar  3 07:36:38 2006
@@ -97,7 +97,7 @@
             }
             transactionStore.addMessage(this, message, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message add commit for: "+id+", at: "+location);
                     message.decrementReferenceCount();
@@ -106,7 +106,7 @@
                         addMessage(md, location);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message add rollback for: "+id+", at: "+location);
                     message.decrementReferenceCount();
@@ -173,7 +173,7 @@
             }
             transactionStore.removeMessage(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message remove commit for: "+ack.getLastMessageId()+", at: "+location);
                     synchronized( QuickJournalMessageStore.this ) {
@@ -181,7 +181,7 @@
                         removeMessage(ack, location);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted message remove rollback for: "+ack.getLastMessageId()+", at: "+location);
                     synchronized( QuickJournalMessageStore.this ) {
@@ -248,7 +248,7 @@
         }
 
         transactionTemplate.run(new Callback() {
-            public void execute() throws Throwable {
+            public void execute() throws Exception {
 
                 int size = 0;
                 
@@ -347,15 +347,15 @@
      * updated.
      * 
      * @param listener
-     * @throws Throwable 
+     * @throws Exception 
      */
-    public void recover(final MessageRecoveryListener listener) throws Throwable {
+    public void recover(final MessageRecoveryListener listener) throws Exception {
         peristenceAdapter.checkpoint(true, true);
         longTermStore.recover(new MessageRecoveryListener() {
-            public void recoverMessage(Message message) throws Throwable {
+            public void recoverMessage(Message message) throws Exception {
                 throw new IOException("Should not get called.");
             }
-            public void recoverMessageReference(String messageReference) throws Throwable {
+            public void recoverMessageReference(String messageReference) throws Exception {
                 RecordLocation loc = toRecordLocation(messageReference);
                 Message message = (Message) peristenceAdapter.readCommand(loc);
                 listener.recoverMessage(message);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -52,13 +52,13 @@
         this.longTermStore = checkpointStore;
     }
     
-    public void recoverSubscription(String clientId, String subscriptionName, final MessageRecoveryListener listener) throws Throwable {
+    public void recoverSubscription(String clientId, String subscriptionName, final MessageRecoveryListener listener) throws Exception {
         this.peristenceAdapter.checkpoint(true, true);
         longTermStore.recoverSubscription(clientId, subscriptionName, new MessageRecoveryListener() {
-            public void recoverMessage(Message message) throws Throwable {
+            public void recoverMessage(Message message) throws Exception {
                 throw new IOException("Should not get called.");
             }
-            public void recoverMessageReference(String messageReference) throws Throwable {
+            public void recoverMessageReference(String messageReference) throws Exception {
                 RecordLocation loc = toRecordLocation(messageReference);
                 Message message = (Message) peristenceAdapter.readCommand(loc);
                 listener.recoverMessage(message);
@@ -112,7 +112,7 @@
             }
             transactionStore.acknowledge(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() {                    
+                public void afterCommit() throws Exception {                    
                     if( debug )
                         log.debug("Transacted acknowledge commit for: "+messageId+", at: "+location);
                     synchronized (QuickJournalTopicMessageStore.this) {
@@ -120,7 +120,7 @@
                         acknowledge(messageId, location, key);
                     }
                 }
-                public void afterRollback() {                    
+                public void afterRollback() throws Exception {                    
                     if( debug )
                         log.debug("Transacted acknowledge rollback for: "+messageId+", at: "+location);
                     synchronized (QuickJournalTopicMessageStore.this) {
@@ -168,7 +168,7 @@
         }
 
         return super.checkpoint( new Callback() {
-            public void execute() throws Throwable {
+            public void execute() throws Exception {
 
                 // Checkpoint the acknowledged messages.
                 Iterator iterator = cpAckedLastAckLocations.keySet().iterator();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java Fri Mar  3 07:36:38 2006
@@ -71,7 +71,7 @@
         messageTable.remove(msgId);
     }
 
-    public void recover(MessageRecoveryListener listener) throws Throwable {
+    public void recover(MessageRecoveryListener listener) throws Exception {
         // the message table is a synchronizedMap - so just have to synchronize here
         synchronized(messageTable){
             for(Iterator iter=messageTable.values().iterator();iter.hasNext();){

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java Fri Mar  3 07:36:38 2006
@@ -89,7 +89,7 @@
     }
     
     public void recoverSubscription(String clientId,String subscriptionName,MessageRecoveryListener listener)
-                    throws Throwable{
+                    throws Exception{
         MessageId lastAck=(MessageId) ackDatabase.get(new SubscriptionKey(clientId,subscriptionName));
         boolean pastLastAck=lastAck==null;
         // the message table is a synchronizedMap - so just have to synchronize here

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java Fri Mar  3 07:36:38 2006
@@ -22,8 +22,8 @@
  */
 public class Synchronization {
 
-    public void beforeEnd() throws Throwable{}
-    public void afterCommit() throws Throwable{}
-    public void afterRollback() throws Throwable{}
+    public void beforeEnd() throws Exception{}
+    public void afterCommit() throws Exception{}
+    public void afterRollback() throws Exception{}
     
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java Fri Mar  3 07:36:38 2006
@@ -55,7 +55,7 @@
         }
     }
 
-    public void prePrepare() throws Throwable {
+    public void prePrepare() throws Exception {
 
         // Is it ok to call prepare now given the state of the
         // transaction?
@@ -76,14 +76,14 @@
 //        }
     }
 
-    protected void fireAfterCommit() throws Throwable {
+    protected void fireAfterCommit() throws Exception {
         for (Iterator iter = synchronizations.iterator(); iter.hasNext();) {
             Synchronization s = (Synchronization) iter.next();
             s.afterCommit();
         }
     }
 
-    public void fireAfterRollback() throws Throwable {
+    public void fireAfterRollback() throws Exception {
         for (Iterator iter = synchronizations.iterator(); iter.hasNext();) {
             Synchronization s = (Synchronization) iter.next();
             s.afterRollback();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java Fri Mar  3 07:36:38 2006
@@ -10,9 +10,9 @@
      * @param context
      * @param message
      * @param deadLetterDestination
-     * @throws Throwable
+     * @throws Exception
      */
-    static public void resend(final ConnectionContext context, Message message, ActiveMQDestination deadLetterDestination) throws Throwable {
+    static public void resend(final ConnectionContext context, Message message, ActiveMQDestination deadLetterDestination) throws Exception {
         if(message.getOriginalDestination()!=null)
             message.setOriginalDestination(message.getDestination());
         if(message.getOriginalTransactionId()!=null)

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/Callback.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/Callback.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/Callback.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/Callback.java Fri Mar  3 07:36:38 2006
@@ -30,8 +30,7 @@
      * Executes some piece of code within a transaction
      * performing a commit if there is no exception thrown
      * else a rollback is performed
-     *
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public void execute() throws Throwable;
+    public void execute() throws Exception;
 }

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java Fri Mar  3 07:36:38 2006
@@ -101,19 +101,19 @@
     }
 
     //Helper Classes
-     protected ConnectionInfo createConnectionInfo() throws Throwable {
+     protected ConnectionInfo createConnectionInfo() throws Exception {
         ConnectionInfo info = new ConnectionInfo();
         info.setConnectionId(new ConnectionId("connection:"+(++idGenerator)));
         info.setClientId( info.getConnectionId().getValue() );
         return info;
     }
 
-    protected SessionInfo createSessionInfo(ConnectionInfo connectionInfo) throws Throwable {
+    protected SessionInfo createSessionInfo(ConnectionInfo connectionInfo) throws Exception {
         SessionInfo info = new SessionInfo(connectionInfo, ++idGenerator);
         return info;
     }
 
-    protected ConsumerInfo createConsumerInfo(SessionInfo sessionInfo, ActiveMQDestination destination) throws Throwable {
+    protected ConsumerInfo createConsumerInfo(SessionInfo sessionInfo, ActiveMQDestination destination) throws Exception {
         ConsumerInfo info = new ConsumerInfo(sessionInfo, ++idGenerator);
         info.setBrowser(false);
         info.setDestination(destination);

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Fri Mar  3 07:36:38 2006
@@ -71,7 +71,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
-    public void testMessageListenerWithConsumerCanBeStopped() throws Throwable {
+    public void testMessageListenerWithConsumerCanBeStopped() throws Exception {
 
         final AtomicInteger counter = new AtomicInteger(0);
         final CountDownLatch done1 = new CountDownLatch(1);
@@ -127,7 +127,7 @@
                 });
     }
 
-    public void testMutiReceiveWithPrefetch1() throws Throwable {
+    public void testMutiReceiveWithPrefetch1() throws Exception {
 
         // Set prefetch to 1
         connection.getPrefetchPolicy().setAll(1);
@@ -158,7 +158,7 @@
         addCombinationValues("destinationType", new Object[] { 
                 new Byte(ActiveMQDestination.TOPIC_TYPE)});
     }
-    public void testDurableConsumerSelectorChange() throws Throwable {
+    public void testDurableConsumerSelectorChange() throws Exception {
 
         // Receive a message with the JMS API
         connection.setClientID("test");
@@ -205,7 +205,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
 
-    public void testSendReceiveBytesMessage() throws Throwable {
+    public void testSendReceiveBytesMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -239,7 +239,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
-    public void testSetMessageListenerAfterStart() throws Throwable {
+    public void testSetMessageListenerAfterStart() throws Exception {
 
         final AtomicInteger counter = new AtomicInteger(0);
         final CountDownLatch done = new CountDownLatch(1);
@@ -282,7 +282,7 @@
         addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE), });
     }
 
-    public void testMessageListenerUnackedWithPrefetch1StayInQueue() throws Throwable {
+    public void testMessageListenerUnackedWithPrefetch1StayInQueue() throws Exception {
 
         final AtomicInteger counter = new AtomicInteger(0);
         final CountDownLatch done = new CountDownLatch(1);
@@ -368,7 +368,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
-    public void testMessageListenerWithConsumerWithPrefetch1() throws Throwable {
+    public void testMessageListenerWithConsumerWithPrefetch1() throws Exception {
 
         final AtomicInteger counter = new AtomicInteger(0);
         final CountDownLatch done = new CountDownLatch(1);
@@ -408,7 +408,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
-    public void testMessageListenerWithConsumer() throws Throwable {
+    public void testMessageListenerWithConsumer() throws Exception {
 
         final AtomicInteger counter = new AtomicInteger(0);
         final CountDownLatch done = new CountDownLatch(1);
@@ -444,7 +444,7 @@
         addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE), });
     }
 
-    public void testUnackedWithPrefetch1StayInQueue() throws Throwable {
+    public void testUnackedWithPrefetch1StayInQueue() throws Exception {
 
         // Set prefetch to 1
         connection.getPrefetchPolicy().setAll(1);
@@ -492,7 +492,7 @@
                 new Byte(ActiveMQDestination.TOPIC_TYPE), });
     }
 
-    public void testDontStart() throws Throwable {
+    public void testDontStart() throws Exception {
 
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         destination = createDestination(session, destinationType);
@@ -511,7 +511,7 @@
                 new Byte(ActiveMQDestination.TOPIC_TYPE), });
     }
 
-    public void testStartAfterSend() throws Throwable {
+    public void testStartAfterSend() throws Exception {
 
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         destination = createDestination(session, destinationType);
@@ -536,7 +536,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
 
-    public void testReceiveMessageWithConsumer() throws Throwable {
+    public void testReceiveMessageWithConsumer() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java Fri Mar  3 07:36:38 2006
@@ -51,9 +51,9 @@
     /**
      * Shows that by default messages are round robined across a set of consumers.
      * 
-     * @throws Throwable
+     * @throws Exception
      */
-    public void testRoundRobinDispatchOnNonExclusive() throws Throwable {
+    public void testRoundRobinDispatchOnNonExclusive() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -89,9 +89,9 @@
      * Shows that if the "?consumer.exclusive=true" option is added to destination,
      * then all messages are routed to 1 consumer.
      * 
-     * @throws Throwable
+     * @throws Exception
      */
-    public void testDispatchExclusive() throws Throwable {
+    public void testDispatchExclusive() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java Fri Mar  3 07:36:38 2006
@@ -70,7 +70,7 @@
                 new Byte(ActiveMQDestination.QUEUE_TYPE)});
     }
     
-    public void testTextMessage() throws Throwable {
+    public void testTextMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -109,7 +109,7 @@
         return factory;
     }
     
-    public void testBytesMessageLength() throws Throwable {
+    public void testBytesMessageLength() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -138,7 +138,7 @@
         assertNull(consumer.receiveNoWait());
     }
     
-    public void testObjectMessage() throws Throwable {
+    public void testObjectMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -163,7 +163,7 @@
         assertNull(consumer.receiveNoWait());
     }
     
-    public void testBytesMessage() throws Throwable {
+    public void testBytesMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -195,7 +195,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testStreamMessage() throws Throwable {
+    public void testStreamMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -235,7 +235,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testMapMessage() throws Throwable {
+    public void testMapMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();
@@ -428,7 +428,7 @@
         }
     }
 
-    public void testForeignMessage() throws Throwable {
+    public void testForeignMessage() throws Exception {
 
         // Receive a message with the JMS API
         connection.start();

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java Fri Mar  3 07:36:38 2006
@@ -56,7 +56,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }       
-    public void testQueueBrowser() throws Throwable {
+    public void testQueueBrowser() throws Exception {
         
         // Send a message to the broker.
         connection.start();
@@ -87,7 +87,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }       
-    public void testSendReceive() throws Throwable {
+    public void testSendReceive() throws Exception {
         // Send a message to the broker.
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -112,7 +112,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }       
-    public void testSendReceiveTransacted() throws Throwable {
+    public void testSendReceiveTransacted() throws Exception {
         // Send a message to the broker.
         connection.start();
         Session session = connection.createSession(true, Session.SESSION_TRANSACTED);

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java Fri Mar  3 07:36:38 2006
@@ -89,7 +89,7 @@
     }
 
     /**
-     * @throws Throwable
+     * @throws Throwable 
      */
     public void testConcurrentSendReceive() throws Throwable {
 

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java Fri Mar  3 07:36:38 2006
@@ -70,7 +70,7 @@
         return "FOO.BAR.HUMBUG";
     }
 
-    public void testReceiveWildcardQueueEndAsterisk() throws Throwable {
+    public void testReceiveWildcardQueueEndAsterisk() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -100,7 +100,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testReceiveWildcardQueueEndGreaterThan() throws Throwable {
+    public void testReceiveWildcardQueueEndGreaterThan() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -136,7 +136,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testReceiveWildcardQueueMidAsterisk() throws Throwable {
+    public void testReceiveWildcardQueueMidAsterisk() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java Fri Mar  3 07:36:38 2006
@@ -54,7 +54,7 @@
         return "FOO.BAR.HUMBUG";
     }
 
-    public void testReceiveWildcardTopicEndAsterisk() throws Throwable {
+    public void testReceiveWildcardTopicEndAsterisk() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -84,7 +84,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testReceiveWildcardTopicEndGreaterThan() throws Throwable {
+    public void testReceiveWildcardTopicEndGreaterThan() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -120,7 +120,7 @@
         assertNull(consumer.receiveNoWait());
     }
 
-    public void testReceiveWildcardTopicMidAsterisk() throws Throwable {
+    public void testReceiveWildcardTopicMidAsterisk() throws Exception {
         connection.start();
         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java Fri Mar  3 07:36:38 2006
@@ -115,7 +115,7 @@
         });
     }
 
-    public void testSendReceive() throws Throwable {
+    public void testSendReceive() throws Exception {
 
         // Durable consumer combination is only valid with topics 
         if( durableConsumer && destinationType!=ActiveMQDestination.TOPIC_TYPE)

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java Fri Mar  3 07:36:38 2006
@@ -41,9 +41,9 @@
     }
 
     /**
-     * @throws Throwable
+     * @throws Exception
      */
-    public void testExponentialRedeliveryPolicyDelaysDeliveryOnRollback() throws Throwable {
+    public void testExponentialRedeliveryPolicyDelaysDeliveryOnRollback() throws Exception {
 
         // Receive a message with the JMS API
         RedeliveryPolicy policy = connection.getRedeliveryPolicy();
@@ -90,9 +90,9 @@
 
 
     /**
-     * @throws Throwable
+     * @throws Exception
      */
-    public void testNornalRedeliveryPolicyDelaysDeliveryOnRollback() throws Throwable {
+    public void testNornalRedeliveryPolicyDelaysDeliveryOnRollback() throws Exception {
 
         // Receive a message with the JMS API
         RedeliveryPolicy policy = connection.getRedeliveryPolicy();
@@ -135,9 +135,9 @@
     }
 
     /**
-     * @throws Throwable
+     * @throws Exception
      */
-    public void testDLQHandling() throws Throwable {
+    public void testDLQHandling() throws Exception {
 
         // Receive a message with the JMS API
         RedeliveryPolicy policy = connection.getRedeliveryPolicy();

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java Fri Mar  3 07:36:38 2006
@@ -76,7 +76,7 @@
                 } );
     }
     
-    public void testPerformance() throws Throwable {
+    public void testPerformance() throws Exception {
         
         System.out.println("Running Benchmark for destination="+destination+", producers="+PRODUCER_COUNT+", consumers="+CONSUMER_COUNT+", deliveryMode="+deliveryMode);
         final int CONSUME_COUNT = destination.isTopic() ? CONSUMER_COUNT*PRODUCE_COUNT : PRODUCE_COUNT;

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java Fri Mar  3 07:36:38 2006
@@ -55,7 +55,7 @@
                 } );
     }
     
-    public void testConsumerPrefetchAndStandardAck() throws Throwable {
+    public void testConsumerPrefetchAndStandardAck() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -109,7 +109,7 @@
                 } );
     }
 
-    public void testTransactedAckWithPrefetchOfOne() throws Throwable {
+    public void testTransactedAckWithPrefetchOfOne() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -161,7 +161,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
-    public void testTransactedSend() throws Throwable {
+    public void testTransactedSend() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -215,7 +215,7 @@
         } );
     }
     
-    public void testQueueTransactedAck() throws Throwable {
+    public void testQueueTransactedAck() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -266,7 +266,7 @@
                 new ActiveMQQueue("TEST")} );
     }   
     
-    public void testConsumerCloseCausesRedelivery() throws Throwable {
+    public void testConsumerCloseCausesRedelivery() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -312,7 +312,7 @@
         
     }
 
-    public void testTopicDurableSubscriptionCanBeRestored() throws Throwable {
+    public void testTopicDurableSubscriptionCanBeRestored() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQTopic("TEST");
         
@@ -376,7 +376,7 @@
                 new Integer(DeliveryMode.NON_PERSISTENT), 
                 new Integer(DeliveryMode.PERSISTENT)} );
     }
-    public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Throwable {
+    public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
         
@@ -441,7 +441,7 @@
                 Boolean.FALSE});
     }
     
-    public void testTopicConsumerOnlySeeMessagesAfterCreation() throws Throwable {
+    public void testTopicConsumerOnlySeeMessagesAfterCreation() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQTopic("TEST");
         
@@ -489,7 +489,7 @@
                 Boolean.FALSE});
     }
     
-    public void testTopicRetroactiveConsumerSeeMessagesBeforeCreation() throws Throwable {
+    public void testTopicRetroactiveConsumerSeeMessagesBeforeCreation() throws Exception {
                 
         ActiveMQDestination destination = new ActiveMQTopic("TEST");
         
@@ -543,7 +543,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testTempDestinationsRemovedOnConnectionClose() throws Throwable {
+    public void testTempDestinationsRemovedOnConnectionClose() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -588,7 +588,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testTempDestinationsAreNotAutoCreated() throws Throwable {
+    public void testTempDestinationsAreNotAutoCreated() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -619,7 +619,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testTempDestinationsOnlyAllowsLocalConsumers() throws Throwable {
+    public void testTempDestinationsOnlyAllowsLocalConsumers() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -657,7 +657,7 @@
                 new Integer(DeliveryMode.NON_PERSISTENT), 
                 new Integer(DeliveryMode.PERSISTENT)} );
     }
-    public void testExclusiveQueueDeliversToOnlyOneConsumer() throws Throwable {
+    public void testExclusiveQueueDeliversToOnlyOneConsumer() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
         
@@ -725,7 +725,7 @@
                 new Byte(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
-    public void testWildcardConsume() throws Throwable {
+    public void testWildcardConsume() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -772,7 +772,7 @@
                 new Byte(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
-    public void testCompositeConsume() throws Throwable {
+    public void testCompositeConsume() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -816,7 +816,7 @@
                 new Byte(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
-    public void testCompositeSend() throws Throwable {
+    public void testCompositeSend() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -883,7 +883,7 @@
                 new ActiveMQQueue("TEST")} );
     }   
     
-    public void testConnectionCloseCascades() throws Throwable {
+    public void testConnectionCloseCascades() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -937,7 +937,7 @@
                 new ActiveMQQueue("TEST")} );
     }   
     
-    public void testSessionCloseCascades() throws Throwable {
+    public void testSessionCloseCascades() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -991,7 +991,7 @@
                 new ActiveMQQueue("TEST")} );
     }   
     
-    public void testConsumerClose() throws Throwable {
+    public void testConsumerClose() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -1041,7 +1041,7 @@
                 new Integer(DeliveryMode.PERSISTENT)} );
     }   
     
-    public void testTopicNoLocal() throws Throwable {
+    public void testTopicNoLocal() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQTopic("TEST");
         
@@ -1106,7 +1106,7 @@
                 new Integer(DeliveryMode.PERSISTENT)} );
     }   
     
-    public void testTopicDispatchIsBroadcast() throws Throwable {
+    public void testTopicDispatchIsBroadcast() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQTopic("TEST");
         
@@ -1158,7 +1158,7 @@
                 } );
     }   
     
-    public void testQueueDispatchedAreRedeliveredOnConsumerClose() throws Throwable {
+    public void testQueueDispatchedAreRedeliveredOnConsumerClose() throws Exception {
         
         // Setup a first connection
         StubConnection connection1 = createConnection();
@@ -1216,7 +1216,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }   
-    public void testQueueBrowseMessages() throws Throwable {
+    public void testQueueBrowseMessages() throws Exception {
                 
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1254,7 +1254,7 @@
                 new Integer(DeliveryMode.PERSISTENT)} );
     }   
     
-    public void testQueueBrowserWith2Consumers() throws Throwable {
+    public void testQueueBrowserWith2Consumers() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
         
@@ -1307,7 +1307,7 @@
                 new Integer(DeliveryMode.NON_PERSISTENT), 
                 new Integer(DeliveryMode.PERSISTENT)} );
     }   
-    public void testQueueOnlyOnceDeliveryWith2Consumers() throws Throwable {
+    public void testQueueOnlyOnceDeliveryWith2Consumers() throws Exception {
         
         ActiveMQDestination destination = new ActiveMQQueue("TEST");
         
@@ -1365,7 +1365,7 @@
                 new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }   
-    public void testQueueSendThenAddConsumer() throws Throwable {
+    public void testQueueSendThenAddConsumer() throws Exception {
         
         // Start a producer
         StubConnection connection = createConnection();
@@ -1401,7 +1401,7 @@
                 } );
     }
     
-    public void testQueueAckRemovesMessage() throws Throwable {
+    public void testQueueAckRemovesMessage() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1444,7 +1444,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testSelectorSkipsMessages() throws Throwable {
+    public void testSelectorSkipsMessages() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1488,7 +1488,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testAddConsumerThenSend() throws Throwable {
+    public void testAddConsumerThenSend() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1522,7 +1522,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
     
-    public void testConsumerPrefetchAtOne() throws Throwable {
+    public void testConsumerPrefetchAtOne() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1561,7 +1561,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
 
-    public void testConsumerPrefetchAtTwo() throws Throwable {
+    public void testConsumerPrefetchAtTwo() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();
@@ -1603,7 +1603,7 @@
                 new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
-    public void testConsumerPrefetchAndDeliveredAck() throws Throwable {
+    public void testConsumerPrefetchAndDeliveredAck() throws Exception {
         
         // Start a producer and consumer
         StubConnection connection = createConnection();



Mime
View raw message