activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r382869 [2/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/broker/jmx/ManagedQueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedQueueRegion.java Fri Mar  3 07:36:38 2006
@@ -50,13 +50,13 @@
         super.destroySubscription(sub);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         Destination rc = super.createDestination(context, destination);
         regionBroker.register(destination, rc);
         return rc;
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         super.removeDestination(context, destination, timeout);
         regionBroker.unregister(destination);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Fri Mar  3 07:36:38 2006
@@ -341,11 +341,11 @@
        
        
             store.recover(new MessageRecoveryListener(){
-                public void recoverMessage(Message message) throws Throwable{
+                public void recoverMessage(Message message) throws Exception{
                     result.add(message);
                 }
 
-                public void recoverMessageReference(String messageReference) throws Throwable{}
+                public void recoverMessageReference(String messageReference) throws Exception{}
 
                 public void finished(){}
             });

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempQueueRegion.java Fri Mar  3 07:36:38 2006
@@ -48,13 +48,13 @@
         super.destroySubscription(sub);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         Destination rc = super.createDestination(context, destination);
         regionBroker.register(destination, rc);
         return rc;
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         super.removeDestination(context, destination, timeout);
         regionBroker.unregister(destination);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTempTopicRegion.java Fri Mar  3 07:36:38 2006
@@ -48,13 +48,13 @@
         super.destroySubscription(sub);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         Destination rc = super.createDestination(context, destination);
         regionBroker.register(destination, rc);
         return rc;
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         super.removeDestination(context, destination, timeout);
         regionBroker.unregister(destination);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTopicRegion.java Fri Mar  3 07:36:38 2006
@@ -50,13 +50,13 @@
         super.destroySubscription(sub);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         Destination rc = super.createDestination(context, destination);
         regionBroker.register(destination, rc);
         return rc;
     }
     
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable {
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception {
         super.removeDestination(context, destination, timeout);
         regionBroker.unregister(destination);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java Fri Mar  3 07:36:38 2006
@@ -78,7 +78,7 @@
         registerMBean();
     }
 
-    public Response processAddConnection(ConnectionInfo info) throws Throwable {
+    public Response processAddConnection(ConnectionInfo info) throws Exception {
         Response answer = super.processAddConnection(info);
         String clientId = info.getClientId();
         if (clientId != null) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueView.java Fri Mar  3 07:36:38 2006
@@ -38,7 +38,7 @@
         ((Queue) destination).purge();
     }
 
-    public boolean copyMessageTo(String messageId, String destinationName) throws Throwable {
+    public boolean copyMessageTo(String messageId, String destinationName) throws Exception {
         return ((Queue) destination).copyMessageTo(BrokerView.getConnectionContext(broker.getContextBroker()), messageId, ActiveMQDestination.createDestination(destinationName, ActiveMQDestination.QUEUE_TYPE));
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java Fri Mar  3 07:36:38 2006
@@ -39,5 +39,5 @@
     public void removeMessage(String messageId);
     public void purge();
 
-    public boolean copyMessageTo(String messageId, String destinationName) throws Throwable;
+    public boolean copyMessageTo(String messageId, String destinationName) throws Exception;
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Fri Mar  3 07:36:38 2006
@@ -71,7 +71,7 @@
     public void stop() throws Exception {
     }
     
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         log.debug("Adding destination: "+destination);
         Destination dest = createDestination(context, destination);
         dest.start();
@@ -91,7 +91,7 @@
     }
 
     public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout)
-            throws Throwable {
+            throws Exception {
         
         // The destination cannot be removed if there are any active subscriptions 
         for (Iterator iter = subscriptions.values().iterator(); iter.hasNext();) {
@@ -113,7 +113,7 @@
         }
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
 
         Subscription sub = createSubscription(context, info);
 
@@ -167,7 +167,7 @@
         return inactiveDests;
     }
     
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         
         Subscription sub = (Subscription) subscriptions.remove(info.getConsumerId());
         if( sub==null )
@@ -185,17 +185,17 @@
     protected void destroySubscription(Subscription sub) {        
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         throw new JMSException("Invalid operation.");
     }
 
     public void send(ConnectionContext context, Message messageSend)
-            throws Throwable {
+            throws Exception {
         Destination dest = lookup(context, messageSend.getDestination());
         dest.send(context, messageSend);
     }
     
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         
         Subscription sub = (Subscription) subscriptions.get(ack.getConsumerId());
         if( sub==null )
@@ -204,7 +204,7 @@
         
     }
 
-    protected Destination lookup(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination lookup(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         synchronized(destinationsMutex){
             Destination dest=(Destination) destinations.get(destination);
             if(dest==null){
@@ -223,7 +223,7 @@
         }
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable{
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception{
         Subscription sub = (Subscription) subscriptions.get(messageDispatchNotification.getConsumerId());
         if (sub != null){
             sub.processMessageDispatchNotification(messageDispatchNotification);
@@ -240,8 +240,8 @@
         }        
     }
 
-    protected abstract Subscription createSubscription(ConnectionContext context, ConsumerInfo info) throws Throwable;
-    abstract protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable;
+    protected abstract Subscription createSubscription(ConnectionContext context, ConsumerInfo info) throws Exception;
+    abstract protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception;
 
     public boolean isAutoCreateDestinations() {
         return autoCreateDestinations;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java Fri Mar  3 07:36:38 2006
@@ -97,11 +97,11 @@
         return destinationFilter.matches(destination);
     }
 
-    public void add(ConnectionContext context, Destination destination) throws Throwable {
+    public void add(ConnectionContext context, Destination destination) throws Exception {
         destinations.add(destination);
     }
 
-    public void remove(ConnectionContext context, Destination destination) throws Throwable {
+    public void remove(ConnectionContext context, Destination destination) throws Exception {
         destinations.remove(destination);
     }
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java Fri Mar  3 07:36:38 2006
@@ -34,10 +34,10 @@
  */
 public interface Destination extends Service {
 
-    void addSubscription(ConnectionContext context, Subscription sub) throws Throwable;
-    void removeSubscription(ConnectionContext context, Subscription sub) throws Throwable;
+    void addSubscription(ConnectionContext context, Subscription sub) throws Exception;
+    void removeSubscription(ConnectionContext context, Subscription sub) throws Exception;
     
-    void send(ConnectionContext context, Message messageSend) throws Throwable;
+    void send(ConnectionContext context, Message messageSend) throws Exception;
     boolean lock(MessageReference node, Subscription subscription);
     void acknowledge(ConnectionContext context, Subscription sub, final MessageAck ack, final MessageReference node) throws IOException;
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Fri Mar  3 07:36:38 2006
@@ -54,7 +54,7 @@
     synchronized public void gc() {
     }
 
-    synchronized public void add(ConnectionContext context, Destination destination) throws Throwable {
+    synchronized public void add(ConnectionContext context, Destination destination) throws Exception {
         super.add(context, destination);
         destinations.put(destination.getActiveMQDestination(), destination);
         if( active ) {
@@ -63,7 +63,7 @@
         }
     }
    
-    synchronized public void activate(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    synchronized public void activate(ConnectionContext context, ConsumerInfo info) throws Exception {
         if( !active ) {
             this.active = true;
             this.context = context;
@@ -78,7 +78,7 @@
         }
     }
 
-    synchronized public void deactivate() throws Throwable {        
+    synchronized public void deactivate() throws Exception {        
         active=false;
         for (Iterator iter = destinations.values().iterator(); iter.hasNext();) {
             Topic topic = (Topic) iter.next();
@@ -114,7 +114,7 @@
         return md;
     }
 
-    synchronized public void add(MessageReference node) throws Throwable {
+    synchronized public void add(MessageReference node) throws Exception {
         if( !active ) {
             return;
         }
@@ -137,7 +137,7 @@
         return active;
     }
     
-    public synchronized void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public synchronized void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         super.acknowledge(context, ack);
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Fri Mar  3 07:36:38 2006
@@ -55,7 +55,7 @@
         super(broker,context,info);
     }
 
-    synchronized public void add(MessageReference node) throws Throwable{
+    synchronized public void add(MessageReference node) throws Exception{
         enqueueCounter++;
         if(!isFull()&&!isSlaveBroker()){
             dispatch(node);
@@ -86,7 +86,7 @@
         }
     }
 
-    synchronized public void acknowledge(final ConnectionContext context,final MessageAck ack) throws Throwable{
+    synchronized public void acknowledge(final ConnectionContext context,final MessageAck ack) throws Exception{
         // Handle the standard acknowledgment case.
         boolean wasFull=isFull();
         if(ack.isStandardAck()){
@@ -106,7 +106,7 @@
                     }else{
                         // setup a Synchronization to remove nodes from the dispatched list.
                         context.getTransaction().addSynchronization(new Synchronization(){
-                            public void afterCommit() throws Throwable{
+                            public void afterCommit() throws Exception{
                                 synchronized(PrefetchSubscription.this){
                                     dispatched.remove(node);
                                     delivered--;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java Fri Mar  3 07:36:38 2006
@@ -77,7 +77,7 @@
     private DeadLetterStrategy deadLetterStrategy = new SharedDeadLetterStrategy();
 
     public Queue(ActiveMQDestination destination, final UsageManager memoryManager, MessageStore store,
-            DestinationStatistics parentStats, TaskRunnerFactory taskFactory) throws Throwable {
+            DestinationStatistics parentStats, TaskRunnerFactory taskFactory) throws Exception {
         this.destination = destination;
         this.usageManager = memoryManager;
         this.store = store;
@@ -96,7 +96,7 @@
                     destinationStatistics.getMessages().increment();
                 }
 
-                public void recoverMessageReference(String messageReference) throws Throwable {
+                public void recoverMessageReference(String messageReference) throws Exception {
                     throw new RuntimeException("Should not be called.");
                 }
                 
@@ -119,7 +119,7 @@
         return true;
     }
 
-    public void addSubscription(ConnectionContext context, Subscription sub) throws Throwable {
+    public void addSubscription(ConnectionContext context, Subscription sub) throws Exception {
         sub.add(context, this);
         destinationStatistics.getConsumers().increment();
 
@@ -165,7 +165,7 @@
         }
     }
 
-    public void removeSubscription(ConnectionContext context, Subscription sub) throws Throwable {
+    public void removeSubscription(ConnectionContext context, Subscription sub) throws Exception {
 
         destinationStatistics.getConsumers().decrement();
 
@@ -233,7 +233,7 @@
 
     }
 
-    public void send(final ConnectionContext context, final Message message) throws Throwable {
+    public void send(final ConnectionContext context, final Message message) throws Exception {
 
         if (context.isProducerFlowControl())
             usageManager.waitForSpace();
@@ -248,7 +248,7 @@
 
             if (context.isInTransaction()) {
                 context.getTransaction().addSynchronization(new Synchronization() {
-                    public void afterCommit() throws Throwable {
+                    public void afterCommit() throws Exception {
                         dispatch(context, node, message);
                     }
                 });
@@ -370,7 +370,7 @@
         return new IndirectMessageReference(this, message);
     }
 
-    private void dispatch(ConnectionContext context, MessageReference node, Message message) throws Throwable {
+    private void dispatch(ConnectionContext context, MessageReference node, Message message) throws Exception {
 
         dispatchValve.increment();
         MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
@@ -501,7 +501,7 @@
         }
     }
 
-    public boolean copyMessageTo(ConnectionContext context, String messageId, ActiveMQDestination dest) throws Throwable {
+    public boolean copyMessageTo(ConnectionContext context, String messageId, ActiveMQDestination dest) throws Exception {
         synchronized (messages) {
             for (Iterator iter = messages.iterator(); iter.hasNext();) {
                 try {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueBrowserSubscription.java Fri Mar  3 07:36:38 2006
@@ -49,7 +49,7 @@
             ", matched="+this.matched.size();
     }
 
-    public void browseDone() throws Throwable {
+    public void browseDone() throws Exception {
         browseDone = true;
         add(IndirectMessageReference.END_OF_BROWSE_MARKER);
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueRegion.java Fri Mar  3 07:36:38 2006
@@ -54,7 +54,7 @@
 
     // Implementation methods
     // -------------------------------------------------------------------------
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         MessageStore store = persistenceAdapter.createQueueMessageStore((ActiveMQQueue) destination);
         Queue queue = new Queue(destination, memoryManager, store, destinationStatistics, taskRunnerFactory);
         configureQueue(queue, destination);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java Fri Mar  3 07:36:38 2006
@@ -34,7 +34,7 @@
         super(broker,context, info);
     }
     
-    public void add(MessageReference node) throws Throwable {
+    public void add(MessageReference node) throws Exception {
         super.add(node);
     }
     
@@ -56,11 +56,11 @@
         } else {
             node.setAcked(true);
             context.getTransaction().addSynchronization(new Synchronization(){
-                public void afterCommit() throws Throwable {                    
+                public void afterCommit() throws Exception {                    
                     node.drop();            
                     queue.dropEvent();
                 }
-                public void afterRollback() throws Throwable {
+                public void afterRollback() throws Exception {
                     node.setAcked(false);
                 }
             });

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Region.java Fri Mar  3 07:36:38 2006
@@ -41,8 +41,9 @@
      * @param context
      * @param destination the destination to create.
      * @return TODO
+     * @throws Exception TODO
      */
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable;
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception;
     
     /**
      * Used to destroy a destination.  
@@ -52,48 +53,54 @@
      * @param context the environment the operation is being executed under.
      * @param destination what is being removed from the broker.
      * @param timeout the max amount of time to wait for the destination to quiesce
+     * @throws Exception TODO
      */
-    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Throwable;
+    public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout) throws Exception;
 
     /**
      * Adds a consumer.
      * @param context the environment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable;
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception;
 
     /**
      * Removes a consumer.
      * @param context the environment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable;
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception;
 
     /**
      * Deletes a durable subscription.
      * @param context the environment the operation is being executed under.
      * @param info TODO
+     * @throws Exception TODO
      */
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable;
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception;
     
     /**
      * Send a message to the broker to using the specified destination.  The destination specified
      * in the message does not need to match the destination the message is sent to.  This is 
      * handy in case the message is being sent to a dead letter destination.
      * @param context the environment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void send(ConnectionContext context, Message message) throws Throwable;
+    public void send(ConnectionContext context, Message message) throws Exception;
     
     /**
      * Used to acknowledge the receipt of a message by a client.
      * @param context the environment the operation is being executed under.
+     * @throws Exception TODO
      */
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable;
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception;
     
     /**
      * Process a notification of a dispatch - used by a Slave Broker
      * @param messageDispatchNotification
-     * @throws Throwable
+     * @throws Exception TODO
      */
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable;
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception;
 
     public void gc();
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Fri Mar  3 07:36:38 2006
@@ -143,7 +143,7 @@
         ss.throwFirstException();
     }
 
-    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Throwable {
+    public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
         String clientId = info.getClientId();
         if (clientId == null) {
             throw new InvalidClientIDException("No clientID specified for connection request");
@@ -160,7 +160,7 @@
         connections.add(context.getConnection());
     }
 
-    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Throwable {
+    public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception {
         String clientId = info.getClientId();
         if (clientId == null) {
             throw new InvalidClientIDException("No clientID specified for connection disconnect request");
@@ -176,14 +176,14 @@
         connections.remove(context.getConnection());
     }
 
-    public Connection[] getClients() throws Throwable {
+    public Connection[] getClients() throws Exception {
         ArrayList l = new ArrayList(connections);
         Connection rc[] = new Connection[l.size()];
         l.toArray(rc);
         return rc;
     }
 
-    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    public Destination addDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         if( destinations.contains(destination) )
             throw new JMSException("Destination already exists: "+destination);
         
@@ -209,7 +209,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 {
         if( !destinations.contains(destination) )
             throw new JMSException("Destination does not exist: "+destination);
         
@@ -233,7 +233,7 @@
         destinations.remove(destination);
     }
 
-    public ActiveMQDestination[] getDestinations() throws Throwable {
+    public ActiveMQDestination[] getDestinations() throws Exception {
         ArrayList l = new ArrayList(destinations);
         ActiveMQDestination rc[] = new ActiveMQDestination[l.size()];
         l.toArray(rc);
@@ -241,19 +241,19 @@
     }
 
 
-    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 void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         ActiveMQDestination destination = info.getDestination();
         switch(destination.getDestinationType()) {
         case ActiveMQDestination.QUEUE_TYPE:
@@ -273,7 +273,7 @@
         }
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         ActiveMQDestination destination = info.getDestination();
         switch(destination.getDestinationType()) {
         case ActiveMQDestination.QUEUE_TYPE:
@@ -293,11 +293,11 @@
         }
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         topicRegion.removeSubscription(context, info);
     }
 
-    public void send(ConnectionContext context,  Message message) throws Throwable {
+    public void send(ConnectionContext context,  Message message) throws Exception {
         message.getMessageId().setBrokerSequenceId(sequenceGenerator.getNextSequenceId());
         if (message.getTimestamp() > 0 && (message.getBrokerPath() == null || message.getBrokerPath().length == 0)) { 
             //timestamp not been disabled and has not passed through a network
@@ -322,7 +322,7 @@
         }
     }
 
-    public void acknowledge(ConnectionContext context, MessageAck ack) throws Throwable {
+    public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
         ActiveMQDestination destination = ack.getDestination();
         switch(destination.getDestinationType()) {
         case ActiveMQDestination.QUEUE_TYPE:
@@ -342,27 +342,27 @@
         }
     }
 
-    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Throwable {
+    public TransactionId[] getPreparedTransactions(ConnectionContext context) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
 
-    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void beginTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
 
-    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public int prepareTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
 
-    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Throwable {
+    public void rollbackTransaction(ConnectionContext context, TransactionId xid) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
 
-    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Throwable {
+    public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
     
-    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Throwable {
+    public void forgetTransaction(ConnectionContext context, TransactionId transactionId) throws Exception {
         throw new IllegalAccessException("Transaction operation not implemented by this broker.");
     }
 
@@ -428,7 +428,7 @@
         
     }
     
-    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Throwable {
+    public void processDispatchNotification(MessageDispatchNotification messageDispatchNotification) throws Exception {
         ActiveMQDestination destination = messageDispatchNotification.getDestination();
         switch(destination.getDestinationType()) {
         case ActiveMQDestination.QUEUE_TYPE:

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java Fri Mar  3 07:36:38 2006
@@ -36,15 +36,15 @@
      * @throws InterruptedException 
      * @throws IOException 
      */
-    void add(MessageReference node) throws Throwable;
+    void add(MessageReference node) throws Exception;
     
     /**
      * Used when client acknowledge receipt of dispatched message. 
      * @param node
      * @throws IOException 
-     * @throws Throwable 
+     * @throws Exception 
      */
-    void acknowledge(ConnectionContext context, final MessageAck ack) throws Throwable;
+    void acknowledge(ConnectionContext context, final MessageAck ack) throws Exception;
     
     /**
      * Is the subscription interested in the message?
@@ -66,16 +66,16 @@
      * The subscription will be receiving messages from the destination.
      * @param context 
      * @param destination
-     * @throws Throwable 
+     * @throws Exception 
      */
-    void add(ConnectionContext context, Destination destination) throws Throwable;
+    void add(ConnectionContext context, Destination destination) throws Exception;
     
     /**
      * The subscription will be no longer be receiving messages from the destination.
      * @param context 
      * @param destination
      */
-    void remove(ConnectionContext context, Destination destination) throws Throwable;
+    void remove(ConnectionContext context, Destination destination) throws Exception;
     
     /**
      * The ConsumerInfo object that created the subscription.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java Fri Mar  3 07:36:38 2006
@@ -38,11 +38,11 @@
         setAutoCreateDestinations(false);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         final ActiveMQTempDestination tempDest = (ActiveMQTempDestination) destination;
         return new Queue(destination, memoryManager, null, destinationStatistics, taskRunnerFactory) {
             
-            public void addSubscription(ConnectionContext context,Subscription sub) throws Throwable {
+            public void addSubscription(ConnectionContext context,Subscription sub) throws Exception {
                 // Only consumers on the same connection can consume from 
                 // the temporary destination
                 if( !tempDest.getConnectionId().equals( sub.getConsumerInfo().getConsumerId().getConnectionId() ) ) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java Fri Mar  3 07:36:38 2006
@@ -37,11 +37,11 @@
         setAutoCreateDestinations(false);
     }
 
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         final ActiveMQTempDestination tempDest = (ActiveMQTempDestination) destination;
         return new Topic(destination, null, memoryManager, destinationStatistics, taskRunnerFactory) {
             
-            public void addSubscription(ConnectionContext context,Subscription sub) throws Throwable {
+            public void addSubscription(ConnectionContext context,Subscription sub) throws Exception {
                 // Only consumers on the same connection can consume from 
                 // the temporary destination
                 if( !tempDest.getConnectionId().equals( sub.getConsumerInfo().getConsumerId().getConnectionId() ) ) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java Fri Mar  3 07:36:38 2006
@@ -81,7 +81,7 @@
         return true;
     }
 
-    public void addSubscription(ConnectionContext context, final Subscription sub) throws Throwable {
+    public void addSubscription(ConnectionContext context, final Subscription sub) throws Exception {
         
         sub.add(context, this);
 
@@ -117,7 +117,7 @@
         }
     }
     
-    public void removeSubscription(ConnectionContext context, Subscription sub) throws Throwable {
+    public void removeSubscription(ConnectionContext context, Subscription sub) throws Exception {
         if ( !sub.getConsumerInfo().isDurable() ) {
             destinationStatistics.getConsumers().decrement();
             synchronized(consumers) {
@@ -127,7 +127,7 @@
         sub.remove(context, this);
     }
     
-    public void addInactiveSubscription(ConnectionContext context, DurableTopicSubscription sub) throws Throwable {
+    public void addInactiveSubscription(ConnectionContext context, DurableTopicSubscription sub) throws Exception {
         sub.add(context, this);        
         destinationStatistics.getConsumers().increment();
         durableSubcribers.put(sub.getSubscriptionKey(), sub);
@@ -141,7 +141,7 @@
         }
     }
     
-    public void activate(ConnectionContext context, final DurableTopicSubscription subscription) throws Throwable {
+    public void activate(ConnectionContext context, final DurableTopicSubscription subscription) throws Exception {
         
         // synchronize with dispatch method so that no new messages are sent
         // while
@@ -178,7 +178,7 @@
             final MessageEvaluationContext msgContext = new MessageEvaluationContext();
             msgContext.setDestination(destination);
             store.recoverSubscription(clientId, subscriptionName, new MessageRecoveryListener() {
-                public void recoverMessage(Message message) throws Throwable {
+                public void recoverMessage(Message message) throws Exception {
                     message.setRegionDestination(Topic.this);
                     try {
                         msgContext.setMessageReference(message);
@@ -195,7 +195,7 @@
                     }
                 }
     
-                public void recoverMessageReference(String messageReference) throws Throwable {
+                public void recoverMessageReference(String messageReference) throws Exception {
                     throw new RuntimeException("Should not be called.");
                 }
                 
@@ -219,7 +219,7 @@
         }
     }
 
-    public void deactivate(ConnectionContext context, DurableTopicSubscription sub) throws Throwable {        
+    public void deactivate(ConnectionContext context, DurableTopicSubscription sub) throws Exception {        
         synchronized(consumers) {           
             consumers.remove(sub);
         }
@@ -227,7 +227,7 @@
     }    
 
 
-    public void send(final ConnectionContext context, final Message message) throws Throwable {
+    public void send(final ConnectionContext context, final Message message) throws Exception {
 
         if (context.isProducerFlowControl())
             usageManager.waitForSpace();
@@ -242,7 +242,7 @@
 
             if (context.isInTransaction()) {
                 context.getTransaction().addSynchronization(new Synchronization() {
-                    public void afterCommit() throws Throwable {
+                    public void afterCommit() throws Exception {
                         dispatch(context, message);
                     }
                 });
@@ -300,11 +300,11 @@
         final Set result=new CopyOnWriteArraySet();
         try{
             store.recover(new MessageRecoveryListener(){
-                public void recoverMessage(Message message) throws Throwable{
+                public void recoverMessage(Message message) throws Exception{
                     result.add(message);
                 }
 
-                public void recoverMessageReference(String messageReference) throws Throwable{}
+                public void recoverMessageReference(String messageReference) throws Exception{}
 
                 public void finished(){}
             });
@@ -373,7 +373,7 @@
 
     // Implementation methods
     // -------------------------------------------------------------------------
-    protected void dispatch(ConnectionContext context, Message message) throws Throwable {
+    protected void dispatch(ConnectionContext context, Message message) throws Exception {
         destinationStatistics.getEnqueues().increment();
         dispatchValve.increment();
         MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
@@ -405,7 +405,7 @@
      * Provides a hook to allow messages with no consumer to be processed in
      * some way - such as to send to a dead letter queue or something..
      */
-    protected void onMessageWithNoConsumers(ConnectionContext context, Message message) throws Throwable {
+    protected void onMessageWithNoConsumers(ConnectionContext context, Message message) throws Exception {
         if (!message.isPersistent()) {
             if (sendAdvisoryIfNoConsumers) {
                 // allow messages with no consumers to be dispatched to a dead

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java Fri Mar  3 07:36:38 2006
@@ -57,7 +57,7 @@
         this.policyMap = policyMap;
     }
 
-    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void addConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         if (info.isDurable()) {
 
             ActiveMQDestination destination = info.getDestination();
@@ -107,7 +107,7 @@
         }
     }
 
-    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Throwable {
+    public void removeConsumer(ConnectionContext context, ConsumerInfo info) throws Exception {
         if (info.isDurable()) {
 
             SubscriptionKey key = new SubscriptionKey(context.getClientId(), info.getSubcriptionName());
@@ -122,7 +122,7 @@
         }
     }
 
-    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Throwable {
+    public void removeSubscription(ConnectionContext context, RemoveSubscriptionInfo info) throws Exception {
         SubscriptionKey key = new SubscriptionKey(info.getClientId(), info.getSubcriptionName());
         DurableTopicSubscription sub = (DurableTopicSubscription) durableSubscriptions.get(key);
         if (sub == null) {
@@ -147,7 +147,7 @@
 
     // Implementation methods
     // -------------------------------------------------------------------------
-    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Throwable {
+    protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
         TopicMessageStore store = persistenceAdapter.createTopicMessageStore((ActiveMQTopic) destination);
         Topic topic = new Topic(destination, store, memoryManager, destinationStatistics, taskRunnerFactory);
         configureTopic(topic, destination);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java Fri Mar  3 07:36:38 2006
@@ -95,14 +95,14 @@
         }
     }
 
-    public void acknowledge(final ConnectionContext context,final MessageAck ack) throws Throwable{
+    synchronized public void acknowledge(final ConnectionContext context,final MessageAck ack) throws Exception{
         // Handle the standard acknowledgment case.
         boolean wasFull=isFull();
         if(ack.isStandardAck()||ack.isPoisonAck()){
             if(context.isInTransaction()){
                 delivered.addAndGet(ack.getMessageCount());
                 context.getTransaction().addSynchronization(new Synchronization(){
-                    public void afterCommit() throws Throwable{
+                    public void afterCommit() throws Exception{
                         dispatched.addAndGet(-ack.getMessageCount());
                         delivered.set(Math.max(0,delivered.get()-ack.getMessageCount()));
                     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/DispatchPolicy.java Fri Mar  3 07:36:38 2006
@@ -44,6 +44,6 @@
      * 
      * @return true if at least one consumer was dispatched or false if there are no active subscriptions that could be dispatched
      */
-    boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Throwable;
+    boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Exception;
 
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -35,14 +35,14 @@
     private int maximumSize=100;
     private int tail=0;
 
-    synchronized public boolean add(ConnectionContext context,MessageReference node) throws Throwable{
+    synchronized public boolean add(ConnectionContext context,MessageReference node) throws Exception{
         messages[tail++]=node;
         if(tail>=messages.length)
             tail=0;
         return true;
     }
 
-    synchronized public void recover(ConnectionContext context,Topic topic,Subscription sub) throws Throwable{
+    synchronized public void recover(ConnectionContext context,Topic topic,Subscription sub) throws Exception{
         // Re-dispatch the last message seen.
         int t=tail;
         // The buffer may not have rolled over yet..., start from the front
@@ -89,7 +89,7 @@
         this.maximumSize=maximumSize;
     }
 
-    public Message[] browse(ActiveMQDestination destination) throws Throwable{
+    public Message[] browse(ActiveMQDestination destination) throws Exception{
         List result=new ArrayList();
         DestinationFilter filter=DestinationFilter.parseFilter(destination);
         int t=tail;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -48,12 +48,12 @@
     private int maximumSize = 100 * 64 * 1024;
     private boolean useSharedBuffer = true;
 
-    public boolean add(ConnectionContext context, MessageReference message) throws Throwable {
+    public boolean add(ConnectionContext context, MessageReference message) throws Exception {
         buffer.add(message);
         return true;
     }
 
-    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Throwable {
+    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Exception {
         // Re-dispatch the messages from the buffer.
         List copy = buffer.getMessages(sub);
         if( !copy.isEmpty() ) {
@@ -110,7 +110,7 @@
         this.useSharedBuffer = useSharedBuffer;
     }
     
-    public Message[] browse(ActiveMQDestination destination) throws Throwable{
+    public Message[] browse(ActiveMQDestination destination) throws Exception{
         return buffer.browse(destination);
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -39,12 +39,12 @@
 
     volatile private MessageReference lastImage;
 
-    public boolean add(ConnectionContext context, MessageReference node) throws Throwable {
+    public boolean add(ConnectionContext context, MessageReference node) throws Exception {
         lastImage = node;
         return true;
     }
 
-    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Throwable {
+    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Exception {
         // Re-dispatch the last message seen.
         MessageReference node = lastImage;
         if( node != null ){
@@ -67,7 +67,7 @@
     public void stop() throws Exception {
     }
 
-    public Message[] browse(ActiveMQDestination destination) throws Throwable{
+    public Message[] browse(ActiveMQDestination destination) throws Exception{
         List result = new ArrayList();
         DestinationFilter filter=DestinationFilter.parseFilter(destination);
         if (filter.matches(lastImage.getMessage().getDestination())){

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -32,11 +32,11 @@
  */
 public class NoSubscriptionRecoveryPolicy implements SubscriptionRecoveryPolicy {
 
-    public boolean add(ConnectionContext context, MessageReference node) throws Throwable {
+    public boolean add(ConnectionContext context, MessageReference node) throws Exception {
         return true;
     }
 
-    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Throwable {
+    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Exception {
     }
 
     public void start() throws Exception {
@@ -45,7 +45,7 @@
     public void stop() throws Exception {
     }
 
-    public Message[] browse(ActiveMQDestination dest) throws Throwable{
+    public Message[] browse(ActiveMQDestination dest) throws Exception{
         return new Message[0];
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -58,11 +58,11 @@
     public QueryBasedSubscriptionRecoveryPolicy() {
     }
 
-    public boolean add(ConnectionContext context, MessageReference message) throws Throwable {
+    public boolean add(ConnectionContext context, MessageReference message) throws Exception {
         return query.validateUpdate(message.getMessage());
     }
 
-    public void recover(ConnectionContext context, final Topic topic, final Subscription sub) throws Throwable {
+    public void recover(ConnectionContext context, final Topic topic, final Subscription sub) throws Exception {
         if (query != null) {
             final MessageEvaluationContext msgContext = context.getMessageEvaluationContext();
             try {
@@ -99,7 +99,7 @@
         this.query = query;
     }
     
-    public org.apache.activemq.command.Message[] browse(ActiveMQDestination dest) throws Throwable{
+    public org.apache.activemq.command.Message[] browse(ActiveMQDestination dest) throws Exception{
         return new org.apache.activemq.command.Message[0];
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java Fri Mar  3 07:36:38 2006
@@ -35,7 +35,7 @@
  */
 public class RoundRobinDispatchPolicy implements DispatchPolicy {
 
-    public boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Throwable {
+    public boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Exception {
         
         // Big synch here so that only 1 message gets dispatched at a time.  Ensures 
         // Everyone sees the same order and that the consumer list is not used while

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java Fri Mar  3 07:36:38 2006
@@ -35,7 +35,7 @@
  */
 public class SimpleDispatchPolicy implements DispatchPolicy {
 
-    public boolean dispatch(ConnectionContext context, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Throwable {
+    public boolean dispatch(ConnectionContext context, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Exception {
         int count = 0;
         for (Iterator iter = consumers.iterator(); iter.hasNext();) {
             Subscription sub = (Subscription) iter.next();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java Fri Mar  3 07:36:38 2006
@@ -34,7 +34,7 @@
  */
 public class StrictOrderDispatchPolicy implements DispatchPolicy {
     
-    public boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Throwable {
+    public boolean dispatch(ConnectionContext newParam, MessageReference node, MessageEvaluationContext msgContext, List consumers) throws Exception {
         // Big synch here so that only 1 message gets dispatched at a time.  Ensures 
         // Everyone sees the same order.
         synchronized(consumers) {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -41,9 +41,9 @@
      * @param message 
      * @param node
      * @return true if successful
-     * @throws Throwable
+     * @throws Exception
      */
-    boolean add(ConnectionContext context, MessageReference message) throws Throwable;
+    boolean add(ConnectionContext context, MessageReference message) throws Exception;
     
     /**
      * Let a subscription recover message held by the policy.
@@ -52,16 +52,16 @@
      * @param topic
      * @param sub 
      * @param node
-     * @throws Throwable
+     * @throws Exception
      */
-    void recover(ConnectionContext context, Topic topic, Subscription sub) throws Throwable;
+    void recover(ConnectionContext context, Topic topic, Subscription sub) throws Exception;
     
     
     /**
      * @param dest 
      * @return messages
-     * @throws Throwable 
+     * @throws Exception 
      */
-    Message[] browse(ActiveMQDestination dest) throws Throwable;
+    Message[] browse(ActiveMQDestination dest) throws Exception;
 
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java Fri Mar  3 07:36:38 2006
@@ -67,12 +67,12 @@
         }
     };
 
-    public boolean add(ConnectionContext context, MessageReference message) throws Throwable {
+    public boolean add(ConnectionContext context, MessageReference message) throws Exception {
         buffer.add(new TimestampWrapper(message, lastGCRun));
         return true;
     }
 
-    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Throwable {
+    public void recover(ConnectionContext context, Topic topic, Subscription sub) throws Exception {
         
         // Re-dispatch the messages from the buffer.
         ArrayList copy = new ArrayList(buffer);
@@ -125,7 +125,7 @@
         this.recoverDuration = recoverDuration;
     }
     
-    public Message[] browse(ActiveMQDestination destination) throws Throwable{
+    public Message[] browse(ActiveMQDestination destination) throws Exception{
         List result = new ArrayList();
         ArrayList copy = new ArrayList(buffer);
         DestinationFilter filter=DestinationFilter.parseFilter(destination);

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

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

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Command.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Command.java?rev=382869&r1=382868&r2=382869&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Command.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Command.java Fri Mar  3 07:36:38 2006
@@ -45,5 +45,5 @@
     boolean isMessageDispatchNotification();
     boolean isShutdownInfo();
     
-    Response visit( CommandVisitor visitor) throws Throwable;
+    Response visit( CommandVisitor visitor) throws Exception;
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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



Mime
View raw message