Title: [458] trunk/rails-integration/plugins/war-snapshot/lib/create_war.rb: Generate full paths for all servlet-mapping files, without using the /* shortcut for directories.
Revision
458
Author
tantalon
Date
2007-04-18 00:43:04 -0400 (Wed, 18 Apr 2007)

Log Message

Generate full paths for all servlet-mapping files, without using the /* shortcut for directories.

Modified Paths

Diff

Modified: trunk/rails-integration/plugins/war-snapshot/lib/create_war.rb (457 => 458)


--- trunk/rails-integration/plugins/war-snapshot/lib/create_war.rb	2007-04-18 01:47:52 UTC (rev 457)
+++ trunk/rails-integration/plugins/war-snapshot/lib/create_war.rb	2007-04-18 04:43:04 UTC (rev 458)
@@ -138,11 +138,12 @@
 
       public_dir = File.join(config.staging, 'public')
       public_files = []
-      public_filelist = Rake::FileList.new(File.join(public_dir, '*'))
+      public_filelist = Rake::FileList.new(File.join(public_dir, '**', '*'))
       public_filelist.each do |f|
-        relative = f[public_dir.length..f.length]
-        relative += File::SEPARATOR + '*' if File.directory?(f)
-        public_files << relative
+        unless File.directory?(f)
+          relative = f[public_dir.length..f.length]
+          public_files << relative
+        end
       end
 
       erb = ERB.new(template)
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to