[kune-commits] r1558 - in trunk/src: main/resources main/webapp test/java/cc/kune/selenium

[Vicente J. Ruiz Jurado]

Author: vjrj_
Date: 2011-10-13 13:01:37 +0200 (Thu, 13 Oct 2011)
New Revision: 1558

Modified:
   trunk/src/main/resources/wave-server.properties
   trunk/src/main/webapp/ws.html
   trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java
Log:
CLOSED - # 132: Global public stats 
http://kune.ourproject.org/issues/ticket/132
CLOSED - # 140: Store all generated files in /var/lib/kune/ 
http://kune.ourproject.org/issues/ticket/140

Modified: trunk/src/main/resources/wave-server.properties
===================================================================
--- trunk/src/main/resources/wave-server.properties	2011-10-12 11:44:25 UTC (rev 1557)
+++ trunk/src/main/resources/wave-server.properties	2011-10-13 11:01:37 UTC (rev 1558)
@@ -2,32 +2,41 @@
 #
 
 # Domain name of the wave server
+# Default value: local.net
 wave_server_domain = localhost
 
 # A comma separated list of address on which to listen for connections.
 # Each address is a comma separated host:port pair.
+# Default value: localhost:9898
 http_frontend_public_address = localhost:8888
+
+# Default value: values passed to http_frontend_public_address.
 http_frontend_addresses = ${http_frontend_public_address}
+
+# A comma separated list of webApp source directories
+# Default value: ./war
 resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/
 
 ### Server-specific variables
 ###
 
-# Settings for the different persistence stores. Currently supported: file, file, mongodb
+# 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
+# Default value: _certificates
+signer_info_store_directory = /var/lib/kune/_certificates
 
 # Currently supported attachment types: mongodb, disk
+# Default value: 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
+attachment_store_directory = /var/lib/kune/_attachments
 
 # Currently supported account store types: fake, memory, file, mongodb
 account_store_type = file
@@ -35,7 +44,7 @@
 # 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
+account_store_directory = /var/lib/kune/_accounts
 
 # Currently supported delta store types: memory, file
 delta_store_type = file
@@ -43,12 +52,31 @@
 # 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
+# Default value: _deltas
+delta_store_directory = /var/lib/kune/_deltas
 
-# Set true to use Socket.IO instead of raw WebSockets in the webclient.
+# The location where user sessions are persisted on disk. This allow to restore user sessions
+# between restarts.
+# Default value: _sessions
+sessions_store_directory = /var/lib/kune/_sessions
+
+# Set false to use raw WebSockets instead of Socket.IO (still a bit experimental) in the webclient
+# Default value: true
 use_socketio = true
 
-# To enable federation, edit the server.federation.config file and uncomment the line below
+# 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.
+# Default value: @${wave_server_domain}
+admin_user = @local.net
+
+# 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.
+# Default value: "" (empty)
+welcome_wave_id = 
+
+# To enable federation, edit the server.federation.config file and include it here.
 #include = server.federation.config
 
 # These two parameters MUST appear in this file AFTER the above include of the

Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html	2011-10-12 11:44:25 UTC (rev 1557)
+++ trunk/src/main/webapp/ws.html	2011-10-13 11:01:37 UTC (rev 1558)
@@ -226,6 +226,7 @@
 .k-home-normal-text {
   color: #8a5050;
   font-size: 16px;
+  line-height: 1.5em;
 }
 
 .k-home-em-text {

Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java
===================================================================
--- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java	2011-10-12 11:44:25 UTC (rev 1557)
+++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java	2011-10-13 11:01:37 UTC (rev 1558)
@@ -62,8 +62,9 @@
   private final WebDriver webdriver;
 
   public KuneSeleniumDefaults() {
-    // baseUrl = "http://kune.beta.iepala.es/ws/?locale=en#";
-    baseUrl = "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#";
+    baseUrl = "http://kune.beta.iepala.es/?locale=en#";
+    // baseUrl =
+    // "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#";
     injector = INJECTOR;
     webdriver = injector.getInstance(WebDriver.class);
     login = injector.getInstance(LoginPageObject.class);