QPID-7896: [Java System Tests] Enable logging for AMQP 1.0 client in EndToEndConversionTests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/dbaff609 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/dbaff609 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/dbaff609 Branch: refs/heads/master Commit: dbaff6090d2d121645008fe44349c5baf341ad3e Parents: ddb8b72 Author: Lorenz Quack <lqu...@apache.org> Authored: Fri Aug 25 16:01:19 2017 +0100 Committer: Lorenz Quack <lqu...@apache.org> Committed: Fri Aug 25 16:01:19 2017 +0100 ---------------------------------------------------------------------- systests/end-to-end-conversion-tests/pom.xml | 5 ++--- .../end_to_end_conversion/EndToEndConversionTestBase.java | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dbaff609/systests/end-to-end-conversion-tests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml index e4d5740..9161c85 100644 --- a/systests/end-to-end-conversion-tests/pom.xml +++ b/systests/end-to-end-conversion-tests/pom.xml @@ -35,8 +35,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <amqp10ClientGavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version}</amqp10ClientGavs> - <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version}</amqp0xClientGavs> + <amqp10ClientGavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp10ClientGavs> + <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version},org.slf4j:slf4j-simple:${slf4j-version}</amqp0xClientGavs> </properties> <dependencies> @@ -51,7 +51,6 @@ <artifactId>qpid-broker</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dbaff609/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java ---------------------------------------------------------------------- diff --git a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java index da04c66..234d67a 100644 --- a/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java +++ b/systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java @@ -154,12 +154,12 @@ public class EndToEndConversionTestBase extends BrokerAdminUsingTestBase protected Protocol getSubscriberProtocolVersion() { - final String publisherGavs = System.getProperty("qpid.systests.end_to_end_conversion.subscriberGavs", - "org.apache.qpid:qpid-jms-client:LATEST"); + final String subscriberGavs = System.getProperty("qpid.systests.end_to_end_conversion.subscriberGavs", + "org.apache.qpid:qpid-client:LATEST,org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1"); final String additionalArgs = System.getProperty( "qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments", "-Dqpid.amqp.version=0-9-1"); - return getClientProtocolVersion(publisherGavs, additionalArgs); + return getClientProtocolVersion(subscriberGavs, additionalArgs); } private Protocol getClientProtocolVersion(final String publisherGavs, final String additionalArgs) @@ -210,6 +210,7 @@ public class EndToEndConversionTestBase extends BrokerAdminUsingTestBase LOGGER.debug("starting client process with arguments: {}", arguments); ProcessBuilder processBuilder = new ProcessBuilder(arguments); + processBuilder.environment().put("PN_TRACE_FRM", "true"); Process p = processBuilder.start(); try (final InputStream pInputStream = p.getInputStream(); final LoggingOutputStream loggingOutputStream = new LoggingOutputStream(CLIENT_LOGGER, Level.DEBUG)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
