diff --git a/basic/http/README.md b/basic/http/README.md
index f61b0981..2dd28770 100644
--- a/basic/http/README.md
+++ b/basic/http/README.md
@@ -3,13 +3,38 @@ Http Sample
 
 This example demonstrates simple request/reply communication when using a pair of **HTTP Inbound/Outbound Gateways**.
 
-It consists of two parts - Client and Server. To run this sample:
+The sample consists of two parts:
 
-1. Deploy project 
-   * If you are using STS and project is imported as Eclipse project in your workspace you can just execute **Run on Server**
-   * You can also run **mvn clean install** and generate the WAR file that you can deploy the conventional way
-2. Run the simple test client program: **org.springframework.integration.samples.http.DemoHttpClient**
+* Client - Basic command-line application
+* Server - Web application (War-file)
+
+## Running the sample
+
+### Command Line Using Maven
+
+The easiest way to run the **server** is to use the [Maven Jetty Plugin](http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin). Simply execute:
+
+    $ mvn jetty:run
+
+This command starts a Jetty servlet container running on port 8080 serving the application. Alternatively you can also package the war-file and deploy it manually to a servlet container of your choosing. For that to happen execute:
+
+    $ mvn clean package
+
+The resulting war-file will be located in the **target** folder. In order to run the **client**, execute:
+
+    $ mvn clean package exec:java
+
+This will package the application and run it using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/)
+
+### Using an IDE such as SpringSource Tool Suite™ (STS)
+
+If you are using STS and the project is imported as an Eclipse project into your workspace, you can just execute **Run on Server**. This will start the **server** application. 
+
+Next, run the simple test **client** program: **org.springframework.integration.samples.http.HttpClientDemo**
+
+### Output
+  
+The gateway (**client**) initiates a simple request posting "Hello" to the **server** and the **server** responds by appending **from the other side** to the message payload and returns. You should see the following output from the server:
    
-The gateway initiates a simple request posting "Hello" to the server and server responds by appending **from the other side** to the message payload and returns. You should see the following output from the server:
-   
-	INFO : org.springframework.integration.samples.http.HttpClientDemo - Replied with: Hello from the other side
\ No newline at end of file
+    INFO : org.springframework.integration.samples.http.HttpClientDemo - Replied with: Hello from the other side
+
diff --git a/basic/http/pom.xml b/basic/http/pom.xml
index 5f4b1940..b6272076 100644
--- a/basic/http/pom.xml
+++ b/basic/http/pom.xml
@@ -65,6 +65,19 @@
 					<showDeprecation>false</showDeprecation>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2</version>
+                <configuration>
+                    <mainClass>org.springframework.integration.samples.http.HttpClientDemo</mainClass>
+                </configuration>
+            </plugin>
+			<plugin>
+		        <groupId>org.mortbay.jetty</groupId>
+		        <artifactId>maven-jetty-plugin</artifactId>
+		        <version>6.1.10</version>
+			</plugin>
 		</plugins>
 	</build>
     <repositories>
diff --git a/basic/http/src/test/java/org/springframework/integration/samples/http/HttpClientDemo.java b/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java
similarity index 100%
rename from basic/http/src/test/java/org/springframework/integration/samples/http/HttpClientDemo.java
rename to basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java
diff --git a/basic/http/src/main/resources/log4j.xml b/basic/http/src/main/resources/log4j.xml
index 6b716c53..df1bb3f4 100644
--- a/basic/http/src/main/resources/log4j.xml
+++ b/basic/http/src/main/resources/log4j.xml
@@ -10,11 +10,11 @@
 		</layout>
 	</appender>
 	<logger name="org.springframework">
-		<level value="debug" />
+		<level value="info" />
 	</logger>
-	
+
 	<logger name="org.springframework.integration.samples.multipart">
-		<level value="debug" />
+		<level value="info" />
 	</logger>
 
 	<!-- Root Logger -->