From 3bcb5a726a030af044cdacac7bfdddb75f52ad38 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 14 May 2010 15:34:17 +0000 Subject: [PATCH] Added log4j to maven build at test time to avoid spurious INFO logging Updated log4j.xml files to quell debug/info output Moved src/test/resources/**/* -> src/main/resources/**/* for the time being to fix the jdbc build Eliminated several System.out.println calls in tests --- .../src/test/resources/log4j.properties | 4 ++-- .../integration/ip/config/ParserUnitTests.java | 8 -------- .../{main => test}/resources/log4j.properties | 6 +++--- .../resources/int-derby.properties | 0 .../{test => main}/resources/log4j.properties | 8 ++++---- .../jdbc/JdbcMessageStoreTests-context.xml | 0 .../jdbc/config/defaultJdbcMessageStore.xml | 0 ...llarHeaderJdbcOutboundChannelAdapterTest.xml | 0 ...MapPayloadJdbcOutboundChannelAdapterTest.xml | 0 ...OperationsJdbcOutboundChannelAdapterTest.xml | 0 .../integration/jdbc/config/inboundSchema.sql | 0 .../jdbcInboundChannelAdapterCommonConfig.xml | 0 .../config/jdbcOperationsJdbcMessageStore.xml | 0 .../jdbcOutboundChannelAdapterCommonConfig.xml | 0 .../integration/jdbc/config/outboundSchema.sql | 0 ...llingForMapJdbcInboundChannelAdapterTest.xml | 0 ...pJdbcInboundChannelAdapterWithUpdateTest.xml | 0 ...cOperationsJdbcInboundChannelAdapterTest.xml | 0 .../jdbc/config/soupedUpJdbcMessageStore.xml | 0 .../jdbc/messageHandlerIntegrationTest.sql | 0 .../pollingChannelAdapterIntegrationTest.sql | 0 .../src/test/resources/log4j.properties | 4 ++-- .../src/test/java/log4j.properties | 2 +- ...InvokingMessageProcessorAnnotationTests.java | 1 - .../src/test/resources/log4j.properties | 2 +- spring-integration-parent/pom.xml | 17 ++++++++++++----- 26 files changed, 25 insertions(+), 27 deletions(-) rename org.springframework.integration.ip/src/{main => test}/resources/log4j.properties (55%) rename org.springframework.integration.jdbc/src/{test => main}/resources/int-derby.properties (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/log4j.properties (54%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/defaultJdbcMessageStore.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/handlingWithJdbcOperationsJdbcOutboundChannelAdapterTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/inboundSchema.sql (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/jdbcOperationsJdbcMessageStore.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/outboundSchema.sql (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/config/soupedUpJdbcMessageStore.xml (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql (100%) rename org.springframework.integration.jdbc/src/{test => main}/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql (100%) diff --git a/org.springframework.integration.file/src/test/resources/log4j.properties b/org.springframework.integration.file/src/test/resources/log4j.properties index c916dc5d9a..941cbe4822 100644 --- a/org.springframework.integration.file/src/test/resources/log4j.properties +++ b/org.springframework.integration.file/src/test/resources/log4j.properties @@ -4,5 +4,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%c{1}: %m%n -log4j.category.org.springframework.integration=INFO -log4j.category.org.springframework.integration.file=DEBUG \ No newline at end of file +log4j.category.org.springframework.integration=WARN +log4j.category.org.springframework.integration.file=WARN diff --git a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index 31b4544466..0338998bbe 100644 --- a/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -31,7 +31,6 @@ import org.springframework.integration.ip.tcp.CustomNioSocketWriter; import org.springframework.integration.ip.tcp.MessageFormats; import org.springframework.integration.ip.tcp.SimpleTcpNetInboundGateway; import org.springframework.integration.ip.tcp.SimpleTcpNetOutboundGateway; -import org.springframework.integration.ip.tcp.SimpleTcpNetOutboundGatewayTests; import org.springframework.integration.ip.tcp.TcpNetReceivingChannelAdapter; import org.springframework.integration.ip.tcp.TcpNetSendingMessageHandler; import org.springframework.integration.ip.tcp.TcpNioReceivingChannelAdapter; @@ -47,7 +46,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Gary Russell - * */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) @@ -288,10 +286,4 @@ public class ParserUnitTests { assertEquals(226, delegateDfa.getPropertyValue("soTimeout")); } - @Test - public void test() { - String[] beanDefinitionNames = ctx.getBeanDefinitionNames(); - for (String x : beanDefinitionNames) - System.out.println(x); - } } diff --git a/org.springframework.integration.ip/src/main/resources/log4j.properties b/org.springframework.integration.ip/src/test/resources/log4j.properties similarity index 55% rename from org.springframework.integration.ip/src/main/resources/log4j.properties rename to org.springframework.integration.ip/src/test/resources/log4j.properties index 72b090d81b..8349c76351 100644 --- a/org.springframework.integration.ip/src/main/resources/log4j.properties +++ b/org.springframework.integration.ip/src/test/resources/log4j.properties @@ -1,8 +1,8 @@ -log4j.rootCategory=DEBUG, stdout +log4j.rootCategory=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%c{1}: %m%n -log4j.category.org.springframework.integration=DEBUG -log4j.category.org.springframework.integration.ip=DEBUG \ No newline at end of file +log4j.category.org.springframework.integration=WARN +log4j.category.org.springframework.integration.ip=WARN diff --git a/org.springframework.integration.jdbc/src/test/resources/int-derby.properties b/org.springframework.integration.jdbc/src/main/resources/int-derby.properties similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/int-derby.properties rename to org.springframework.integration.jdbc/src/main/resources/int-derby.properties diff --git a/org.springframework.integration.jdbc/src/test/resources/log4j.properties b/org.springframework.integration.jdbc/src/main/resources/log4j.properties similarity index 54% rename from org.springframework.integration.jdbc/src/test/resources/log4j.properties rename to org.springframework.integration.jdbc/src/main/resources/log4j.properties index d40675320b..54815027cf 100644 --- a/org.springframework.integration.jdbc/src/test/resources/log4j.properties +++ b/org.springframework.integration.jdbc/src/main/resources/log4j.properties @@ -5,7 +5,7 @@ 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=DEBUG -log4j.category.org.springframework.integration=INFO -log4j.category.org.springframework.integration.jdbc=DEBUG -log4j.category.org.springframework.jdbc=TRACE \ No newline at end of file +log4j.category.org.springframework=WARN +log4j.category.org.springframework.integration=WARN +log4j.category.org.springframework.integration.jdbc=WARN +log4j.category.org.springframework.jdbc=WARN diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/JdbcMessageStoreTests-context.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/defaultJdbcMessageStore.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/defaultJdbcMessageStore.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/defaultJdbcMessageStore.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/defaultJdbcMessageStore.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingDollarHeaderJdbcOutboundChannelAdapterTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingMapPayloadJdbcOutboundChannelAdapterTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingWithJdbcOperationsJdbcOutboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingWithJdbcOperationsJdbcOutboundChannelAdapterTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/handlingWithJdbcOperationsJdbcOutboundChannelAdapterTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/handlingWithJdbcOperationsJdbcOutboundChannelAdapterTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/inboundSchema.sql b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/inboundSchema.sql similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/inboundSchema.sql rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/inboundSchema.sql diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcInboundChannelAdapterCommonConfig.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcOperationsJdbcMessageStore.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcOperationsJdbcMessageStore.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcOperationsJdbcMessageStore.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcOperationsJdbcMessageStore.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/jdbcOutboundChannelAdapterCommonConfig.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/outboundSchema.sql b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/outboundSchema.sql similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/outboundSchema.sql rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/outboundSchema.sql diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingForMapJdbcInboundChannelAdapterWithUpdateTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/pollingWithJdbcOperationsJdbcInboundChannelAdapterTest.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/soupedUpJdbcMessageStore.xml b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/soupedUpJdbcMessageStore.xml similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/config/soupedUpJdbcMessageStore.xml rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/config/soupedUpJdbcMessageStore.xml diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql diff --git a/org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql b/org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql similarity index 100% rename from org.springframework.integration.jdbc/src/test/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql rename to org.springframework.integration.jdbc/src/main/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql diff --git a/org.springframework.integration.security/src/test/resources/log4j.properties b/org.springframework.integration.security/src/test/resources/log4j.properties index c9354151a2..857ef41ba2 100644 --- a/org.springframework.integration.security/src/test/resources/log4j.properties +++ b/org.springframework.integration.security/src/test/resources/log4j.properties @@ -4,5 +4,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%c{1}: %m%n -log4j.category.org.springframework.integration.security=DEBUG -log4j.category.org.springframework.integration=INFO +log4j.category.org.springframework.integration.security=WARN +log4j.category.org.springframework.integration=WARN diff --git a/org.springframework.integration.xml/src/test/java/log4j.properties b/org.springframework.integration.xml/src/test/java/log4j.properties index c5000b932a..538a5c4c9e 100644 --- a/org.springframework.integration.xml/src/test/java/log4j.properties +++ b/org.springframework.integration.xml/src/test/java/log4j.properties @@ -4,4 +4,4 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%c{1}: %m%n -log4j.category.org.springframework.integration=INFO \ No newline at end of file +log4j.category.org.springframework.integration=WARN diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index 06d4575e4a..4587865925 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -297,7 +297,6 @@ public class MethodInvokingMessageProcessorAnnotationTests { private static class TestService { public Map mapOnly(Map map) { - System.out.println(map); return map; } diff --git a/org.springframework.integration/src/test/resources/log4j.properties b/org.springframework.integration/src/test/resources/log4j.properties index c5000b932a..538a5c4c9e 100644 --- a/org.springframework.integration/src/test/resources/log4j.properties +++ b/org.springframework.integration/src/test/resources/log4j.properties @@ -4,4 +4,4 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%c{1}: %m%n -log4j.category.org.springframework.integration=INFO \ No newline at end of file +log4j.category.org.springframework.integration=WARN diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml index c6078e004f..e5ac4df6b9 100644 --- a/spring-integration-parent/pom.xml +++ b/spring-integration-parent/pom.xml @@ -10,16 +10,16 @@ the build process. pom + UTF-8 3.4.2.v_883_R34x 4.7 3.0.2.RELEASE - true - strict + non-strict - false + true @@ -129,7 +129,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -138,7 +137,6 @@ 1.5 - + + log4j + log4j + 1.2.12 + test + +