svn commit: r395675 - in /incubator/roller/trunk: sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java src/org/roller/presentation/website/actions/CreateWebsiteAction.java

[sn...@apache.org]

Author: snoopdave
Date: Thu Apr 20 12:18:08 2006
New Revision: 395675

URL: http://svn.apache.org/viewcvs?rev=395675&view=rev
Log:
Use first editor in list as default editor for new weblogs

Modified:
    incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
    incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java

Modified: incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java?rev=395675&r1=395674&r2=395675&view=diff
==============================================================================
--- incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java (original)
+++ incubator/roller/trunk/sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/RollerWeblogHandler.java Thu Apr 20 12:18:08 2006
@@ -13,11 +13,13 @@
 import java.util.List;
 import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.jdom.Document;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
 import org.roller.RollerException;
-import org.roller.config.RollerConfig;
+import org.roller.config.RollerRuntimeConfig;
 import org.roller.model.UserManager;
 import org.roller.pojos.PermissionsData;
 import org.roller.pojos.UserData;
@@ -29,6 +31,7 @@
 import org.roller.presentation.atomadminapi.sdk.WeblogEntry;
 import org.roller.presentation.atomadminapi.sdk.WeblogEntrySet;
 import org.roller.presentation.cache.CacheManager;
+import org.roller.util.Utilities;
 
 /**
  * This class handles requests concerning Roller weblog resources.
@@ -36,6 +39,9 @@
  * @author jtb
  */
 class RollerWeblogHandler extends Handler {
+    private static Log log =
+        LogFactory.getFactory().getInstance(RollerWeblogHandler.class);
+
     /** Theme name used when creating weblogs */
     private static final String DEFAULT_THEME = "basic";
     
@@ -197,10 +203,19 @@
                     DEFAULT_THEME,
                     entry.getLocale(),
                     entry.getTimezone());
-                wd.setEditorPage(RollerConfig.getProperty("newweblog.editor"));
+                
+                try {
+                    String def = RollerRuntimeConfig.getProperty("users.editor.pages");
+                    String[] defs = Utilities.stringToStringArray(def,",");
+                    wd.setEditorPage(defs[0]);
+                } catch (Exception ex) {
+                    log.error("ERROR setting default editor page for weblog", ex);
+                }
+                
                 mgr.addWebsite(wd);
             }
             getRoller().flush();
+            
         } catch (RollerException re) {
             throw new InternalException("ERROR: Could not create weblogs: " + c, re);
         }

Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=395675&r1=395674&r2=395675&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Thu Apr 20 12:18:08 2006
@@ -1,5 +1,4 @@
 package org.roller.presentation.website.actions;
-import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17,6 +16,7 @@
 import org.apache.struts.actions.DispatchAction;
 import org.roller.RollerException;
 import org.roller.config.RollerConfig;
+import org.roller.config.RollerRuntimeConfig;
 import org.roller.model.Roller;
 import org.roller.model.RollerFactory;
 import org.roller.model.ThemeManager;
@@ -27,6 +27,7 @@
 import org.roller.presentation.RollerContext;
 import org.roller.presentation.RollerSession;
 import org.roller.presentation.website.formbeans.CreateWebsiteForm;
+import org.roller.util.Utilities;
 
 
 /**
@@ -146,7 +147,15 @@
                     form.getTheme(),
                     form.getLocale(),
                     form.getTimeZone());
-            wd.setEditorPage(RollerConfig.getProperty("newweblog.editor"));
+            
+            try {
+                String def = RollerRuntimeConfig.getProperty("users.editor.pages");
+                String[] defs = Utilities.stringToStringArray(def,",");
+                wd.setEditorPage(defs[0]);
+            } catch (Exception ex) {
+                log.error("ERROR setting default editor page for weblog", ex);
+            }
+            
             mgr.addWebsite(wd);
             
             RollerFactory.getRoller().flush();