1 files changed, 0 insertions, 155 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
deleted file mode 100644
index 23a4bec6bd..0000000000
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.exchange;
-
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.server.exception.InternalErrorException;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.protocol.ExchangeInitialiser;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class DefaultExchangeRegistry implements ExchangeRegistry
-{
-    private static final Logger _log = Logger.getLogger(DefaultExchangeRegistry.class);
-
-    /**
-     * Maps from exchange name to exchange instance
-     */
-    private ConcurrentMap<AMQShortString, Exchange> _exchangeMap = new ConcurrentHashMap<AMQShortString, Exchange>();
-
-    private Exchange _defaultExchange;
-    private VirtualHost _host;
-
-    public DefaultExchangeRegistry(VirtualHost host)
-    {
-        //create 'standard' exchanges:
-        _host = host;
-
-    }
-
-    public void initialise() throws AMQException
-    {
-        new ExchangeInitialiser().initialise(_host.getExchangeFactory(), this);
-    }
-
-    public MessageStore getMessageStore()
-    {
-        return _host.getMessageStore();
-    }
-
-    public void registerExchange(Exchange exchange) throws AMQException
-    {
-        _exchangeMap.put(exchange.getName(), exchange);
-        if(exchange.isDurable())
-        {
-                getMessageStore().createExchange(exchange);
-            //DTX MessageStore
-//            try
-//            {
-//                getMessageStore().createExchange(exchange);
-//            } catch (InternalErrorException e)
-//            {
-//                throw new AMQException(null, "problem registering excahgne " + exchange, e);
-//            }
-        }
-    }
-
-    public void setDefaultExchange(Exchange exchange)
-    {
-        _defaultExchange = exchange;
-    }
-
-    public Exchange getDefaultExchange()
-    {
-        return _defaultExchange;
-    }
-
-    public Collection<AMQShortString> getExchangeNames()
-    {
-        return _exchangeMap.keySet();
-    }
-
-    public void unregisterExchange(AMQShortString name, boolean inUse) throws AMQException
-    {
-        // TODO: check inUse argument
-        Exchange e = _exchangeMap.remove(name);
-        if (e != null)
-        {
-            if (e.isDurable())
-            {
-                getMessageStore().removeExchange(e);
-                //DTX MessageStore
-//                try
-//                {
-//                    getMessageStore().removeExchange(e);
-//                } catch (InternalErrorException e1)
-//                {
-//                    throw new AMQException(null, "Problem unregistering Exchange " + name, e1);
-//                }
-            }
-            e.close();
-        }
-        else
-        {
-            throw new AMQException(null, "Unknown exchange " + name, null);
-        }
-    }
-
-    public Exchange getExchange(AMQShortString name)
-    {
-        if((name == null) || name.length() == 0)
-        {
-            return getDefaultExchange();
-        }
-        else
-        {
-            return _exchangeMap.get(name);
-        }
-
-    }
-
-    /**
-     * Routes content through exchanges, delivering it to 1 or more queues.
-     * @param payload
-     * @throws AMQException if something goes wrong delivering data
-     */
-    public void routeContent(AMQMessage payload) throws AMQException
-    {
-        final AMQShortString exchange = payload.getMessagePublishInfo().getExchange();
-        final Exchange exch = getExchange(exchange);
-        // there is a small window of opportunity for the exchange to be deleted in between
-        // the BasicPublish being received (where the exchange is validated) and the final
-        // content body being received (which triggers this method)
-        // TODO: check where the exchange is validated
-        if (exch == null)
-        {
-            throw new AMQException(null, "Exchange '" + exchange + "' does not exist", null);
-        }
-        exch.route(payload);
-    }
-}