From bbd69da37f8cfe07dcf07ac4c824f9370a2e818a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 12 May 2009 16:43:15 +0000
Subject: [PATCH] updated all Spring Framework OSGI manifests to list
 unversioned imports explicitly; relaxed several OSGi bundle dependencies to
 optional and extended version ranges

---
 org.springframework.aop/template.mf           | 12 ++++---
 org.springframework.beans/template.mf         | 11 ++++--
 .../template.mf                               | 10 +++---
 org.springframework.context/template.mf       | 32 +++++++++--------
 org.springframework.core/template.mf          | 14 +++++---
 org.springframework.expression/template.mf    |  9 ++---
 org.springframework.jdbc/template.mf          | 28 +++++++++------
 org.springframework.jms/template.mf           | 14 ++++----
 org.springframework.orm/template.mf           | 33 +++++------------
 org.springframework.oxm/template.mf           | 16 +++------
 org.springframework.test/template.mf          | 12 ++++---
 org.springframework.transaction/template.mf   | 29 ++++++++-------
 org.springframework.web.portlet/template.mf   |  7 ++--
 org.springframework.web.servlet/template.mf   | 36 +++++++------------
 org.springframework.web/template.mf           | 15 ++++----
 15 files changed, 137 insertions(+), 141 deletions(-)

diff --git a/org.springframework.aop/template.mf b/org.springframework.aop/template.mf
index 270f3a621cc..01dc53a11fb 100644
--- a/org.springframework.aop/template.mf
+++ b/org.springframework.aop/template.mf
@@ -9,8 +9,12 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
  org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 3.0.1)",
+ org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/org.springframework.beans/template.mf b/org.springframework.beans/template.mf
index d3b260f53f2..b7ffe9ccd3a 100644
--- a/org.springframework.beans/template.mf
+++ b/org.springframework.beans/template.mf
@@ -4,10 +4,15 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
-Unversioned-Imports: 
- *
-
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/org.springframework.context.support/template.mf b/org.springframework.context.support/template.mf
index b3ca4cc6dec..d2be27f499a 100644
--- a/org.springframework.context.support/template.mf
+++ b/org.springframework.context.support/template.mf
@@ -4,9 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  commonj.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- freemarker.*;version="[2.3.0, 3.0.0)";resolution:=optional,
- javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ freemarker.*;version="[2.3.14, 3.0.0)";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
  javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
  net.sf.ehcache.*;version="[1.3.0, 2.0.0)";resolution:=optional,
  net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional,
  org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
@@ -16,13 +18,11 @@ Import-Template:
  org.springframework.beans.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.context.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
- org.springframework.jdbc.datasource.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.jdbc.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index 3f9ac082b2c..eb63ad1173a 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -3,38 +3,40 @@ Bundle-Name: Spring Context
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional
- com.ibm.websphere.management;resolution:=optional
+ javax.persistence;version="[1.0.0, 3.0.0)";resolution:=optional,
+ org.springframework.orm.jpa.support;version="[3.0.0, 3.0.1)";resolution:=optional,
+ com.ibm.websphere.management;version="0";resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,
  com.sun.enterprise.loader.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- com.sun.net.*;resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
  edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
  groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- javax.annotation.*;version="[0.0.0, 2.0.0)";resolution:=optional,
+ javax.annotation.*;version="0";resolution:=optional,
  javax.ejb.*;version="[2.1.0, 4.0.0)";resolution:=optional,
  javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
- javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.xml.stream.*;resolution:=optional,
- javax.xml.ws.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.rmi.*;version="0";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  net.sf.cglib.*;version="[2.1.3, 2.2.0)";resolution:=optional,
- oracle.classloader.*;version="[10.1.3.1, 10.2.0.0)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ oracle.classloader.*;version="0";resolution:=optional,
+ org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.omg.CORBA.*;version="0";resolution:=optional,
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.expression.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.instrument.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.metadata.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.core/template.mf b/org.springframework.core/template.mf
index e1841d7e3da..fc0ece241b9 100644
--- a/org.springframework.core/template.mf
+++ b/org.springframework.core/template.mf
@@ -3,15 +3,19 @@ Bundle-Name: Spring Core
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.eclipse.core.runtime;common="split";resolution:=optional
+ org.eclipse.core.runtime;version="0";common="split";resolution:=optional
 Import-Template: 
  edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
  org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
