From b28765384705da7091f78f678555a9cb8d0137de Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@vmware.com>
Date: Thu, 5 Jun 2008 14:50:43 +0000
Subject: [PATCH] Template polishing

---
 spring-faces/template.mf   | 32 +++++++++++++-----------
 spring-js/template.mf      | 25 ++++++++++---------
 spring-webflow/template.mf | 50 +++++++++++++++++++++-----------------
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/spring-faces/template.mf b/spring-faces/template.mf
index a0b01e30..85fcafcb 100644
--- a/spring-faces/template.mf
+++ b/spring-faces/template.mf
@@ -1,15 +1,19 @@
-Manifest-Version: 1.0
-Unversioned-Imports: org.w3c.dom
-Import-Package: org.springframework.webflow.engine.builder.support;ver
- sion="[2.0.1,2.0.1]"
-Import-Template: org.springframework.js.*;version="[2.0.1,2.0.1]",org.
- springframework.*;version="[2.5.4.A,3.0)",org.springframework.binding
- .*;version="[2.0.1,2.0.1]",org.springframework.webflow.*;version="[2.
- 0.1,2.0.1]",org.apache.commons.logging;version="[1.1.1,2.0)",javax.el
- ;version="[2.1,3.0)",javax.servlet;version="[2.4,3.0)",javax.servlet.
- http;version="[2.4,3.0)",javax.faces.*;version="[1.2,2.0)",org.ajax4j
- sf.*;version="[1.1.1,2.0)";resolution:=optional
 Bundle-SymbolicName: org.springframework.faces
-Ignored-Existing-Headers: Import-Package,Export-Package
-Bundle-Version: 2.0.1
-
+Bundle-Name: Spring Faces
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Package: 
+ org.springframework.webflow.engine.builder.support;version="[2.0.2, 2.0.2]"
+Import-Template: 
+ org.springframework.js.*;version="[2.0.2, 2.0.2]",
+ org.springframework.*;version="[2.5.4.A, 3.0.0)",
+ org.springframework.binding.*;version="[2.0.2, 2.0.2]",
+ org.springframework.webflow.*;version="[2.0.2, 2.0.2]",
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ javax.el;version="[2.1.0, 3.0.0)",
+ javax.servlet;version="[2.4.0, 3.0.0)",
+ javax.servlet.http;version="[2.4.0, 3.0.0)",
+ javax.faces.*;version="[1.2.0, 2.0.0)",
+ org.ajax4jsf.*;version="[1.1.1, 2.0.0)";resolution:=optional
+Unversioned-Imports: 
+ org.w3c.dom
diff --git a/spring-js/template.mf b/spring-js/template.mf
index 744a2559..e90fb616 100644
--- a/spring-js/template.mf
+++ b/spring-js/template.mf
@@ -1,13 +1,14 @@
-Manifest-Version: 1.0
-Import-Template: org.springframework.*;version="[2.5.4.A,3.0)",org.apa
- che.commons.logging;version="[1.1.1,2.0)",javax.servlet;version="[2.4
- ,3.0)",javax.servlet.http;version="[2.4,3.0)",org.apache.tiles;versio
- n="[2.0.5,3.0)";resolution:=optional,org.apache.tiles.access;version=
- "[2.0.5,3.0)";resolution:=optional,org.apache.tiles.context;version="
- [2.0.5.osgi,3.0)";resolution:=optional,org.apache.tiles.definition;ve
- rsion="[2.0.5.osgi,3.0)";resolution:=optional,org.apache.tiles.impl;v
- ersion="[2.0.5.osgi,3.0)";resolution:=optional
 Bundle-SymbolicName: org.springframework.js
-Ignored-Existing-Headers: Import-Package,Export-Package
-Bundle-Version: 2.0.1
-
+Bundle-Name: Spring JS
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ org.springframework.*;version="[2.5.4.A, 3.0.0)",
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ javax.servlet;version="[2.4.0, 3.0.0)",
+ javax.servlet.http;version="[2.4.0, 3.0.0)",
+ 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.definition;version="[2.0.5.osgi, 3.0.0)";resolution:=optional,
+ org.apache.tiles.impl;version="[2.0.5.osgi, 3.0.0)";resolution:=optional
diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf
index dcf35979..eed82c84 100644
--- a/spring-webflow/template.mf
+++ b/spring-webflow/template.mf
@@ -1,23 +1,29 @@
-Manifest-Version: 1.0
-Unversioned-Imports: org.w3c.dom,org.xml.sax,javax.xml.parsers,javax.x
- ml.transform,javax.xml.transform.stream
-Import-Template: org.springframework.js.*;version="[2.0.1,2.0.1]",org.
- springframework.*;version="[2.5.4.A,3.0)",org.springframework.binding
- .*;version="[2.0.1,2.0.1]",org.springframework.orm.*;version="[2.5.4.
- A,3.0)";resolution:=optional,org.springframework.security.*;version="
- [2.0,3.0)";resolution:=optional,org.springframework.transaction.*;ver
- sion="[2.5.4.A,3.0)";resolution:=optional,org.springframework.web.por
- tlet.*;version="[2.5.4.A,3.0)";resolution:=optional,org.apache.common
- s.logging;version="[1.1.1,2.0)",javax.servlet;version="[2.4,3.0)",jav
- ax.servlet.http;version="[2.4,3.0)",javax.el;version="[2.1,3.0)";reso
- lution:=optional,edu.emory.mathcs.backport.java.util.concurrent.*;ver
- sion="[3.0,4.0)";resolution:=optional,javax.persistence;version="[1.0
- ,2.0)";resolution:=optional,javax.portlet;version="[1.0,2.0)";resolut
- ion:=optional,ognl;version="[2.6.9,3.0)";resolution:=optional,junit.f
- ramework;resolution:=optional;version="[3.8.2,4.0)",org.hibernate;res
- olution:=optional;version="[3.2.6.ga,4.0)",org.hibernate.classic;reso
- lution:=optional;version="[3.2.6.ga,4.0)"
 Bundle-SymbolicName: org.springframework.webflow
-Ignored-Existing-Headers: Import-Package,Export-Package
-Bundle-Version: 2.0.1
-
+Bundle-Name: Spring Web Flow
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template: 
+ org.springframework.js.*;version="[2.0.2, 2.0.2]",
+ org.springframework.*;version="[2.5.4.A, 3.0.0)",
+ org.springframework.binding.*;version="[2.0.2, 2.0.2]",
+ org.springframework.orm.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
+ org.springframework.security.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ org.springframework.transaction.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
+ org.springframework.web.portlet.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ javax.servlet;version="[2.4.0, 3.0.0)",
+ javax.servlet.http;version="[2.4.0, 3.0.0)",
+ javax.el;version="[2.1.0, 3.0.0)";resolution:=optional,
+ edu.emory.mathcs.backport.java.util.concurrent.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.portlet;version="[1.0.0, 2.0.0)";resolution:=optional,
+ ognl;version="[2.6.9, 3.0.0)";resolution:=optional,
+ junit.framework;resolution:=optional;version="[3.8.2, 4.0.0)",
+ org.hibernate;resolution:=optional;version="[3.2.6.ga, 4.0.0)",
+ org.hibernate.classic;resolution:=optional;version="[3.2.6.ga, 4.0.0)"
+Unversioned-Imports: 
+ org.w3c.dom,
+ org.xml.sax,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.stream