roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r475828 - in /incubator/roller/trunk/src/org/apache/roller: business/ business/hibernate/ business/runnable/ business/search/ ui/authoring/struts/actions/ ui/rendering/servlets/ ui/rendering/util/cache/ ui/rendering/velocity/deprecated/ web...
Date Thu, 16 Nov 2006 17:37:12 GMT
Author: agilliland
Date: Thu Nov 16 09:37:10 2006
New Revision: 475828

URL: http://svn.apache.org/viewvc?view=rev&rev=475828
Log:
Roller.getXXXManager() methods no longer throw a RollerException.


Modified:
    incubator/roller/trunk/src/org/apache/roller/business/Roller.java
    incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
    incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
    incubator/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java
    incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
    incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java

Modified: incubator/roller/trunk/src/org/apache/roller/business/Roller.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/Roller.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/Roller.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/Roller.java Thu Nov 16 09:37:10
2006
@@ -1,20 +1,20 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  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.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  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.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
 
 package org.apache.roller.business;
 
@@ -40,25 +40,25 @@
     /** 
      * Get UserManager associated with this Roller instance.
      */
-    public UserManager getUserManager() throws RollerException;
+    public UserManager getUserManager();
     
     
     /** 
      * Get BookmarkManager associated with this Roller instance.
      */
-    public BookmarkManager getBookmarkManager() throws RollerException;
+    public BookmarkManager getBookmarkManager();
     
     
     /** 
      * Get WeblogManager associated with this Roller instance.
      */
-    public WeblogManager getWeblogManager() throws RollerException;
+    public WeblogManager getWeblogManager();
     
     
     /** 
      * Get RefererManager associated with this Roller instance.
      */
-    public RefererManager getRefererManager() throws RollerException;
+    public RefererManager getRefererManager();
     
     
     /**
@@ -70,67 +70,67 @@
     /** 
      * Get RefererManager associated with this Roller instance.
      */
-    public ConfigManager getConfigManager() throws RollerException;
+    public ConfigManager getConfigManager();
     
     
     /**
      * Get the AutoPingManager associated with this Roller instance.
      */
-    public AutoPingManager getAutopingManager() throws RollerException;
+    public AutoPingManager getAutopingManager();
     
     
     /**
      * Get the PingTargetManager associated with this Roller instance.
      */
-    public PingTargetManager getPingTargetManager() throws RollerException;
+    public PingTargetManager getPingTargetManager();
     
     
     /**
      * Get the PingQueueManager associated with this Roller instance.
      */
-    public PingQueueManager getPingQueueManager() throws RollerException;
+    public PingQueueManager getPingQueueManager();
     
     
     /** 
      * Get PropertiesManager associated with this Roller instance.
      */
-    public PropertiesManager getPropertiesManager() throws RollerException;
+    public PropertiesManager getPropertiesManager();
     
     
     /** 
      * Get FileManager associated with this Roller instance.
      */
-    public FileManager getFileManager() throws RollerException;
+    public FileManager getFileManager();
     
     
     /**
      * Get ThreadManager associated with this Roller instance.
      */
-    public ThreadManager getThreadManager() throws RollerException;
+    public ThreadManager getThreadManager();
     
     
     /**
      * Get IndexManager associated with this Roller instance.
      */
-    public IndexManager getIndexManager() throws RollerException;
+    public IndexManager getIndexManager();
     
     
     /**
      * Get PlanetManager associated with this Roller instance.
      */
-    public PlanetManager getPlanetManager() throws RollerException;
+    public PlanetManager getPlanetManager();
     
     
     /**
      * Get ThemeManager associated with this Roller instance.
      */
-    public ThemeManager getThemeManager() throws RollerException;
+    public ThemeManager getThemeManager();
     
     
     /**
      * Get PluginManager associated with this Roller instance.
      */
-    public PluginManager getPagePluginManager() throws RollerException;
+    public PluginManager getPagePluginManager();
     
     
     /**

Modified: incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/RollerImpl.java Thu Nov 16 09:37:10
2006
@@ -60,7 +60,7 @@
     /**
      * @see org.apache.roller.model.Roller#getFileManager()
      */
