Repository: incubator-wave Updated Branches: refs/heads/master f889e9e49 -> 2d5773686
Adds Vagrant file for apache wave Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/2d577368 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/2d577368 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/2d577368 Branch: refs/heads/master Commit: 2d5773686cce84bc3d57fb557a34329b32b8bf4c Parents: f889e9e Author: Evan Hughes <[email protected]> Authored: Mon Dec 28 10:22:08 2015 +0200 Committer: Yuri Zelikov <[email protected]> Committed: Mon Dec 28 10:22:08 2015 +0200 ---------------------------------------------------------------------- .gitignore | 2 + README.md | 159 +++++++++++++++++++------------ Vagrantfile | 75 +++++++++++++++ scripts/release/artifact-sign.sh | 27 ++++++ scripts/vagrant/application.conf | 23 +++++ scripts/vagrant/setup-fedora.sh | 37 +++++++ scripts/vagrant/setup-ubuntu.sh | 44 +++++++++ scripts/vagrant/setup-win-choco.cmd | 18 ++++ scripts/vagrant/setup-win.cmd | 19 ++++ wave/build.gradle | 8 +- wave/config/reference.conf | 6 +- 11 files changed, 353 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index b8ef753..dafa041 100755 --- a/.gitignore +++ b/.gitignore @@ -54,5 +54,7 @@ wave/gwt-unitCache ### config wave/local.net.cfg.lua wave/config/wave.conf +### Vagrant +.vagrant/ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 3be1780..1ef8c84 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -Apache Wave ------------- +# Apache Wave + The Apache Wave project is a stand alone wave server and rich web client that serves as a Wave reference implementation. -Apache Wave site: http://incubator.apache.org/wave/. +Apache Wave site: http://incubator.apache.org/wave/. This project lets developers and enterprise users run wave servers and host waves on their own hardware. And then share those waves with other -wave servers. +wave servers. + +## Cryptographic Software Notice -Cryptographic Software Notice ------------------------------ This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of @@ -34,30 +34,72 @@ software: Wave requires the BouncyCastle Java cryptography APIs: http://www.bouncycastle.org/java.html -Run Binary ----------- -The nightly binaries can be downloaded from https://builds.apache.org/view/S-Z/view/Wave/job/wave-artifacts/lastSuccessfulBuild/artifact/. -The latest "dev" releases can be downloaded from: https://dist.apache.org/repos/dist/dev/incubator/wave/. -The latest officially released binaries can be downloaded from: https://dist.apache.org/repos/dist/release/incubator/wave/. -Extract the archive and execute run-server.sh for Linux/Mac or run-server.bat for Windows. +## Run Binary + +The nightly binaries can be downloaded from https://builds.apache.org/view/S-Z/view/Wave/job/wave-artifacts/lastSuccessfulBuild/artifact/. +The latest "dev" releases can be downloaded from: https://dist.apache.org/repos/dist/dev/incubator/wave/. +The latest officially released binaries can be downloaded from: https://dist.apache.org/repos/dist/release/incubator/wave/. +Extract the archive and execute run-server.sh for Linux/Mac or run-server.bat for Windows. The web client will be accessible by default at http://localhost:9898/. -Setup Dev ---------- +## Setup with Vagrant + +A vagrant setup has been provided for automatic compile on a Ubuntu or Fedora +linux box. A windows box is also provided for testing but only installs requirements, +compilation and setup of the server require manual setup. + +Note: + +- requires vagrant and virtual box to be installed and an internet +connection. +- these images use jdk v8 which isn't officially supported but is used to test +for future compatibility. + +### Ubuntu & Fedora ( recommended ) + +running `vagrant up ubuntu` or `vagrant up fedora` will create a linux box +where the project will be compiled and dist installed to `/opt/apache/wave`. In +this folder you can find the current dist source and run the server. A server +config file has been provided to allow the server to be accessible outside the +vm listening on `0.0.0.0:9898`. + +To update the dist just run `vagrant up linux` where linux is either ubuntu or +fedora. + +note: +`vagrant ssh linux` where linux is either ubuntu or fedora can be used for a +ssh session. + +### Windows 10 (requires vagrant 1.8+) + +running `vagrant up win10` will setup a windows 10 environment for Apache Wave, +this vm does not setup a dist but that can be done by following the steps below +in the Gradle Tasks section within the vm. + +The virtual machine will make a copy of the current source into the users +documents folder under Apache-Wave. Running the vagrant up command again will +update this folder. The standard config for vagrant testing can be located at +`scripts/vagrant/application.conf`, just copy this file to the location +of the distributions config folder. + +### Note + +These vagrant setups are not production use and should not be used as such. + +## Setup Dev Apache Wave can be setup for eclipse and intellij IDE's. -Running `gradle eclipse` or `gradle idea` will generate all project files needed. +Running `./gradlew eclipse` or `./gradlew idea` will generate all project files needed. In a situation where dependencies have changed or project structure has changed -run `gradle cleanEclipse` or `gradle cleanIdea` depending on your IDE. +run `./gradlew cleanEclipse` or `./gradlew cleanIdea` depending on your IDE. -Gradle Tasks ------------- +## Gradle Tasks Apache Wave requires Java 7 & Gradle 2.8+ to build. -Gradle tasks can be run by `gradle [task name]` +Gradle tasks can be run by `./gradlew [task name]` Test Tasks: @@ -97,56 +139,55 @@ Distribution Tasks: - **createDistSourceTar**: builds the tar for distributing the source. -Build ------ +## Build To build the client and server: - `gradle jar` + `./gradlew jar` It will be created in wave/build/libs/wave-*version*.jar The sources can also be packaged into a jar by doing - `gradle sourcesJar` + `./gradlew sourcesJar` This will create a `project name`-sources.jar in each projects build/libs directory. -Note: +Note: -- if pst-`version`.jar is unable to be found run `gradle pst:jar` then retry. -- if a jar is unable to be unzipped with wave:extractApi then delete the jar from your cache and try again. +- if pst-`version`.jar is unable to be found run `./gradlew pst:jar` then retry. +- if a jar is unable to be unzipped with wave:extractApi then delete the jar from your cache and try again. You may need to restart. If problem persists let the newsgroup know or create an issue on Jira. -To config your server a default configuration is provided by reference.conf, +To config your server a default configuration is provided by reference.conf, this can be overwritten by application.conf with custom values. To enable federation the following must be run. -To create a simple configuration run: - `gradle prosody-config` +To create a simple configuration run: + `./gradlew prosody-config` -To override default values pass them to the ant script. -For example, to override wave\_server\_domain run: -`gradle prosody-config -Dwave_server_domain=example.com` +To override default values pass them to the ant script. +For example, to override wave\_server\_domain run: +`./gradlew prosody-config -Dwave_server_domain=example.com` 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 -Or on Windows by running +The server can be started (on Linux/MacOS) by running + ./run-server.sh +Or on Windows by running 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 +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/. -To learn more about Wave in a Box and Wave Federation Protocol: ------- -1. Subscribe to the wave-dev mailing list, find instructions at http://incubator.apache.org/wave/mailing-lists.html. +## To learn more about Wave in a Box and Wave Federation Protocol: + +1. Subscribe to the wave-dev mailing list, find instructions at http://incubator.apache.org/wave/mailing-lists.html. 2. Visit the Apache Wave wiki at https://cwiki.apache.org/confluence/display/WAVE/Home. -3. Look at the white papers folder - the information is a bit old but still usable. +3. Look at the white papers folder - the information is a bit old but still usable. 4. Watch the Wave Summit videos on YouTube, find the links at: https://cwiki.apache.org/confluence/display/WAVE/Wave+Summit+Talks -To enable SSL: --- +## To enable SSL: + Create a Java keystore for your server (e.g. using http://portecle.sourceforge.net/). You will need a key (e.g. called "server") whose subject Common Name (CN) is the hostname of your server. @@ -169,22 +210,22 @@ You can get your CA's certficate from their website, though note they might prov Users will be automatically logged in when they access the site, with the username taken from the email address in their certificate. -Setting up third party optional dependencies: +Setting up third party optional dependencies: + +## To enable MongoDB: -To enable MongoDB: --- -In order to specify MongoDB in server.config as the storage option for storing deltas, accounts and attachments - you need to install according to instructions at: http://www.mongodb.org/downloads. -Or on Ubuntu Linux you can use the following command: +In order to specify MongoDB in server.config as the storage option for storing deltas, accounts and attachments - you need to install according to instructions at: http://www.mongodb.org/downloads. +Or on Ubuntu Linux you can use the following command: sudo apt-get install mongodb-org -To enable Solr (Currently Disabled): --- -In order to specify Solr in server.config as the search type - you need to install Solr according to instructions at: http://www.apache.org/dyn/closer.cgi/lucene/solr/4.9.1. -Or, you can use built in Ant script, i.e. run: - ant get-third-party-solr-dep -This will download and unzip the Solr distribution into third_party/solr folder. -You can then run the Solr server with: - run-solr.sh -for Linux/Mac or: - run-solr.bat -for Windows. +## To enable Solr (Currently Disabled): + +In order to specify Solr in server.config as the search type - you need to install Solr according to instructions at: http://www.apache.org/dyn/closer.cgi/lucene/solr/4.9.1. +Or, you can use built in Ant script, i.e. run: + ant get-third-party-solr-dep +This will download and unzip the Solr distribution into third_party/solr folder. +You can then run the Solr server with: + run-solr.sh +for Linux/Mac or: + run-solr.bat +for Windows. http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/Vagrantfile ---------------------------------------------------------------------- diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..3a36da3 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,75 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# All Vagrant configuration is done below. The "2" in Vagrant.configure +# configures the configuration version (we support older styles for +# backwards compatibility). Please don't change it unless you know what +# you're doing. +Vagrant.configure(2) do |config| + + config.vm.define "ubuntu" do |ubuntu| + ubuntu.vm.box = "ubuntu/trusty64" + ubuntu.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'udp', auto_correct: true + ubuntu.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'tcp', auto_correct: true + ubuntu.vm.provision :shell, path: "scripts/vagrant/setup-ubuntu.sh" + ubuntu.vm.post_up_message = "Apache Wave Dev environment setup - dist in /opt/apache/wave" + + ubuntu.vm.provider "virtualbox" do |vb| + vb.name = "Apache Wave dev - Ubuntu" + vb.memory = 2048 + vb.cpus = 1 + end + end + + config.vm.define "fedora" do |fedora| + fedora.vm.box = "fedora/23-cloud-base" + fedora.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'udp', auto_correct: true + fedora.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'tcp', auto_correct: true + fedora.vm.provision :shell, path: "scripts/vagrant/setup-fedora.sh" + fedora.vm.post_up_message = "Apache Wave Dev environment setup - dist in /opt/apache/wave" + + fedora.vm.provider "virtualbox" do |vb| + vb.name = "Apache Wave dev - Fedora" + vb.memory = 2048 + vb.cpus = 1 + end + end + + config.vm.define "win10" do |win10| + win10.vm.box = "modernIE/w10-edge" + win10.vm.guest = :windows + + win10.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'udp', auto_correct: true + win10.vm.network "forwarded_port", guest: 9898, host: 9898, protocol: 'tcp', auto_correct: true + + win10.vm.provision :shell, path: "scripts/vagrant/setup-win-choco.cmd" + win10.vm.provision :shell, path: "scripts/vagrant/setup-win.cmd" + + win10.vm.provider "virtualbox" do |vb| + vb.name = "Apache Wave dev - Win10" + vb.customize ["modifyvm", :id, "--memory", "3064"] + vb.customize ["modifyvm", :id, "--vram", "128"] + vb.customize ["modifyvm", :id, "--cpus", "2"] + vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"] + vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] + vb.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000] + end + end +end http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/release/artifact-sign.sh ---------------------------------------------------------------------- diff --git a/scripts/release/artifact-sign.sh b/scripts/release/artifact-sign.sh new file mode 100644 index 0000000..004d5f0 --- /dev/null +++ b/scripts/release/artifact-sign.sh @@ -0,0 +1,27 @@ +#!/bin/zsh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +#Assumes it is being run in the base directory. + +PRE="dist/apache-wave-" +for f in $PRE*; do +gpg --armor --output $f.asc --detach-sig $f +gpg --print-md SHA512 $f > $f.sha +done \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/vagrant/application.conf ---------------------------------------------------------------------- diff --git a/scripts/vagrant/application.conf b/scripts/vagrant/application.conf new file mode 100644 index 0000000..887528f --- /dev/null +++ b/scripts/vagrant/application.conf @@ -0,0 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Configuration for the Apache Wave Server for Vagrant VM port forward. + + +core { + http_frontend_addresses : ["0.0.0.0:9898"] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/vagrant/setup-fedora.sh ---------------------------------------------------------------------- diff --git a/scripts/vagrant/setup-fedora.sh b/scripts/vagrant/setup-fedora.sh new file mode 100644 index 0000000..c15a83f --- /dev/null +++ b/scripts/vagrant/setup-fedora.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# install the dependencies +dnf install -y ant java-1.8.0-openjdk mongodb +# create install location +cd /opt +sudo mkdir apache +cd apache +sudo mkdir wave +# create the binary +cd /vagrant +./gradlew clean createDist + +# Get Apache Wave version +WAVE_VERSION=`sed "s/[\\t ]*=[\\t ]*/=/g" wave/config/wave.conf | grep ^version= | cut -f2 -d=` + +cd distributions +sudo tar -C /opt/apache/wave -xvf apache-wave-bin-$WAVE_VERSION.tar +cd .. +cp scripts/vagrant/application.conf /opt/apache/wave/apache-wave/config/application.conf \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/vagrant/setup-ubuntu.sh ---------------------------------------------------------------------- diff --git a/scripts/vagrant/setup-ubuntu.sh b/scripts/vagrant/setup-ubuntu.sh new file mode 100644 index 0000000..907576a --- /dev/null +++ b/scripts/vagrant/setup-ubuntu.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# install the dependencies +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 +echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list +sudo add-apt-repository ppa:openjdk-r/ppa +apt-get update +apt-get install -y ant openjdk-8-jdk mongodb-org +# set jdk version +JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ +export JAVA_HOME +# create install location +cd /opt +sudo mkdir apache +cd apache +sudo mkdir wave +# create the binary +cd /vagrant +./gradlew clean createDist + +# Get Apache Wave version +WAVE_VERSION=`sed "s/[\\t ]*=[\\t ]*/=/g" wave/config/wave.conf | grep ^version= | cut -f2 -d=` + +cd distributions +sudo tar -C /opt/apache/wave -xvf apache-wave-bin-$WAVE_VERSION.tar +cd .. +cp scripts/vagrant/application.conf /opt/apache/wave/apache-wave/config/application.conf http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/vagrant/setup-win-choco.cmd ---------------------------------------------------------------------- diff --git a/scripts/vagrant/setup-win-choco.cmd b/scripts/vagrant/setup-win-choco.cmd new file mode 100644 index 0000000..ee4f7c6 --- /dev/null +++ b/scripts/vagrant/setup-win-choco.cmd @@ -0,0 +1,18 @@ +:: Licensed to the Apache Software Foundation (ASF) under one +:: or more contributor license agreements. See the NOTICE file +:: distributed with this work for additional information +:: regarding copyright ownership. The ASF licenses this file +:: to you under the Apache License, Version 2.0 (the +:: "License"); you may not use this file except in compliance +:: with the License. You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, +:: software distributed under the License is distributed on an +:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +:: KIND, either express or implied. See the License for the +:: specific language governing permissions and limitations +:: under the License. + +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/scripts/vagrant/setup-win.cmd ---------------------------------------------------------------------- diff --git a/scripts/vagrant/setup-win.cmd b/scripts/vagrant/setup-win.cmd new file mode 100644 index 0000000..63d9d56 --- /dev/null +++ b/scripts/vagrant/setup-win.cmd @@ -0,0 +1,19 @@ +:: Licensed to the Apache Software Foundation (ASF) under one +:: or more contributor license agreements. See the NOTICE file +:: distributed with this work for additional information +:: regarding copyright ownership. The ASF licenses this file +:: to you under the Apache License, Version 2.0 (the +:: "License"); you may not use this file except in compliance +:: with the License. You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, +:: software distributed under the License is distributed on an +:: "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +:: KIND, either express or implied. See the License for the +:: specific language governing permissions and limitations +:: under the License. + +choco install ant jdk8 mongodb -my +xcopy c:\vagrant C:\Users\IEUser\Documents\Apache-Wave /IYS \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index ca39a6d..9367a11 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -221,6 +221,8 @@ task generateMessages { } } +generateMessages.dependsOn ":pst:jar" + task generateGXP { description = 'Generate source files from GXP prototypes' FileTree inputFiles = fileTree(dir: 'src/main/gxp', include: '**/*.gxp') @@ -551,7 +553,7 @@ task createPropertiesFile(type: Copy) { } task createDistBinZip(type: Zip) { - baseName = this.group + "-bin-" + baseName = this.group + "-bin" destinationDir = file('../distributions') from(jar) { into 'apache-wave/bin' @@ -580,7 +582,7 @@ task createDistBinZip(type: Zip) { } task createDistBinTar(type: Tar) { - baseName = this.group + "-bin-" + baseName = this.group + "-bin" destinationDir = file('../distributions') from(jar) { into 'apache-wave/bin' @@ -621,7 +623,7 @@ task createDistBin() { } } -createDistBin.dependsOn createDistBinZip, +createDistBin.dependsOn createDistBinZip, createDistBinTar // Additional Clean clean { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2d577368/wave/config/reference.conf ---------------------------------------------------------------------- diff --git a/wave/config/reference.conf b/wave/config/reference.conf index 04753c4..8142f9b 100644 --- a/wave/config/reference.conf +++ b/wave/config/reference.conf @@ -15,11 +15,11 @@ # specific language governing permissions and limitations # under the License. -# Configuration for the Wave in a Box server +# Configuration for the Apache Wave server. core { - # Domain name of the wave server. + # Domain name of the Wave server. wave_server_domain : "local.net" # A comma separated list of address on which to listen for connections. @@ -43,7 +43,7 @@ core { # See https://cwiki.apache.org/confluence/display/WAVE/Gadgets+with+your+own+Gadget+Server gadget_server_hostname : "gmodules.com" - # The gadget serer port. + # The gadget server port. gadget_server_port : 80 # A comma separated list of webApp source directories
