Reorganize Copycat code to put it all under one top-level directory.

This commit is contained in:
Ewen Cheslack-Postava 2015-08-12 19:58:08 -07:00
parent b29cb2c5cd
commit d55d31ec98
80 changed files with 14 additions and 14 deletions

View File

@ -66,9 +66,9 @@ do
CLASSPATH=$CLASSPATH:$file CLASSPATH=$CLASSPATH:$file
done done
for pkg in "copycat-data" "copycat-api" "copycat-runtime" "copycat-file" "copycat-json" for cc_pkg in "data" "api" "runtime" "file" "json"
do do
for file in $base_dir/${pkg}/build/libs/${pkg}*.jar $base_dir/${pkg}/build/dependant-libs/*.jar; for file in $base_dir/copycat/${cc_pkg}/build/libs/copycat-${cc_pkg}*.jar $base_dir/copycat/${cc_pkg}/build/dependant-libs/*.jar;
do do
CLASSPATH=$CLASSPATH:$file CLASSPATH=$CLASSPATH:$file
done done

View File

@ -209,7 +209,7 @@ for ( sv in ['2_10_5', '2_11_7'] ) {
} }
} }
def copycatPkgs = ['copycat-data', 'copycat-api', 'copycat-runtime', 'copycat-json', 'copycat-file'] def copycatPkgs = ['copycat:data', 'copycat:api', 'copycat:runtime', 'copycat:json', 'copycat:file']
def pkgs = ['clients', 'examples', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'log4j-appender', 'tools'] + copycatPkgs def pkgs = ['clients', 'examples', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'log4j-appender', 'tools'] + copycatPkgs
tasks.create(name: "jarCopycat", dependsOn: copycatPkgs.collect { it + ":jar" }) {} tasks.create(name: "jarCopycat", dependsOn: copycatPkgs.collect { it + ":jar" }) {}
@ -507,7 +507,7 @@ project(':log4j-appender') {
test.dependsOn('checkstyleMain', 'checkstyleTest') test.dependsOn('checkstyleMain', 'checkstyleTest')
} }
project(':copycat-data') { project(':copycat:data') {
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
archivesBaseName = "copycat-data" archivesBaseName = "copycat-data"
@ -550,12 +550,12 @@ project(':copycat-data') {
test.dependsOn('checkstyleMain', 'checkstyleTest') */ test.dependsOn('checkstyleMain', 'checkstyleTest') */
} }
project(':copycat-api') { project(':copycat:api') {
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
archivesBaseName = "copycat-api" archivesBaseName = "copycat-api"
dependencies { dependencies {
compile project(':copycat-data') compile project(':copycat:data')
compile "$slf4japi" compile "$slf4japi"
testCompile "$junit" testCompile "$junit"
@ -592,12 +592,12 @@ project(':copycat-api') {
test.dependsOn('checkstyleMain', 'checkstyleTest') test.dependsOn('checkstyleMain', 'checkstyleTest')
} }
project(':copycat-json') { project(':copycat:json') {
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
archivesBaseName = "copycat-json" archivesBaseName = "copycat-json"
dependencies { dependencies {
compile project(':copycat-api') compile project(':copycat:api')
compile "$slf4japi" compile "$slf4japi"
compile 'com.fasterxml.jackson.core:jackson-databind:2.5.4' compile 'com.fasterxml.jackson.core:jackson-databind:2.5.4'
@ -650,12 +650,12 @@ project(':copycat-json') {
} }
} }
project(':copycat-runtime') { project(':copycat:runtime') {
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
archivesBaseName = "copycat-runtime" archivesBaseName = "copycat-runtime"
dependencies { dependencies {
compile project(':copycat-api') compile project(':copycat:api')
compile project(':clients') compile project(':clients')
compile "$slf4japi" compile "$slf4japi"
@ -664,7 +664,7 @@ project(':copycat-runtime') {
testCompile "$powermock" testCompile "$powermock"
testCompile "$powermock_easymock" testCompile "$powermock_easymock"
testRuntime "$slf4jlog4j" testRuntime "$slf4jlog4j"
testRuntime project(":copycat-json") testRuntime project(":copycat:json")
} }
task testJar(type: Jar) { task testJar(type: Jar) {
@ -697,12 +697,12 @@ project(':copycat-runtime') {
test.dependsOn('checkstyleMain', 'checkstyleTest') test.dependsOn('checkstyleMain', 'checkstyleTest')
} }
project(':copycat-file') { project(':copycat:file') {
apply plugin: 'checkstyle' apply plugin: 'checkstyle'
archivesBaseName = "copycat-file" archivesBaseName = "copycat-file"
dependencies { dependencies {
compile project(':copycat-api') compile project(':copycat:api')
compile "$slf4japi" compile "$slf4japi"
testCompile "$junit" testCompile "$junit"

View File

@ -15,4 +15,4 @@
apply from: file('scala.gradle') apply from: file('scala.gradle')
include 'core', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'examples', 'clients', 'tools', 'log4j-appender', include 'core', 'contrib:hadoop-consumer', 'contrib:hadoop-producer', 'examples', 'clients', 'tools', 'log4j-appender',
'copycat-data', 'copycat-api', 'copycat-runtime', 'copycat-json', 'copycat-file' 'copycat:data', 'copycat:api', 'copycat:runtime', 'copycat:json', 'copycat:file'