[Armedbear-cvs] r14699 - branches/1.3.1/contrib/asdf-jar

[mevenson at common-lisp.net]

Author: mevenson
Date: Sun Apr 27 14:16:02 2014
New Revision: 14699

Log:
Backport r14695:  Enable PACKAGE-FOR-WAR to work by reading the servlet spec and disabling WARN.

Modified:
   branches/1.3.1/contrib/asdf-jar/asdf-jar.lisp

Modified: branches/1.3.1/contrib/asdf-jar/asdf-jar.lisp
==============================================================================
--- branches/1.3.1/contrib/asdf-jar/asdf-jar.lisp	Sun Apr 27 14:12:38 2014	(r14698)
+++ branches/1.3.1/contrib/asdf-jar/asdf-jar.lisp	Sun Apr 27 14:16:02 2014	(r14699)
@@ -159,13 +159,12 @@
                                  (out #p"/var/tmp/") 
                                  (recursive nil)          ; whether to package dependencies
                                  (force nil)            ; whether to force ASDF compilation
-                                 (root (list :relative "WEB-INF" "resources"))
+                                 (root (list :relative "META-INF" "resources"))
                                  (verbose t))
   "Package named asdf SYSTEM for deployment in a Java Servlet container war file. 
 
 c.f. PACKAGE for further options."
 
-  (warn "Unaudited.  Please see your local Honey dealer.")
   (package system :out out :recursive recursive :force force :verbose verbose
            :root root))