- javax.xml.stream.*;resolution:=optional,
- javax.xml.transform.stax.*;resolution:=optional
-Unversioned-Imports: 
- *
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/org.springframework.expression/template.mf b/org.springframework.expression/template.mf
index 32c52c55996..3d0a897876d 100644
--- a/org.springframework.expression/template.mf
+++ b/org.springframework.expression/template.mf
@@ -3,10 +3,7 @@ Bundle-Name: Spring Expression Language
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.util;version="[3.0.0, 3.0.1)",
- org.springframework.core;version="[3.0.0, 3.0.1)",
- org.springframework.core.convert;version="[3.0.0, 3.0.1)",
- org.springframework.core.convert.service;version="[3.0.0, 3.0.1)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.antlr.runtime;version="[3.0.1,4.0.0)",
- org.antlr.runtime.tree;version="[3.0.1,4.0.0)"
+ org.antlr.runtime.*;version="[3.0.1,4.0.0)",
+ org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.util.*;version="[3.0.0, 3.0.1)"
diff --git a/org.springframework.jdbc/template.mf b/org.springframework.jdbc/template.mf
index 70d7325dde3..6ac6e5dde45 100644
--- a/org.springframework.jdbc/template.mf
+++ b/org.springframework.jdbc/template.mf
@@ -3,22 +3,30 @@ Bundle-Name: Spring JDBC
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- oracle.sql;resolution:=optional,
- org.jboss.resource.adapter.jdbc;resolution:=optional,
- weblogic.jdbc.extensions;resolution:=optional,
- com.ibm.websphere.rsadapter;resolution:=optional,
- com.ibm.ws.rsadapter.jdbc;resolution:=optional
+ oracle.sql;version="0";resolution:=optional,
+ org.jboss.resource.adapter.jdbc;version="0";resolution:=optional,
+ weblogic.jdbc.extensions;version="0";resolution:=optional,
+ com.ibm.websphere.rsadapter;version="0";resolution:=optional,
+ com.ibm.ws.rsadapter.jdbc;version="0";resolution:=optional
 Import-Template: 
- com.mchange.v2.c3p0.*;version="[0.9.1.2, 1.0.0)";resolution:=optional,
+ com.mchange.v2.c3p0.*;version="[0.9.1, 2.0.0)";resolution:=optional,
  com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0",
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.h2.*;version="[1.8.0, 2.0.0)";resolution:=optional,
+ org.hsqldb.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.dao.*;version="[3.0.0, 3.0.1)",
  org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
- org.springframework.util;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/org.springframework.jms/template.mf b/org.springframework.jms/template.mf
index d343789d0cf..001f9a59aba 100644
--- a/org.springframework.jms/template.mf
+++ b/org.springframework.jms/template.mf
@@ -4,23 +4,25 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  javax.jms.*;version="[1.1.0, 2.0.0)",
+ javax.naming.*;version="0";resolution:=optional,
  javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ javax.xml.*;version="0";resolution:=optional,
+ org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.commons.pool.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.jca.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.remoting.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.orm/template.mf b/org.springframework.orm/template.mf
index 00c1cf58df0..a6db3581ae5 100644
--- a/org.springframework.orm/template.mf
+++ b/org.springframework.orm/template.mf
@@ -9,49 +9,32 @@ Import-Package:
 Import-Template: 
  com.ibatis.*;version="[2.3.0, 3.0.0)";resolution:=optional,
  javax.jdo.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
  javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.servlet.*;version="[2.4.0, 4.0.0)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  oracle.toplink.essentials.*;version="[2.0.0, 3.0.0)";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.openjpa.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  org.eclipse.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
- org.hibernate;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.cache;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.cfg;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.classic;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.connection;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.context;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.criterion;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.dialect;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.ejb;version="[3.3.0.ga, 4.0.0)";resolution:=optional,
- org.hibernate.engine;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.event.*;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.exception;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.impl;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.jdbc;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.persister.entity;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.tool.hbm2ddl;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.transaction;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.transform;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.type;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.usertype;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
- org.hibernate.util;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
+ org.hibernate.*;version="[3.2.6.ga, 4.0.0)";resolution:=optional,
  org.springframework.aop.*;version="[3.0.0, 3.0.1)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.context.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.dao.*;version="[3.0.0, 3.0.1)",
