1 files changed, 46 insertions, 55 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
index 5058f91995..5e6e36d330 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
@@ -27,10 +27,9 @@ import org.apache.qpid.AMQSecurityException;
 import org.apache.qpid.AMQUnknownExchangeType;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.qmf.ManagementExchange;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.plugin.ExchangeType;
+import org.apache.qpid.server.plugin.QpidServiceLoader;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import java.util.ArrayList;
@@ -41,42 +40,72 @@ import java.util.UUID;
 
 public class DefaultExchangeFactory implements ExchangeFactory
 {
-    private static final Logger _logger = Logger.getLogger(DefaultExchangeFactory.class);
     public static final String DEFAULT_DLE_NAME_SUFFIX = "_DLE";
 
-    private Map<AMQShortString, ExchangeType<? extends Exchange>> _exchangeClassMap = new HashMap<AMQShortString, ExchangeType<? extends Exchange>>();
+    private static final Logger LOGGER = Logger.getLogger(DefaultExchangeFactory.class);
+
+    private static final AMQShortString[] BASE_EXCHANGE_TYPES =
+                                    new AMQShortString[]{ExchangeDefaults.DIRECT_EXCHANGE_CLASS,
+                                                         ExchangeDefaults.FANOUT_EXCHANGE_CLASS,
+                                                         ExchangeDefaults.HEADERS_EXCHANGE_CLASS,
+                                                         ExchangeDefaults.TOPIC_EXCHANGE_CLASS};
+
     private final VirtualHost _host;
+    private Map<AMQShortString, ExchangeType<? extends Exchange>> _exchangeClassMap = new HashMap<AMQShortString, ExchangeType<? extends Exchange>>();
 
     public DefaultExchangeFactory(VirtualHost host)
     {
         _host = host;
-        registerExchangeType(DirectExchange.TYPE);
-        registerExchangeType(TopicExchange.TYPE);
-        registerExchangeType(HeadersExchange.TYPE);
-        registerExchangeType(FanoutExchange.TYPE);
-        registerExchangeType(ManagementExchange.TYPE);
+
+        @SuppressWarnings("rawtypes")
+        Iterable<ExchangeType> exchangeTypes = loadExchangeTypes();
+        for (ExchangeType<?> exchangeType : exchangeTypes)
+        {
+            AMQShortString typeName = exchangeType.getName();
+
+            if(LOGGER.isDebugEnabled())
+            {
+                LOGGER.debug("Registering exchange type '" + typeName + "' using class '" + exchangeType.getClass().getName() + "'");
+            }
+
+            if(_exchangeClassMap.containsKey(typeName))
+            {
+                ExchangeType<?> existingType = _exchangeClassMap.get(typeName);
+
+                throw new IllegalStateException("ExchangeType with type name '" + typeName + "' is already registered using class '"
+                                                 + existingType.getClass().getName() + "', can not register class '"
+                                                 + exchangeType.getClass().getName() + "'");
+            }
+
+            _exchangeClassMap.put(typeName, exchangeType);
+        }
+
+        for(AMQShortString type : BASE_EXCHANGE_TYPES)
+        {
+            if(!_exchangeClassMap.containsKey(type))
+            {
+                throw new IllegalStateException("Did not find expected exchange type: " + type.asString());
+            }
+        }
     }
 
-    public void registerExchangeType(ExchangeType<? extends Exchange> type)
+    @SuppressWarnings("rawtypes")
+    protected Iterable<ExchangeType> loadExchangeTypes()
     {
-        _exchangeClassMap.put(type.getName(), type);
+        return new QpidServiceLoader<ExchangeType>().atLeastOneInstanceOf(ExchangeType.class);
     }
 
     public Collection<ExchangeType<? extends Exchange>> getRegisteredTypes()
     {
         return _exchangeClassMap.values();
     }
-    
+
     public Collection<ExchangeType<? extends Exchange>> getPublicCreatableTypes()
     {
         Collection<ExchangeType<? extends Exchange>> publicTypes = 
                                 new ArrayList<ExchangeType<? extends Exchange>>();
         publicTypes.addAll(_exchangeClassMap.values());
         
-        //Remove the ManagementExchange type if present, as these 
-        //are private and cannot be created by external means
-        publicTypes.remove(ManagementExchange.TYPE);
-        
         return publicTypes;
     }
 
@@ -120,42 +149,4 @@ public class DefaultExchangeFactory implements ExchangeFactory
         Exchange e = exchType.newInstance(id, _host, exchange, durable, ticket, autoDelete);
         return e;
     }
-
-    public void initialise(VirtualHostConfiguration hostConfig)
-    {
-
-        if (hostConfig == null)
-        {
-            return;
-        }
-
-        for(Object className : hostConfig.getCustomExchanges())
-        {
-            try
-            {
-                ExchangeType<?> exchangeType = ApplicationRegistry.getInstance().getPluginManager().getExchanges().get(String.valueOf(className));
-                if (exchangeType == null)
-                {
-                    _logger.error("No such custom exchange class found: \""+String.valueOf(className)+"\"");
-                    continue;
-                }
-                Class<? extends ExchangeType> exchangeTypeClass = exchangeType.getClass();
-                ExchangeType<? extends ExchangeType> type = exchangeTypeClass.newInstance();
-                registerExchangeType(type);
-            }
-            catch (ClassCastException classCastEx)
-            {
-                _logger.error("No custom exchange class: \""+String.valueOf(className)+"\" cannot be registered as it does not extend class \""+ExchangeType.class+"\"");
-            }
-            catch (IllegalAccessException e)
-            {
-                _logger.error("Cannot create custom exchange class: \""+String.valueOf(className)+"\"",e);
-            }
-            catch (InstantiationException e)
-            {
-                _logger.error("Cannot create custom exchange class: \""+String.valueOf(className)+"\"",e);
-            }
-        }
-
-    }
 }