Permalink
Browse files

make sure paths includeded in (uber)war are distinct

  • Loading branch information...
1 parent b518561 commit 43a39c5c244e075194205d9c0177072ab729c627 @mstump mstump committed Dec 5, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/leiningen/ring/uberwar.clj
  2. +2 −2 src/leiningen/ring/war.clj
@@ -33,8 +33,8 @@
(doto war-stream
(war/str-entry "WEB-INF/web.xml" (war/make-web-xml project))
(war/dir-entry project "WEB-INF/classes/" (:compile-path project)))
- (doseq [path (concat [(:source-path project)] (:source-paths project)
- [(:resources-path project)] (:resource-paths project))
+ (doseq [path (distinct (concat [(:source-path project)] (:source-paths project)
+ [(:resources-path project)] (:resource-paths project)))
:when path]
(war/dir-entry war-stream project "WEB-INF/classes/" path))
(war/dir-entry war-stream project "" (war/war-resources-path project))
@@ -188,8 +188,8 @@
(doto war-stream
(str-entry "WEB-INF/web.xml" (make-web-xml project))
(dir-entry project "WEB-INF/classes/" (:compile-path project)))
- (doseq [path (concat [(:source-path project)] (:source-paths project)
- [(:resources-path project)] (:resource-paths project))
+ (doseq [path (distinct (concat [(:source-path project)] (:source-paths project)
+ [(:resources-path project)] (:resource-paths project)))
:when path]
(dir-entry war-stream project "WEB-INF/classes/" path))
(dir-entry war-stream project "" (war-resources-path project))

0 comments on commit 43a39c5

Please sign in to comment.