Changed build from UberJar to normal application dist. Removed alot of startup scripts which dont have targets (they dont run anything)
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/7d80a8ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/7d80a8ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/7d80a8ba Branch: refs/heads/fix/dependendices-2016 Commit: 7d80a8ba62d7d0613dfe3976fbd3e557c392c9f1 Parents: 89f19a8 Author: wisebaldone <wisebald...@apache.org> Authored: Thu Dec 22 18:20:45 2016 +1000 Committer: wisebaldone <wisebald...@apache.org> Committed: Thu Dec 22 18:20:45 2016 +1000 ---------------------------------------------------------------------- .gitignore | 1 + build.gradle | 23 +- pst/build.gradle | 10 +- wave/build.gradle | 116 +- wave/dist/CHANGES | 2788 ------------------ wave/dist/LICENSE | 524 ---- wave/dist/NOTICE | 17 - wave/dist/README.export-import | 52 - wave/dist/check-certificates.sh | 95 - wave/dist/jsongadgets.json | 730 ----- wave/dist/make_cert.sh | 42 - wave/dist/platforms/ubuntu/daemon-script.sh | 85 - wave/dist/platforms/ubuntu/server-wrapper.sh | 46 - wave/dist/process-script-args.sh | 41 - wave/dist/run-data-migration.sh | 28 - wave/dist/run-export.sh | 25 - wave/dist/run-import.sh | 25 - wave/dist/run-server.bat | 23 - wave/dist/run-server.sh | 31 - wave/dist/run-solr.bat | 26 - wave/dist/run-solr.sh | 30 - .../thumbnail_patterns/application-certificate | Bin 5029 -> 0 bytes ...plication-vnd.ms-excel.sheet.macroEnabled.12 | Bin 3704 -> 0 bytes ...d.ms-powerpoint.presentation.macroEnabled.12 | Bin 3640 -> 0 bytes ...ication-vnd.ms-word.document.macroEnabled.12 | Bin 2530 -> 0 bytes ...s-officedocument.presentationml.presentation | Bin 3640 -> 0 bytes ...rmats-officedocument.presentationml.template | Bin 5216 -> 0 bytes ...mlformats-officedocument.spreadsheetml.sheet | Bin 3704 -> 0 bytes ...ormats-officedocument.spreadsheetml.template | Bin 4127 -> 0 bytes ...ats-officedocument.wordprocessingml.document | Bin 2530 -> 0 bytes ...ats-officedocument.wordprocessingml.template | Bin 4848 -> 0 bytes .../thumbnail_patterns/application-x-executable | Bin 4112 -> 0 bytes wave/dist/thumbnail_patterns/application_pdf | Bin 2811 -> 0 bytes wave/dist/thumbnail_patterns/application_zip | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/ascii | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/audio-x-generic | Bin 3294 -> 0 bytes wave/dist/thumbnail_patterns/binary | Bin 4112 -> 0 bytes wave/dist/thumbnail_patterns/contents2 | Bin 4613 -> 0 bytes wave/dist/thumbnail_patterns/deb | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/default | Bin 2230 -> 0 bytes wave/dist/thumbnail_patterns/document | Bin 2530 -> 0 bytes wave/dist/thumbnail_patterns/empty | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/exec | Bin 4112 -> 0 bytes wave/dist/thumbnail_patterns/folder_tar | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/font | Bin 3257 -> 0 bytes wave/dist/thumbnail_patterns/font-x-generic | Bin 3257 -> 0 bytes wave/dist/thumbnail_patterns/font_bitmap | Bin 3257 -> 0 bytes wave/dist/thumbnail_patterns/font_truetype | Bin 3257 -> 0 bytes wave/dist/thumbnail_patterns/font_type1 | Bin 3257 -> 0 bytes .../dist/thumbnail_patterns/gnome-fs-executable | Bin 4112 -> 0 bytes wave/dist/thumbnail_patterns/gnome-package | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/html | Bin 5007 -> 0 bytes wave/dist/thumbnail_patterns/image | Bin 3326 -> 0 bytes wave/dist/thumbnail_patterns/image-x-generic | Bin 3326 -> 0 bytes wave/dist/thumbnail_patterns/kpresenter_kpr | Bin 3640 -> 0 bytes wave/dist/thumbnail_patterns/mime_ascii | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/misc | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/package | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/package-x-generic | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/package_editors | Bin 2003 -> 0 bytes .../thumbnail_patterns/package_wordprocessing | Bin 2530 -> 0 bytes wave/dist/thumbnail_patterns/plan | Bin 3774 -> 0 bytes wave/dist/thumbnail_patterns/rpm | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/shellscript | Bin 3469 -> 0 bytes wave/dist/thumbnail_patterns/sound | Bin 3294 -> 0 bytes wave/dist/thumbnail_patterns/spreadsheet | Bin 3704 -> 0 bytes wave/dist/thumbnail_patterns/stock_addressbook | Bin 4613 -> 0 bytes wave/dist/thumbnail_patterns/stock_calendar | Bin 3774 -> 0 bytes wave/dist/thumbnail_patterns/stock_certificate | Bin 5029 -> 0 bytes wave/dist/thumbnail_patterns/stock_script | Bin 3469 -> 0 bytes wave/dist/thumbnail_patterns/tar | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/template_source | Bin 2431 -> 0 bytes wave/dist/thumbnail_patterns/text-html | Bin 5007 -> 0 bytes wave/dist/thumbnail_patterns/text-x-generic | Bin 2003 -> 0 bytes .../thumbnail_patterns/text-x-generic-template | Bin 2431 -> 0 bytes wave/dist/thumbnail_patterns/text-x-script | Bin 3469 -> 0 bytes wave/dist/thumbnail_patterns/text_plain | Bin 744 -> 0 bytes wave/dist/thumbnail_patterns/tgz | Bin 3142 -> 0 bytes wave/dist/thumbnail_patterns/txt | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/txt2 | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/unknown | Bin 2003 -> 0 bytes wave/dist/thumbnail_patterns/vcalendar | Bin 3774 -> 0 bytes wave/dist/thumbnail_patterns/vcard | Bin 4613 -> 0 bytes wave/dist/thumbnail_patterns/video | Bin 5680 -> 0 bytes wave/dist/thumbnail_patterns/video-x-generic | Bin 5680 -> 0 bytes wave/dist/thumbnail_patterns/wordprocessing | Bin 2530 -> 0 bytes wave/dist/thumbnail_patterns/www | Bin 5007 -> 0 bytes .../thumbnail_patterns/x-office-address-book | Bin 4613 -> 0 bytes wave/dist/thumbnail_patterns/x-office-calendar | Bin 3774 -> 0 bytes wave/dist/thumbnail_patterns/x-office-document | Bin 2530 -> 0 bytes .../x-office-document-template | Bin 4848 -> 0 bytes wave/dist/thumbnail_patterns/x-office-drawing | Bin 3402 -> 0 bytes .../x-office-drawing-template | Bin 5471 -> 0 bytes .../thumbnail_patterns/x-office-presentation | Bin 3640 -> 0 bytes .../x-office-presentation-template | Bin 5216 -> 0 bytes .../thumbnail_patterns/x-office-spreadsheet | Bin 3704 -> 0 bytes .../x-office-spreadsheet-template | Bin 4127 -> 0 bytes wave/dist/thumbnail_patterns/zip | Bin 3142 -> 0 bytes wave/src/dist/CHANGES | 2788 ++++++++++++++++++ wave/src/dist/LICENSE | 524 ++++ wave/src/dist/NOTICE | 17 + wave/src/dist/README.export-import | 52 + wave/src/dist/check-certificates.sh | 95 + wave/src/dist/jsongadgets.json | 730 +++++ wave/src/dist/make_cert.sh | 42 + wave/src/dist/process-script-args.sh | 41 + .../thumbnail_patterns/application-certificate | Bin 0 -> 5029 bytes ...plication-vnd.ms-excel.sheet.macroEnabled.12 | Bin 0 -> 3704 bytes ...d.ms-powerpoint.presentation.macroEnabled.12 | Bin 0 -> 3640 bytes ...ication-vnd.ms-word.document.macroEnabled.12 | Bin 0 -> 2530 bytes ...s-officedocument.presentationml.presentation | Bin 0 -> 3640 bytes ...rmats-officedocument.presentationml.template | Bin 0 -> 5216 bytes ...mlformats-officedocument.spreadsheetml.sheet | Bin 0 -> 3704 bytes ...ormats-officedocument.spreadsheetml.template | Bin 0 -> 4127 bytes ...ats-officedocument.wordprocessingml.document | Bin 0 -> 2530 bytes ...ats-officedocument.wordprocessingml.template | Bin 0 -> 4848 bytes .../thumbnail_patterns/application-x-executable | Bin 0 -> 4112 bytes .../src/dist/thumbnail_patterns/application_pdf | Bin 0 -> 2811 bytes .../src/dist/thumbnail_patterns/application_zip | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/ascii | Bin 0 -> 2003 bytes .../src/dist/thumbnail_patterns/audio-x-generic | Bin 0 -> 3294 bytes wave/src/dist/thumbnail_patterns/binary | Bin 0 -> 4112 bytes wave/src/dist/thumbnail_patterns/contents2 | Bin 0 -> 4613 bytes wave/src/dist/thumbnail_patterns/deb | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/default | Bin 0 -> 2230 bytes wave/src/dist/thumbnail_patterns/document | Bin 0 -> 2530 bytes wave/src/dist/thumbnail_patterns/empty | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/exec | Bin 0 -> 4112 bytes wave/src/dist/thumbnail_patterns/folder_tar | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/font | Bin 0 -> 3257 bytes wave/src/dist/thumbnail_patterns/font-x-generic | Bin 0 -> 3257 bytes wave/src/dist/thumbnail_patterns/font_bitmap | Bin 0 -> 3257 bytes wave/src/dist/thumbnail_patterns/font_truetype | Bin 0 -> 3257 bytes wave/src/dist/thumbnail_patterns/font_type1 | Bin 0 -> 3257 bytes .../dist/thumbnail_patterns/gnome-fs-executable | Bin 0 -> 4112 bytes wave/src/dist/thumbnail_patterns/gnome-package | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/html | Bin 0 -> 5007 bytes wave/src/dist/thumbnail_patterns/image | Bin 0 -> 3326 bytes .../src/dist/thumbnail_patterns/image-x-generic | Bin 0 -> 3326 bytes wave/src/dist/thumbnail_patterns/kpresenter_kpr | Bin 0 -> 3640 bytes wave/src/dist/thumbnail_patterns/mime_ascii | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/misc | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/package | Bin 0 -> 3142 bytes .../dist/thumbnail_patterns/package-x-generic | Bin 0 -> 3142 bytes .../src/dist/thumbnail_patterns/package_editors | Bin 0 -> 2003 bytes .../thumbnail_patterns/package_wordprocessing | Bin 0 -> 2530 bytes wave/src/dist/thumbnail_patterns/plan | Bin 0 -> 3774 bytes wave/src/dist/thumbnail_patterns/rpm | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/shellscript | Bin 0 -> 3469 bytes wave/src/dist/thumbnail_patterns/sound | Bin 0 -> 3294 bytes wave/src/dist/thumbnail_patterns/spreadsheet | Bin 0 -> 3704 bytes .../dist/thumbnail_patterns/stock_addressbook | Bin 0 -> 4613 bytes wave/src/dist/thumbnail_patterns/stock_calendar | Bin 0 -> 3774 bytes .../dist/thumbnail_patterns/stock_certificate | Bin 0 -> 5029 bytes wave/src/dist/thumbnail_patterns/stock_script | Bin 0 -> 3469 bytes wave/src/dist/thumbnail_patterns/tar | Bin 0 -> 3142 bytes .../src/dist/thumbnail_patterns/template_source | Bin 0 -> 2431 bytes wave/src/dist/thumbnail_patterns/text-html | Bin 0 -> 5007 bytes wave/src/dist/thumbnail_patterns/text-x-generic | Bin 0 -> 2003 bytes .../thumbnail_patterns/text-x-generic-template | Bin 0 -> 2431 bytes wave/src/dist/thumbnail_patterns/text-x-script | Bin 0 -> 3469 bytes wave/src/dist/thumbnail_patterns/text_plain | Bin 0 -> 744 bytes wave/src/dist/thumbnail_patterns/tgz | Bin 0 -> 3142 bytes wave/src/dist/thumbnail_patterns/txt | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/txt2 | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/unknown | Bin 0 -> 2003 bytes wave/src/dist/thumbnail_patterns/vcalendar | Bin 0 -> 3774 bytes wave/src/dist/thumbnail_patterns/vcard | Bin 0 -> 4613 bytes wave/src/dist/thumbnail_patterns/video | Bin 0 -> 5680 bytes .../src/dist/thumbnail_patterns/video-x-generic | Bin 0 -> 5680 bytes wave/src/dist/thumbnail_patterns/wordprocessing | Bin 0 -> 2530 bytes wave/src/dist/thumbnail_patterns/www | Bin 0 -> 5007 bytes .../thumbnail_patterns/x-office-address-book | Bin 0 -> 4613 bytes .../dist/thumbnail_patterns/x-office-calendar | Bin 0 -> 3774 bytes .../dist/thumbnail_patterns/x-office-document | Bin 0 -> 2530 bytes .../x-office-document-template | Bin 0 -> 4848 bytes .../dist/thumbnail_patterns/x-office-drawing | Bin 0 -> 3402 bytes .../x-office-drawing-template | Bin 0 -> 5471 bytes .../thumbnail_patterns/x-office-presentation | Bin 0 -> 3640 bytes .../x-office-presentation-template | Bin 0 -> 5216 bytes .../thumbnail_patterns/x-office-spreadsheet | Bin 0 -> 3704 bytes .../x-office-spreadsheet-template | Bin 0 -> 4127 bytes wave/src/dist/thumbnail_patterns/zip | Bin 0 -> 3142 bytes wave/src/main/configs/wave.conf | 20 - 184 files changed, 4336 insertions(+), 4731 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d80a8ba/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 9337c37..c800a52 100755 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ war/WEB-INF *.project *.classpath */.settings/ +.metadata/ ### Gradle .gradle http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d80a8ba/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 698fd7f..2de1768 100644 --- a/build.gradle +++ b/build.gradle @@ -22,20 +22,24 @@ buildscript { repositories { mavenCentral() } - dependencies { - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0' - } + //dependencies { + // classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0' + //} } plugins { id "org.nosphere.apache.rat" version "0.2.0" } allprojects { - apply plugin: 'eclipse'; - apply plugin: 'idea'; + apply plugin: 'eclipse' + apply plugin: 'idea' apply plugin: 'jacoco' group = 'apache-wave' } +tasks.withType(Tar) { + compression = Compression.BZIP2 +} + //============================================================================= // Project Level Settings //============================================================================= @@ -105,8 +109,6 @@ task createDistSourceZip(type: Zip) { } task createDistSourceTar(type: Tar) { - compression = Compression.GZIP - extension = 'tar.gz' baseName = srcName destinationDir = file('distributions') from('./') { @@ -130,7 +132,7 @@ createDistSource.dependsOn createDistSourceZip, createDistSourceTar, ":pst:creat //============================================================================= // Distribution's //============================================================================= -task createDist() { +task createDist(type: Copy) { doFirst { println '' println '--------------------------------------------------------' @@ -139,6 +141,9 @@ task createDist() { println '--------------------------------------------------------' println '' } + from('wave/build/distributions') { + } + into 'distributions' } -createDist.dependsOn createDistSource, ":wave:createDistBin", ":pst:createDist" \ No newline at end of file +createDist.dependsOn createDistSource, ":wave:assembleDist", ":pst:createDist" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d80a8ba/pst/build.gradle ---------------------------------------------------------------------- diff --git a/pst/build.gradle b/pst/build.gradle index d32385a..3c7bbe6 100644 --- a/pst/build.gradle +++ b/pst/build.gradle @@ -21,8 +21,8 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '1.2.3' + id 'com.google.protobuf' version '0.8.0' } -apply plugin: 'com.google.protobuf' //============================================================================= // Project Level Settings @@ -46,6 +46,10 @@ jar { } } +tasks.withType(Tar) { + compression = Compression.BZIP2 +} + //============================================================================= // Source's //============================================================================= @@ -126,8 +130,6 @@ def srcExcludes = [ ] task createDistSourceTar(type: Tar) { - compression = Compression.GZIP - extension = 'tar.gz' baseName = srcName destinationDir = file('../distributions') from('./') { @@ -165,8 +167,6 @@ createDistSource.dependsOn createDistSourceTar, createDistSourceZip def binName = this.group + "-" + this.name + "-bin" task createDistBinTar(type: Tar) { - compression = Compression.GZIP - extension = 'tar.gz' baseName = binName destinationDir = file('../distributions') from(shadowJar) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d80a8ba/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 21a0064..440bd6b 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -21,9 +21,8 @@ plugins { id 'java' id 'application' - id 'com.github.johnrengelman.shadow' version '1.2.4' + id "com.google.protobuf" version "0.8.0" } -apply plugin: 'com.google.protobuf' //============================================================================= // Project Level Settings @@ -467,7 +466,7 @@ testLarge.mustRunAfter test // Dist's //============================================================================= -shadowJar { +jar { baseName = 'wave' classifier = '' manifest { @@ -505,101 +504,40 @@ shadowJar { exclude "org/waveprotocol/wave/client/widget/**/*" exclude "com/google/api/client/**/*" } -shadowJar.dependsOn compileJava, compileGwt +jar.dependsOn compileJava, compileGwt //============================================================================= // Binary Distribution //============================================================================= - -def binName = this.group + "-bin" - -task createPropertiesFile(type: Copy) { - from 'src/main/configs' - include 'wave.conf' - into 'config' - expand([ - version: version - ]) +tasks.withType(Tar) { + compression = Compression.BZIP2 } -task createDistBinZip(type: Zip) { - baseName = binName - destinationDir = file('../distributions') - from(shadowJar) { - into 'apache-wave/bin' - } - from('dist') { - into 'apache-wave' - } - from('config') { - into 'apache-wave/config' - } - from('war') { - into 'apache-wave/war' - } - from('../THANKS') { - into 'apache-wave' - } - from('../RELEASE-NOTES') { - into 'apache-wave' - } - from('../KEYS') { - into 'apache-wave' - } - from('../DISCLAIMER') { - into 'apache-wave' - } -} - -task createDistBinTar(type: Tar) { - compression = Compression.GZIP - extension = 'tar.gz' - baseName = binName - destinationDir = file('../distributions') - from(shadowJar) { - into 'apache-wave/bin' - } - from('dist') { - into 'apache-wave' - } - from('config') { - into 'apache-wave/config' - } - from('war') { - into 'apache-wave/war' - } - from('../THANKS') { - into 'apache-wave' - } - from('../RELEASE-NOTES') { - into 'apache-wave' - } - from('../KEYS') { - into 'apache-wave' - } - from('../DISCLAIMER') { - into 'apache-wave' - } -} - -createDistBinZip.dependsOn shadowJar, createPropertiesFile -createDistBinTar.dependsOn shadowJar, createPropertiesFile - -//============================================================================= -// Distribution's -//============================================================================= -task createDistBin() { - doFirst { - println '' - println '--------------------------------------------------------' - println ' Creating Deployment ' - println '--------------------------------------------------------' - println '' +distributions { + main { + contents { + from('config') { + into 'config' + } + from('war') { + into 'war' + } + from('../THANKS') { + into '' + } + from('../RELEASE-NOTES') { + into '' + } + from('../KEYS') { + into '' + } + from('../DISCLAIMER') { + into '' + } + } } } -createDistBin.dependsOn createDistBinZip, createDistBinTar - // Additional Clean clean { delete "war/WEB-INF"
