From 6aa9a375024543c9c1d3a9cf306c15e04d955046 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sat, 27 Jun 2009 14:40:53 +0000
Subject: [PATCH] INT-687 Upgraded to spring-build 2.2.10 r669, removed all
 Unversioned-Imports from template.mf files, and added ivy.xml to the
 spring-integration-reference module.

---
 org.springframework.integration.adapter/template.mf    |  6 ++----
 org.springframework.integration.event/template.mf      |  1 -
 org.springframework.integration.file/template.mf       |  6 ++----
 org.springframework.integration.http/template.mf       |  6 ++----
 .../template.mf                                        |  6 ++----
 org.springframework.integration.jms/template.mf        |  6 ++----
 org.springframework.integration.mail/template.mf       |  6 ++----
 org.springframework.integration.rmi/template.mf        |  6 ++----
 org.springframework.integration.samples/template.mf    | 10 ++++------
 org.springframework.integration.security/template.mf   |  5 ++---
 org.springframework.integration.stream/template.mf     |  5 ++---
 org.springframework.integration.ws/template.mf         |  7 +++----
 org.springframework.integration.xml/template.mf        |  9 ++++-----
 org.springframework.integration/template.mf            |  6 ++----
 14 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf
index 0dac8f12b6..d0f04fad52 100644
--- a/org.springframework.integration.adapter/template.mf
+++ b/org.springframework.integration.adapter/template.mf
@@ -7,7 +7,5 @@ Import-Template:
  org.springframework.beans.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.remoting;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
- org.springframework.integration.*;version="[1.0.2, 1.0.3)"
-Unversioned-Imports: 
- org.w3c.dom
-
+ org.springframework.integration.*;version="[1.0.2, 1.0.3)",
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.event/template.mf b/org.springframework.integration.event/template.mf
index 6c7b2b0a75..cba711bfa1 100644
--- a/org.springframework.integration.event/template.mf
+++ b/org.springframework.integration.event/template.mf
@@ -7,4 +7,3 @@ Import-Template:
  org.springframework.context;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)"
-
diff --git a/org.springframework.integration.file/template.mf b/org.springframework.integration.file/template.mf
index 33a1ef84d4..cf96668fe4 100644
--- a/org.springframework.integration.file/template.mf
+++ b/org.springframework.integration.file/template.mf
@@ -8,7 +8,5 @@ Import-Template:
  org.springframework.beans.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.context;version="[2.5.6.A, 3.0.0)",
  org.springframework.core.*;version="[2.5.6.A, 3.0.0)",
- org.springframework.util;version="[2.5.6.A, 3.0.0)"
-Unversioned-Imports: 
- org.w3c.dom
-
+ org.springframework.util;version="[2.5.6.A, 3.0.0)",
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.http/template.mf b/org.springframework.integration.http/template.mf
index 6da52a8922..e7c980666c 100644
--- a/org.springframework.integration.http/template.mf
+++ b/org.springframework.integration.http/template.mf
@@ -11,7 +11,5 @@ Import-Template:
  org.springframework.web.*;version="[2.5.6.A, 3.0.0)";resolution:=optional,
  org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional
-Unversioned-Imports: 
- org.w3c.dom
-
+ javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.httpinvoker/template.mf b/org.springframework.integration.httpinvoker/template.mf
index 0db65ae6d3..6737672a0b 100644
--- a/org.springframework.integration.httpinvoker/template.mf
+++ b/org.springframework.integration.httpinvoker/template.mf
@@ -11,7 +11,5 @@ Import-Template:
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
  org.springframework.web;version="[2.5.6.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)";resolution:=optional
-Unversioned-Imports: 
- org.w3c.dom
-
+ javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.jms/template.mf b/org.springframework.integration.jms/template.mf
index 2371380f8e..4413a6a2c6 100644
--- a/org.springframework.integration.jms/template.mf
+++ b/org.springframework.integration.jms/template.mf
@@ -11,7 +11,5 @@ Import-Template:
  org.springframework.transaction.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional
-Unversioned-Imports: 
- org.w3c.dom
-
+ javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.mail/template.mf b/org.springframework.integration.mail/template.mf
index 3acb76748c..c6415bbbab 100644
--- a/org.springframework.integration.mail/template.mf
+++ b/org.springframework.integration.mail/template.mf
@@ -11,7 +11,5 @@ Import-Template:
  org.springframework.util.*;version="[2.5.6.A, 3.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.mail.*;version="[1.4.0, 2.0.0)",
