diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml
index 05af953085..2aec74c5ce 100644
--- a/build-spring-integration/build.xml
+++ b/build-spring-integration/build.xml
@@ -5,7 +5,6 @@
 		<pathelement location="${basedir}/../spring-integration-parent"/>
 		<pathelement location="${basedir}/../org.springframework.integration"/>
 		<pathelement location="${basedir}/../org.springframework.integration.security"/>
-		<pathelement location="${basedir}/../org.springframework.integration.adapter"/>
 		<pathelement location="${basedir}/../org.springframework.integration.xml"/>
 		<pathelement location="${basedir}/../org.springframework.integration.event"/>
 		<pathelement location="${basedir}/../org.springframework.integration.file"/>
diff --git a/build-spring-integration/pom.xml b/build-spring-integration/pom.xml
index 3b9bc65d66..e007c3ee1f 100644
--- a/build-spring-integration/pom.xml
+++ b/build-spring-integration/pom.xml
@@ -20,7 +20,6 @@
       <module>../spring-integration-parent</module>
       <module>../org.springframework.integration</module>
       <module>../org.springframework.integration.security</module>
-      <module>../org.springframework.integration.adapter</module>
       <module>../org.springframework.integration.event</module>
       <module>../org.springframework.integration.file</module>
       <module>../org.springframework.integration.http</module>
@@ -40,9 +39,9 @@
     <url>http://www.springsource.com</url>
   </organization>
   <scm>
-    <url>https://fisheye.springframework.org/browse/spring-integration</url>
-    <connection>scm:svn:https://src.springframework.org/svn/spring-integration</connection>
-    <developerConnection>scm:svn:https://src.springframework.org/svn/spring-integration/trunk</developerConnection>
+    <url>https://fisheye.springsource.org/browse/spring-integration</url>
+    <connection>scm:svn:https://src.springsource.org/svn/spring-integration</connection>
+    <developerConnection>scm:svn:https://src.springsource.org/svn/spring-integration/trunk</developerConnection>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -52,13 +51,13 @@
     <mailingList>
       <name>        Spring Integration Forum
       </name>
-      <post>http://forum.springframework.org/forumdisplay.php?f=42</post>
-      <archive>http://forum.springframework.org/forumdisplay.php?f=42</archive>
+      <post>http://forum.springsource.org/forumdisplay.php?f=42</post>
+      <archive>http://forum.springsource.org/forumdisplay.php?f=42</archive>
     </mailingList>
   </mailingLists>
   <ciManagement>
     <system>Bamboo</system>
-    <url>https://build.springframework.org/browse/INT</url>
+    <url>https://build.springsource.org/browse/INT</url>
   </ciManagement>
   <licenses>
     <license>
diff --git a/build-spring-integration/publish.xml b/build-spring-integration/publish.xml
index d7eea169aa..07f4ab5b8a 100644
--- a/build-spring-integration/publish.xml
+++ b/build-spring-integration/publish.xml
@@ -7,7 +7,6 @@
   <path id="modules-with-code-artifacts">
 		<pathelement location="${basedir}/../org.springframework.integration"/>
 		<pathelement location="${basedir}/../org.springframework.integration.security"/>
-		<pathelement location="${basedir}/../org.springframework.integration.adapter"/>
 		<pathelement location="${basedir}/../org.springframework.integration.xml"/>
 		<pathelement location="${basedir}/../org.springframework.integration.event"/>
 		<pathelement location="${basedir}/../org.springframework.integration.file"/>
