change-list

fabiokung · Dec 2, 2008 · e9d2ef5 · e9d2ef5
1 parent 95abc3c
commit e9d2ef5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/History.txt b/History.txt
@@ -1,5 +1,6 @@
 == 0.8
-
+* reading config/web.xml file (not yet supporting config/web.xml.erb)
+* supporting /public/WEB-INF dir for custom web resources (config files and taglibs)
 
 == 0.7
 * Merb 1.0 support!

diff --git a/TODO.txt b/TODO.txt
@@ -1,13 +1,11 @@
 == TODO never ends...
 
 * Improve RDocs
-* configuration defaults (web.xml, classes dir, lib dir, ...)
 * integration test for lib_dir jars loading
 * read configuration from warble.rb
 * install custom resources from warbler configuration
-* more command line options: --daemon, --num-instances
 * add custom classes from warble.rb to the context classpath
 * add custom jars from warble.rb to the context classpath
-* load web.xml (or web.erb.xml) from config/web.xml
+* support config/web.xml.erb
 * read any custom jetty.xml
 * support jetty-plus features (i.e.: jndi)