- com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional
-Unversioned-Imports: 
- org.w3c.dom
-
+ com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.rmi/template.mf b/org.springframework.integration.rmi/template.mf
index 5f2d4df170..75d8625080 100644
--- a/org.springframework.integration.rmi/template.mf
+++ b/org.springframework.integration.rmi/template.mf
@@ -9,7 +9,5 @@ Import-Template:
  org.springframework.core.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.remoting.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
- org.apache.commons.logging;version="[1.1.1, 2.0.0)"
-Unversioned-Imports: 
- org.w3c.dom
-
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.samples/template.mf b/org.springframework.integration.samples/template.mf
index e72e4f56a1..c14e9bf471 100644
--- a/org.springframework.integration.samples/template.mf
+++ b/org.springframework.integration.samples/template.mf
@@ -9,9 +9,7 @@ Import-Template:
  org.springframework.util.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.stereotype;version="[2.5.6.A, 3.0.0)",
  org.springframework.core.*;version="[2.5.6.A, 3.0.0)",
- org.springframework.xml.*;version="[1.5.5.A, 2.0.0)"
-Unversioned-Imports: 
- org.w3c.dom,
- javax.xml.*,
- org.xml.sax.*
- 
\ No newline at end of file
+ org.springframework.xml.*;version="[1.5.5.A, 2.0.0)",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0",
+ javax.xml.*;version="0"
diff --git a/org.springframework.integration.security/template.mf b/org.springframework.integration.security/template.mf
index 628ceafd37..7bb7775080 100644
--- a/org.springframework.integration.security/template.mf
+++ b/org.springframework.integration.security/template.mf
@@ -10,6 +10,5 @@ Import-Template:
  org.springframework.core;version="[2.5.6.A, 3.0.0)",
  org.springframework.util.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.integration.*;version="[1.0.2, 1.0.3)",
- org.springframework.security.*;version="[2.0.4.A, 3.0.0)"
-Unversioned-Imports: 
- org.w3c.dom
+ org.springframework.security.*;version="[2.0.4.A, 3.0.0)",
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.stream/template.mf b/org.springframework.integration.stream/template.mf
index 582078febf..16626124d9 100644
--- a/org.springframework.integration.stream/template.mf
+++ b/org.springframework.integration.stream/template.mf
@@ -6,6 +6,5 @@ Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.beans.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
- org.springframework.integration.*;version="[1.0.2, 1.0.3)"
-Unversioned-Imports: 
- org.w3c.dom
+ org.springframework.integration.*;version="[1.0.2, 1.0.3)",
+ org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.ws/template.mf b/org.springframework.integration.ws/template.mf
index fbe6bebf12..1777ed345c 100644
--- a/org.springframework.integration.ws/template.mf
+++ b/org.springframework.integration.ws/template.mf
@@ -9,7 +9,6 @@ Import-Template:
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
  org.springframework.oxm;version="[1.5.5.A, 2.0.0)",
  org.springframework.ws.*;version="[1.5.5.A, 2.0.0)",
- org.springframework.xml.transform;version="[1.5.5.A, 2.0.0)"
-Unversioned-Imports: 
- org.w3c.dom,
- javax.xml.*
+ org.springframework.xml.transform;version="[1.5.5.A, 2.0.0)",
+ org.w3c.dom.*;version="0",
+ javax.xml.*;version="0"
diff --git a/org.springframework.integration.xml/template.mf b/org.springframework.integration.xml/template.mf
index 7ad319a887..c70d1c3545 100644
--- a/org.springframework.integration.xml/template.mf
+++ b/org.springframework.integration.xml/template.mf
@@ -8,8 +8,7 @@ Import-Template:
  org.springframework.core.*;version="[2.5.6.A, 3.0.0)",
  org.springframework.util;version="[2.5.6.A, 3.0.0)",
  org.springframework.oxm;version="[1.5.5.A, 2.0.0)";resolution:=optional,
- org.springframework.xml.*;version="[1.5.5.A, 2.0.0)"
-Unversioned-Imports: 
- org.w3c.dom,
- javax.xml.*,
- org.xml.sax.*
+ org.springframework.xml.*;version="[1.5.5.A, 2.0.0)",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0",
+ javax.xml.*;version="0"
diff --git a/org.springframework.integration/template.mf b/org.springframework.integration/template.mf
index c4d4637485..91b8673045 100644
--- a/org.springframework.integration/template.mf
+++ b/org.springframework.integration/template.mf
@@ -5,7 +5,5 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.*;version="[2.5.6.A, 3.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.aopalliance.*;version="[1.0.0,2.0.0)"
-Unversioned-Imports: 
- org.w3c.dom
-
+ org.aopalliance.*;version="[1.0.0,2.0.0)",
+ org.w3c.dom.*;version="0"