[kune-commits] r1457 - in trunk/src/main: java/cc/kune/core/server/manager/impl resources

Thu Jul 14 11:57:36 CEST 2011

Author: vjrj_
Date: 2011-07-14 11:57:36 +0200 (Thu, 14 Jul 2011)
New Revision: 1457

Modified:
   trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
   trunk/src/main/resources/kune.properties
Log:
Minor welcome fix

Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
===================================================================

--- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java	2011-07-14 08:58:16 UTC (rev 1456)
+++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java	2011-07-14 09:57:36 UTC (rev 1457)
@@ -143,15 +143,10 @@
 
       final String defWave = properties.getWelcomewave();
       if (defWave != null) {
-        kuneWaveManager.createWave(ContentConstants.WELCOME_WAVE_CONTENT_TITLE, "", defWave, null,
+        kuneWaveManager.createWave(
+            ContentConstants.WELCOME_WAVE_CONTENT_TITLE.replaceAll("\\[%s\\]",
+                properties.getDefaultSiteName()), "", defWave, null,
             participantUtils.of(properties.getAdminShortName()), participantUtils.of(shortName));
-        // kuneWaveManager.createWave(
-        // ContentConstants.WELCOME_WAVE_CONTENT_TITLE.replaceAll("\\[%s\\]",
-        // properties.getDefaultSiteName()),
-        // ContentConstants.WELCOME_WAVE_CONTENT.replaceAll("\\[%s\\]",
-        // properties.getDefaultSiteName()),
-        // participantUtils.of(properties.getAdminShortName()),
-        // participantUtils.of(shortName));
       }
       return user;
     } catch (final RuntimeException e) {

Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties	2011-07-14 08:58:16 UTC (rev 1456)
+++ trunk/src/main/resources/kune.properties	2011-07-14 09:57:36 UTC (rev 1457)
@@ -35,7 +35,7 @@
 ### Other params
 
 # If defined create a copy of this wave as welcome to new users
-kune.site.welcomewave = w+rtackLTkDCA
+kune.site.welcomewave =
 
 ### Workspace enabled themes
 


