Group client projects under :client

:client ---------> :client:rest
:client-sniffer -> :client:sniffer
:client-test ----> :client:test

This lines the client up with how we do things like modules and
plugins.

57 files changed, 21 insertions, 21 deletions

diff --git a/build.gradle b/build.gradle
index 32fde42579..540f27503f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,9 +163,9 @@ subprojects {
     "org.elasticsearch.gradle:build-tools:${version}": ':build-tools',
     "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec',
     "org.elasticsearch:elasticsearch:${version}": ':core',
-    "org.elasticsearch:client:${version}": ':client',
-    "org.elasticsearch:client-sniffer:${version}": ':client-sniffer',
-    "org.elasticsearch:client-test:${version}": ':client-test',
+    "org.elasticsearch.client:rest:${version}": ':client:rest',
+    "org.elasticsearch.client:sniffer:${version}": ':client:sniffer',
+    "org.elasticsearch.client:test:${version}": ':client:test',
     "org.elasticsearch.test:framework:${version}": ':test:framework',
     "org.elasticsearch.distribution.integ-test-zip:elasticsearch:${version}": ':distribution:integ-test-zip',
     "org.elasticsearch.distribution.zip:elasticsearch:${version}": ':distribution:zip',
diff --git a/client/build.gradle b/client/rest/build.gradle
index 2a2e77f88a..e578126b38 100644
--- a/client/build.gradle
+++ b/client/rest/build.gradle
@@ -32,7 +32,7 @@ dependencies {
   compile "commons-codec:commons-codec:${versions.commonscodec}"
   compile "commons-logging:commons-logging:${versions.commonslogging}"
 
-  testCompile "org.elasticsearch:client-test:${version}"
+  testCompile "org.elasticsearch.client:test:${version}"
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
   testCompile "junit:junit:${versions.junit}"
   testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
diff --git a/client-sniffer/licenses/commons-codec-1.10.jar.sha1 b/client/rest/licenses/commons-codec-1.10.jar.sha1
index 3fe8682a1b..3fe8682a1b 100644
--- a/client-sniffer/licenses/commons-codec-1.10.jar.sha1
+++ b/client/rest/licenses/commons-codec-1.10.jar.sha1
diff --git a/client-sniffer/licenses/commons-codec-LICENSE.txt b/client/rest/licenses/commons-codec-LICENSE.txt
index d645695673..d645695673 100644
--- a/client-sniffer/licenses/commons-codec-LICENSE.txt
+++ b/client/rest/licenses/commons-codec-LICENSE.txt
diff --git a/client-sniffer/licenses/commons-codec-NOTICE.txt b/client/rest/licenses/commons-codec-NOTICE.txt
index 1da9af50f6..1da9af50f6 100644
--- a/client-sniffer/licenses/commons-codec-NOTICE.txt
+++ b/client/rest/licenses/commons-codec-NOTICE.txt
diff --git a/client-sniffer/licenses/commons-logging-1.1.3.jar.sha1 b/client/rest/licenses/commons-logging-1.1.3.jar.sha1
index 5b8f029e58..5b8f029e58 100644
--- a/client-sniffer/licenses/commons-logging-1.1.3.jar.sha1
+++ b/client/rest/licenses/commons-logging-1.1.3.jar.sha1
diff --git a/client-sniffer/licenses/commons-logging-LICENSE.txt b/client/rest/licenses/commons-logging-LICENSE.txt
index d645695673..d645695673 100644
--- a/client-sniffer/licenses/commons-logging-LICENSE.txt
+++ b/client/rest/licenses/commons-logging-LICENSE.txt
diff --git a/client-sniffer/licenses/commons-logging-NOTICE.txt b/client/rest/licenses/commons-logging-NOTICE.txt
index 556bd03951..556bd03951 100644
--- a/client-sniffer/licenses/commons-logging-NOTICE.txt
+++ b/client/rest/licenses/commons-logging-NOTICE.txt
diff --git a/client-sniffer/licenses/httpclient-4.5.2.jar.sha1 b/client/rest/licenses/httpclient-4.5.2.jar.sha1
index 6937112a09..6937112a09 100644
--- a/client-sniffer/licenses/httpclient-4.5.2.jar.sha1
+++ b/client/rest/licenses/httpclient-4.5.2.jar.sha1
diff --git a/client-sniffer/licenses/httpclient-LICENSE.txt b/client/rest/licenses/httpclient-LICENSE.txt
index 32f01eda18..32f01eda18 100644
--- a/client-sniffer/licenses/httpclient-LICENSE.txt
+++ b/client/rest/licenses/httpclient-LICENSE.txt
diff --git a/client-sniffer/licenses/httpclient-NOTICE.txt b/client/rest/licenses/httpclient-NOTICE.txt
index 91e5c40c4c..91e5c40c4c 100644
--- a/client-sniffer/licenses/httpclient-NOTICE.txt
+++ b/client/rest/licenses/httpclient-NOTICE.txt
diff --git a/client-sniffer/licenses/httpcore-4.4.4.jar.sha1 b/client/rest/licenses/httpcore-4.4.4.jar.sha1
index ef0c257e01..ef0c257e01 100644
--- a/client-sniffer/licenses/httpcore-4.4.4.jar.sha1
+++ b/client/rest/licenses/httpcore-4.4.4.jar.sha1
diff --git a/client-sniffer/licenses/httpcore-LICENSE.txt b/client/rest/licenses/httpcore-LICENSE.txt
index 32f01eda18..32f01eda18 100644
--- a/client-sniffer/licenses/httpcore-LICENSE.txt
+++ b/client/rest/licenses/httpcore-LICENSE.txt
diff --git a/client-sniffer/licenses/httpcore-NOTICE.txt b/client/rest/licenses/httpcore-NOTICE.txt
index 91e5c40c4c..91e5c40c4c 100644
--- a/client-sniffer/licenses/httpcore-NOTICE.txt
+++ b/client/rest/licenses/httpcore-NOTICE.txt
diff --git a/client/src/main/java/org/elasticsearch/client/DeadHostState.java b/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java
index a7b222da70..a7b222da70 100644
--- a/client/src/main/java/org/elasticsearch/client/DeadHostState.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java
diff --git a/client/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java b/client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java
index 85927b6f87..85927b6f87 100644
--- a/client/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java
diff --git a/client/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java b/client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java
index c25418387e..c25418387e 100644
--- a/client/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java
diff --git a/client/src/main/java/org/elasticsearch/client/RequestLogger.java b/client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java
index ad8204be2b..ad8204be2b 100644
--- a/client/src/main/java/org/elasticsearch/client/RequestLogger.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java
diff --git a/client/src/main/java/org/elasticsearch/client/Response.java b/client/rest/src/main/java/org/elasticsearch/client/Response.java
index f7685b27bb..f7685b27bb 100644
--- a/client/src/main/java/org/elasticsearch/client/Response.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/Response.java
diff --git a/client/src/main/java/org/elasticsearch/client/ResponseException.java b/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java
index 44f59cce7d..44f59cce7d 100644
--- a/client/src/main/java/org/elasticsearch/client/ResponseException.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java
diff --git a/client/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
index a8f46ee6b0..a8f46ee6b0 100644
--- a/client/src/main/java/org/elasticsearch/client/RestClient.java
+++ b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
diff --git a/client/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java b/client/rest/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java
index dd866bac54..dd866bac54 100644
--- a/client/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java
diff --git a/client/src/test/java/org/elasticsearch/client/RequestLoggerTests.java b/client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java
index 190774d46f..190774d46f 100644
--- a/client/src/test/java/org/elasticsearch/client/RequestLoggerTests.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java
diff --git a/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
index a16e961fd2..a16e961fd2 100644
--- a/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
diff --git a/client/src/test/java/org/elasticsearch/client/RestClientIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientIntegTests.java
index 4a14c17435..4a14c17435 100644
--- a/client/src/test/java/org/elasticsearch/client/RestClientIntegTests.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/RestClientIntegTests.java
diff --git a/client/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java
index 9d08246612..9d08246612 100644
--- a/client/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java
diff --git a/client/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java
index 59e88b0ed6..59e88b0ed6 100644
--- a/client/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java
diff --git a/client/src/test/java/org/elasticsearch/client/TrackingFailureListener.java b/client/rest/src/test/java/org/elasticsearch/client/TrackingFailureListener.java
index 3584282392..3584282392 100644
--- a/client/src/test/java/org/elasticsearch/client/TrackingFailureListener.java
+++ b/client/rest/src/test/java/org/elasticsearch/client/TrackingFailureListener.java
diff --git a/client-sniffer/build.gradle b/client/sniffer/build.gradle
index ffd776ccae..748c3e2261 100644
--- a/client-sniffer/build.gradle
+++ b/client/sniffer/build.gradle
@@ -27,14 +27,14 @@ targetCompatibility = JavaVersion.VERSION_1_7
 sourceCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-  compile "org.elasticsearch:client:${version}"
+  compile "org.elasticsearch.client:rest:${version}"
   compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
   compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
   compile "commons-codec:commons-codec:${versions.commonscodec}"
   compile "commons-logging:commons-logging:${versions.commonslogging}"
   compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
 
-  testCompile "org.elasticsearch:client-test:${version}"
+  testCompile "org.elasticsearch.client:test:${version}"
   testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
   testCompile "junit:junit:${versions.junit}"
   testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
diff --git a/client/licenses/commons-codec-1.10.jar.sha1 b/client/sniffer/licenses/commons-codec-1.10.jar.sha1
index 3fe8682a1b..3fe8682a1b 100644
--- a/client/licenses/commons-codec-1.10.jar.sha1
+++ b/client/sniffer/licenses/commons-codec-1.10.jar.sha1
diff --git a/client/licenses/commons-codec-LICENSE.txt b/client/sniffer/licenses/commons-codec-LICENSE.txt
index d645695673..d645695673 100644
--- a/client/licenses/commons-codec-LICENSE.txt
+++ b/client/sniffer/licenses/commons-codec-LICENSE.txt
diff --git a/client/licenses/commons-codec-NOTICE.txt b/client/sniffer/licenses/commons-codec-NOTICE.txt
index 1da9af50f6..1da9af50f6 100644
--- a/client/licenses/commons-codec-NOTICE.txt
+++ b/client/sniffer/licenses/commons-codec-NOTICE.txt
diff --git a/client/licenses/commons-logging-1.1.3.jar.sha1 b/client/sniffer/licenses/commons-logging-1.1.3.jar.sha1
index 5b8f029e58..5b8f029e58 100644
--- a/client/licenses/commons-logging-1.1.3.jar.sha1
+++ b/client/sniffer/licenses/commons-logging-1.1.3.jar.sha1
diff --git a/client/licenses/commons-logging-LICENSE.txt b/client/sniffer/licenses/commons-logging-LICENSE.txt
index d645695673..d645695673 100644
--- a/client/licenses/commons-logging-LICENSE.txt
+++ b/client/sniffer/licenses/commons-logging-LICENSE.txt
diff --git a/client/licenses/commons-logging-NOTICE.txt b/client/sniffer/licenses/commons-logging-NOTICE.txt
index 556bd03951..556bd03951 100644
--- a/client/licenses/commons-logging-NOTICE.txt
+++ b/client/sniffer/licenses/commons-logging-NOTICE.txt
diff --git a/client/licenses/httpclient-4.5.2.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.2.jar.sha1
index 6937112a09..6937112a09 100644
--- a/client/licenses/httpclient-4.5.2.jar.sha1
+++ b/client/sniffer/licenses/httpclient-4.5.2.jar.sha1
diff --git a/client/licenses/httpclient-LICENSE.txt b/client/sniffer/licenses/httpclient-LICENSE.txt
index 32f01eda18..32f01eda18 100644
--- a/client/licenses/httpclient-LICENSE.txt
+++ b/client/sniffer/licenses/httpclient-LICENSE.txt
diff --git a/client/licenses/httpclient-NOTICE.txt b/client/sniffer/licenses/httpclient-NOTICE.txt
index 91e5c40c4c..91e5c40c4c 100644
--- a/client/licenses/httpclient-NOTICE.txt
+++ b/client/sniffer/licenses/httpclient-NOTICE.txt
diff --git a/client/licenses/httpcore-4.4.4.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.4.jar.sha1
index ef0c257e01..ef0c257e01 100644
--- a/client/licenses/httpcore-4.4.4.jar.sha1
+++ b/client/sniffer/licenses/httpcore-4.4.4.jar.sha1
diff --git a/client/licenses/httpcore-LICENSE.txt b/client/sniffer/licenses/httpcore-LICENSE.txt
index 32f01eda18..32f01eda18 100644
--- a/client/licenses/httpcore-LICENSE.txt
+++ b/client/sniffer/licenses/httpcore-LICENSE.txt
diff --git a/client/licenses/httpcore-NOTICE.txt b/client/sniffer/licenses/httpcore-NOTICE.txt
index 91e5c40c4c..91e5c40c4c 100644
--- a/client/licenses/httpcore-NOTICE.txt
+++ b/client/sniffer/licenses/httpcore-NOTICE.txt
diff --git a/client-sniffer/licenses/jackson-core-2.7.1.jar.sha1 b/client/sniffer/licenses/jackson-core-2.7.1.jar.sha1
index 73831ed2d5..73831ed2d5 100644
--- a/client-sniffer/licenses/jackson-core-2.7.1.jar.sha1
+++ b/client/sniffer/licenses/jackson-core-2.7.1.jar.sha1
diff --git a/client-sniffer/licenses/jackson-core-LICENSE b/client/sniffer/licenses/jackson-core-LICENSE
index f5f45d26a4..f5f45d26a4 100644
--- a/client-sniffer/licenses/jackson-core-LICENSE
+++ b/client/sniffer/licenses/jackson-core-LICENSE
diff --git a/client-sniffer/licenses/jackson-core-NOTICE b/client/sniffer/licenses/jackson-core-NOTICE
index 4c976b7b4c..4c976b7b4c 100644
--- a/client-sniffer/licenses/jackson-core-NOTICE
+++ b/client/sniffer/licenses/jackson-core-NOTICE
diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java
index 7cdb51066c..7cdb51066c 100644
--- a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java
+++ b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java
diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java
index 7635005714..7635005714 100644
--- a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java
+++ b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java
diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
index 74a28cdd22..74a28cdd22 100644
--- a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
+++ b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
index c167a3a104..c167a3a104 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java
index 1b38f03426..1b38f03426 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java
index bdc052d07c..bdc052d07c 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java
index 6a71d72f60..6a71d72f60 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java
diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
index defa83554a..defa83554a 100644
--- a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
+++ b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java
diff --git a/client-test/build.gradle b/client/test/build.gradle
index 1296b9fa5b..1296b9fa5b 100644
--- a/client-test/build.gradle
+++ b/client/test/build.gradle
diff --git a/client-test/src/main/java/org/elasticsearch/client/RestClientTestCase.java b/client/test/src/main/java/org/elasticsearch/client/RestClientTestCase.java
index 30305478d7..30305478d7 100644
--- a/client-test/src/main/java/org/elasticsearch/client/RestClientTestCase.java
+++ b/client/test/src/main/java/org/elasticsearch/client/RestClientTestCase.java
diff --git a/client-test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java b/client/test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java
index 4d4aa00f49..4d4aa00f49 100644
--- a/client-test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java
+++ b/client/test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java
diff --git a/settings.gradle b/settings.gradle
index a1585a7bdf..c0d7a72b2a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,9 +5,9 @@ List projects = [
   'rest-api-spec',
   'core',
   'docs',
-  'client',
-  'client-sniffer',
-  'client-test',
+  'client:rest',
+  'client:sniffer',
+  'client:test',
   'benchmarks',
   'distribution:integ-test-zip',
   'distribution:zip',
diff --git a/test/framework/build.gradle b/test/framework/build.gradle
index 6ddcb7598a..8be06574df 100644
--- a/test/framework/build.gradle
+++ b/test/framework/build.gradle
@@ -26,7 +26,7 @@ dependencies {
   compile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
   compile "org.apache.lucene:lucene-test-framework:${versions.lucene}"
   compile "org.apache.lucene:lucene-codecs:${versions.lucene}"
-  compile "org.elasticsearch:client:${version}"
+  compile "org.elasticsearch.client:rest:${version}"
   compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
   compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
   compile "commons-logging:commons-logging:${versions.commonslogging}"
@@ -48,17 +48,17 @@ dependencyLicenses.enabled = false
 
 thirdPartyAudit.excludes = [
   // classes are missing
-  'javax.servlet.ServletContextEvent', 
-  'javax.servlet.ServletContextListener', 
-  'org.apache.avalon.framework.logger.Logger', 
-  'org.apache.log.Hierarchy', 
-  'org.apache.log.Logger', 
+  'javax.servlet.ServletContextEvent',
+  'javax.servlet.ServletContextListener',
+  'org.apache.avalon.framework.logger.Logger',
+  'org.apache.log.Hierarchy',
+  'org.apache.log.Logger',
    // we intentionally exclude the ant tasks because people were depending on them from their tests!!!!!!!
-  'org.apache.tools.ant.BuildException', 
-  'org.apache.tools.ant.DirectoryScanner', 
-  'org.apache.tools.ant.Task', 
-  'org.apache.tools.ant.types.FileSet', 
-  'org.easymock.EasyMock', 
-  'org.easymock.IArgumentMatcher', 
+  'org.apache.tools.ant.BuildException',
+  'org.apache.tools.ant.DirectoryScanner',
+  'org.apache.tools.ant.Task',
+  'org.apache.tools.ant.types.FileSet',
+  'org.easymock.EasyMock',
+  'org.easymock.IArgumentMatcher',
   'org.jmock.core.Constraint',
 ]