diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
index bb882607b2..45dec9c710 100644
--- a/org.springframework.integration.adapter/.classpath
+++ b/org.springframework.integration.adapter/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.0/com.springsource.javax.activation-1.1.0.jar" sourcepath="/IVY_CACHE/javax.activation/com.springsource.javax.activation/1.1.0/com.springsource.javax.activation-sources-1.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-1.4.1.jar" sourcepath="/IVY_CACHE/javax.mail/com.springsource.javax.mail/1.4.1/com.springsource.javax.mail-sources-1.4.1.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.net/1.4.1/com.springsource.org.apache.commons.net-1.4.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.net/1.4.1/com.springsource.org.apache.commons.net-sources-1.4.1.jar"/>
@@ -18,8 +17,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.5.A/org.springframework.context.support-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.5.A/org.springframework.context.support-sources-2.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.5.A/org.springframework.core-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.5.A/org.springframework.core-sources-2.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.5.A/org.springframework.test-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.5.A/org.springframework.test-sources-2.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.5.A/org.springframework.transaction-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.5.A/org.springframework.transaction-sources-2.5.5.A.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/2.5.5.A/org.springframework.web-2.5.5.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/2.5.5.A/org.springframework.web-2.5.5.A.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock.classextension/2.3.0/com.springsource.org.easymock.classextension-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-2.1.3.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf
index f54131efa9..afdc7a6f7f 100644
--- a/org.springframework.integration.adapter/template.mf
+++ b/org.springframework.integration.adapter/template.mf
@@ -3,30 +3,16 @@ Bundle-Name: Spring Integration Adapters
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.integration.*;version="[1.0.0, 1.0.1)",
+ com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional,
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.apache.commons.net.ftp;version="[1.4.1, 2.0.0)";resolution:=optional,
  org.springframework.beans.*;version="[2.5.5.A, 3.0.0)",
  org.springframework.context;version="[2.5.5.A, 3.0.0)",
  org.springframework.core.*;version="[2.5.5.A, 3.0.0)",
- org.springframework.jms.*;version="[2.5.5.A, 3.0.0)";resolution:=optional,
  org.springframework.mail.*;version="[2.5.5.A, 3.0.0)";resolution:=optional,
- org.springframework.remoting.*;version="[2.5.5.A, 3.0.0)";resolution:=optional,
- org.springframework.transaction.*;version="[2.5.5.A, 3.0.0)",
  org.springframework.util;version="[2.5.5.A, 3.0.0)",
- org.springframework.web;version="[2.5.5.A, 3.0.0)";resolution:=optional,
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.apache.commons.net.ftp;version="[1.4.1, 2.0.0)";resolution:=optional,
- javax.mail.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
- javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional,
- javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional
+ org.springframework.integration.*;version="[1.0.0, 1.0.1)"
 Unversioned-Imports: 
  org.w3c.dom
-Excluded-Exports: 
- org.springframework.integration.adapter.file.config,
- org.springframework.integration.adapter.ftp.config,
- org.springframework.integration.adapter.httpinvoker.config,
- org.springframework.integration.adapter.jms.config,
- org.springframework.integration.adapter.mail.config,
- org.springframework.integration.adapter.rmi.config,
- org.springframework.integration.adapter.stream.config