Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -N -r1.35 -r1.36
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	8 Dec 2012 18:20:36 -0000	1.35
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	4 Apr 2013 08:33:01 -0000	1.36
@@ -514,13 +514,29 @@
     Currently, a file is ignored if it is a backup file or a CVS directory.
 
 } {
-    set tail [file tail $path]
-    if { [apm_backup_file_p $tail] } {
-	return 1
+    if {[file isdirectory $path]} {
+	#
+	# ignored directories
+	#
+	set parts [file split $path]
+	if {[lindex $parts end] eq "resources" && [lindex $parts end-1] eq "www"} {
+	    return 1
+	}
+	if {[lindex $parts end] in {CVS catalog upgrade}} {
+	    return 1
+	}
     }
-    if {$tail eq "CVS"} {
+    #
+    # ignored extensions
+    #
+    if {[file extension $path] in {.html .gif .png .jpg .ico .pdf .js .css .xsl .tgz .zip .gz .java .sql}} {
+	return 1 
+    }
+
+    if { [apm_backup_file_p [file tail $path]] } {
 	return 1
     }
+
     return 0
 }
 
@@ -537,13 +553,14 @@
     </ul>
 
 } {
-    return [regexp {(\.old|\.bak|~)$|^#|^bak([^a-zA-Z]|$)} [file tail $path]]
+    return [regexp {(\.old|\.bak|~)$|^#|^bak$|^bak([^a-zA-Z]+)} $path]
 }
 
 ad_proc -private apm_include_file_p { filename } {    
     Check if the APM should consider a file found by ad_find_all_files.
     Files for which apm_ignore_file_p returns true will be ignored.
     Backup files are ignored.
 } {
+    #ns_log notice "apm_include_file_p <$filename> => [apm_ignore_file_p $filename]"
     return [expr {![apm_ignore_file_p $filename]}] 
 }