/*
 * Copyright 2010 the original author or authors.
 *
 * Licensed 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.gradle.initialization;

import org.apache.tools.ant.Project;
import org.gradle.internal.jvm.Jvm;
import org.gradle.util.ClassPath;
import org.gradle.api.internal.ClassPathRegistry;
import org.gradle.util.*;

import java.io.File;
import java.net.URLClassLoader;
import java.util.Collections;

public class DefaultClassLoaderRegistry implements ClassLoaderRegistry {
    private final FilteringClassLoader rootClassLoader;
    private final ClassLoader coreImplClassLoader;
    private final ClassLoader pluginsClassLoader;

    public DefaultClassLoaderRegistry(ClassPathRegistry classPathRegistry, ClassLoaderFactory classLoaderFactory) {
        // Add in tools.jar to the Ant classloader
        ClassLoader antClassLoader = Project.class.getClassLoader();
        File toolsJar = Jvm.current().getToolsJar();
        if (toolsJar != null) {
            ClasspathUtil.addUrl((URLClassLoader) antClassLoader, GFileUtils.toURLs(Collections.singleton(toolsJar)));
        }

        ClassLoader runtimeClassLoader = getClass().getClassLoader();

        // Core impl
        ClassPath coreImplClassPath = classPathRegistry.getClassPath("GRADLE_CORE_IMPL");
        coreImplClassLoader = new MutableURLClassLoader(runtimeClassLoader, coreImplClassPath);

        // Add in libs for plugins
        ClassPath pluginsClassPath = classPathRegistry.getClassPath("GRADLE_PLUGINS");
        MultiParentClassLoader pluginsImports = new MultiParentClassLoader(runtimeClassLoader, coreImplClassLoader);
        pluginsClassLoader = new MutableURLClassLoader(pluginsImports, pluginsClassPath);

        rootClassLoader = classLoaderFactory.createFilteringClassLoader(pluginsClassLoader);
        rootClassLoader.allowPackage("org.gradle");
        rootClassLoader.allowResources("META-INF/gradle-plugins");
        rootClassLoader.allowPackage("org.apache.tools.ant");
        rootClassLoader.allowPackage("groovy");
        rootClassLoader.allowPackage("org.codehaus.groovy");
        rootClassLoader.allowPackage("groovyjarjarantlr");
        rootClassLoader.allowPackage("org.apache.ivy");
        rootClassLoader.allowPackage("org.slf4j");
        rootClassLoader.allowPackage("org.apache.commons.logging");
        rootClassLoader.allowPackage("org.apache.log4j");
    }

    public ClassLoader getRootClassLoader() {
        return rootClassLoader;
    }

    public ClassLoader getCoreImplClassLoader() {
        return coreImplClassLoader;
    }

    public ClassLoader getPluginsClassLoader() {
        return pluginsClassLoader;
    }

    public MultiParentClassLoader createScriptClassLoader() {
        return new MultiParentClassLoader(rootClassLoader);
    }
}

@@ -650,45 +650,8 @@
 n;%0A%0A
-import org.apache.tools.ant.Project;%0A
 impo
@@ -664,16 +664,20 @@
 .gradle.
+api.
 internal
@@ -681,40 +681,8 @@
 nal.
-jvm.Jvm;%0Aimport org.gradle.util.
 Clas
@@ -686,16 +686,24 @@
 lassPath
+Registry
 ;%0Aimport
@@ -706,36 +706,32 @@
 port org.gradle.
-api.
 internal.ClassPa
@@ -723,33 +723,23 @@
 nternal.
-ClassPathRegistry
+jvm.Jvm
 ;%0Aimport
@@ -1229,92 +1229,32 @@
 the 
-Ant classloader%0A        ClassLoader antClassLoader = Project.class.getClassLoader();
+systemClassloader parent
 %0A   
@@ -1331,24 +1331,128 @@
  != null) %7B%0A
+            final ClassLoader systemClassLoaderParent = ClassLoader.getSystemClassLoader().getParent();%0A
             
@@ -1489,19 +1489,22 @@
 Loader) 
-ant
+system
 ClassLoa
@@ -1506,16 +1506,22 @@
 ssLoader
+Parent
 , GFileU

Change injection of tools.jar to systemClassLoader parent