INT-1380 added helloworld example

getting-started/helloworld/.classpath

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<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>

getting-started/helloworld/.gitignore

@@ -0,0 +1 @@
+/target

getting-started/helloworld/README.txt

@@ -1,9 +0,0 @@
-Instructions for running the HelloWorldDemo sample
--------------------------------------------------------------------------------
-1. See README.txt in the parent directory.
-
-2. To run this sample as a standalone application simply execute the
-   HelloWorldDemo class that is located within the
-   org.springframework.integration.samples.helloworld package.
-
-Happy integration :-)

getting-started/helloworld/pom.xml

@@ -2,51 +2,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.integration.samples</groupId>
-		<artifactId>spring-integration-samples</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
-	</parent>
+	<groupId>org.springframework.integration.samples</groupId>
 	<artifactId>helloworld</artifactId>
+	<version>2.0.0</version>	
 	<name>Spring Integration Hello World Sample</name>
-	<build>
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-				</includes>
-			</resource>
-			<resource>
-				<filtering>false</filtering>
-				<directory>${basedir}/src/main/resources</directory>
-				<includes>
-					<include>META-INF/spring/*.xml</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
+	<packaging>jar</packaging>
+	<properties>
+		<spring.integration.version>2.0.0.M7</spring.integration.version>
+		<log4j.version>1.2.15</log4j.version>
+		<junit.version>4.7</junit.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
+			<version>${spring.integration.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<!-- test-scoped dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
-</project>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<compilerArgument>-Xlint:all</compilerArgument>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>false</showDeprecation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

getting-started/helloworld/readme.txt

@@ -0,0 +1,5 @@
+This is an obvious place to get started. It demonstrates a simple message flow represented by the diagram below:
+
+Message -> Channel -> ServiceActivator -> QueueChannel 
+
+To run sample simply execute a test case in org.springframework.integration.samples.helloworld package

getting-started/helloworld/src/test/java/org/springframework/integration/samples/helloworld/HelloWorldDemoTest.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.samples.helloworld;
 
+import org.apache.log4j.Logger;
+import org.junit.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.MessageChannel;
@@ -36,14 +38,17 @@ import org.springframework.integration.message.GenericMessage;
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  */
-public class HelloWorldDemo {
+public class HelloWorldDemoTest {
 
-	public static void main(String[] args) {
-		AbstractApplicationContext context = new ClassPathXmlApplicationContext("helloWorldDemo.xml", HelloWorldDemo.class);
+	private static Logger logger = Logger.getLogger(HelloWorldDemoTest.class);
+	
+	@Test
+	public void testHelloWorld(){
+		AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/helloWorldDemo.xml", HelloWorldDemoTest.class);
 		MessageChannel inputChannel = context.getBean("inputChannel", MessageChannel.class);
 		PollableChannel outputChannel = context.getBean("outputChannel", PollableChannel.class);
 		inputChannel.send(new GenericMessage<String>("World"));
-		System.out.println("==> HelloWorldDemo: " + outputChannel.receive(0).getPayload());		
+		logger.info("==> HelloWorldDemo: " + outputChannel.receive(0).getPayload());		
 	}
 
 }

getting-started/helloworld/src/test/resources/log4j.xml

@@ -15,8 +15,8 @@
 		<level value="warn" />
 	</logger>
 
-	<logger name="org.springframework.integration">
-		<level value="warn" />
+	<logger name="org.springframework.integration.samples">
+		<level value="debug" />
 	</logger>
 
 	<!-- Root Logger -->

getting-started/helloworld/target/classes/log4j.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Loggers -->
-	<logger name="org.springframework">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.springframework.integration">
-		<level value="warn" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="console" />
-	</root>
-	
-</log4j:configuration>

getting-started/helloworld/target/classes/org/springframework/integration/samples/helloworld/helloWorldDemo.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
-	<channel id="inputChannel"/>
-
-	<channel id="outputChannel">
-		<queue capacity="10"/>
-	</channel>
-
-	<service-activator input-channel="inputChannel"
-	                   output-channel="outputChannel"
-	                   ref="helloService"
-	                   method="sayHello"/>
-
-	<beans:bean id="helloService" class="org.springframework.integration.samples.helloworld.HelloService"/>
-
-</beans:beans>

getting-started/helloworld/target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Sat Sep 04 08:22:06 EDT 2010
-version=2.0.0.BUILD-SNAPSHOT
-groupId=org.springframework.integration.samples
-artifactId=helloworld