http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/run-server.bat ---------------------------------------------------------------------- diff --git a/wave/dist/run-server.bat b/wave/dist/run-server.bat new file mode 100644 index 0000000..f70f6d3 --- /dev/null +++ b/wave/dist/run-server.bat @@ -0,0 +1,24 @@ +echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +for /F "tokens=1* delims==" %%A IN (build.properties) DO ( + IF "%%A"=="waveinabox.version" set WAVEINABOX_VERSION=%%B + IF "%%A"=="name" set NAME=%%B + ) +echo on + +java -Djava.util.logging.config.file=wiab-logging.conf -Djava.security.auth.login.config=jaas.config -Dwave.server.config=server.config -jar dist/%NAME%-server-%WAVEINABOX_VERSION%.jar +pause
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/run-server.sh ---------------------------------------------------------------------- diff --git a/wave/dist/run-server.sh b/wave/dist/run-server.sh new file mode 100755 index 0000000..f733bad --- /dev/null +++ b/wave/dist/run-server.sh @@ -0,0 +1,32 @@ +#!/bin/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. + +# This script will start the Wave in a Box server. + +# The version of Wave in a Box, extracted from the build.properties file +WAVEINABOX_VERSION=`sed "s/[\\t ]*=[\\t ]*/=/g" build.properties | grep ^waveinabox.version= | cut -f2 -d=` +NAME=`sed "s/[\\t ]*=[\\t ]*/=/g" build.properties | grep ^name= | cut -f2 -d=` + +. process-script-args.sh + +exec java $DEBUG_FLAGS \ + -Djava.util.logging.config.file=wiab-logging.conf \ + -Djava.security.auth.login.config=jaas.config \ + -Dwave.server.config=server.config \ + -jar dist/$NAME-server-$WAVEINABOX_VERSION.jar http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/run-solr.bat ---------------------------------------------------------------------- diff --git a/wave/dist/run-solr.bat b/wave/dist/run-solr.bat new file mode 100644 index 0000000..95d9a29 --- /dev/null +++ b/wave/dist/run-solr.bat @@ -0,0 +1,26 @@ +echo off +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + +if not exist "third_party\solr\solr-4.9.1\example" ( + echo "Please download Solr by running: ant get-third-party-solr-dep " + echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.1/ into third_party\solr and unzip there." + pause + exit 1 +) + +cd third_party\solr\solr-4.9.1\example +java -jar start.jar +pause http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/run-solr.sh ---------------------------------------------------------------------- diff --git a/wave/dist/run-solr.sh b/wave/dist/run-solr.sh new file mode 100755 index 0000000..4edc87f --- /dev/null +++ b/wave/dist/run-solr.sh @@ -0,0 +1,30 @@ +#!/bin/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. + +# This script will start the Solr server. + +# Make sure the third_party/solr/solr-4.9.1/example folder exists. +if [ ! -d third_party/solr/solr-4.9.1/example ]; then + echo "Please download Solr by running: ant get-third-party-solr-dep " + echo "Or download it manually from http://apache.spd.co.il/lucene/solr/4.9.1/ into third_party/solr and unzip there." + exit 1 +fi + +cd third_party/solr/solr-4.9.1/example +exec java -jar start.jar http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-certificate ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-certificate b/wave/dist/thumbnail_patterns/application-certificate new file mode 100644 index 0000000..290e62c Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-certificate differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.ms-excel.sheet.macroEnabled.12 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.ms-excel.sheet.macroEnabled.12 b/wave/dist/thumbnail_patterns/application-vnd.ms-excel.sheet.macroEnabled.12 new file mode 100644 index 0000000..f3aae1b Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.ms-excel.sheet.macroEnabled.12 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.ms-powerpoint.presentation.macroEnabled.12 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.ms-powerpoint.presentation.macroEnabled.12 b/wave/dist/thumbnail_patterns/application-vnd.ms-powerpoint.presentation.macroEnabled.12 new file mode 100644 index 0000000..1a26651 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.ms-powerpoint.presentation.macroEnabled.12 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.ms-word.document.macroEnabled.12 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.ms-word.document.macroEnabled.12 b/wave/dist/thumbnail_patterns/application-vnd.ms-word.document.macroEnabled.12 new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.ms-word.document.macroEnabled.12 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.presentation ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.presentation b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.presentation new file mode 100644 index 0000000..1a26651 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.presentation differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.template b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.template new file mode 100644 index 0000000..e12fc28 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.presentationml.template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet new file mode 100644 index 0000000..f3aae1b Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.template b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.template new file mode 100644 index 0000000..b09500e Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.spreadsheetml.template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.document ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.document b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.document new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.document differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.template b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.template new file mode 100644 index 0000000..4d43da2 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-vnd.openxmlformats-officedocument.wordprocessingml.template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application-x-executable ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application-x-executable b/wave/dist/thumbnail_patterns/application-x-executable new file mode 100644 index 0000000..72ea15b Binary files /dev/null and b/wave/dist/thumbnail_patterns/application-x-executable differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application_pdf ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application_pdf b/wave/dist/thumbnail_patterns/application_pdf new file mode 100644 index 0000000..25f33a3 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application_pdf differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/application_zip ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/application_zip b/wave/dist/thumbnail_patterns/application_zip new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/application_zip differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/ascii ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/ascii b/wave/dist/thumbnail_patterns/ascii new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/ascii differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/audio-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/audio-x-generic b/wave/dist/thumbnail_patterns/audio-x-generic new file mode 100644 index 0000000..f543aa6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/audio-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/binary ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/binary b/wave/dist/thumbnail_patterns/binary new file mode 100644 index 0000000..72ea15b Binary files /dev/null and b/wave/dist/thumbnail_patterns/binary differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/contents2 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/contents2 b/wave/dist/thumbnail_patterns/contents2 new file mode 100644 index 0000000..02f1d5b Binary files /dev/null and b/wave/dist/thumbnail_patterns/contents2 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/deb ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/deb b/wave/dist/thumbnail_patterns/deb new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/deb differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/default ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/default b/wave/dist/thumbnail_patterns/default new file mode 100644 index 0000000..469eb52 Binary files /dev/null and b/wave/dist/thumbnail_patterns/default differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/document ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/document b/wave/dist/thumbnail_patterns/document new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/document differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/empty ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/empty b/wave/dist/thumbnail_patterns/empty new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/empty differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/exec ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/exec b/wave/dist/thumbnail_patterns/exec new file mode 100644 index 0000000..72ea15b Binary files /dev/null and b/wave/dist/thumbnail_patterns/exec differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/folder_tar ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/folder_tar b/wave/dist/thumbnail_patterns/folder_tar new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/folder_tar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/font ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/font b/wave/dist/thumbnail_patterns/font new file mode 100644 index 0000000..9d5839c Binary files /dev/null and b/wave/dist/thumbnail_patterns/font differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/font-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/font-x-generic b/wave/dist/thumbnail_patterns/font-x-generic new file mode 100644 index 0000000..9d5839c Binary files /dev/null and b/wave/dist/thumbnail_patterns/font-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/font_bitmap ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/font_bitmap b/wave/dist/thumbnail_patterns/font_bitmap new file mode 100644 index 0000000..9d5839c Binary files /dev/null and b/wave/dist/thumbnail_patterns/font_bitmap differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/font_truetype ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/font_truetype b/wave/dist/thumbnail_patterns/font_truetype new file mode 100644 index 0000000..9d5839c Binary files /dev/null and b/wave/dist/thumbnail_patterns/font_truetype differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/font_type1 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/font_type1 b/wave/dist/thumbnail_patterns/font_type1 new file mode 100644 index 0000000..9d5839c Binary files /dev/null and b/wave/dist/thumbnail_patterns/font_type1 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/gnome-fs-executable ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/gnome-fs-executable b/wave/dist/thumbnail_patterns/gnome-fs-executable new file mode 100644 index 0000000..72ea15b Binary files /dev/null and b/wave/dist/thumbnail_patterns/gnome-fs-executable differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/gnome-package ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/gnome-package b/wave/dist/thumbnail_patterns/gnome-package new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/gnome-package differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/html ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/html b/wave/dist/thumbnail_patterns/html new file mode 100644 index 0000000..aceb2cd Binary files /dev/null and b/wave/dist/thumbnail_patterns/html differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/image ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/image b/wave/dist/thumbnail_patterns/image new file mode 100644 index 0000000..b05624f Binary files /dev/null and b/wave/dist/thumbnail_patterns/image differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/image-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/image-x-generic b/wave/dist/thumbnail_patterns/image-x-generic new file mode 100644 index 0000000..b05624f Binary files /dev/null and b/wave/dist/thumbnail_patterns/image-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/kpresenter_kpr ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/kpresenter_kpr b/wave/dist/thumbnail_patterns/kpresenter_kpr new file mode 100644 index 0000000..1a26651 Binary files /dev/null and b/wave/dist/thumbnail_patterns/kpresenter_kpr differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/mime_ascii ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/mime_ascii b/wave/dist/thumbnail_patterns/mime_ascii new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/mime_ascii differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/misc ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/misc b/wave/dist/thumbnail_patterns/misc new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/misc differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/package ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/package b/wave/dist/thumbnail_patterns/package new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/package differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/package-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/package-x-generic b/wave/dist/thumbnail_patterns/package-x-generic new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/package-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/package_editors ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/package_editors b/wave/dist/thumbnail_patterns/package_editors new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/package_editors differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/package_wordprocessing ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/package_wordprocessing b/wave/dist/thumbnail_patterns/package_wordprocessing new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/package_wordprocessing differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/plan ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/plan b/wave/dist/thumbnail_patterns/plan new file mode 100644 index 0000000..69deb8b Binary files /dev/null and b/wave/dist/thumbnail_patterns/plan differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/rpm ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/rpm b/wave/dist/thumbnail_patterns/rpm new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/rpm differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/shellscript ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/shellscript b/wave/dist/thumbnail_patterns/shellscript new file mode 100644 index 0000000..30134b6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/shellscript differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/sound ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/sound b/wave/dist/thumbnail_patterns/sound new file mode 100644 index 0000000..f543aa6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/sound differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/spreadsheet ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/spreadsheet b/wave/dist/thumbnail_patterns/spreadsheet new file mode 100644 index 0000000..f3aae1b Binary files /dev/null and b/wave/dist/thumbnail_patterns/spreadsheet differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/stock_addressbook ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/stock_addressbook b/wave/dist/thumbnail_patterns/stock_addressbook new file mode 100644 index 0000000..02f1d5b Binary files /dev/null and b/wave/dist/thumbnail_patterns/stock_addressbook differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/stock_calendar ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/stock_calendar b/wave/dist/thumbnail_patterns/stock_calendar new file mode 100644 index 0000000..69deb8b Binary files /dev/null and b/wave/dist/thumbnail_patterns/stock_calendar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/stock_certificate ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/stock_certificate b/wave/dist/thumbnail_patterns/stock_certificate new file mode 100644 index 0000000..290e62c Binary files /dev/null and b/wave/dist/thumbnail_patterns/stock_certificate differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/stock_script ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/stock_script b/wave/dist/thumbnail_patterns/stock_script new file mode 100644 index 0000000..30134b6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/stock_script differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/tar ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/tar b/wave/dist/thumbnail_patterns/tar new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/tar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/template_source ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/template_source b/wave/dist/thumbnail_patterns/template_source new file mode 100644 index 0000000..47796bd Binary files /dev/null and b/wave/dist/thumbnail_patterns/template_source differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/text-html ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/text-html b/wave/dist/thumbnail_patterns/text-html new file mode 100644 index 0000000..aceb2cd Binary files /dev/null and b/wave/dist/thumbnail_patterns/text-html differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/text-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/text-x-generic b/wave/dist/thumbnail_patterns/text-x-generic new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/text-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/text-x-generic-template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/text-x-generic-template b/wave/dist/thumbnail_patterns/text-x-generic-template new file mode 100644 index 0000000..47796bd Binary files /dev/null and b/wave/dist/thumbnail_patterns/text-x-generic-template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/text-x-script ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/text-x-script b/wave/dist/thumbnail_patterns/text-x-script new file mode 100644 index 0000000..30134b6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/text-x-script differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/text_plain ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/text_plain b/wave/dist/thumbnail_patterns/text_plain new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/wave/dist/thumbnail_patterns/text_plain differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/tgz ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/tgz b/wave/dist/thumbnail_patterns/tgz new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/tgz differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/txt ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/txt b/wave/dist/thumbnail_patterns/txt new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/txt differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/txt2 ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/txt2 b/wave/dist/thumbnail_patterns/txt2 new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/txt2 differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/unknown ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/unknown b/wave/dist/thumbnail_patterns/unknown new file mode 100644 index 0000000..d6b401a Binary files /dev/null and b/wave/dist/thumbnail_patterns/unknown differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/vcalendar ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/vcalendar b/wave/dist/thumbnail_patterns/vcalendar new file mode 100644 index 0000000..69deb8b Binary files /dev/null and b/wave/dist/thumbnail_patterns/vcalendar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/vcard ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/vcard b/wave/dist/thumbnail_patterns/vcard new file mode 100644 index 0000000..02f1d5b Binary files /dev/null and b/wave/dist/thumbnail_patterns/vcard differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/video ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/video b/wave/dist/thumbnail_patterns/video new file mode 100644 index 0000000..84a40c4 Binary files /dev/null and b/wave/dist/thumbnail_patterns/video differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/video-x-generic ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/video-x-generic b/wave/dist/thumbnail_patterns/video-x-generic new file mode 100644 index 0000000..84a40c4 Binary files /dev/null and b/wave/dist/thumbnail_patterns/video-x-generic differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/wordprocessing ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/wordprocessing b/wave/dist/thumbnail_patterns/wordprocessing new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/wordprocessing differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/www ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/www b/wave/dist/thumbnail_patterns/www new file mode 100644 index 0000000..aceb2cd Binary files /dev/null and b/wave/dist/thumbnail_patterns/www differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-address-book ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-address-book b/wave/dist/thumbnail_patterns/x-office-address-book new file mode 100644 index 0000000..02f1d5b Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-address-book differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-calendar ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-calendar b/wave/dist/thumbnail_patterns/x-office-calendar new file mode 100644 index 0000000..69deb8b Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-calendar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-document ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-document b/wave/dist/thumbnail_patterns/x-office-document new file mode 100644 index 0000000..4a05f84 Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-document differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-document-template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-document-template b/wave/dist/thumbnail_patterns/x-office-document-template new file mode 100644 index 0000000..4d43da2 Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-document-template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-drawing ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-drawing b/wave/dist/thumbnail_patterns/x-office-drawing new file mode 100644 index 0000000..64d6da6 Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-drawing differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-drawing-template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-drawing-template b/wave/dist/thumbnail_patterns/x-office-drawing-template new file mode 100644 index 0000000..d7f87df Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-drawing-template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-presentation ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-presentation b/wave/dist/thumbnail_patterns/x-office-presentation new file mode 100644 index 0000000..1a26651 Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-presentation differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-presentation-template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-presentation-template b/wave/dist/thumbnail_patterns/x-office-presentation-template new file mode 100644 index 0000000..e12fc28 Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-presentation-template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-spreadsheet ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-spreadsheet b/wave/dist/thumbnail_patterns/x-office-spreadsheet new file mode 100644 index 0000000..f3aae1b Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-spreadsheet differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/x-office-spreadsheet-template ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/x-office-spreadsheet-template b/wave/dist/thumbnail_patterns/x-office-spreadsheet-template new file mode 100644 index 0000000..b09500e Binary files /dev/null and b/wave/dist/thumbnail_patterns/x-office-spreadsheet-template differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/dist/thumbnail_patterns/zip ---------------------------------------------------------------------- diff --git a/wave/dist/thumbnail_patterns/zip b/wave/dist/thumbnail_patterns/zip new file mode 100644 index 0000000..7df2419 Binary files /dev/null and b/wave/dist/thumbnail_patterns/zip differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/jaas.config ---------------------------------------------------------------------- diff --git a/wave/jaas.config b/wave/jaas.config deleted file mode 100644 index 044f2d1..0000000 --- a/wave/jaas.config +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -Wave { - org.waveprotocol.box.server.authentication.AccountStoreLoginModule required debug=true; -}; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/prosody.cfg.lua.example ---------------------------------------------------------------------- diff --git a/wave/prosody.cfg.lua.example b/wave/prosody.cfg.lua.example deleted file mode 100644 index 2a5403d..0000000 --- a/wave/prosody.cfg.lua.example +++ /dev/null @@ -1,31 +0,0 @@ ---[[ - * 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. ---]] - -component_ports = { @XMPP_SERVER_COMPONENT_PORT@ } -s2s_ports = { @XMPP_SERVER_TO_SERVER_PORT@ } - -VirtualHost "@CERTIFICATE_DOMAIN@" - enabled = true - ssl = { - key = "@BASEDIR@/@CERTIFICATE_PRIVATE_KEY@"; - certificate = "@BASEDIR@/@[email protected]"; - } - -Component "@XMPP_JID@" - component_secret = "@XMPP_SERVER_SECRET@" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/reference.conf ---------------------------------------------------------------------- diff --git a/wave/reference.conf b/wave/reference.conf deleted file mode 100644 index 04753c4..0000000 --- a/wave/reference.conf +++ /dev/null @@ -1,257 +0,0 @@ -# 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 Wave in a Box server - - -core { - # Domain name of the wave server. - wave_server_domain : "local.net" - - # A comma separated list of address on which to listen for connections. - # Each address is a comma separated host:port pair. - http_frontend_addresses : ["localhost:9898"] - - # The public address - a comma separated host:port pair, i.e. example.com:80 - http_frontend_public_address : "" - - # An optional host:port address on which to listen for websocket connections. - # Defaults to http_websocket_public_address. - # If no value is set for http_websocket_public_address it defaults to the first address specified - # by http_frontend_public_address. - http_websocket_public_address : "" - - # An optional host:port address for which the client is told to attempt websocket connections. - # If no value is set for http_websocket_presented_address it defaults to http_websocket_public_address. - http_websocket_presented_address : "" - - # The address of Apache Shindig gadgets server patched to support Wave gadgets. - # See https://cwiki.apache.org/confluence/display/WAVE/Gadgets+with+your+own+Gadget+Server - gadget_server_hostname : "gmodules.com" - - # The gadget serer port. - gadget_server_port : 80 - - # A comma separated list of webApp source directories - resource_bases : ["./war"] - - # Settings for the different persistence stores. Currently supported: memory, file, mongodb. - signer_info_store_type : file - - # The location where signer info certificate data is stored on disk. This should be changed. - # Note: This is only used when using the file signer info store. It is ignored - # for other data store types. - signer_info_store_directory : _certificates - - # Currently supported attachment types: mongodb, disk - attachment_store_type : disk - - # The location where attachments are stored on disk. This should be changed. - # Note: This is only used when using the disk attachment store. It is ignored - # for other data store types. - attachment_store_directory : _attachments - - # Directory that holds the thumbnails for attachments. - # Icon must be in PNG format, and named as MIME type with replacing '/' to '_'. - # For example thumbnail file for ZIP format (MIME type application/zip) must be named application_zip. - thumbnail_patterns_directory : _thumbnail_patterns - - # Currently supported account store types: fake, memory, file, mongodb - account_store_type : file - - # The location where accounts are stored on disk. This should be changed. - # Note: This is only used when using the file account store. It is ignored - # for other data store types. - account_store_directory : _accounts - - # Currently supported delta store types: memory, file, mongodb. - # Note: file system support is experimental. Your server may crash. And the file format is - # not stable and shouldn't be relied upon for long-term storage yet; upcoming changes will - # require you to blow away your data. - delta_store_type : file - - # The location where deltas are stored on disk. This should be changed. - # Note: This is only used when using the file delta store. It is ignored - # for other data store types. - delta_store_directory : _deltas - - # The location where user sessions are persisted on disk. This allow to restore user sessions - # between restarts. - sessions_store_directory : _sessions - - # Currently supported search types: memory, lucene, solr. - search_type : memory - - # The location where search indexes are stored on disk. - # Note: This is only used when using the lucene search type. It is ignored - # for other search types. - index_directory : _indexes - - # Currently supported profile fetcher types: gravatar, initials. - profile_fetcher_type : initials - - # The Solr endpoint url. - solr_base_url : "http://localhost:8983/solr"; - - # Enables server side profiling. To display the stats press ctrl+alt+ctrl in the web client. - # Default value: true - enable_profiling : true - - # Mongodb connection options - # Only used if some of the *_store_type properties are set to 'mongodb' - - # Server's host name or IP address. - mongodb_host : "127.0.0.1" - - # Server's port. Default value: 27017 - mongodb_port : 27017 - - # Database's name. Default name: wiab - mongodb_database : wiab -} - -network { - # Max age of session cookie in seconds. - # -1 means cookie lives in the browser current session only. - session_cookie_max_age : -1 - - # The time in ms that the websocket connection can be idle before closing - websocket_max_idle_time : 0 - - # Maximum websocket message size to be received in MB - websocket_max_message_size : 2 -} - -administration { - # Note: the default value for admin is an invalid user id that cannot be registered. - # To become an admin: Register a user and set its address as the value below. - # Admin has a privilege to change passwords of other users using an agent robot. - admin_user : "@" - - # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). - # If filled in then a copy of this wave (actually only the root blip) will be - # automatically added to the inbox of every new user. - welcome_wave_id : "" - - # Set true to prevent anyone registering on your server. - # When true, only the admin user can use the RegistrationRobot to add new accounts - disable_registration : false - - # Disable login page - useful to force x509-only authentication - disable_loginpage : false - - # Google Analytics account. - analytics_account : "" -} - -threads { - # The number of threads to listen on wavelet updates. Default value: 1 - listener_executor_thread_count : 1 - - # The number of threads for loading wavelets. Default value: 1 - wavelet_load_executor_thread_count : 1 - - # The number of threads to persist deltas. Default value: 1 - delta_persist_executor_thread_count : 1 - - # The number of threads to perform post wavelet loading logic. Default value: 1 - storage_continuation_executor_thread_count : 1 - - # The number of threads for looking up the wavelet ids - # while creating a list of all wavelets in the persistent storage. Default value: 1 - lookup_executor_thread_count : 1 - - # The number of threads for making search/update requests to Solr. Default value: 1 - solr_thread_count : 1 - - # The number of threads for making for retrieving contacts. - contact_executor_thread_count : 1 -} - -security { - # Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional). - enable_ssl : false - - # Path to keystore containg the ssl certificates to server - # Note: this is only used when enable_ssl set to true. - ssl_keystore_path : wiab.ks - - # Password to the keystore. - # Note: this is only used when enable_ssl set to true. - ssl_keystore_password : changeme - - # Enable client x509 cert. authentication? - enable_clientauth : false - - # Domain of the email to look for as email field of x509 client auth certificates when using client authentication - clientauth_cert_domain : "" -} - -federation { - # Federation Configuration for the Wave in a Box server - enable_federation : false - - # These will probably need to be changed - xmpp_server_secret : secret - - # The PKCS#8-PEM-encoded private key. - certificate_private_key : "local.net.key" - - # The list of file names that have the certificates of this signer. - # The first file name must have the signer's target certificate. The certificates can be DER or PEM encoded. - # The order of certificates is important. Place intermediate certs - # after "${wave_server_domain}.crt". Please refer to - # http://www.waveprotocol.org/federation/certificates - # for more details. - certificate_files : ["local.net.crt","sub.class1.server.ca.pem","ca.pem"] - - # The domain for which the certificate was issued. - certificate_domain : "local.net" - - xmpp_component_name : wave - - # This server's local JID - xmpp_jid : "wave.local.net" - - xmpp_server_description : "Wave in a Box" - - disco_info_category : "collaboration" - - disco_info_type : "apache-wave" - - xmpp_server_hostname : "local.net" - - xmpp_server_component_port : 5275 - - # How long to cache failed disco results. - xmpp_disco_failed_expiry : 300s - - # How long to cache successful disco results. - xmpp_disco_successful_expiry : 7200s - - disco_expiration : 6h - - # Set XMPP_SERVER_IP to localhost if the XMPP and Wave in a Box servers are - # running on the same host - xmpp_server_ip : localhost - - # Set true to disable the verification of signed deltas - waveserver_disable_verification : true - - # Set true to disable the verification of signers (certificates) - waveserver_disable_signer_verification : true -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/server-config.xml ---------------------------------------------------------------------- diff --git a/wave/server-config.xml b/wave/server-config.xml deleted file mode 100644 index fa80815..0000000 --- a/wave/server-config.xml +++ /dev/null @@ -1,65 +0,0 @@ -<!-- - * 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. - --> -<project name="server config" basedir="." default="prosody-config"> - <description>Creates the server configuration file.</description> - - <property name="wave_server_domain" value="local.net" /> - <property name="xmpp_server_secret" value="opensesame" /> - <property name="certificate_private_key" value="${wave_server_domain}.key" /> - <property name="certificate_files" value="${wave_server_domain}.crt,sub.class1.server.ca.pem,ca.pem" /> - <property name="certificate_domain" value="${wave_server_domain}" /> - <property name="xmpp_component_name" value="wave" /> - <property name="xmpp_jid" value="${xmpp_component_name}.${wave_server_domain}" /> - <property name="xmpp_server_description" value=""Wave in a Box"" /> - <property name="xmpp_server_hostname" value="${wave_server_domain}" /> - <property name="xmpp_server_component_port" value="5275" /> - <property name="xmpp_server_to_server_port" value="5269" /> - <property name="xmpp_server_ping" value="wavesandbox.com" /> - <property name="xmpp_server_ip" value="${xmpp_server_hostname}" /> - <property name="waveserver_disable_verification" value="false" /> - <property name="waveserver_disable_signer_verification" value="false" /> - - - <target name="prosody-config" - description="Run to create the prosody configuration files. - ant -f server-config.xml prosody-config"> - <echo>Generating ${certificate_domain}.cfg.lua</echo> - <copy file="${certificate_domain}.cfg.lua" - tofile="${certificate_domain}.cfg.lua.old" - overwrite="true" - failonerror="false" /> - <copy file="prosody.cfg.lua.example" tofile="${certificate_domain}.cfg.lua" overwrite="true"> - <filterchain> - <replacetokens> - <token key="BASEDIR" value="${basedir}" /> - <token key="XMPP_SERVER_SECRET" value="${xmpp_server_secret}" /> - <token key="CERTIFICATE_PRIVATE_KEY" value="${certificate_private_key}" /> - <token key="CERTIFICATE_DOMAIN" value="${certificate_domain}" /> - <token key="XMPP_JID" value="${xmpp_jid}" /> - <token key="XMPP_SERVER_DESCRIPTION" value="${xmpp_server_description}" /> - <token key="XMPP_SERVER_COMPONENT_PORT" value="${xmpp_server_component_port}" /> - <token key="XMPP_SERVER_TO_SERVER_PORT" value="${xmpp_server_to_server_port}" /> - </replacetokens> - </filterchain> - </copy> - <echo>Please, manually copy ${certificate_domain}.cfg.lua to your prosody configuration directory.</echo> - <echo>E.g. sudo cp ${certificate_domain}.cfg.lua /etc/prosody/conf.d/${certificate_domain}.cfg.lua</echo> - <echo>Additionally, ensure your ${certificate_domain} SRV record points to port ${xmpp_server_to_server_port}</echo> - </target> -</project> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/src/main/configs/wave.conf ---------------------------------------------------------------------- diff --git a/wave/src/main/configs/wave.conf b/wave/src/main/configs/wave.conf new file mode 100644 index 0000000..17e9861 --- /dev/null +++ b/wave/src/main/configs/wave.conf @@ -0,0 +1,20 @@ +# 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. + +# This config file contains variables used by the Apache Wave scripts. + +version=${version} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/src/main/java/org/waveprotocol/box/server/ServerMain.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/waveprotocol/box/server/ServerMain.java b/wave/src/main/java/org/waveprotocol/box/server/ServerMain.java index 50a8b7c..bfa3b92 100644 --- a/wave/src/main/java/org/waveprotocol/box/server/ServerMain.java +++ b/wave/src/main/java/org/waveprotocol/box/server/ServerMain.java @@ -116,8 +116,8 @@ public class ServerMain { protected void configure() { Config config = ConfigFactory.load().withFallback( - ConfigFactory.parseFile(new File("application.conf")).withFallback( - ConfigFactory.parseFile(new File("reference.conf")))); + ConfigFactory.parseFile(new File("config/application.conf")).withFallback( + ConfigFactory.parseFile(new File("config/reference.conf")))); bind(Config.class).toInstance(config); bind(Key.get(String.class, Names.named(CoreSettingsNames.WAVE_SERVER_DOMAIN))) .toInstance(config.getString("core.wave_server_domain")); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/wiab-logging.conf ---------------------------------------------------------------------- diff --git a/wave/wiab-logging.conf b/wave/wiab-logging.conf deleted file mode 100644 index efad66c..0000000 --- a/wave/wiab-logging.conf +++ /dev/null @@ -1,47 +0,0 @@ -# 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. -# -# This file sets up console and file logging for the wiab server - -handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Available log levels are: -# ALL, FINEST, FINER, FINE, CONFIG, INFO, WARNING, SEVERE, OFF - -# Default global logging level. -# Loggers and Handlers may override this level -.level=INFO - -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter - -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = wiab-server.log -java.util.logging.FileHandler.count=5 -java.util.logging.FileHandler.append=false -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.limit=5242880 - -# Per-package logging levels. -# Add extra packages here to increase or decrease the log level -# per-package levels affect both console and file output - -org.eclipse.jetty.level = SEVERE -org.eclipse.jetty.websocket.level = SEVERE - -#org.waveprotocol.level=ALL -