diff --git a/org.springframework.integration.adapter/.classpath b/org.springframework.integration.adapter/.classpath
deleted file mode 100644
index ddc9103c5c..0000000000
--- a/org.springframework.integration.adapter/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.springframework.integration.adapter/.project b/org.springframework.integration.adapter/.project
deleted file mode 100644
index 5ea3d1a6be..0000000000
--- a/org.springframework.integration.adapter/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-integration-adapter</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.springframework.integration.adapter/.settings/org.eclipse.jdt.core.prefs b/org.springframework.integration.adapter/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 38e4cdc2e5..0000000000
--- a/org.springframework.integration.adapter/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Mar 01 13:40:51 GMT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.springframework.integration.adapter/.settings/org.maven.ide.eclipse.prefs b/org.springframework.integration.adapter/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index b2b77e81bb..0000000000
--- a/org.springframework.integration.adapter/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Mar 01 13:38:47 GMT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/org.springframework.integration.adapter/build.xml b/org.springframework.integration.adapter/build.xml
deleted file mode 100644
index 63609ff858..0000000000
--- a/org.springframework.integration.adapter/build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.integration.adapter">
-
-	<property file="${basedir}/../build.properties"/>
-	<import file="${basedir}/../build-spring-integration/package-bundle.xml"/>
-	<import file="${basedir}/../build-spring-integration/generate-pom.xml"/>
-	<import file="${basedir}/../spring-build/standard/default.xml"/>
-
-
-</project>
diff --git a/org.springframework.integration.adapter/ivy.xml b/org.springframework.integration.adapter/ivy.xml
deleted file mode 100644
index f41c1ca30a..0000000000
--- a/org.springframework.integration.adapter/ivy.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
-		version="1.3">
-
-	<info organisation="org.springframework.integration" module="${ant.project.name}">
-		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
-		<ivyauthor name="Mark Fisher"/>
-	</info>
-
-	<configurations>
-		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
-	</configurations>
-
-	<publications>
-		<artifact name="${ant.project.name}"/>
-		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
-	</publications>
-
-	<dependencies>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-	</dependencies>
-
-</ivy-module>
diff --git a/org.springframework.integration.adapter/pom.xml b/org.springframework.integration.adapter/pom.xml
deleted file mode 100644
index 553a80f8af..0000000000
--- a/org.springframework.integration.adapter/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.integration</groupId>
-  <artifactId>spring-integration-adapter</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Integration Adapters</name>
-  <parent>
-    <groupId>org.springframework.integration</groupId>
-    <artifactId>spring-integration-parent</artifactId>
-    <version>2.0.0.BUILD-SNAPSHOT</version>
-    <relativePath>../spring-integration-parent</relativePath>
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
deleted file mode 100644
index faf34902cc..0000000000
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.adapter;
-
-import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessagingException;
-
-/**
- * Exception that indicates an error during message mapping.
- * 
- * @author Mark Fisher
- */
-@SuppressWarnings("serial")
-public class MessageMappingException extends MessagingException {
-
-	public MessageMappingException(String description) {
-		super(description);
-	}
-
-	public MessageMappingException(String description, Throwable cause) {
-		super(description, cause);
-	}
-
-	public MessageMappingException(Message<?> failedMessage, String description) {
-		super(failedMessage, description);
-	}
-
-	public MessageMappingException(Message<?> failedMessage, String description, Throwable cause) {
-		super(failedMessage, description, cause);
-	}
-
-}
diff --git a/org.springframework.integration.adapter/src/main/resources/.gitignore b/org.springframework.integration.adapter/src/main/resources/.gitignore
deleted file mode 100644
index f935021a8f..0000000000
--- a/org.springframework.integration.adapter/src/main/resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
diff --git a/org.springframework.integration.adapter/src/test/java/.gitignore b/org.springframework.integration.adapter/src/test/java/.gitignore
deleted file mode 100644
index f935021a8f..0000000000
--- a/org.springframework.integration.adapter/src/test/java/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!.gitignore
diff --git a/org.springframework.integration.adapter/template.mf b/org.springframework.integration.adapter/template.mf
deleted file mode 100644
index f2a68a20ac..0000000000
--- a/org.springframework.integration.adapter/template.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-SymbolicName: org.springframework.integration.adapter
-Bundle-Name: Spring Integration Adapters
-Bundle-Vendor: SpringSource
-Bundle-ManifestVersion: 2
-Import-Template: 
- org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.remoting;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
- org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.w3c.dom.*;version="0"
diff --git a/org.springframework.integration.httpinvoker/ivy.xml b/org.springframework.integration.httpinvoker/ivy.xml
index 0703ca2cf7..d2eacd9f20 100644
--- a/org.springframework.integration.httpinvoker/ivy.xml
+++ b/org.springframework.integration.httpinvoker/ivy.xml
@@ -26,7 +26,6 @@
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.web" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.ip/ivy.xml b/org.springframework.integration.ip/ivy.xml
index a01f7108c9..9578586509 100644
--- a/org.springframework.integration.ip/ivy.xml
+++ b/org.springframework.integration.ip/ivy.xml
@@ -26,7 +26,6 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
         <dependency org="org.springframework.integration" name="org.springframework.integration.test" rev="latest.integration" conf="test->runtime"/>                
         <dependency org="org.springframework.integration" name="org.springframework.integration.stream" rev="latest.integration" conf="test->runtime"/>        
