From ccc548b9e4ca580c0beffc939466143bb9760b39 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 8 Mar 2011 16:20:37 +0000
Subject: [PATCH] Fixing bundlor warnings.

---
 acl/template.mf     | 1 +
 aspects/template.mf | 4 +++-
 config/template.mf  | 5 +++--
 taglibs/template.mf | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/acl/template.mf b/acl/template.mf
index f3ead64c3b..947f50c3ca 100644
--- a/acl/template.mf
+++ b/acl/template.mf
@@ -9,6 +9,7 @@ Ignored-Existing-Headers:
  Import-Package,
  Export-Package
 Import-Template:
+ org.aopalliance.*;version="${aopAllianceRange}",
  org.apache.commons.logging.*;version="${cloggingRange}",
  org.springframework.security.core.*;version="${secRange}",
  org.springframework.security.access.*;version="${secRange}",
diff --git a/aspects/template.mf b/aspects/template.mf
index 2859d4d9aa..5f43a718e0 100644
--- a/aspects/template.mf
+++ b/aspects/template.mf
@@ -11,4 +11,6 @@ Ignored-Existing-Headers:
 Import-Template:
  org.aspectj.*;version="${aspectjRange}";resolution:=optional,
  org.apache.commons.logging.*;version="${cloggingRange}",
- org.springframework.security.core.*;version="${secRange}"
+ org.springframework.security.core.*;version="${secRange}",
+ org.springframework.security.access.intercept.aspectj;version="${secRange}",
+ org.springframework.beans.factory;version="${springRange}"
diff --git a/config/template.mf b/config/template.mf
index 92677c6b66..95997af80f 100644
--- a/config/template.mf
+++ b/config/template.mf
@@ -21,7 +21,8 @@ Import-Template:
  org.springframework.beans.*;version="${springRange}",
  org.springframework.context.*;version="${springRange}",
  org.springframework.core.*;version="${springRange}",
- org.springframework.util.*;version="${springRange}",
- javax.servlet;version="0";resolution:=optional,
+ org.springframework.web.*;version="${springRange}",
+ org.springframework.util;version="${springRange}",
+ javax.servlet.*;version="0";resolution:=optional,
  javax.naming.directory;version="0";resolution:=optional,
  org.w3c.dom;version="0";resolution:=optional
diff --git a/taglibs/template.mf b/taglibs/template.mf
index c0573a3a54..bce2d3fbac 100644
--- a/taglibs/template.mf
+++ b/taglibs/template.mf
@@ -15,6 +15,8 @@ Import-Template:
  org.springframework.security.access.*;version="${secRange}",
  org.springframework.security.util;version="${secRange}",
  org.springframework.security.acls.*;version="${secRange}";resolution:=optional,
+ org.springframework.core.*;version="${springRange}",
+ org.springframework.util;version="${springRange}",
  org.springframework.beans.*;version="${springRange}",
  org.springframework.context.*;version="${springRange}",
  org.springframework.expression;version="${springRange}";resolution:=optional,