aplaws-commit Mailing List for APLAWS (Page 18)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: sskracic
Date: 2006-07-18 15:14:45 +0200 (Tue, 18 Jul 2006)
New Revision: 1267

Modified:
   releases/1.0.3/ccm-ldn-theme/application.xml
   releases/1.0.3/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java
Log:
  Integrated r1266 from trunk (excessive theme caching fix).


Modified: releases/1.0.3/ccm-ldn-theme/application.xml
===================================================================

--- releases/1.0.3/ccm-ldn-theme/application.xml	2006-07-18 12:18:48 UTC (rev 1266)
+++ releases/1.0.3/ccm-ldn-theme/application.xml	2006-07-18 13:14:45 UTC (rev 1267)
@@ -3,11 +3,10 @@
   name="ccm-ldn-theme"
   prettyName="Theme"
   version="6.2.0"
-  release="4">
+  release="5">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-subsite" version="6.2.0" relation="ge"/>
-    
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>

Modified: releases/1.0.3/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java
===================================================================
--- releases/1.0.3/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java	2006-07-18 12:18:48 UTC (rev 1266)
+++ releases/1.0.3/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java	2006-07-18 13:14:45 UTC (rev 1267)
@@ -17,17 +17,17 @@
 
 import com.arsdigita.london.theme.Theme;
 import com.arsdigita.london.theme.ThemeFileCollection;
+import com.arsdigita.templating.Templating;
 import java.io.File;
 import org.apache.log4j.Logger;
-import java.io.File;
 
 
 /**
- *  Class for polling the database to look for new/updated published files in 
- *  the ThemeFile table.  
- *  
+ *  Class for polling the database to look for new/updated published files in
+ *  the ThemeFile table.
+ *
  *  For "published" files, It goes through each Theme and looks at the
- *  last time it was published.  If the last time published > last
+ *  last time it was published.  If the last time published &gt; last
  *  time thread was run then it examines those files.  When the thread
  *  runs for the first time, it examines all themes.
  *
@@ -40,13 +40,13 @@
     private static Logger s_log =
             Logger.getLogger(ThemePublishedFileManager.class);
 
-    // The code in this class borrows heavily from 
+    // The code in this class borrows heavily from
     // com.arsdigita.cms.publishToFile.FileManager
 
     static private ThemeFileManager s_manager = null;
 
 
-    protected ThemePublishedFileManager(int startupDelay, int pollDelay, 
+    protected ThemePublishedFileManager(int startupDelay, int pollDelay,
                                         String baseDirectory) {
         super(startupDelay, pollDelay, baseDirectory);
     }
@@ -54,12 +54,12 @@
     // is there a way to move this code up in to the parent class?
     /**
      * Start watching the files.  This method spawns a
-     * background thread that looks for changes in files in the database 
+     * background thread that looks for changes in files in the database
      * if there is not already a thread that has been spawned.  If there
      * is already a running thread then this is a no-op that returns a
      * reference to the running thread.
      *
-     * The thread starts processing after <code>startupDelay</code> seconds. 
+     * The thread starts processing after <code>startupDelay</code> seconds.
      * The db is checked for new/updated
      * files every <code>pollDelay</code> seconds.
      *
@@ -77,8 +77,8 @@
             s_log.info("Starting Theme File Manager Thread with the base " +
                        "directory of " + baseDirectory);
             if ( startupDelay > 0 ) {
-                s_manager = new ThemePublishedFileManager(startupDelay, 
-                                                          pollDelay, 
+                s_manager = new ThemePublishedFileManager(startupDelay,
+                                                          pollDelay,
                                                           baseDirectory);
                 s_manager.setDaemon(true);
                 s_manager.setName("theme-pub-files");
@@ -88,7 +88,7 @@
                            "because the startup delay is <= 0");
             }
         }
-        return s_manager;        
+        return s_manager;
     }
 
     /**
@@ -115,11 +115,14 @@
      *  last published then this is a no-op
      */
     protected void updateTheme(Theme theme) {
-        if (getLastRunDate() == null || 
+        if (getLastRunDate() == null ||
             !(new File(getManagerSpecificDirectory() + theme.getURL())).exists() ||
             (theme.getLastPublishedDate() != null &&
             getLastRunDate().before(theme.getLastPublishedDate()))) {
             super.updateTheme(theme);
+            // purge the templating cache  -- we want newly published themes
+            // to be visible immediately, and not after a server restart.
+            Templating.purgeTemplates();
         }
     }
 





2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (48)	Dec (31)
2005	Jan (22)	Feb (68)	Mar (185)	Apr (11)	May (21)	Jun (23)	Jul (46)	Aug (69)	Sep (211)	Oct (26)	Nov (51)	Dec (52)
2006	Jan (13)	Feb (13)	Mar (8)	Apr (21)	May (17)	Jun (100)	Jul (34)	Aug (23)	Sep (26)	Oct (16)	Nov	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (66)	Oct (10)	Nov (1)	Dec
2008	Jan	Feb	Mar (1)	Apr (3)	May (8)	Jun (5)	Jul (31)	Aug (8)	Sep (11)	Oct (6)	Nov	Dec
2012	Jan (13)	Feb (2)	Mar (9)	Apr (6)	May (24)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (120)
2013	Jan (6)	Feb (35)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

aplaws-commit Mailing List for APLAWS (Page 18)

aplaws-commit — Automatic mailing when changes are committed to CVS.