diff --git a/org.springframework.integration.jms/ivy.xml b/org.springframework.integration.jms/ivy.xml
index 19f3104067..23d6b872b4 100644
--- a/org.springframework.integration.jms/ivy.xml
+++ b/org.springframework.integration.jms/ivy.xml
@@ -28,7 +28,6 @@
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.transaction" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.mail/ivy.xml b/org.springframework.integration.mail/ivy.xml
index bf8574e8b4..3598ab299c 100644
--- a/org.springframework.integration.mail/ivy.xml
+++ b/org.springframework.integration.mail/ivy.xml
@@ -29,7 +29,6 @@
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.rmi/ivy.xml b/org.springframework.integration.rmi/ivy.xml
index 1e127f303e..33937c8eda 100644
--- a/org.springframework.integration.rmi/ivy.xml
+++ b/org.springframework.integration.rmi/ivy.xml
@@ -25,7 +25,6 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.integration.test/ivy.xml b/org.springframework.integration.test/ivy.xml
index d59ab42c88..44c133c04c 100644
--- a/org.springframework.integration.test/ivy.xml
+++ b/org.springframework.integration.test/ivy.xml
@@ -22,7 +22,6 @@
 	<dependencies>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
 		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" />
 	</dependencies>
diff --git a/org.springframework.integration.ws/ivy.xml b/org.springframework.integration.ws/ivy.xml
index df4ca3a259..a14b41a727 100644
--- a/org.springframework.integration.ws/ivy.xml
+++ b/org.springframework.integration.ws/ivy.xml
@@ -23,15 +23,15 @@
 		<dependency org="com.sun.xml" name="com.springsource.com.sun.xml.messaging.saaj" rev="1.3.0" conf="provided->runtime"/>
 		<dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided->runtime"/>
 		<dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="1.0.1" conf="provided->runtime"/>
-		<dependency org="org.springframework.integration" name="org.springframework.integration.adapter" rev="latest.integration" conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.oxm" rev="${spring.version}" conf="compile->runtime"/>
 		<dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.8.A" conf="compile->runtime">
 			<exclude org="org.springframework"/>
 		</dependency>
+		<dependency org="org.springframework.integration" name="org.springframework.integration" rev="latest.integration" conf="compile->compile"/>
 		<!-- test dependencies -->
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>	
 		<dependency org="org.mockito" name="com.springsource.org.mockito" rev="${mockito.version}" conf="test->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>				
+		<dependency org="org.springframework" name="org.springframework.test" rev="${spring.version}" conf="test->runtime"/>
 	</dependencies>
 
 </ivy-module>
\ No newline at end of file
diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml
index 527553cec1..5cc4470802 100644
--- a/org.springframework.integration.ws/pom.xml
+++ b/org.springframework.integration.ws/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-adapter</artifactId>
+      <artifactId>spring-integration-core</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 87e1cd0958..5e6130bea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,6 @@
 	<modules>
 		<module>spring-integration-parent</module>
 		<module>org.springframework.integration</module>
-		<module>org.springframework.integration.adapter</module>
 		<module>org.springframework.integration.test</module>
 		<module>org.springframework.integration.event</module>
 		<module>org.springframework.integration.file</module>
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 32d8017624..39f0a11618 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -30,11 +30,6 @@
 			<artifactId>org.springframework.integration</artifactId>
 			<version>${release.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>org.springframework.integration.adapter</artifactId>
-			<version>${release.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>org.springframework.integration.event</artifactId>