diff --git a/getting-started/jms/.gitignore b/getting-started/jms/.gitignore index ea8c4bf7..8f8c119a 100644 --- a/getting-started/jms/.gitignore +++ b/getting-started/jms/.gitignore @@ -1 +1,2 @@ /target +/activemq-data diff --git a/getting-started/jms/activemq-data/localhost/journal/data-1 b/getting-started/jms/activemq-data/localhost/journal/data-1 deleted file mode 100644 index ee276967..00000000 Binary files a/getting-started/jms/activemq-data/localhost/journal/data-1 and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/journal/data-control b/getting-started/jms/activemq-data/localhost/journal/data-control deleted file mode 100644 index 8ddb3b47..00000000 Binary files a/getting-started/jms/activemq-data/localhost/journal/data-control and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/data-container-roots-1 b/getting-started/jms/activemq-data/localhost/kr-store/data/data-container-roots-1 deleted file mode 100644 index 9a7f7a7e..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/data/data-container-roots-1 and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/data-queue-data-1 b/getting-started/jms/activemq-data/localhost/kr-store/data/data-queue-data-1 deleted file mode 100644 index 6e239cef..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/data/data-queue-data-1 and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/hash-index-queue-data_queue#3a#2f#2fqueue.demo b/getting-started/jms/activemq-data/localhost/kr-store/data/hash-index-queue-data_queue#3a#2f#2fqueue.demo deleted file mode 100644 index a32cd6f4..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/data/hash-index-queue-data_queue#3a#2f#2fqueue.demo and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/index-container-roots b/getting-started/jms/activemq-data/localhost/kr-store/data/index-container-roots deleted file mode 100644 index d0c7b846..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/data/index-container-roots and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/index-queue-data b/getting-started/jms/activemq-data/localhost/kr-store/data/index-queue-data deleted file mode 100644 index b08363d8..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/data/index-queue-data and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/data/lock b/getting-started/jms/activemq-data/localhost/kr-store/data/lock deleted file mode 100644 index e69de29b..00000000 diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/data-kaha-1 b/getting-started/jms/activemq-data/localhost/kr-store/state/data-kaha-1 deleted file mode 100644 index e769fa9b..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/data-kaha-1 and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/data-store-state-1 b/getting-started/jms/activemq-data/localhost/kr-store/state/data-store-state-1 deleted file mode 100644 index cdc3fa73..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/data-store-state-1 and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/hash-index-store-state_state b/getting-started/jms/activemq-data/localhost/kr-store/state/hash-index-store-state_state deleted file mode 100644 index a906d976..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/hash-index-store-state_state and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/index-kaha b/getting-started/jms/activemq-data/localhost/kr-store/state/index-kaha deleted file mode 100644 index 58cd920e..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/index-kaha and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/index-store-state b/getting-started/jms/activemq-data/localhost/kr-store/state/index-store-state deleted file mode 100644 index b7c6635c..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/index-store-state and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/index-transactions-state b/getting-started/jms/activemq-data/localhost/kr-store/state/index-transactions-state deleted file mode 100644 index c097b35b..00000000 Binary files a/getting-started/jms/activemq-data/localhost/kr-store/state/index-transactions-state and /dev/null differ diff --git a/getting-started/jms/activemq-data/localhost/kr-store/state/lock b/getting-started/jms/activemq-data/localhost/kr-store/state/lock deleted file mode 100644 index e69de29b..00000000 diff --git a/getting-started/jms/activemq-data/localhost/lock b/getting-started/jms/activemq-data/localhost/lock deleted file mode 100644 index e69de29b..00000000 diff --git a/getting-started/jmx/.classpath b/getting-started/jmx/.classpath index 16f01e2e..6331965e 100644 --- a/getting-started/jmx/.classpath +++ b/getting-started/jmx/.classpath @@ -1,6 +1,9 @@ + + + diff --git a/getting-started/jmx/.gitignore b/getting-started/jmx/.gitignore new file mode 100644 index 00000000..ea8c4bf7 --- /dev/null +++ b/getting-started/jmx/.gitignore @@ -0,0 +1 @@ +/target diff --git a/getting-started/jmx/pom.xml b/getting-started/jmx/pom.xml index 31f4e171..bc3219d4 100644 --- a/getting-started/jmx/pom.xml +++ b/getting-started/jmx/pom.xml @@ -2,38 +2,52 @@ 4.0.0 - - org.springframework.integration.samples - spring-integration-samples - 2.0.0.BUILD-SNAPSHOT - + org.springframework.integration.samples jmx Spring Integration JMX Sample + 2.0.0 + jar + + 2.0.0.M7 + 1.2.15 + 4.7 + org.springframework.integration spring-integration-jmx + ${spring.integration.version} org.springframework.integration spring-integration-stream + ${spring.integration.version} + + + log4j + log4j + ${log4j.version} + + + + junit + junit + ${junit.version} - - - repository.springframework.maven.release - Spring Framework Maven Release Repository - http://maven.springframework.org/release - - - repository.springframework.maven.milestone - Spring Framework Maven Milestone Repository - http://maven.springframework.org/milestone - - - repository.springframework.maven.snapshot - Spring Framework Maven Snapshot Repository - http://maven.springframework.org/snapshot - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + -Xlint:all + true + false + + + + + \ No newline at end of file diff --git a/getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml b/getting-started/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml similarity index 100% rename from getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml rename to getting-started/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml diff --git a/getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo.java b/getting-started/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java similarity index 71% rename from getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo.java rename to getting-started/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java index 74ad3ff4..e2e8cc8a 100644 --- a/getting-started/jmx/src/main/java/org/springframework/integration/samples/jmx/JmxAdapterDemo.java +++ b/getting-started/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java @@ -16,17 +16,21 @@ package org.springframework.integration.samples.jmx; +import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Mark Fisher * @since 2.0 */ -public class JmxAdapterDemo { +public class JmxAdapterDemoTest { - public static void main(String[] args) { - new ClassPathXmlApplicationContext( - "JmxAdapterDemo-context.xml", JmxAdapterDemo.class); + @Test + public void testJmxAdapterDemo() throws Exception{ + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/JmxAdapterDemo-context.xml", JmxAdapterDemoTest.class); + Thread.sleep(20000); + context.stop(); } } diff --git a/getting-started/jmx/src/main/java/log4j.xml b/getting-started/jmx/src/test/resources/log4j.xml similarity index 88% rename from getting-started/jmx/src/main/java/log4j.xml rename to getting-started/jmx/src/test/resources/log4j.xml index a01d5446..678b69b3 100644 --- a/getting-started/jmx/src/main/java/log4j.xml +++ b/getting-started/jmx/src/test/resources/log4j.xml @@ -15,8 +15,8 @@ - - + + diff --git a/getting-started/jmx/target/classes/log4j.xml b/getting-started/jmx/target/classes/log4j.xml deleted file mode 100644 index a01d5446..00000000 --- a/getting-started/jmx/target/classes/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml b/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml deleted file mode 100644 index e3aceb8a..00000000 --- a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo-context.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo.class b/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo.class deleted file mode 100644 index 16ec859a..00000000 Binary files a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/JmxAdapterDemo.class and /dev/null differ diff --git a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch$1.class b/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch$1.class deleted file mode 100644 index ed78681d..00000000 Binary files a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch$1.class and /dev/null differ diff --git a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch.class b/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch.class deleted file mode 100644 index 7c98fc18..00000000 Binary files a/getting-started/jmx/target/classes/org/springframework/integration/samples/jmx/StopWatch.class and /dev/null differ diff --git a/getting-started/jmx/target/jmx-2.0.0.BUILD-SNAPSHOT.jar b/getting-started/jmx/target/jmx-2.0.0.BUILD-SNAPSHOT.jar deleted file mode 100644 index eb99783e..00000000 Binary files a/getting-started/jmx/target/jmx-2.0.0.BUILD-SNAPSHOT.jar and /dev/null differ diff --git a/getting-started/jmx/target/maven-archiver/pom.properties b/getting-started/jmx/target/maven-archiver/pom.properties deleted file mode 100644 index b2a2f224..00000000 --- a/getting-started/jmx/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sat Sep 04 08:22:10 EDT 2010 -version=2.0.0.BUILD-SNAPSHOT -groupId=org.springframework.integration.samples -artifactId=jmx