/****************************************************************
 * 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.james.container.spring.bean.factory.protocols;

import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.container.spring.bean.AbstractBeanFactory;
import org.apache.james.protocols.api.LifecycleAwareProtocolHandler;
import org.apache.james.protocols.api.ProtocolHandler;
import org.apache.james.protocols.api.ProtocolHandlerLoader;
import org.springframework.beans.BeansException;

public class ProtocolHandlerLoaderBeanFactory extends AbstractBeanFactory implements ProtocolHandlerLoader{

    @SuppressWarnings("unchecked")
    @Override
    public ProtocolHandler load(String name, Configuration config) throws LoadingException {
        
        try {
            // Use the classloader which is used for bean instance stuff
            Class<ProtocolHandler> c = (Class<ProtocolHandler>) getBeanFactory().getBeanClassLoader().loadClass(name);
            ProtocolHandler handler =  (ProtocolHandler) getBeanFactory().createBean(c);
            if (handler instanceof LifecycleAwareProtocolHandler) {
                ((LifecycleAwareProtocolHandler) handler).init(config);
            }
            return handler;
        } catch (ClassNotFoundException e) {
            throw new LoadingException("Unable to load handler", e);

        } catch (BeansException e) {
            throw new LoadingException("Unable to load handler", e);
        } catch (ConfigurationException e) {
            throw new LoadingException("Unable to load handler", e);
        }


    }

    
}

@@ -1473,16 +1473,24 @@
 ols.api.
+handler.
 Lifecycl
@@ -1542,32 +1542,40 @@
 s.protocols.api.
+handler.
 ProtocolHandler;
@@ -1613,16 +1613,24 @@
 ols.api.
+handler.
 Protocol

Move Handler stuff to extra package