[kune-commits] r1569 - in trunk: . src/main/java/cc/kune/core/server/init src/main/resources

Mon Oct 24 14:57:56 CEST 2011

Author: vjrj_
Date: 2011-10-24 14:57:55 +0200 (Mon, 24 Oct 2011)
New Revision: 1569

Modified:
   trunk/INSTALL
   trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java
   trunk/src/main/resources/kune.properties
Log:
minor doc changes

Modified: trunk/INSTALL
===================================================================

--- trunk/INSTALL	2011-10-23 22:25:20 UTC (rev 1568)
+++ trunk/INSTALL	2011-10-24 12:57:55 UTC (rev 1569)
@@ -178,7 +178,7 @@
 
 In debian and derivatives, to install the .deb its highly recomended.
 
-Currently only openfire xmpp server is supported (due database dependencies). Ejabberd support in progress.
+Currently only openfire xmpp server is supported (due to openfire can use our users database). Ejabberd support in progress.
 
 Works in most of the openfire server versions after 3.5.1.
 See emite (our xmpp software) Server Compatibility: https://code.google.com/p/emite/wiki/ServerAndClientsCompatibility
@@ -258,7 +258,7 @@
   <jdbcUserProvider/>
   <admin/>
 
-(Be sure that the password matches if you changed de default password 'db4kune').
+(Be sure that the password matches if you changed de default password 'db4kune', also the database name if you use another different like production one).
 
 For more details:
 http://www.igniterealtime.org/builds/openfire/docs/latest/documentation/db-integration-guide.html

Modified: trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java	2011-10-23 22:25:20 UTC (rev 1568)
+++ trunk/src/main/java/cc/kune/core/server/init/DatabaseInitializer.java	2011-10-24 12:57:55 UTC (rev 1569)
@@ -23,6 +23,8 @@
 
 import javax.persistence.NoResultException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.waveprotocol.box.server.authentication.PasswordDigest;
 
 import cc.kune.core.client.errors.UserMustBeLoggedException;
@@ -50,6 +52,7 @@
 import com.google.inject.persist.Transactional;
 
 public class DatabaseInitializer {
+  private static final Log LOG = LogFactory.getLog(DatabaseInitializer.class);
   private final ContentManager contentManager;
   private final I18nCountryManager countryManager;
   private final GroupManager groupManager;
@@ -58,6 +61,7 @@
   private final LicenseManager licenseManager;
   private final KuneBasicProperties properties;
   private final I18nTranslationManager translationManager;
+
   private final UserManager userManager;
 
   @Inject
@@ -206,6 +210,9 @@
     try {
       groupManager.getSiteDefaultGroup();
     } catch (final NoResultException e) {
+      LOG.info("The default group '" + properties.getDefaultSiteName()
+          + "' does not exist in Database, "
+          + "creating it (see kune.default.site.shortName in kune.properties for more details)");
       initDatabase();
     }
   }

Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties	2011-10-23 22:25:20 UTC (rev 1568)
+++ trunk/src/main/resources/kune.properties	2011-10-24 12:57:55 UTC (rev 1569)
@@ -7,6 +7,8 @@
 kune.sitelogourl = ws/images/kune-logo-16px.png
 
 # Every kune site have a group with this name:
+# This group will be created in the first execution of kune.
+# NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly.
 
 kune.default.site.name = Site Administration
 kune.default.site.shortName = site


