Moved some classes from core to baseServices.

mrhaki · Aug 12, 2013 · 252f16d · 252f16d
1 parent 91ab70d
commit 252f16d
Show file tree

Hide file tree

Showing 25 changed files with 39 additions and 28 deletions.
diff --git a/...y/org/gradle/util/CachingClassLoader.java → ...ernal/classloader/CachingClassLoader.java b/...y/org/gradle/util/CachingClassLoader.java → ...ernal/classloader/CachingClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.util;
+package org.gradle.internal.classloader;
 
 import com.google.common.collect.MapMaker;
 

diff --git a/...org/gradle/util/FilteringClassLoader.java → ...nal/classloader/FilteringClassLoader.java b/...org/gradle/util/FilteringClassLoader.java → ...nal/classloader/FilteringClassLoader.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.util;
+package org.gradle.internal.classloader;
 
 import org.gradle.internal.reflect.JavaReflectionUtil;
+import org.gradle.util.JavaMethod;
 
 import java.io.IOException;
 import java.net.URL;

diff --git a/...g/gradle/util/MultiParentClassLoader.java → ...l/classloader/MultiParentClassLoader.java b/...g/gradle/util/MultiParentClassLoader.java → ...l/classloader/MultiParentClassLoader.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.util;
+package org.gradle.internal.classloader;
 
-import org.gradle.internal.classloader.ClassLoaderHierarchy;
-import org.gradle.internal.classloader.ClassLoaderVisitor;
 import org.gradle.internal.reflect.JavaReflectionUtil;
+import org.gradle.util.JavaMethod;
 
 import java.io.IOException;
 import java.net.URL;

diff --git a/...gradle/util/CachingClassLoaderTest.groovy → ...classloader/CachingClassLoaderTest.groovy b/...gradle/util/CachingClassLoaderTest.groovy → ...classloader/CachingClassLoaderTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.util
+package org.gradle.internal.classloader
 
 import spock.lang.Specification
 

diff --git a/...adle/util/FilteringClassLoaderTest.groovy → ...assloader/FilteringClassLoaderTest.groovy b/...adle/util/FilteringClassLoaderTest.groovy → ...assloader/FilteringClassLoaderTest.groovy
@@ -13,20 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.util
+package org.gradle.internal.classloader
 
 import org.hamcrest.Matcher
-import org.jmock.integration.junit4.JMock
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.junit.runners.BlockJUnit4ClassRunner
+
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.*
-import org.junit.Before
 
