From commits-return-35668-apmail-karaf-commits-archive=karaf.apache.org@karaf.apache.org Wed Feb 6 17:08:56 2019 Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5CFE11881F for ; Wed, 6 Feb 2019 17:08:56 +0000 (UTC) Received: (qmail 92337 invoked by uid 500); 6 Feb 2019 17:08:56 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 92314 invoked by uid 500); 6 Feb 2019 17:08:56 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 92299 invoked by uid 99); 6 Feb 2019 17:08:56 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2019 17:08:56 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8E55480660; Wed, 6 Feb 2019 17:08:55 +0000 (UTC) Date: Wed, 06 Feb 2019 17:08:54 +0000 To: "commits@karaf.apache.org" Subject: [karaf] branch master updated: [KARAF-6139] Fix JmsTest itest MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154947293376.7713.13726382273174193238@gitbox.apache.org> From: jbonofre@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 52a5fd598b966ea724319c94b3f5acc27c005d31 X-Git-Newrev: 9ed5b6996e7a7791db0c214efa8abb7ccae1f1d2 X-Git-Rev: 9ed5b6996e7a7791db0c214efa8abb7ccae1f1d2 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git The following commit(s) were added to refs/heads/master by this push: new 9ed5b69 [KARAF-6139] Fix JmsTest itest new 6963899 Merge pull request #759 from jbonofre/KARAF-6139 9ed5b69 is described below commit 9ed5b6996e7a7791db0c214efa8abb7ccae1f1d2 Author: Jean-Baptiste Onofré AuthorDate: Wed Feb 6 15:25:06 2019 +0100 [KARAF-6139] Fix JmsTest itest --- .../main/java/org/apache/karaf/itests/KarafTestSupport.java | 1 - itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java index d92e0fd..7110abb 100644 --- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java +++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java @@ -62,7 +62,6 @@ import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil; import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; -import org.ops4j.pax.exam.options.extra.EnvironmentOption; import org.ops4j.pax.exam.options.extra.VMOption; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java index 87a27d1..66a279d 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java @@ -48,13 +48,15 @@ public class JmsTest extends KarafTestSupport { "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features, " + "mvn:org.apache.karaf.features/standard/" + version + "/xml/features, " + "mvn:org.apache.activemq/activemq-karaf/" + System.getProperty("activemq.version") + "/xml/features")); - options.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", - "instance,package,log,ssh,framework,system,eventadmin,feature,shell,management,service,jaas,deployer,diagnostic,wrap,bundle,config,kar,aries-blueprint,shell-compat,activemq-broker-noweb")); return options.toArray(new Option[options.size()]); } @Test(timeout = 60000) public void testCommands() throws Exception { + System.out.println("== Installing ActiveMQ"); + featureService.installFeature("aries-blueprint"); + featureService.installFeature("activemq-broker-noweb"); + System.out.println("== Installing JMS feature"); featureService.installFeature("jms"); featureService.installFeature("pax-jms-activemq"); @@ -100,6 +102,10 @@ public class JmsTest extends KarafTestSupport { @Test public void testMBean() throws Exception { + System.out.println("== Installing ActiveMQ"); + featureService.installFeature("aries-blueprint"); + featureService.installFeature("activemq-broker-noweb"); + System.out.println("== Installing JMS feature"); featureService.installFeature("jms"); featureService.installFeature("pax-jms-activemq");