diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/DelayerApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/DelayerApp.java
deleted file mode 100644
index 804466eb..00000000
--- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/DelayerApp.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.springframework.integration.samples.helloworld;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class DelayerApp {
-
- /**
- * @param args
- */
- public static void main(String[] args) throws Exception{
- new ClassPathXmlApplicationContext("META-INF/spring/integration/delay.xml");
- System.in.read();
- }
-
-}
diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
index a8f76a8c..a1c6e202 100644
--- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
+++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -18,7 +18,7 @@ package org.springframework.integration.samples.helloworld;
/**
* Simple POJO to be referenced from a Service Activator.
- *
+ *
* @author Mark Fisher
*/
public class HelloService {
diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java
index b4b47a4e..ce6f876c 100644
--- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java
+++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -33,20 +33,20 @@ import org.springframework.integration.message.GenericMessage;
*
* View the configuration of the channels and the endpoint (a <service-activator/>
* element) in 'helloWorldDemo.xml' within this same package.
- *
+ *
* @author Mark Fisher
* @author Oleg Zhurakousky
*/
public class HelloWorldApp {
private static Logger logger = Logger.getLogger(HelloWorldApp.class);
-
+
public static void main(String[] args) {
AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/helloWorldDemo.xml", HelloWorldApp.class);
MessageChannel inputChannel = context.getBean("inputChannel", MessageChannel.class);
PollableChannel outputChannel = context.getBean("outputChannel", PollableChannel.class);
inputChannel.send(new GenericMessage("World"));
- logger.info("==> HelloWorldDemo: " + outputChannel.receive(0).getPayload());
+ logger.info("==> HelloWorldDemo: " + outputChannel.receive(0).getPayload());
}
}
diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/PollerApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/PollerApp.java
new file mode 100644
index 00000000..f9a38206
--- /dev/null
+++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/PollerApp.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2012 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.samples.helloworld;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class PollerApp {
+
+ /**
+ * Simple application that polls the current system time 2 times every
+ * 20 seconds (20000 milliseconds).
+ *
+ * The resulting message contains the time in milliseconds and the message
+ * is routed to a Logging Channel Adapter which will print the time to the
+ * command prompt.
+ *
+ * @param args Not used.
+ */
+ public static void main(String[] args) throws Exception{
+ new ClassPathXmlApplicationContext("META-INF/spring/integration/delay.xml");
+ }
+
+}
diff --git a/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml b/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
index 7345602b..2e650f8e 100644
--- a/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
+++ b/basic/helloworld/src/main/resources/META-INF/spring/integration/delay.xml
@@ -11,8 +11,8 @@
-
-
-
+
+
+
diff --git a/basic/helloworld/src/main/resources/log4j.properties b/basic/helloworld/src/main/resources/log4j.properties
deleted file mode 100644
index eb601e8e..00000000
--- a/basic/helloworld/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-log4j.rootCategory=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n
-
-#log4j.category.org.springframework=WARN
-#log4j.category.org.springframework.integration.sftp=TRACE
-log4j.category.org.springframework=TRACE
diff --git a/basic/helloworld/src/main/resources/log4j.xml b/basic/helloworld/src/main/resources/log4j.xml
index f391e2ed..678b69b3 100644
--- a/basic/helloworld/src/main/resources/log4j.xml
+++ b/basic/helloworld/src/main/resources/log4j.xml
@@ -24,5 +24,5 @@
-
+
\ No newline at end of file