- org.springframework.instrument.classloading.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.instrument.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.jdbc.*;version="[3.0.0, 3.0.1)",
  org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.transaction.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
  org.springframework.web.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.ui.*;version="[3.0.0, 3.0.1)";resolution:=optional
-Unversioned-Imports: 
- *
+ org.springframework.ui.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  DynamicImport-Package,
diff --git a/org.springframework.oxm/template.mf b/org.springframework.oxm/template.mf
index 11a15652644..3485b4c9d2a 100644
--- a/org.springframework.oxm/template.mf
+++ b/org.springframework.oxm/template.mf
@@ -3,9 +3,9 @@ Bundle-Name: Spring Object/XML Mapping
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.xml.bind.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.xml.stream.*;version="[1.0.1, 2.0.0)",
+ javax.activation.*;version="0";resolution:=optional,
+ javax.xml.*;version="0",
+ javax.xml.stream.*;version="0";resolution:=optional,
  com.thoughtworks.xstream.*;version="[1.2.2, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.xmlbeans.*;version="[2.2.0, 3.0.0)";resolution:=optional,
@@ -14,14 +14,8 @@ Import-Template:
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
-Unversioned-Imports: 
- javax.xml.datatype.*,
- javax.xml.namespace.*,
- javax.xml.parsers.*,
- javax.xml.transform.*,
- javax.xml.validation.*,
- org.w3c.dom.*,
- org.xml.sax.*
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  DynamicImport-Package,
diff --git a/org.springframework.test/template.mf b/org.springframework.test/template.mf
index cc5eea6a501..ce2c437cff4 100644
--- a/org.springframework.test/template.mf
+++ b/org.springframework.test/template.mf
@@ -3,22 +3,24 @@ Bundle-Name: Spring Test
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- javax.activation.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.el.*;resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
  javax.persistence.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
  javax.servlet;version="[2.4.0, 4.0.0)";resolution:=optional,
  javax.servlet.http;version="[2.4.0, 4.0.0)";resolution:=optional,
  javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  junit.framework.*;version="[3.8.2, 5.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
  org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
  org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional
-Unversioned-Imports: 
- *
+ org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.transaction/template.mf b/org.springframework.transaction/template.mf
index f17016623c3..326d381a0bf 100644
--- a/org.springframework.transaction/template.mf
+++ b/org.springframework.transaction/template.mf
@@ -3,24 +3,29 @@ Bundle-Name: Spring Transaction
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
- org.springframework.stereotype;version="[3.0.0, 3.0.1)"
- com.ibm.ws.Transaction;resolution:=optional,
- oracle.j2ee.transaction;resolution:=optional,
- weblogic.transaction;resolution:=optional
+ com.ibm.ws.Transaction;version="0";resolution:=optional,
+ oracle.j2ee.transaction;version="0";resolution:=optional,
+ weblogic.transaction;version="0";resolution:=optional
 Import-Template: 
  com.ibm.wsspi.uow.*;version="[6.0.2.17, 6.1.0)";resolution:=optional,
- javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional, 
+ javax.ejb.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
  javax.resource.*;version="[1.5.0, 2.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
- org.aopalliance.*;version="[1.0.0, 2.0.0)",
+ org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.aop.*;version="[3.0.0, 3.0.1)",
+ org.springframework.aop.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
- org.springframework.context.*;version="[3.0.0, 3.0.1)",
+ org.springframework.context.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
  org.springframework.jndi.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.metadata.*;version="[3.0.0, 3.0.1)",
  org.springframework.scheduling.*;version="[3.0.0, 3.0.1)";resolution:=optional,
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.stereotype;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers: 
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/org.springframework.web.portlet/template.mf b/org.springframework.web.portlet/template.mf
index 6b8673b80d3..8f6e4a2dc9a 100644
--- a/org.springframework.web.portlet/template.mf
+++ b/org.springframework.web.portlet/template.mf
@@ -5,18 +5,19 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  javax.portlet.*;version="[2.0.0, 3.0.0)",
  javax.servlet.*;version="[2.4.0, 4.0.0)",
+ javax.xml.*;version="0";resolution:=optional,
  org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.context.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.http.*;version="[3.0.0, 3.0.1)",
  org.springframework.stereotype;version="[3.0.0, 3.0.1)",
  org.springframework.ui.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
  org.springframework.validation.*;version="[3.0.0, 3.0.1)",
