/****************************************************************
 * 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;

import org.apache.james.api.kernel.InstanceFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

public class SpringInstanceFactory implements InstanceFactory, BeanFactoryAware{
    private ConfigurableListableBeanFactory cFactory;
  

    /*
     * (non-Javadoc)
     * @see org.apache.james.api.kernel.InstanceFactory#newInstance(java.lang.String)
     */
    public Object newInstance(String className) throws InstanceException, ClassNotFoundException {
        return cFactory.createBean(cFactory.getBeanClassLoader().loadClass(className));
    }

    /*
     * (non-Javadoc)
     * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
     */
    public void setBeanFactory(BeanFactory factory) throws BeansException {
        cFactory = (ConfigurableListableBeanFactory) factory;
    }

}

@@ -1268,34 +1268,32 @@
 pache.james.
-api.kernel
+services
 .InstanceFac

Move classes to eliminate strange package structure