roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1504489 - in /roller/trunk/app/src/main: java/org/apache/roller/planet/business/ java/org/apache/roller/weblogger/business/ java/org/apache/roller/weblogger/ui/core/filters/ java/org/apache/roller/weblogger/ui/rendering/filters/ webapp/WEB...
Date Thu, 18 Jul 2013 14:30:33 GMT
Author: gmazza
Date: Thu Jul 18 14:30:32 2013
New Revision: 1504489

URL: http://svn.apache.org/r1504489
Log:
Removed redundant calling of Weblogger.release() in PersistenceSessionFilter (apparent copy
& paste error during recent app simplification), deleted unused CompressionFilter per
Dave's 2007 comment (https://issues.apache.org/jira/browse/ROL-1119?focusedCommentId=12690735&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-12690735)
that it's no longer needed, Sonar complaints about redundant public modifiers in interface
method declarations fixed in two classes.

Removed:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CompressionFilter.java
Modified:
    roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetProvider.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
    roller/trunk/app/src/main/webapp/WEB-INF/web.xml

Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetProvider.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetProvider.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/business/PlanetProvider.java Thu
Jul 18 14:30:32 2013
@@ -27,12 +27,12 @@ public interface PlanetProvider {
     /**
      * Trigger bootstrapping.
      */
-    public void bootstrap() throws BootstrapException;
+    void bootstrap() throws BootstrapException;
     
     
     /**
      * Get a Planet instance.
      */
-    public Planet getWeblogger();
+    Planet getWeblogger();
     
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
Thu Jul 18 14:30:32 2013
@@ -39,46 +39,46 @@ public interface WeblogManager {
      * creates categories and other objects required for new website.
      * @param newWebsite New website to be created, must have creator.
      */
-    public void addWeblog(Weblog newWebsite) throws WebloggerException;
+    void addWeblog(Weblog newWebsite) throws WebloggerException;
     
     
     /**
      * Store a single weblog.
      */
-    public void saveWeblog(Weblog data) throws WebloggerException;
+    void saveWeblog(Weblog data) throws WebloggerException;
 
     /**
      * Save new theme associativity for Weblog
      * @param themeAssoc
      * @throws WebloggerException
      */
-    public void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException;
+    void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException;
     
     
     /**
      * Remove website object.
      */
-    public void removeWeblog(Weblog website) throws WebloggerException;
+    void removeWeblog(Weblog website) throws WebloggerException;
     
     
     /**
      * Get website object by name.
      */
-    public Weblog getWeblog(String id) throws WebloggerException;
+    Weblog getWeblog(String id) throws WebloggerException;
     
     
     /**
      * Get website specified by handle (or null if enabled website not found).
      * @param handle  Handle of website
      */
-    public Weblog getWeblogByHandle(String handle) throws WebloggerException;
+    Weblog getWeblogByHandle(String handle) throws WebloggerException;
     
     
     /**
      * Get website specified by handle with option to return only enabled websites.
      * @param handle  Handle of website
      */
-    public Weblog getWeblogByHandle(String handle, Boolean enabled)
+    Weblog getWeblogByHandle(String handle, Boolean enabled)
         throws WebloggerException;
     
     
@@ -92,7 +92,7 @@ public interface WeblogManager {
      * @param length    Maximum number of results to return (for paging)
      * @return List of WebsiteData objects.
      */
-    public List getWeblogs(
+    List getWeblogs(
             Boolean  enabled,
             Boolean  active,
             Date     startDate,
@@ -108,7 +108,7 @@ public interface WeblogManager {
      * @param enabledOnly Include only enabled weblogs?
      * @return List of WebsiteData objects.
      */
-    public List getUserWeblogs(User user, boolean enabledOnly) throws WebloggerException;
+    List getUserWeblogs(User user, boolean enabledOnly) throws WebloggerException;
     
     
     /**
@@ -117,7 +117,7 @@ public interface WeblogManager {
      * @param enabledOnly Include only enabled users?
      * @return List of WebsiteData objects.
      */
-    public List getWeblogUsers(Weblog weblog, boolean enabledOnly) throws WebloggerException;
+    List getWeblogUsers(Weblog weblog, boolean enabledOnly) throws WebloggerException;
     
     
     /**
@@ -128,7 +128,7 @@ public interface WeblogManager {
      * @param len       Maximum number of results to return (for paging)
      * @return List of WebsiteData objects.
      */
-    public List getMostCommentedWeblogs(
+    List getMostCommentedWeblogs(
             Date startDate,
             Date endDate,
             int  offset,
@@ -141,81 +141,81 @@ public interface WeblogManager {
      * containing integers reflecting the number of weblogs whose
      * names start with each letter.
      */
-    public Map getWeblogHandleLetterMap() throws WebloggerException;
+    Map getWeblogHandleLetterMap() throws WebloggerException;
     
     
     /** 
      * Get collection of weblogs whose handles begin with specified letter 
      */
-    public List getWeblogsByLetter(char letter, int offset, int length) 
+    List getWeblogsByLetter(char letter, int offset, int length)
         throws WebloggerException;
     
         /**
      * Store page.
      */
-    public void savePage(WeblogTemplate data) throws WebloggerException;
+    void savePage(WeblogTemplate data) throws WebloggerException;
     
     
     /**
      * Remove page.
      */
-    public void removePage(WeblogTemplate page) throws WebloggerException;
+    void removePage(WeblogTemplate page) throws WebloggerException;
     
     
     /**
      * Get page by id.
      */
-    public WeblogTemplate getPage(String id) throws WebloggerException;
+    WeblogTemplate getPage(String id) throws WebloggerException;
     
     
     /**
      * Get user's page by action.
      */
-    public WeblogTemplate getPageByAction(Weblog w, String a) throws WebloggerException;
+    WeblogTemplate getPageByAction(Weblog w, String a) throws WebloggerException;
     
     
     /**
      * Get user's page by name.
      */
-    public WeblogTemplate getPageByName(Weblog w, String p) throws WebloggerException;
+    WeblogTemplate getPageByName(Weblog w, String p) throws WebloggerException;
     
     
     /**
      * Get website's page by link.
      */
-    public WeblogTemplate getPageByLink(Weblog w, String p)
+    WeblogTemplate getPageByLink(Weblog w, String p)
         throws WebloggerException;
 
     /**
      * Get template code by Type.
      */
-    public WeblogThemeTemplateCode getTemplateCodeByType(String templateName, String type)
+    WeblogThemeTemplateCode getTemplateCodeByType(String templateName, String type)
             throws WebloggerException ;
 
     /**
      * Save template code
      */
-     public void saveTemplateCode(WeblogThemeTemplateCode templateCode) throws WebloggerException;
+     void saveTemplateCode(WeblogThemeTemplateCode templateCode) throws WebloggerException;
 
     /**
      * Get website's pages
      */
-    public List getPages(Weblog w) throws WebloggerException;
+    List getPages(Weblog w) throws WebloggerException;
    
     
     /**
      * Get count of active weblogs
      */    
-    public long getWeblogCount() throws WebloggerException;
+    long getWeblogCount() throws WebloggerException;
     
     
     /**
      * Release any resources held by manager.
      */
-    public void release();
+    void release();
 
     /**
      *   get Theme Associativity object for type
      */
-    public WeblogThemeAssoc getThemeAssoc(Weblog weblog , String type) throws WebloggerException;
+    WeblogThemeAssoc getThemeAssoc(Weblog weblog , String type) throws WebloggerException;
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CharEncodingFilter.java
Thu Jul 18 14:30:32 2013
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  * Entry point filter for all requests. This filter ensures that the request 
  * encoding is set to UTF-8 before any other processing forces request parsing 
  * using a default encoding.  It also syncs up the Struts and JSTL locales.  
- * This filter should normally be first and last in the chain.
+ * This filter should normally be first in the chain.
  *
  * @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
  */

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/DebugFilter.java
Thu Jul 18 14:30:32 2013
@@ -54,8 +54,8 @@ public class DebugFilter implements Filt
         
         // some info about the request and response
         log.info("Response Object:");
-        log.info("   isCommited = "+response.isCommitted());
-        log.info("   bufferSize = "+response.getBufferSize());
+        log.info("   isCommitted = "+response.isCommitted());
+        log.info("   bufferSize  = "+response.getBufferSize());
         log.info("");
         
         chain.doFilter(request, response);
@@ -64,8 +64,8 @@ public class DebugFilter implements Filt
         
         // some info about the request and response
         log.info("Response Object:");
-        log.info("   isCommited = "+response.isCommitted());
-        log.info("   bufferSize = "+response.getBufferSize());
+        log.info("   isCommitted = "+response.isCommitted());
+        log.info("   bufferSize  = "+response.getBufferSize());
         log.info("");
     }
     

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
Thu Jul 18 14:30:32 2013
@@ -61,13 +61,6 @@ public class PersistenceSessionFilter im
             if (WebloggerFactory.isBootstrapped()) {
                 log.debug("Releasing Roller Session");
                 WebloggerFactory.getWeblogger().release();
-                
-                // if planet is enabled then release planet backend as well
-                if (WebloggerConfig.getBooleanProperty("planet.aggregator.enabled")) {
-                    if (WebloggerFactory.isBootstrapped()) {
-                        WebloggerFactory.getWeblogger().release();
-                    }
-                }
             }
             
         }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/SchemeEnforcementFilter.java
Thu Jul 18 14:30:32 2013
@@ -43,7 +43,7 @@ import org.apache.roller.weblogger.confi
 
 /**
  * The SchemeEnforcementFilter is provided for Roller sites that enable secure
- * logins and want to ensure that only login urls are used under https.
+ * logins and want to ensure that login urls are used only under https.
  * 
  * @author Allen Gilliland
  * 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/RequestMappingFilter.java
Thu Jul 18 14:30:32 2013
@@ -36,7 +36,7 @@ import org.apache.roller.weblogger.confi
 import org.apache.roller.weblogger.ui.rendering.RequestMapper;
 
 /**
- * Provides generalized request mapping capablilites.
+ * Provides generalized request mapping capabilities.
  *
  * Incoming requests can be inspected by a series of RequestMappers and can
  * potentially be re-routed to different places within the application.

Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1504489&r1=1504488&r2=1504489&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Thu Jul 18 14:30:32 2013
@@ -26,11 +26,6 @@
     </filter>
 
     <filter>
-        <filter-name>DebugFilter</filter-name>
-        <filter-class>org.apache.roller.weblogger.ui.core.filters.DebugFilter</filter-class>
-    </filter>
-
-    <filter>
         <filter-name>PersistenceSessionFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.PersistenceSessionFilter</filter-class>
     </filter>
@@ -40,15 +35,6 @@
         <filter-class>org.apache.roller.weblogger.ui.core.filters.BootstrapFilter</filter-class>
     </filter>
 
-    <!--
-    Most app servers support compression, if yours doesn't then use this one,
-    but don't forget to uncomment the mapping below too.
-    <filter>
-        <filter-name>CompressionFilter</filter-name>
-        <filter-class>org.apache.roller.weblogger.ui.core.filters.CompressionFilter</filter-class>
-    </filter>
-    -->
-
     <filter>
         <filter-name>RequestMappingFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.rendering.filters.RequestMappingFilter</filter-class>
@@ -84,16 +70,16 @@
 		<filter-class>org.apache.roller.weblogger.ui.core.filters.ValidateSaltFilter</filter-class>
 	</filter>
 
+    <!-- Development purposes only, not activated in a filter-mapping by default -->
+    <filter>
+        <filter-name>DebugFilter</filter-name>
+        <filter-class>org.apache.roller.weblogger.ui.core.filters.DebugFilter</filter-class>
+    </filter>
+
     <!-- ******************************************
          Filter mappings - order IS important here.
          ****************************************** -->
 
-    <!--
-     NOTE: Wherever "dispatcher" elements are specified in the filter mappings, they are
-     required for Servlet API 2.4 containers, such as Tomcat 5+ and Resin 3+, but should
be
-     commented out for Servlet API 2.3 containers, like Tomcat 4.x and Resin 2.x.
-    -->
-
     <!-- This filter ensures that the request encoding is set to UTF-8 before any
      other processing forces request parsing using a default encoding.
     Note: Any filters preceding this one MUST not cause request parsing. -->
@@ -109,10 +95,6 @@
     <filter-mapping>
         <filter-name>IPBanFilter</filter-name>
         <url-pattern>/roller-ui/rendering/comment/*</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>IPBanFilter</filter-name>
         <url-pattern>/roller-ui/rendering/trackback/*</url-pattern>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
@@ -172,21 +154,6 @@
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
 
-    <!--
-    Most app servers support compression, if yours doesn't then use this one,
-    but don't forget to uncomment the filter definition above too.
-    <filter-mapping>
-        <filter-name>CompressionFilter</filter-name>
-        <url-pattern>/roller-ui/rendering/page/*</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>CompressionFilter</filter-name>
-        <url-pattern>/roller-ui/rendering/feed/*</url-pattern>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-    -->
-
     <!-- Struts2 -->
     <filter-mapping>
         <filter-name>struts2</filter-name>
@@ -195,7 +162,6 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
-
     <!-- Context Listeners -->
     <listener>
         <listener-class>org.apache.roller.weblogger.ui.core.RollerSession</listener-class>



Mime
View raw message