-    public FileManager getFileManager() throws RollerException {
+    public FileManager getFileManager() {
         if (fileManager == null) {
             fileManager = new FileManagerImpl();
         }
@@ -71,7 +71,7 @@
     /**
      * @see org.apache.roller.model.Roller#getThreadManager()
      */
-    public ThreadManager getThreadManager() throws RollerException {
+    public ThreadManager getThreadManager() {
         if (threadManager == null) {
             threadManager = new ThreadManagerImpl();
         }
@@ -82,7 +82,7 @@
     /**
      * @see org.apache.roller.model.Roller#getIndexManager()
      */
-    public IndexManager getIndexManager() throws RollerException {
+    public IndexManager getIndexManager() {
         if (indexManager == null) {
             indexManager = new IndexManagerImpl();
         }
@@ -93,7 +93,7 @@
     /**
      * @see org.apache.roller.model.Roller#getThemeManager()
      */
-    public ThemeManager getThemeManager() throws RollerException {
+    public ThemeManager getThemeManager() {
         if (themeManager == null) {
             themeManager = new ThemeManagerImpl();
         }
@@ -112,7 +112,7 @@
     /**
      * @see org.apache.roller.model.Roller#getPluginManager()
      */
-    public PluginManager getPagePluginManager() throws RollerException {
+    public PluginManager getPagePluginManager() {
         if (pluginManager == null) {
             pluginManager = new PluginManagerImpl();
         }

Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
Thu Nov 16 09:37:10 2006
@@ -144,77 +144,84 @@
     /**
      * @see org.apache.roller.model.Roller#getUserManager()
      */
-    public UserManager getUserManager() throws RollerException {
+    public UserManager getUserManager() {
         if ( userManager == null ) {
             userManager = new HibernateUserManagerImpl(strategy);
         }
         return userManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getBookmarkManager()
      */
-    public BookmarkManager getBookmarkManager() throws RollerException {
+    public BookmarkManager getBookmarkManager() {
         if ( bookmarkManager == null ) {
             bookmarkManager = new HibernateBookmarkManagerImpl(strategy);
         }
         return bookmarkManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getWeblogManager()
      */
-    public WeblogManager getWeblogManager() throws RollerException {
+    public WeblogManager getWeblogManager() {
         if ( weblogManager == null ) {
             weblogManager = new HibernateWeblogManagerImpl(strategy);
         }
         return weblogManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getRefererManager()
      */
-    public RefererManager getRefererManager() throws RollerException {
+    public RefererManager getRefererManager() {
         if ( refererManager == null ) {
             refererManager = new HibernateRefererManagerImpl(strategy);
         }
         return refererManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getConfigManager()
      */
-    public ConfigManager getConfigManager() throws RollerException {
+    public ConfigManager getConfigManager() {
         if (configManager == null) {
             configManager = new HibernateConfigManagerImpl(strategy);
         }
         return configManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getPropertiesManager()
      */
-    public PropertiesManager getPropertiesManager() throws RollerException {
+    public PropertiesManager getPropertiesManager() {
         if (propertiesManager == null) {
             propertiesManager = new HibernatePropertiesManagerImpl(strategy);
         }
         return propertiesManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getPingTargetManager()
      */
-    public PingQueueManager getPingQueueManager() throws RollerException {
+    public PingQueueManager getPingQueueManager() {
         if (pingQueueManager == null) {
             pingQueueManager = new HibernatePingQueueManagerImpl(strategy);
         }
         return pingQueueManager;
     }
     
+    
     /**
      * @see org.apache.roller.model.Roller#getPlanetManager()
      */
-    public PlanetManager getPlanetManager() throws RollerException {
+    public PlanetManager getPlanetManager() {
         if ( planetManager == null ) {
             planetManager = new HibernateRollerPlanetManagerImpl(strategy);
         }
@@ -225,7 +232,7 @@
     /**
      * @see org.apache.roller.model.Roller#getPingTargetManager()
      */
-    public AutoPingManager getAutopingManager() throws RollerException {
+    public AutoPingManager getAutopingManager() {
         if (autoPingManager == null) {
             autoPingManager = new HibernateAutoPingManagerImpl(strategy);
         }
@@ -236,7 +243,7 @@
     /**
      * @see org.apache.roller.model.Roller#getPingTargetManager()
      */
-    public PingTargetManager getPingTargetManager() throws RollerException {
+    public PingTargetManager getPingTargetManager() {
         if (pingTargetManager == null) {
             pingTargetManager = new HibernatePingTargetManagerImpl(strategy);
         }
@@ -247,7 +254,7 @@
     /**
      * @see org.apache.roller.model.Roller#getThreadManager()
      */
-    public ThreadManager getThreadManager() throws RollerException {
+    public ThreadManager getThreadManager() {
         if (threadManager == null) {
             threadManager = new HibernateThreadManagerImpl(strategy);
         }

Modified: incubator/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java
Thu Nov 16 09:37:10 2006
@@ -52,16 +52,8 @@
      */
     public void execute() {
         
-        UserManager umgr = null;
-        WeblogManager wmgr = null;
-        try {
-            umgr = RollerFactory.getRoller().getUserManager();
-            wmgr = RollerFactory.getRoller().getWeblogManager();
-        } catch (RollerException ex) {
-            // if we can't even get the manager instances then bail now
-            log.error("Error getting managers", ex);
-            return;
-        }
+        UserManager umgr = RollerFactory.getRoller().getUserManager();
+        WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
         
         HitCountQueue hitCounter = HitCountQueue.getInstance();
         

Modified: incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java Thu
Nov 16 09:37:10 2006
@@ -15,7 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-/* Created on Jul 18, 2003 */
+
 package org.apache.roller.business.search;
 
 import java.io.File;
@@ -223,8 +223,6 @@
                 mLogger.debug("Starting scheduled index operation: "+op.getClass().getName());
                 RollerFactory.getRoller().getThreadManager().executeInBackground(op);
             }
-        } catch (RollerException re) {
-            mLogger.error("Error getting thread manager", re);
         } catch (InterruptedException e) {
             mLogger.error("Error executing operation", e);
         }
@@ -240,8 +238,6 @@
                 mLogger.debug("Executing index operation now: "+op.getClass().getName());
                 RollerFactory.getRoller().getThreadManager().executeInForeground(op);
             }
-        } catch (RollerException re) {
-            mLogger.error("Error getting thread manager", re);
         } catch (InterruptedException e) {
             mLogger.error("Error executing operation", e);
         }

Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java
Thu Nov 16 09:37:10 2006
@@ -15,6 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
+
 package org.apache.roller.ui.authoring.struts.actions;
 
 import java.net.MalformedURLException;
@@ -201,9 +202,6 @@
         } catch (MalformedURLException e) {
             throw new RollerException("ERROR: Revokation email(s) not sent, "
                     + "Roller site URL is malformed?", e);
-        } catch (RollerException e) {
-            throw new RuntimeException(
-                    "FATAL ERROR: unable to find Roller object", e);
         }
     }
     

Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
Thu Nov 16 09:37:10 2006
@@ -15,6 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
+
 package org.apache.roller.ui.authoring.struts.actions;
 
 import java.net.MalformedURLException;
@@ -249,11 +250,7 @@
         } catch (MalformedURLException e) {
             throw new RollerException("ERROR: Notification email(s) not sent, "
                     + "Roller site URL is malformed?", e);
-        } catch (RollerException e) {
-            throw new RuntimeException(
-                    "FATAL ERROR: unable to find Roller object", e);
         }
     }
-    
     
 }

Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryPageModel.java
Thu Nov 16 09:37:10 2006
@@ -1,21 +1,21 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  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.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-/* Created on Mar 10, 2004 */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  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.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
 package org.apache.roller.ui.authoring.struts.actions;
 
 import java.util.ArrayList;
@@ -39,7 +39,6 @@
 import org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx;
 import org.apache.commons.lang.StringUtils;
 
-//import com.swabunga.spell.event.SpellCheckEvent;
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -52,6 +51,7 @@
 import org.apache.roller.ui.core.plugins.UIPluginManager;
 import org.apache.roller.util.URLUtilities;
 
+
 /**
  * All data needed to render the edit-weblog page.
  * @author David M Johnson
@@ -217,15 +217,8 @@
 
     public boolean getHasPagePlugins()
     {
-        boolean ret = false;
-        try {
-            Roller roller = RollerFactory.getRoller();
-            PluginManager ppmgr = roller.getPagePluginManager();
-            ret = ppmgr.hasPagePlugins();
-        } catch (RollerException e) {
-            logger.error(e);
-        }
-        return ret;
+        PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
+        return ppmgr.hasPagePlugins();
     }
     
     public List getPagePlugins() 

Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WebsiteFormAction.java
Thu Nov 16 09:37:10 2006
@@ -354,15 +354,8 @@
             return moderationRequired;
         }
         public boolean getHasPagePlugins() {
-            boolean ret = false;
-            try {
-                Roller roller = RollerFactory.getRoller();
-                PluginManager ppmgr = roller.getPagePluginManager();
-                ret = ppmgr.hasPagePlugins();
-            } catch (RollerException e) {
-                mLogger.error(e);
-            }
-            return ret;
+            PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
+            return ppmgr.hasPagePlugins();
         }
         
         public List getPagePlugins() {

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
Thu Nov 16 09:37:10 2006
@@ -395,15 +395,7 @@
             //------------------------------------------
             // --- Build list of email addresses to send notification to
             
-            List comments = null;
-            try {
-                WeblogManager wMgr = RollerFactory.getRoller().getWeblogManager();
-                // get only approved, non spam comments
-                comments = entry.getComments(true, true); 
-            } catch(RollerException re) {
-                // should never happen
-                comments = new ArrayList();
-            }
+            List comments = entry.getComments(true, true);
             
             // Get all the subscribers to this comment thread
             Set subscribers = new TreeSet();

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
Thu Nov 16 09:37:10 2006
@@ -77,15 +77,7 @@
         
         log.debug("Entering");
         
-        PlanetManager planet = null;
-        try {
-            planet = RollerFactory.getRoller().getPlanetManager();
-        } catch (RollerException ex) {
-            // error getting planet manager :(
-            log.error("Unable to get planet manager", ex);
-            response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-            return;
-        }
+        PlanetManager planet = RollerFactory.getRoller().getPlanetManager();
         
         PlanetRequest planetRequest = null;
         try {

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
Thu Nov 16 09:37:10 2006
@@ -158,11 +158,7 @@
         // still null, we need to get a fresh value
         if(lastModified == null) {
             
-            try {
-                lastModified = RollerFactory.getRoller().getPlanetManager().getLastUpdated();
-            } catch (RollerException ex) {
-                log.error("Error getting planet manager", ex);
-            }
+            lastModified = RollerFactory.getRoller().getPlanetManager().getLastUpdated();
             
             if (lastModified == null) {
                 lastModified = new Date();

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
Thu Nov 16 09:37:10 2006
@@ -120,29 +120,24 @@
         mIsMonthSpecified = isMonth;
         mLocale = locale;
         
-        try {
-            mBookmarkMgr = RollerFactory.getRoller().getBookmarkManager();
-            mRefererMgr  = RollerFactory.getRoller().getRefererManager();
-            mUserMgr     = RollerFactory.getRoller().getUserManager();
-            mWeblogMgr   = RollerFactory.getRoller().getWeblogManager();
-            
-            // Preload what we can for encapsulation.  What we cannot preload we
-            // will use the Managers later to fetch.
+        mBookmarkMgr = RollerFactory.getRoller().getBookmarkManager();
+        mRefererMgr  = RollerFactory.getRoller().getRefererManager();
+        mUserMgr     = RollerFactory.getRoller().getUserManager();
+        mWeblogMgr   = RollerFactory.getRoller().getWeblogManager();
+        
+        // Preload what we can for encapsulation.  What we cannot preload we
+        // will use the Managers later to fetch.
+        
+        // Get the pages, put into context & load map
+        if (mWebsite != null) {
             
             // Get the pages, put into context & load map
-            if (mWebsite != null) {
-                
-                // Get the pages, put into context & load map
-                List pages = mWebsite.getPages();
-                Iterator pageIter = pages.iterator();
-                while (pageIter.hasNext()) {
-                    Template page = (Template) pageIter.next();
-                    mPageMap.put(page.getName(), TemplateWrapper.wrap(page));
-                }
+            List pages = mWebsite.getPages();
+            Iterator pageIter = pages.iterator();
+            while (pageIter.hasNext()) {
+                Template page = (Template) pageIter.next();
+                mPageMap.put(page.getName(), TemplateWrapper.wrap(page));
             }
-            
-        } catch (RollerException e) {
-            mLogger.error("PageModel Roller get*Manager Exception", e);
         }
     }
     

Modified: incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java?view=diff&rev=475828&r1=475827&r2=475828
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java
(original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/RollerWeblogHandler.java
Thu Nov 16 09:37:10 2006
@@ -15,6 +15,7 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
+
 package org.apache.roller.webservices.adminapi;
 
 import java.io.Reader;
@@ -211,24 +212,20 @@
     }
     
     private WeblogEntrySet updateWeblogs(WeblogEntrySet c) throws HandlerException {
-        try {
-            UserManager mgr = getRoller().getUserManager();
-            
-            //TODO: group blogging check?
-            
-            HashMap pages = null;
-            
-            List websiteDatas = new ArrayList();
-            for (int i = 0; i < c.getEntries().length; i++) {
-                WeblogEntry entry = (WeblogEntry)c.getEntries()[i];
-                WebsiteData wd = getWebsiteData(entry.getHandle());
-                updateWebsiteData(wd, entry);
-                websiteDatas.add(wd);
-            }
-            return toWeblogEntrySet((WebsiteData[])websiteDatas.toArray(new WebsiteData[0]));
-        } catch (RollerException re) {
-            throw new InternalException("ERROR: Could not update weblogs: " + c, re);
+        UserManager mgr = getRoller().getUserManager();
+        
+        //TODO: group blogging check?
+        
+        HashMap pages = null;
+        
+        List websiteDatas = new ArrayList();
+        for (int i = 0; i < c.getEntries().length; i++) {
+            WeblogEntry entry = (WeblogEntry)c.getEntries()[i];
+            WebsiteData wd = getWebsiteData(entry.getHandle());
+            updateWebsiteData(wd, entry);
+            websiteDatas.add(wd);
         }
+        return toWeblogEntrySet((WebsiteData[])websiteDatas.toArray(new WebsiteData[0]));
     }
     
     private void updateWebsiteData(WebsiteData wd, WeblogEntry entry) throws HandlerException
{



Mime
View raw message