-@RunWith(JMock.class)
 class FilteringClassLoaderTest {
-    private final JUnit4GroovyMockery context = new JUnit4GroovyMockery()
     private final FilteringClassLoader classLoader = new FilteringClassLoader(FilteringClassLoaderTest.class.getClassLoader())
 
     @Test

diff --git a/...le/util/MultiParentClassLoaderTest.groovy → ...sloader/MultiParentClassLoaderTest.groovy b/...le/util/MultiParentClassLoaderTest.groovy → ...sloader/MultiParentClassLoaderTest.groovy
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.util
+package org.gradle.internal.classloader
 
+import org.gradle.util.JUnit4GroovyMockery
 import org.jmock.integration.junit4.JMock
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.*
 

diff --git a/...urces/org/gradle/util/ClassLoaderTest.txt → ...urces/org/gradle/util/ClassLoaderTest.txt b/...urces/org/gradle/util/ClassLoaderTest.txt → ...urces/org/gradle/util/ClassLoaderTest.txt
diff --git a/...cts/core/src/main/groovy/org/gradle/api/internal/project/DefaultIsolatedAntBuilder.groovy b/...cts/core/src/main/groovy/org/gradle/api/internal/project/DefaultIsolatedAntBuilder.groovy
@@ -18,6 +18,8 @@ package org.gradle.api.internal.project
 import org.gradle.api.internal.ClassPathRegistry
 import org.gradle.api.internal.project.ant.AntLoggingAdapter
 import org.gradle.api.internal.project.ant.BasicAntBuilder
+import org.gradle.internal.classloader.FilteringClassLoader
+import org.gradle.internal.classloader.MultiParentClassLoader
 import org.gradle.internal.classloader.MutableURLClassLoader
 import org.gradle.util.*
 import org.gradle.internal.jvm.Jvm

diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java
@@ -17,6 +17,9 @@
 package org.gradle.initialization;
 
 import org.gradle.api.internal.ClassPathRegistry;
+import org.gradle.internal.classloader.CachingClassLoader;
+import org.gradle.internal.classloader.FilteringClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.gradle.internal.classloader.MutableURLClassLoader;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;

diff --git a/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultBuildClassLoaderRegistry.java b/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultBuildClassLoaderRegistry.java
@@ -17,8 +17,8 @@
 package org.gradle.invocation;
 
 import org.gradle.initialization.ClassLoaderRegistry;
-import org.gradle.util.CachingClassLoader;
-import org.gradle.util.MultiParentClassLoader;
+import org.gradle.internal.classloader.CachingClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 
 public class DefaultBuildClassLoaderRegistry implements BuildClassLoaderRegistry {
     private final MultiParentClassLoader rootClassLoader;

diff --git a/...re/src/main/groovy/org/gradle/process/internal/child/ImplementationClassLoaderWorker.java b/...re/src/main/groovy/org/gradle/process/internal/child/ImplementationClassLoaderWorker.java
@@ -19,6 +19,9 @@
 import org.gradle.api.Action;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.internal.UncheckedException;
+import org.gradle.internal.classloader.CachingClassLoader;
+import org.gradle.internal.classloader.FilteringClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.gradle.internal.classloader.MutableURLClassLoader;
 import org.gradle.internal.io.ClassLoaderObjectInputStream;
 import org.gradle.logging.LoggingManagerInternal;

diff --git a/subprojects/core/src/main/groovy/org/gradle/util/ClassLoaderFactory.java b/subprojects/core/src/main/groovy/org/gradle/util/ClassLoaderFactory.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.util;
 
+import org.gradle.internal.classloader.FilteringClassLoader;
 import org.gradle.internal.classpath.ClassPath;
 
 import java.net.URI;

diff --git a/subprojects/core/src/main/groovy/org/gradle/util/DefaultClassLoaderFactory.java b/subprojects/core/src/main/groovy/org/gradle/util/DefaultClassLoaderFactory.java
@@ -16,6 +16,7 @@
 package org.gradle.util;
 
 import org.gradle.internal.UncheckedException;
+import org.gradle.internal.classloader.FilteringClassLoader;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.service.ServiceLocator;
 

diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.java
@@ -29,7 +29,7 @@
 import org.gradle.testfixtures.internal.TestBuildScopeServices;
 import org.gradle.testfixtures.internal.TestGlobalScopeServices;
 import org.gradle.util.JUnit4GroovyMockery;
-import org.gradle.util.MultiParentClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;

diff --git a/...cts/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy b/...cts/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy
@@ -49,7 +49,7 @@ import org.gradle.process.internal.WorkerProcessBuilder
 import org.gradle.profile.ProfileEventAdapter
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.ClassLoaderFactory
-import org.gradle.util.MultiParentClassLoader
+import org.gradle.internal.classloader.MultiParentClassLoader
 import org.junit.Rule
 import spock.lang.Specification
 import spock.lang.Timeout

diff --git a/...ts/core/src/test/groovy/org/gradle/internal/service/scopes/GradleScopeServicesTest.groovy b/...ts/core/src/test/groovy/org/gradle/internal/service/scopes/GradleScopeServicesTest.groovy
@@ -33,7 +33,7 @@ import org.gradle.execution.taskgraph.DefaultTaskGraphExecuter
 import org.gradle.internal.service.ServiceRegistry
 import org.gradle.invocation.BuildClassLoaderRegistry
 import org.gradle.listener.ListenerManager
-import org.gradle.util.MultiParentClassLoader
+import org.gradle.internal.classloader.MultiParentClassLoader
 import spock.lang.Specification
 
 import static org.hamcrest.Matchers.sameInstance

diff --git a/...cts/core/src/test/groovy/org/gradle/invocation/DefaultBuildClassLoaderRegistryTest.groovy b/...cts/core/src/test/groovy/org/gradle/invocation/DefaultBuildClassLoaderRegistryTest.groovy
@@ -17,8 +17,8 @@
 package org.gradle.invocation
 
 import org.gradle.initialization.ClassLoaderRegistry
-import org.gradle.util.CachingClassLoader
-import org.gradle.util.MultiParentClassLoader
+import org.gradle.internal.classloader.CachingClassLoader
+import org.gradle.internal.classloader.MultiParentClassLoader
 import spock.lang.Specification
 
 class DefaultBuildClassLoaderRegistryTest extends Specification {

diff --git a/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java b/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java
@@ -40,7 +40,7 @@
 import org.gradle.util.GradleVersion;
 import org.gradle.util.TestUtil;
 import org.gradle.util.JUnit4GroovyMockery;
-import org.gradle.util.MultiParentClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;

diff --git a/...launcher/src/main/java/org/gradle/tooling/internal/provider/ModelClassLoaderRegistry.java b/...launcher/src/main/java/org/gradle/tooling/internal/provider/ModelClassLoaderRegistry.java
@@ -18,7 +18,7 @@
 
 import org.gradle.internal.classloader.TransformingClassLoader;
 import org.gradle.tooling.provider.model.internal.LegacyConsumerInterface;
-import org.gradle.util.FilteringClassLoader;
+import org.gradle.internal.classloader.FilteringClassLoader;
 import org.objectweb.asm.*;
 
 import java.net.URL;

diff --git a/...ojects/launcher/src/main/java/org/gradle/tooling/internal/provider/PayloadSerializer.java b/...ojects/launcher/src/main/java/org/gradle/tooling/internal/provider/PayloadSerializer.java
@@ -23,8 +23,8 @@
 import org.gradle.internal.UncheckedException;
 import org.gradle.internal.classloader.ClassLoaderVisitor;
 import org.gradle.internal.jvm.Jvm;
-import org.gradle.util.CachingClassLoader;
-import org.gradle.util.MultiParentClassLoader;
+import org.gradle.internal.classloader.CachingClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 
 import java.io.*;
 import java.lang.reflect.Proxy;

diff --git a/...auncher/src/test/groovy/org/gradle/tooling/internal/provider/PayloadSerializerTest.groovy b/...auncher/src/test/groovy/org/gradle/tooling/internal/provider/PayloadSerializerTest.groovy
@@ -17,7 +17,7 @@
 package org.gradle.tooling.internal.provider
 
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.gradle.util.FilteringClassLoader
+import org.gradle.internal.classloader.FilteringClassLoader
 import org.junit.Assert
 import org.junit.Rule
 import spock.lang.Ignore

diff --git a/...ects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java b/...ects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/ApiGroovyCompiler.java
@@ -27,7 +27,7 @@
 import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.internal.classpath.DefaultClassPath;
-import org.gradle.util.FilteringClassLoader;
+import org.gradle.internal.classloader.FilteringClassLoader;
 
 import java.io.File;
 import java.io.Serializable;

diff --git a/...n/groovy/org/gradle/api/internal/tasks/compile/daemon/InProcessCompilerDaemonFactory.java b/...n/groovy/org/gradle/api/internal/tasks/compile/daemon/InProcessCompilerDaemonFactory.java
@@ -20,6 +20,7 @@
 import org.gradle.api.internal.tasks.compile.CompileSpec;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.internal.UncheckedException;
+import org.gradle.internal.classloader.FilteringClassLoader;
 import org.gradle.internal.classloader.MutableURLClassLoader;
 import org.gradle.internal.classpath.DefaultClassPath;
 import org.gradle.internal.io.ClassLoaderObjectInputStream;

diff --git a/...st/groovy/org/gradle/integtests/tooling/fixture/ToolingApiCompatibilitySuiteRunner.groovy b/...st/groovy/org/gradle/integtests/tooling/fixture/ToolingApiCompatibilitySuiteRunner.groovy
@@ -20,6 +20,7 @@ import org.gradle.api.specs.Specs
 import org.gradle.integtests.fixtures.AbstractCompatibilityTestRunner
 import org.gradle.integtests.fixtures.AbstractMultiTestRunner
 import org.gradle.integtests.fixtures.executer.GradleDistribution
+import org.gradle.internal.classloader.MultiParentClassLoader
 import org.gradle.internal.classloader.MutableURLClassLoader
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.util.*

diff --git a/.../java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java b/.../java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java
@@ -28,9 +28,9 @@
 import org.gradle.tooling.internal.consumer.parameters.ConsumerConnectionParameters;
 import org.gradle.tooling.internal.consumer.versioning.ModelMapping;
 import org.gradle.tooling.internal.protocol.*;
-import org.gradle.util.FilteringClassLoader;
+import org.gradle.internal.classloader.FilteringClassLoader;
 import org.gradle.util.GradleVersion;
-import org.gradle.util.MultiParentClassLoader;
+import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.gradle.internal.classloader.MutableURLClassLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;