activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r382869 [1/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
Author: chirino
Date: Fri Mar  3 07:36:38 2006
New Revision: 382869

URL: http://svn.apache.org/viewcvs?rev=382869&view=rev
Log:
Standardize on throwing Exception instead of Throwable, we were using both forms throught the API


Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/BrokerInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Command.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionError.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConnectionInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ControlCommand.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/DestinationInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/FlushCommand.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/KeepAliveInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatchNotification.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ProducerInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/RemoveSubscriptionInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Response.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/SessionInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ShutdownInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/TransactionInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/BrokerSupport.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/Callback.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ClientTestSupport.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsBenchmark.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RecoveryBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubConnection.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/XARecoveryBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DemandForwardingBridgeTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/BooleanStreamTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ConnectorXBeanConfigTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/ManagementContextXBeanConfigTest.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
    incubator/activemq/trunk/openwire-dotnet/src/src.csproj

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Fri Mar  3 07:36:38 2006
@@ -420,7 +420,7 @@
         ActiveMQMessage m = (ActiveMQMessage) md.getMessage().copy();
         if (session.isClientAcknowledge()) {
             m.setAcknowledgeCallback(new Callback() {
-                public void execute() throws Throwable {
+                public void execute() throws Exception {
                     session.checkClosed();
                     session.acknowledge();
                 }
@@ -576,17 +576,17 @@
             if (!synchronizationRegistered) {
                 synchronizationRegistered = true;
                 session.getTransactionContext().addSynchronization(new Synchronization() {
-                    public void beforeEnd() throws Throwable {
+                    public void beforeEnd() throws Exception {
                         acknowledge();
                         synchronizationRegistered = false;
                     }
 
-                    public void afterCommit() throws Throwable {
+                    public void afterCommit() throws Exception {
                         commit();
                         synchronizationRegistered = false;
                     }
 
-                    public void afterRollback() throws Throwable {
+                    public void afterRollback() throws Exception {
                         rollback();
                         synchronizationRegistered = false;
                     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Fri Mar  3 07:36:38 2006
@@ -649,7 +649,7 @@
             
             if( isClientAcknowledge() ) {
                 message.setAcknowledgeCallback(new Callback() {
-                    public void execute() throws Throwable {
+                    public void execute() throws Exception {
                     }
                 });
             }
@@ -675,7 +675,7 @@
                 ack.setTransactionId(getTransactionContext().getTransactionId());
                 if( ack.getTransactionId()!=null ) {
                     getTransactionContext().addSynchronization(new Synchronization(){
-                        public void afterRollback() throws Throwable {
+                        public void afterRollback() throws Exception {
 
                             md.getMessage().incrementRedeliveryCounter();
                             

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java Fri Mar  3 07:36:38 2006
@@ -62,7 +62,7 @@
         advisoryProducerId.setConnectionId(idGenerator.generateId());
     }
 
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
         next.addConnection(context, info);
 
         ActiveMQTopic topic = AdvisorySupport.getConnectionAdvisoryTopic();
@@ -70,7 +70,7 @@
         connections.put(info.getConnectionId(), info);
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         next.addConsumer(context, info);
 
         // Don't advise advisory topics.
@@ -122,7 +122,7 @@
         }
     }
 
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         next.addProducer(context, info);
 
         // Don't advise advisory topics.        
@@ -133,7 +133,7 @@
         }
     }
     
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         Destination answer = next.addDestination(context, destination);        
         ActiveMQTopic topic = AdvisorySupport.getDestinationAdvisoryTopic(destination);
         DestinationInfo info = new DestinationInfo(context.getConnectionId(), DestinationInfo.ADD_OPERATION_TYPE, destination);
@@ -142,7 +142,7 @@
         return answer;
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         next.removeDestination(context, destination, timeout);
         ActiveMQTopic topic = AdvisorySupport.getDestinationAdvisoryTopic(destination);
         DestinationInfo info = (DestinationInfo) destinations.remove(destination);
@@ -152,7 +152,7 @@
         }
     }
 
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         next.removeConnection(context, info, error);
 
         ActiveMQTopic topic = AdvisorySupport.getConnectionAdvisoryTopic();
@@ -160,7 +160,7 @@
         connections.remove(info.getConnectionId());
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         next.removeConsumer(context, info);
 
         // Don't advise advisory topics.
@@ -171,7 +171,7 @@
         }
     }
 
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         next.removeProducer(context, info);
 
         // Don't advise advisory topics.
@@ -182,34 +182,34 @@
         }
     }
     
-    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Throwable {
+    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Exception {
         fireAdvisory(context, topic, command, null);
     }
     
-    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Throwable {
+    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Exception {
         ActiveMQMessage advisoryMessage = new ActiveMQMessage();
         fireAdvisory(context, topic, command, targetConsumerId, advisoryMessage);
     }
     
-    protected void fireConsumerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Throwable {
+    protected void fireConsumerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Exception {
         fireConsumerAdvisory(context, topic, command, null);
     }
-    protected void fireConsumerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Throwable {
+    protected void fireConsumerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Exception {
         ActiveMQMessage advisoryMessage = new ActiveMQMessage();
         advisoryMessage.setIntProperty("consumerCount", consumers.size());
         fireAdvisory(context, topic, command, targetConsumerId, advisoryMessage);
     }
     
-    protected void fireProducerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Throwable {
+    protected void fireProducerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Exception {
         fireProducerAdvisory(context, topic, command, null);
     }
-    protected void fireProducerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Throwable {
+    protected void fireProducerAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId) throws Exception {
         ActiveMQMessage advisoryMessage = new ActiveMQMessage();
         advisoryMessage.setIntProperty("producerCount", producers.size());
         fireAdvisory(context, topic, command, targetConsumerId, advisoryMessage);
     }
 
-    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId, ActiveMQMessage advisoryMessage) throws Throwable {
+    protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command, ConsumerId targetConsumerId, ActiveMQMessage advisoryMessage) throws Exception {
         advisoryMessage.setDataStructure(command);
         advisoryMessage.setPersistent(false);
         advisoryMessage.setType(AdvisorySupport.ADIVSORY_MESSAGE_TYPE);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java Fri Mar  3 07:36:38 2006
@@ -232,30 +232,30 @@
         return cs;
     }
 
-    public Response processKeepAlive(KeepAliveInfo info) throws Throwable {
+    public Response processKeepAlive(KeepAliveInfo info) throws Exception {
         return null;
     }
 
-    public Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Throwable {
+    public Response processRemoveSubscription(RemoveSubscriptionInfo info) throws Exception {
         broker.removeSubscription(lookupConnectionState(info.getConnectionId()).getContext(), info);
         return null;
     }
     
-    public Response processWireFormat(WireFormatInfo info) throws Throwable {
+    public Response processWireFormat(WireFormatInfo info) throws Exception {
         wireFormatInfo = info;
         return null;
     }
     
-    public Response processShutdown(ShutdownInfo info) throws Throwable {
+    public Response processShutdown(ShutdownInfo info) throws Exception {
         stop();
         return null;
     }
      
-    public Response processFlush(FlushCommand command) throws Throwable {
+    public Response processFlush(FlushCommand command) throws Exception {
         return null;
     }
 
-    public Response processBeginTransaction(TransactionInfo info) throws Throwable {
+    public Response processBeginTransaction(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -265,14 +265,14 @@
         return null;
     }
     
-    public Response processEndTransaction(TransactionInfo info) throws Throwable {
+    public Response processEndTransaction(TransactionInfo info) throws Exception {
         // No need to do anything.  This packet is just sent by the client
         // make sure he is synced with the server as commit command could
         // come from a different connection.
         return null;
     }
     
-    public Response processPrepareTransaction(TransactionInfo info) throws Throwable {
+    public Response processPrepareTransaction(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -283,7 +283,7 @@
         return response;
     }
 
-    public Response processCommitTransactionOnePhase(TransactionInfo info) throws Throwable {
+    public Response processCommitTransactionOnePhase(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -293,7 +293,7 @@
         return null;
     }
 
-    public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Throwable {
+    public Response processCommitTransactionTwoPhase(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -303,7 +303,7 @@
         return null;
     }
 
-    public Response processRollbackTransaction(TransactionInfo info) throws Throwable {
+    public Response processRollbackTransaction(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -313,7 +313,7 @@
         return null;
     }
     
-    public Response processForgetTransaction(TransactionInfo info) throws Throwable {
+    public Response processForgetTransaction(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -323,7 +323,7 @@
         return null;
     }
     
-    public Response processRecoverTransactions(TransactionInfo info) throws Throwable {
+    public Response processRecoverTransactions(TransactionInfo info) throws Exception {
         ConnectionState cs = (ConnectionState) connectionStates.get(info.getConnectionId());
         ConnectionContext context=null;
         if( cs!=null ) {
@@ -334,7 +334,7 @@
     }
 
 
-    public Response processMessage(Message messageSend) throws Throwable {
+    public Response processMessage(Message messageSend) throws Exception {
         ProducerId producerId = messageSend.getProducerId();
         ConnectionState state = lookupConnectionState(producerId);
         ConnectionContext context = state.getContext();
@@ -342,12 +342,12 @@
         return null;
     }
 
-    public Response processMessageAck(MessageAck ack) throws Throwable {
+    public Response processMessageAck(MessageAck ack) throws Exception {
         broker.acknowledge(lookupConnectionState(ack.getConsumerId()).getContext(), ack);
         return null;
     }
     
-    public Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Throwable{
+    public Response processMessageDispatchNotification(MessageDispatchNotification notification) throws Exception{
         broker.processDispatchNotification(notification);
         return null;
     }
@@ -357,7 +357,7 @@
         return null;
     }
 
-    public Response processAddDestination(DestinationInfo info) throws Throwable {
+    public Response processAddDestination(DestinationInfo info) throws Exception {
         ConnectionState cs = lookupConnectionState(info.getConnectionId());
         broker.addDestination(cs.getContext(), info.getDestination());
         if( info.getDestination().isTemporary() ) {
@@ -366,7 +366,7 @@
         return null;
     }
 
-    public Response processRemoveDestination(DestinationInfo info) throws Throwable {
+    public Response processRemoveDestination(DestinationInfo info) throws Exception {
         ConnectionState cs = lookupConnectionState(info.getConnectionId());
         broker.removeDestination(cs.getContext(), info.getDestination(), info.getTimeout());
         if( info.getDestination().isTemporary() ) {
@@ -376,7 +376,7 @@
     }
 
 
-    public Response processAddProducer(ProducerInfo info) throws Throwable {
+    public Response processAddProducer(ProducerInfo info) throws Exception {
         SessionId sessionId = info.getProducerId().getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         
@@ -389,7 +389,7 @@
         return null;
     }
     
-    public Response processRemoveProducer(ProducerId id) throws Throwable {
+    public Response processRemoveProducer(ProducerId id) throws Exception {
         SessionId sessionId = id.getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         
@@ -405,7 +405,7 @@
         return null;
     }
 
-    public Response processAddConsumer(ConsumerInfo info) throws Throwable {
+    public Response processAddConsumer(ConsumerInfo info) throws Exception {
         SessionId sessionId = info.getConsumerId().getParentId();
         ConnectionId connectionId = sessionId.getParentId();
         
@@ -419,7 +419,7 @@
         return null;
     }
     
-    public Response processRemoveConsumer(ConsumerId id) throws Throwable {
+    public Response processRemoveConsumer(ConsumerId id) throws Exception {
         
         SessionId sessionId = id.getParentId();
         ConnectionId connectionId = sessionId.getParentId();
@@ -436,7 +436,7 @@
         return null;
     }
     
-    public Response processAddSession(SessionInfo info) throws Throwable {
+    public Response processAddSession(SessionInfo info) throws Exception {
         ConnectionId connectionId = info.getSessionId().getParentId();
         
         ConnectionState cs = lookupConnectionState(connectionId);
@@ -445,7 +445,7 @@
         return null;
     }
     
-    public Response processRemoveSession(SessionId id) throws Throwable {
+    public Response processRemoveSession(SessionId id) throws Exception {
         
         ConnectionId connectionId = id.getParentId();
         
@@ -478,7 +478,7 @@
         return null;
     }
     
-    public Response processAddConnection(ConnectionInfo info) throws Throwable {
+    public Response processAddConnection(ConnectionInfo info) throws Exception {
         // Setup the context.
         String clientId = info.getClientId();
         ConnectionContext context = new ConnectionContext();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java Fri Mar  3 07:36:38 2006
@@ -79,8 +79,9 @@
      * @param context
      * @param info 
      * @param client
+     * @throws Exception TODO
      */
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable;
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception;
     
     /**
      * A client is disconnecting from the broker.
@@ -88,94 +89,102 @@
      * @param info 
      * @param client
      * @param error null if the client requested the disconnect or the error that caused the client to disconnect.
+     * @throws Exception TODO
      */
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable;
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception;
 
     /**
      * Adds a session.
      * @param context
      * @param info
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public void addSession(ConnectionContext context, SessionInfo info) throws Throwable;
+    public void addSession(ConnectionContext context, SessionInfo info) throws Exception;
 
     /**
      * Removes a session.
      * @param context
      * @param info
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public void removeSession(ConnectionContext context, SessionInfo info) throws Throwable;
+    public void removeSession(ConnectionContext context, SessionInfo info) throws Exception;
 
     /**
      * Adds a producer.
      * @param context the enviorment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable;
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception;
 
     /**
      * Removes a producer.
      * @param context the enviorment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable;
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception;
       
     /**
      * @return all clients added to the Broker.
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public Connection[] getClients() throws Throwable;
+    public Connection[] getClients() throws Exception;
 
     /**
      * @return all destinations added to the Broker.
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public ActiveMQDestination[] getDestinations() throws Throwable;
+    public ActiveMQDestination[] getDestinations() throws Exception;
     
     /**
      * Gets a list of all the prepared xa transactions.
      * @param client
+     * @throws Exception TODO
      */
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable;
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception;
 
     /**
      * Starts a transaction.
      * @param client
      * @param xid
+     * @throws Exception TODO
      */
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable;
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception;
 
     /**
      * Prepares a transaction. Only valid for xa transactions.
      * @param client
      * @param xid
      * @return
+     * @throws Exception TODO
      */
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable;
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception;
 
     /**
      * Rollsback a transaction.
      * @param client
      * @param xid
+     * @throws Exception TODO
      */
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable;
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception;
 
     /**
      * Commits a transaction.
      * @param client
      * @param xid
      * @param onePhase
+     * @throws Exception TODO
      */
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable;
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception;
 
     /**
      * Forgets a transaction.
      * @param client
      * @param xid
      * @param onePhase
-     * @throws Throwable 
+     * @throws Exception TODO
      */
-    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Throwable;
+    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Exception;
     
     /**
      * Get the BrokerInfo's of any connected Brokers
@@ -189,13 +198,6 @@
      * @param messageDispatch
      */
     public void processDispatch(MessageDispatch messageDispatch);
-    
-    /**
-     * Notify the Broker of a MessageDispatchNotification
-     * @param messageDispatchNotification
-     * @throws Throwable 
-     */
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable;
     
     /**
      * @return true if the broker is running as a slave

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerBroadcaster.java Fri Mar  3 07:36:38 2006
@@ -38,7 +38,7 @@
         super(next);
     }
 
-    public void acknowledge(ConnectionContext context,MessageAck ack) throws Throwable{
+    public void acknowledge(ConnectionContext context,MessageAck ack) throws Exception{
         next.acknowledge(context,ack);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -46,7 +46,7 @@
         }
     }
 
-    public void addConnection(ConnectionContext context,ConnectionInfo info) throws Throwable{
+    public void addConnection(ConnectionContext context,ConnectionInfo info) throws Exception{
         next.addConnection(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -54,7 +54,7 @@
         }
     }
 
-    public void addConsumer(ConnectionContext context,ConsumerInfo info) throws Throwable{
+    public void addConsumer(ConnectionContext context,ConsumerInfo info) throws Exception{
         next.addConsumer(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -62,7 +62,7 @@
         }
     }
 
-    public void addProducer(ConnectionContext context,ProducerInfo info) throws Throwable{
+    public void addProducer(ConnectionContext context,ProducerInfo info) throws Exception{
         next.addProducer(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -70,7 +70,7 @@
         }
     }
 
-    public void commitTransaction(ConnectionContext context,TransactionId xid,boolean onePhase) throws Throwable{
+    public void commitTransaction(ConnectionContext context,TransactionId xid,boolean onePhase) throws Exception{
         next.commitTransaction(context,xid,onePhase);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -78,7 +78,7 @@
         }
     }
 
-    public void removeSubscription(ConnectionContext context,RemoveSubscriptionInfo info) throws Throwable{
+    public void removeSubscription(ConnectionContext context,RemoveSubscriptionInfo info) throws Exception{
         next.removeSubscription(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -86,7 +86,7 @@
         }
     }
 
-    public int prepareTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public int prepareTransaction(ConnectionContext context,TransactionId xid) throws Exception{
         int result=next.prepareTransaction(context,xid);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -96,7 +96,7 @@
         return result;
     }
 
-    public void removeConnection(ConnectionContext context,ConnectionInfo info,Throwable error) throws Throwable{
+    public void removeConnection(ConnectionContext context,ConnectionInfo info,Throwable error) throws Exception{
         next.removeConnection(context,info,error);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -104,7 +104,7 @@
         }
     }
 
-    public void removeConsumer(ConnectionContext context,ConsumerInfo info) throws Throwable{
+    public void removeConsumer(ConnectionContext context,ConsumerInfo info) throws Exception{
         next.removeConsumer(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -112,7 +112,7 @@
         }
     }
 
-    public void removeProducer(ConnectionContext context,ProducerInfo info) throws Throwable{
+    public void removeProducer(ConnectionContext context,ProducerInfo info) throws Exception{
         next.removeProducer(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -120,7 +120,7 @@
         }
     }
 
-    public void rollbackTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public void rollbackTransaction(ConnectionContext context,TransactionId xid) throws Exception{
         next.rollbackTransaction(context,xid);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -128,7 +128,7 @@
         }
     }
 
-    public void send(ConnectionContext context,Message messageSend) throws Throwable{
+    public void send(ConnectionContext context,Message messageSend) throws Exception{
         next.send(context,messageSend);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -136,7 +136,7 @@
         }
     }
 
-    public void beginTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public void beginTransaction(ConnectionContext context,TransactionId xid) throws Exception{
         next.beginTransaction(context,xid);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -144,7 +144,7 @@
         }
     }
 
-    public void forgetTransaction(ConnectionContext context,TransactionId transactionId) throws Throwable{
+    public void forgetTransaction(ConnectionContext context,TransactionId transactionId) throws Exception{
         next.forgetTransaction(context,transactionId);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -152,7 +152,7 @@
         }
     }
 
-    public Destination addDestination(ConnectionContext context,ActiveMQDestination destination) throws Throwable{
+    public Destination addDestination(ConnectionContext context,ActiveMQDestination destination) throws Exception{
         Destination result=next.addDestination(context,destination);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -162,7 +162,7 @@
     }
 
     public void removeDestination(ConnectionContext context,ActiveMQDestination destination,long timeout)
-                    throws Throwable{
+                    throws Exception{
         next.removeDestination(context,destination,timeout);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -186,7 +186,7 @@
         }
     }
 
-    public void addSession(ConnectionContext context,SessionInfo info) throws Throwable{
+    public void addSession(ConnectionContext context,SessionInfo info) throws Exception{
         next.addSession(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){
@@ -194,7 +194,7 @@
         }
     }
 
-    public void removeSession(ConnectionContext context,SessionInfo info) throws Throwable{
+    public void removeSession(ConnectionContext context,SessionInfo info) throws Exception{
         next.removeSession(context,info);
         Broker brokers[]=getListeners();
         for(int i=0;i<brokers.length;i++){

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java Fri Mar  3 07:36:38 2006
@@ -55,79 +55,79 @@
     }
 
     
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         next.acknowledge(context, ack);
     }
 
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
         next.addConnection(context, info);
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         next.addConsumer(context, info);
     }
 
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         next.addProducer(context, info);
     }
 
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable {
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
         next.commitTransaction(context, xid, onePhase);
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         next.removeSubscription(context, info);
     }
 
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable {
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception {
         return next.getPreparedTransactions(context);
     }
 
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         return next.prepareTransaction(context, xid);
     }
 
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         next.removeConnection(context, info, error);
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         next.removeConsumer(context, info);
     }
 
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         next.removeProducer(context, info);
     }
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         next.rollbackTransaction(context, xid);
     }
 
-    public void send(ConnectionContext context, Message messageSend) throws Throwable {
+    public void send(ConnectionContext context, Message messageSend) throws Exception {
         next.send(context, messageSend);
     }
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         next.beginTransaction(context, xid);
     }
 
-    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Throwable {
+    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Exception {
         next.forgetTransaction(context, transactionId);
     }
 
-    public Connection[] getClients() throws Throwable {
+    public Connection[] getClients() throws Exception {
         return next.getClients();
     }
 
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         return next.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 {
         next.removeDestination(context, destination, timeout);
     }
 
-    public ActiveMQDestination[] getDestinations() throws Throwable {
+    public ActiveMQDestination[] getDestinations() throws Exception {
         return next.getDestinations();
     }
 
@@ -139,11 +139,11 @@
         next.stop();
     }
 
-    public void addSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void addSession(ConnectionContext context, SessionInfo info) throws Exception {
         next.addSession(context, info);
     }
 
-    public void removeSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void removeSession(ConnectionContext context, SessionInfo info) throws Exception {
         next.removeSession(context, info);
     }
 
@@ -177,7 +177,7 @@
         next.processDispatch(messageDispatch);
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable{
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception{
         next.processDispatchNotification(messageDispatchNotification);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/CompositeDestinationBroker.java Fri Mar  3 07:36:38 2006
@@ -44,7 +44,7 @@
     /**
      * A producer may register to send to multiple destinations via a composite destination.
      */
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         // The destination may be null.
         ActiveMQDestination destination = info.getDestination();
         if( destination!=null && destination.isComposite() ) {
@@ -62,7 +62,7 @@
     /**
      * A producer may de-register from sending to multiple destinations via a composite destination.
      */
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         // The destination may be null.
         ActiveMQDestination destination = info.getDestination();
         if( destination!=null && destination.isComposite() ) {
@@ -80,7 +80,7 @@
     /**
      * 
      */
-    public void send(ConnectionContext context, Message message) throws Throwable {
+    public void send(ConnectionContext context, Message message) throws Exception {
         ActiveMQDestination destination = message.getDestination();
         if( destination.isComposite() ) {
             ActiveMQDestination[] destinations = destination.getCompositeDestinations();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java Fri Mar  3 07:36:38 2006
@@ -54,92 +54,92 @@
         return null;
     }
 
-    public void addConnection(ConnectionContext context,ConnectionInfo info) throws Throwable{
+    public void addConnection(ConnectionContext context,ConnectionInfo info) throws Exception{
 
     }
 
-    public void removeConnection(ConnectionContext context,ConnectionInfo info,Throwable error) throws Throwable{
+    public void removeConnection(ConnectionContext context,ConnectionInfo info,Throwable error) throws Exception{
 
     }
 
-    public void addSession(ConnectionContext context,SessionInfo info) throws Throwable{
+    public void addSession(ConnectionContext context,SessionInfo info) throws Exception{
 
     }
 
-    public void removeSession(ConnectionContext context,SessionInfo info) throws Throwable{
+    public void removeSession(ConnectionContext context,SessionInfo info) throws Exception{
 
     }
 
-    public void addProducer(ConnectionContext context,ProducerInfo info) throws Throwable{
+    public void addProducer(ConnectionContext context,ProducerInfo info) throws Exception{
 
     }
 
-    public void removeProducer(ConnectionContext context,ProducerInfo info) throws Throwable{
+    public void removeProducer(ConnectionContext context,ProducerInfo info) throws Exception{
 
     }
 
-    public Connection[] getClients() throws Throwable{
+    public Connection[] getClients() throws Exception{
 
         return null;
     }
 
-    public ActiveMQDestination[] getDestinations() throws Throwable{
+    public ActiveMQDestination[] getDestinations() throws Exception{
 
         return null;
     }
 
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable{
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception{
 
         return null;
     }
 
-    public void beginTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public void beginTransaction(ConnectionContext context,TransactionId xid) throws Exception{
 
     }
 
-    public int prepareTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public int prepareTransaction(ConnectionContext context,TransactionId xid) throws Exception{
 
         return 0;
     }
 
-    public void rollbackTransaction(ConnectionContext context,TransactionId xid) throws Throwable{
+    public void rollbackTransaction(ConnectionContext context,TransactionId xid) throws Exception{
 
     }
 
-    public void commitTransaction(ConnectionContext context,TransactionId xid,boolean onePhase) throws Throwable{
+    public void commitTransaction(ConnectionContext context,TransactionId xid,boolean onePhase) throws Exception{
 
     }
 
-    public void forgetTransaction(ConnectionContext context,TransactionId transactionId) throws Throwable{
+    public void forgetTransaction(ConnectionContext context,TransactionId transactionId) throws Exception{
 
     }
 
-    public Destination addDestination(ConnectionContext context,ActiveMQDestination destination) throws Throwable{
+    public Destination addDestination(ConnectionContext context,ActiveMQDestination destination) throws Exception{
 
         return null;
     }
 
-    public void removeDestination(ConnectionContext context,ActiveMQDestination destination,long timeout) throws Throwable{
+    public void removeDestination(ConnectionContext context,ActiveMQDestination destination,long timeout) throws Exception{
 
     }
 
-    public void addConsumer(ConnectionContext context,ConsumerInfo info) throws Throwable{
+    public void addConsumer(ConnectionContext context,ConsumerInfo info) throws Exception{
 
     }
 
-    public void removeConsumer(ConnectionContext context,ConsumerInfo info) throws Throwable{
+    public void removeConsumer(ConnectionContext context,ConsumerInfo info) throws Exception{
 
     }
 
-    public void removeSubscription(ConnectionContext context,RemoveSubscriptionInfo info) throws Throwable{
+    public void removeSubscription(ConnectionContext context,RemoveSubscriptionInfo info) throws Exception{
 
     }
 
-    public void send(ConnectionContext context,Message message) throws Throwable{
+    public void send(ConnectionContext context,Message message) throws Exception{
 
     }
 
-    public void acknowledge(ConnectionContext context,MessageAck ack) throws Throwable{
+    public void acknowledge(ConnectionContext context,MessageAck ack) throws Exception{
 
     }
 
@@ -175,7 +175,7 @@
         
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification){
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception{
         
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java Fri Mar  3 07:36:38 2006
@@ -60,87 +60,87 @@
         throw new IllegalStateException(this.message);
     }
 	
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void addSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void addSession(ConnectionContext context, SessionInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void removeSession(ConnectionContext context, SessionInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public Connection[] getClients() throws Throwable {
+    public Connection[] getClients() throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public ActiveMQDestination[] getDestinations() throws Throwable {
+    public ActiveMQDestination[] getDestinations() throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable {
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable {
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Throwable {
+    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void send(ConnectionContext context, Message message) throws Throwable {
+    public void send(ConnectionContext context, Message message) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         throw new IllegalStateException(this.message);
     }
 
@@ -173,7 +173,7 @@
         throw new IllegalStateException(this.message);
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification){
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception{
         throw new IllegalStateException(this.message);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java Fri Mar  3 07:36:38 2006
@@ -67,79 +67,79 @@
         }
     }
     
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         getNext().acknowledge(context, ack);
     }
 
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
         getNext().addConnection(context, info);
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         getNext().addConsumer(context, info);
     }
 
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         getNext().addProducer(context, info);
     }
 
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable {
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
         getNext().commitTransaction(context, xid, onePhase);
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         getNext().removeSubscription(context, info);
     }
 
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable {
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception {
         return getNext().getPreparedTransactions(context);
     }
 
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         return getNext().prepareTransaction(context, xid);
     }
 
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         getNext().removeConnection(context, info, error);
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         getNext().removeConsumer(context, info);
     }
 
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable {
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception {
         getNext().removeProducer(context, info);
     }
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         getNext().rollbackTransaction(context, xid);
     }
 
-    public void send(ConnectionContext context, Message messageSend) throws Throwable {
+    public void send(ConnectionContext context, Message messageSend) throws Exception {
         getNext().send(context, messageSend);
     }
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         getNext().beginTransaction(context, xid);
     }
 
-    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Throwable {
+    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Exception {
         getNext().forgetTransaction(context, transactionId);
     }
 
-    public Connection[] getClients() throws Throwable {
+    public Connection[] getClients() throws Exception {
         return getNext().getClients();
     }
 
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         return getNext().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 {
         getNext().removeDestination(context, destination, timeout);
     }
 
-    public ActiveMQDestination[] getDestinations() throws Throwable {
+    public ActiveMQDestination[] getDestinations() throws Exception {
         return getNext().getDestinations();
     }
 
@@ -151,11 +151,11 @@
         getNext().stop();
     }
 
-    public void addSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void addSession(ConnectionContext context, SessionInfo info) throws Exception {
         getNext().addSession(context, info);
     }
 
-    public void removeSession(ConnectionContext context, SessionInfo info) throws Throwable {
+    public void removeSession(ConnectionContext context, SessionInfo info) throws Exception {
         getNext().removeSession(context, info);
     }
 
@@ -187,7 +187,7 @@
         getNext().processDispatch(messageDispatch);
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable{
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception{
         getNext().processDispatchNotification(messageDispatchNotification);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java Fri Mar  3 07:36:38 2006
@@ -111,7 +111,7 @@
     // BrokerFilter overrides
     //
     //////////////////////////////////////////////////////////////////////////////
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable {
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception {
         ArrayList txs = new ArrayList();
         for (Iterator iter = xaTransactions.values().iterator(); iter.hasNext();) {
             Transaction tx = (Transaction) iter.next();
@@ -123,7 +123,7 @@
         return rc;
     }
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         
         // the transaction may have already been started.
         if( xid.isXATransaction() ) {
@@ -143,27 +143,27 @@
         }
     }
 
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         Transaction transaction = getTransaction(context, xid, false);
         return transaction.prepare();
     }
     
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable {
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
         Transaction transaction = getTransaction(context, xid, true);
         transaction.commit(onePhase);
     }
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         Transaction transaction = getTransaction(context, xid, true);
         transaction.rollback();
     }
     
-    public void forgetTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void forgetTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         Transaction transaction = getTransaction(context, xid, true);
         transaction.rollback();
     }
     
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         // This method may be invoked recursively.  
         // Track original tx so that it can be restored.
         Transaction originalTx = context.getTransaction();
@@ -179,7 +179,7 @@
         }
     }
     
-    public void send(ConnectionContext context, Message message) throws Throwable {
+    public void send(ConnectionContext context, Message message) throws Exception {
         // This method may be invoked recursively.  
         // Track original tx so that it can be restored.
         Transaction originalTx = context.getTransaction();
@@ -195,7 +195,7 @@
         }
     }
     
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         for (Iterator iter = context.getTransactions().values().iterator(); iter.hasNext();) {
             try {
                 Transaction transaction = (Transaction) iter.next();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/UserIDBroker.java Fri Mar  3 07:36:38 2006
@@ -32,7 +32,7 @@
         super(next);
     }
 
-    public void send(ConnectionContext context, Message messageSend) throws Throwable {
+    public void send(ConnectionContext context, Message messageSend) throws Exception {
         String userID = context.getUserName();
         messageSend.setUserID(userID);
         super.send(context, messageSend);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Fri Mar  3 07:36:38 2006
@@ -77,7 +77,7 @@
      * @param info 
      * @param client
      */
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable{
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception{
         super.addConnection(context,info);
         sendAsyncToSlave(info);
     }
@@ -89,7 +89,7 @@
      * @param client
      * @param error null if the client requested the disconnect or the error that caused the client to disconnect.
      */
-    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);
         sendAsyncToSlave(new RemoveInfo(info.getConnectionId()));
     }
@@ -98,9 +98,8 @@
      * Adds a session.
      * @param context
      * @param info
-     * @throws Throwable
      */
-    public void addSession(ConnectionContext context, SessionInfo info) throws Throwable{
+    public void addSession(ConnectionContext context, SessionInfo info) throws Exception{
         super.addSession(context, info);
         sendAsyncToSlave(info);
     }
@@ -109,9 +108,8 @@
      * Removes a session.
      * @param context
      * @param info
-     * @throws Throwable
      */
-    public void removeSession(ConnectionContext context, SessionInfo info) throws Throwable{
+    public void removeSession(ConnectionContext context, SessionInfo info) throws Exception{
         super.removeSession(context, info);
         sendAsyncToSlave(new RemoveInfo(info.getSessionId()));
     }
@@ -120,7 +118,7 @@
      * Adds a producer.
      * @param context the enviorment the operation is being executed under.
      */
-    public void addProducer(ConnectionContext context, ProducerInfo info) throws Throwable{
+    public void addProducer(ConnectionContext context, ProducerInfo info) throws Exception{
         super.addProducer(context,info);
         sendAsyncToSlave(info);
     }
@@ -129,25 +127,25 @@
      * Removes a producer.
      * @param context the enviorment the operation is being executed under.
      */
-    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Throwable{
+    public void removeProducer(ConnectionContext context, ProducerInfo info) throws Exception{
         super.removeProducer(context, info);
         sendAsyncToSlave(new RemoveInfo(info.getProducerId()));
     }
     
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         super.addConsumer(context, info);
         sendAsyncToSlave(info);
     }
 
     
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         super.removeSubscription(context, info);
         sendAsyncToSlave(info);
     }
       
     
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable{
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception{
         super.beginTransaction(context, xid);
         TransactionInfo info = new TransactionInfo(context.getConnectionId(),xid,TransactionInfo.BEGIN);
         sendAsyncToSlave(info);
@@ -159,7 +157,7 @@
      * @param xid
      * @return
      */
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable{
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception{
         int result = super.prepareTransaction(context, xid);
         TransactionInfo info = new TransactionInfo(context.getConnectionId(),xid,TransactionInfo.PREPARE);
         sendAsyncToSlave(info);
@@ -172,7 +170,7 @@
      * @param xid
      */
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable{
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception{
         super.rollbackTransaction(context, xid);
         TransactionInfo info = new TransactionInfo(context.getConnectionId(),xid,TransactionInfo.ROLLBACK);
         sendAsyncToSlave(info);
@@ -185,7 +183,7 @@
      * @param xid
      * @param onePhase
      */
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable{
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception{
         super.commitTransaction(context, xid,onePhase);
         TransactionInfo info = new TransactionInfo(context.getConnectionId(),xid,TransactionInfo.COMMIT_ONE_PHASE);
         sendSyncToSlave(info);
@@ -196,9 +194,8 @@
      * @param client
      * @param xid
      * @param onePhase
-     * @throws Throwable 
      */
-    public void forgetTransaction(ConnectionContext context, TransactionId xid) throws Throwable{
+    public void forgetTransaction(ConnectionContext context, TransactionId xid) throws Exception{
         super.forgetTransaction(context, xid);
         TransactionInfo info = new TransactionInfo(context.getConnectionId(),xid,TransactionInfo.FORGET);
         sendAsyncToSlave(info);
@@ -218,7 +215,7 @@
         sendAsyncToSlave(mdn);
     }
     
-    public void send(ConnectionContext context, Message message) throws Throwable{
+    public void send(ConnectionContext context, Message message) throws Exception{
         /**
          * A message can be dispatched before the super.send() method returns
          * so - here the order is switched to avoid problems on the slave
@@ -229,7 +226,7 @@
     }
     
    
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable{
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception{
         super.acknowledge(context, ack);
         sendToSlave(ack);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java Fri Mar  3 07:36:38 2006
@@ -124,19 +124,19 @@
         return broker.getInactiveDurableTopicSubscribers();
     }
 
-    public void addTopic(String name) throws Throwable {
+    public void addTopic(String name) throws Exception {
         broker.addDestination(getConnectionContext(broker.getContextBroker()), new ActiveMQTopic(name));
     }
 
-    public void addQueue(String name) throws Throwable {
+    public void addQueue(String name) throws Exception {
         broker.addDestination(getConnectionContext(broker.getContextBroker()), new ActiveMQQueue(name));
     }
 
-    public void removeTopic(String name) throws Throwable {
+    public void removeTopic(String name) throws Exception {
         broker.removeDestination(getConnectionContext(broker.getContextBroker()), new ActiveMQTopic(name), 1000);
     }
 
-    public void removeQueue(String name) throws Throwable {
+    public void removeQueue(String name) throws Exception {
         broker.removeDestination(getConnectionContext(broker.getContextBroker()), new ActiveMQQueue(name), 1000);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java Fri Mar  3 07:36:38 2006
@@ -50,9 +50,9 @@
     public ObjectName[] getTemporaryTopicSubscribers();
     public ObjectName[] getTemporaryQueueSubscribers();
     
-    public void addTopic(String name) throws Throwable;
-    public void addQueue(String name) throws Throwable;
-    public void removeTopic(String name) throws Throwable;
-    public void removeQueue(String name) throws Throwable;
+    public void addTopic(String name) throws Exception;
+    public void addQueue(String name) throws Exception;
+    public void removeTopic(String name) throws Exception;
+    public void removeQueue(String name) throws Exception;
     
 }



Mime
View raw message