- org.springframework.web.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.web.*;version="[3.0.0, 3.0.1)",
+ org.xml.sax.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index 79e8188f57b..b0e2244e56c 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -2,49 +2,39 @@ Bundle-SymbolicName: org.springframework.web.servlet
 Bundle-Name: Spring Web Servlet
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- org.springframework.stereotype;version="[3.0.0, 3.0.1)",
- org.apache.tiles.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.jsp.context;version="[2.0.5, 3.0.0)";resolution:=optional
 Import-Template: 
  com.sun.syndication.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  com.lowagie.text.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- freemarker.*;version="[2.3.0, 3.0.0)";resolution:=optional,
+ freemarker.*;version="[2.3.14, 3.0.0)";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  javax.servlet;version="[2.4.0, 4.0.0)",
  javax.servlet.http;version="[2.4.0, 4.0.0)",
  javax.servlet.jsp;version="[2.0.0, 3.0.0)";resolution:=optional,
  javax.servlet.jsp.jstl.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  javax.servlet.jsp.tagext;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  jxl.*;version="[2.6.6, 3.0.0)";resolution:=optional,
  net.sf.jasperreports.*;version="[2.0.5, 3.0.0)";resolution:=optional,
  org.apache.commons.fileupload.*;version="[1.2.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)";resolution:=optional,
  org.apache.poi.*;version="[3.0.2.FINAL, 4.0.0)";resolution:=optional,
- org.apache.tiles;version="[2.0.5, 3.0.0)";resolution:=optional,
- org.apache.tiles.access;version="[2.0.5, 3.0.0)";resolution:=optional,
- org.apache.tiles.context;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.factory;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.locale.impl;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.preparer;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.servlet.context;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.tiles.web.util;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
- org.apache.velocity;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.apache.velocity.app.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.apache.velocity.context;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.apache.velocity.exception;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.apache.velocity.runtime.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.apache.velocity.tools.generic;version="[1.4.0, 3.0.0)";resolution:=optional,
- org.apache.velocity.tools.view.*;version="[1.4.0, 3.0.0)";resolution:=optional,
+ org.apache.tiles.*;version="[2.0.5, 3.0.0)";resolution:=optional,
+ org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
+ org.apache.velocity.tools.*;version="[1.4.0, 3.0.0)";resolution:=optional,
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.context.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.http.*;version="[3.0.0, 3.0.1)",
+ org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
+ org.springframework.stereotype;version="[3.0.0, 3.0.1)",
  org.springframework.ui.*;version="[3.0.0, 3.0.1)",
  org.springframework.util.*;version="[3.0.0, 3.0.1)",
  org.springframework.validation.*;version="[3.0.0, 3.0.1)",
- org.springframework.web.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.web.*;version="[3.0.0, 3.0.1)",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index f3985d20ead..1c5d04fc1e2 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -4,17 +4,15 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  com.caucho.*;version="[3.1.5, 4.0.0)";resolution:=optional,
- com.sun.net.*;resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
  javax.el.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  javax.faces.*;version="[1.1.0, 3.0.0)";resolution:=optional,
- javax.jws.*;resolution:=optional,
+ javax.jws.*;version="0";resolution:=optional,
  javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
  javax.servlet;version="[2.4.0, 4.0.0)",
  javax.servlet.http;version="[2.4.0, 4.0.0)",
  javax.servlet.jsp.*;version="[2.0.0, 3.0.0)";resolution:=optional,
- javax.xml.rpc.*;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.xml.soap.*;version="[1.3.0, 2.0.0)";resolution:=optional,
- javax.xml.ws.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
@@ -23,11 +21,12 @@ Import-Template:
  org.springframework.beans.*;version="[3.0.0, 3.0.1)",
  org.springframework.context.*;version="[3.0.0, 3.0.1)",
  org.springframework.core.*;version="[3.0.0, 3.0.1)",
+ org.springframework.oxm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.remoting.*;version="[3.0.0, 3.0.1)";resolution:=optional,
  org.springframework.ui.*;version="[3.0.0, 3.0.1)",
- org.springframework.util.*;version="[3.0.0, 3.0.1)"
-Unversioned-Imports: 
- *
+ org.springframework.util.*;version="[3.0.0, 3.0.1)",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
 Ignored-Existing-Headers: 
  Bnd-LastModified,
  Import-Package,