From 76fb8abc17b0bb9fe581ab3a6bb95baf7efedf29 Mon Sep 17 00:00:00 2001 From: wisebaldone Date: Mon, 14 Dec 2015 13:39:37 +1000 Subject: [PATCH] Moved some files around for creating dists. Removed extensions on license and notice files but kept seperated by folder location. --- LICENSE.src => LICENSE | 0 NOTICE.src => NOTICE | 0 README.md | 5 ++-- .../dist/README.profiling => README.profiling | 0 build.gradle | 12 ++++----- wave/build.gradle | 24 ++++++++++++++++++ wave/dist/{LICENSE.bin => LICENSE} | 0 wave/dist/{NOTICE.bin => NOTICE} | 0 wave/{dist => }/doc/01-server-setting.jpg | Bin wave/{dist => }/doc/02-database-settings.jpg | Bin wave/{dist => }/doc/03-profile-settings.jpg | Bin wave/{dist => }/doc/04-administer-account.jpg | Bin .../doc/05-external-components-02.png | Bin .../{dist => }/doc/05-external-components.png | Bin .../doc/06-security-settings-tls-custom.jpg | Bin .../doc/06-security-settings-tls.jpg | Bin .../doc/07-lockdown-user-creation.jpg | Bin wave/{dist => }/doc/agent.png | Bin wave/{dist => }/doc/client/01-blank.png | Bin wave/{dist => }/doc/client/02-first-waves.png | Bin wave/{dist => }/doc/client/03-open-wave.png | Bin wave/{dist => }/doc/client/04-some-text.png | Bin wave/{dist => }/doc/client/05-with-bar1.png | Bin wave/{dist => }/doc/client/05-with-bar2.png | Bin .../{dist => }/doc/client/06-without-foo1.png | Bin .../{dist => }/doc/client/06-without-foo2.png | Bin wave/{dist => }/doc/frontpage/FedOne.png | Bin 27 files changed, 33 insertions(+), 8 deletions(-) rename LICENSE.src => LICENSE (100%) rename NOTICE.src => NOTICE (100%) rename wave/dist/README.profiling => README.profiling (100%) rename wave/dist/{LICENSE.bin => LICENSE} (100%) rename wave/dist/{NOTICE.bin => NOTICE} (100%) rename wave/{dist => }/doc/01-server-setting.jpg (100%) rename wave/{dist => }/doc/02-database-settings.jpg (100%) rename wave/{dist => }/doc/03-profile-settings.jpg (100%) rename wave/{dist => }/doc/04-administer-account.jpg (100%) rename wave/{dist => }/doc/05-external-components-02.png (100%) rename wave/{dist => }/doc/05-external-components.png (100%) rename wave/{dist => }/doc/06-security-settings-tls-custom.jpg (100%) rename wave/{dist => }/doc/06-security-settings-tls.jpg (100%) rename wave/{dist => }/doc/07-lockdown-user-creation.jpg (100%) rename wave/{dist => }/doc/agent.png (100%) rename wave/{dist => }/doc/client/01-blank.png (100%) rename wave/{dist => }/doc/client/02-first-waves.png (100%) rename wave/{dist => }/doc/client/03-open-wave.png (100%) rename wave/{dist => }/doc/client/04-some-text.png (100%) rename wave/{dist => }/doc/client/05-with-bar1.png (100%) rename wave/{dist => }/doc/client/05-with-bar2.png (100%) rename wave/{dist => }/doc/client/06-without-foo1.png (100%) rename wave/{dist => }/doc/client/06-without-foo2.png (100%) rename wave/{dist => }/doc/frontpage/FedOne.png (100%) diff --git a/LICENSE.src b/LICENSE similarity index 100% rename from LICENSE.src rename to LICENSE diff --git a/NOTICE.src b/NOTICE similarity index 100% rename from NOTICE.src rename to NOTICE diff --git a/README.md b/README.md index 7eec1224..ec13599b 100644 --- a/README.md +++ b/README.md @@ -127,9 +127,10 @@ For example, to override wave\_server\_domain run: Take a look at the reference.conf to learn about configuration and possible/default values. The server can be started (on Linux/MacOS) by running - ./run-server.sh (currently disabled please use gradle method) + ./run-server.sh Or on Windows by running - run-server.bat (currently disabled please use gradle method) + run-server.bat + Note: must be cd'ed into the root directory Or, you can run the server from the compiled classes with Gradle: gradle run The web client will be accessible by default at http://localhost:9898/. diff --git a/wave/dist/README.profiling b/README.profiling similarity index 100% rename from wave/dist/README.profiling rename to README.profiling diff --git a/build.gradle b/build.gradle index 2f6791f9..6107ebbb 100644 --- a/build.gradle +++ b/build.gradle @@ -83,11 +83,11 @@ rat.doFirst { task createDistSourceZip(type: Zip) { baseName = "apache-wave-source" from('./') { - into '' + into 'apache-wave-src' } excludes = [ - 'apache-wave-source.zip', - 'apache-wave-source.tar', + 'apache-wave-src.zip', + 'apache-wave-src.tar', '.gradle/', '.git/', '.vagrant/', @@ -104,11 +104,11 @@ task createDistSourceZip(type: Zip) { task createDistSourceTar(type: Tar) { baseName = "apache-wave-source" from('./') { - into '' + into 'apache-wave-src' } excludes = [ - 'apache-wave-source.zip', - 'apache-wave-source.tar', + 'apache-wave-src.zip', + 'apache-wave-src.tar', '.gradle/', '.git/', '.vagrant/', diff --git a/wave/build.gradle b/wave/build.gradle index 0b6c7c4f..345484a6 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -558,6 +558,18 @@ task createDistZip(type: Zip) { 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 createDistTar(type: Tar) { @@ -573,6 +585,18 @@ task createDistTar(type: Tar) { 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' + } } createDistZip.dependsOn jar, createPropertiesFile diff --git a/wave/dist/LICENSE.bin b/wave/dist/LICENSE similarity index 100% rename from wave/dist/LICENSE.bin rename to wave/dist/LICENSE diff --git a/wave/dist/NOTICE.bin b/wave/dist/NOTICE similarity index 100% rename from wave/dist/NOTICE.bin rename to wave/dist/NOTICE diff --git a/wave/dist/doc/01-server-setting.jpg b/wave/doc/01-server-setting.jpg similarity index 100% rename from wave/dist/doc/01-server-setting.jpg rename to wave/doc/01-server-setting.jpg diff --git a/wave/dist/doc/02-database-settings.jpg b/wave/doc/02-database-settings.jpg similarity index 100% rename from wave/dist/doc/02-database-settings.jpg rename to wave/doc/02-database-settings.jpg diff --git a/wave/dist/doc/03-profile-settings.jpg b/wave/doc/03-profile-settings.jpg similarity index 100% rename from wave/dist/doc/03-profile-settings.jpg rename to wave/doc/03-profile-settings.jpg diff --git a/wave/dist/doc/04-administer-account.jpg b/wave/doc/04-administer-account.jpg similarity index 100% rename from wave/dist/doc/04-administer-account.jpg rename to wave/doc/04-administer-account.jpg diff --git a/wave/dist/doc/05-external-components-02.png b/wave/doc/05-external-components-02.png similarity index 100% rename from wave/dist/doc/05-external-components-02.png rename to wave/doc/05-external-components-02.png diff --git a/wave/dist/doc/05-external-components.png b/wave/doc/05-external-components.png similarity index 100% rename from wave/dist/doc/05-external-components.png rename to wave/doc/05-external-components.png diff --git a/wave/dist/doc/06-security-settings-tls-custom.jpg b/wave/doc/06-security-settings-tls-custom.jpg similarity index 100% rename from wave/dist/doc/06-security-settings-tls-custom.jpg rename to wave/doc/06-security-settings-tls-custom.jpg diff --git a/wave/dist/doc/06-security-settings-tls.jpg b/wave/doc/06-security-settings-tls.jpg similarity index 100% rename from wave/dist/doc/06-security-settings-tls.jpg rename to wave/doc/06-security-settings-tls.jpg diff --git a/wave/dist/doc/07-lockdown-user-creation.jpg b/wave/doc/07-lockdown-user-creation.jpg similarity index 100% rename from wave/dist/doc/07-lockdown-user-creation.jpg rename to wave/doc/07-lockdown-user-creation.jpg diff --git a/wave/dist/doc/agent.png b/wave/doc/agent.png similarity index 100% rename from wave/dist/doc/agent.png rename to wave/doc/agent.png diff --git a/wave/dist/doc/client/01-blank.png b/wave/doc/client/01-blank.png similarity index 100% rename from wave/dist/doc/client/01-blank.png rename to wave/doc/client/01-blank.png diff --git a/wave/dist/doc/client/02-first-waves.png b/wave/doc/client/02-first-waves.png similarity index 100% rename from wave/dist/doc/client/02-first-waves.png rename to wave/doc/client/02-first-waves.png diff --git a/wave/dist/doc/client/03-open-wave.png b/wave/doc/client/03-open-wave.png similarity index 100% rename from wave/dist/doc/client/03-open-wave.png rename to wave/doc/client/03-open-wave.png diff --git a/wave/dist/doc/client/04-some-text.png b/wave/doc/client/04-some-text.png similarity index 100% rename from wave/dist/doc/client/04-some-text.png rename to wave/doc/client/04-some-text.png diff --git a/wave/dist/doc/client/05-with-bar1.png b/wave/doc/client/05-with-bar1.png similarity index 100% rename from wave/dist/doc/client/05-with-bar1.png rename to wave/doc/client/05-with-bar1.png diff --git a/wave/dist/doc/client/05-with-bar2.png b/wave/doc/client/05-with-bar2.png similarity index 100% rename from wave/dist/doc/client/05-with-bar2.png rename to wave/doc/client/05-with-bar2.png diff --git a/wave/dist/doc/client/06-without-foo1.png b/wave/doc/client/06-without-foo1.png similarity index 100% rename from wave/dist/doc/client/06-without-foo1.png rename to wave/doc/client/06-without-foo1.png diff --git a/wave/dist/doc/client/06-without-foo2.png b/wave/doc/client/06-without-foo2.png similarity index 100% rename from wave/dist/doc/client/06-without-foo2.png rename to wave/doc/client/06-without-foo2.png diff --git a/wave/dist/doc/frontpage/FedOne.png b/wave/doc/frontpage/FedOne.png similarity index 100% rename from wave/dist/doc/frontpage/FedOne.png rename to wave/doc/frontpage/FedOne.png