Repository: oozie Updated Branches: refs/heads/master c2f48f5d8 -> 059462650
OOZIE-3251 Disable JMX for ActiveMQ in the tests (pbacsko) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/05946265 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/05946265 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/05946265 Branch: refs/heads/master Commit: 059462650519252f5b38c6f6ac3714eb9bd6d938 Parents: c2f48f5 Author: Peter Bacsko <[email protected]> Authored: Tue May 22 16:56:58 2018 +0200 Committer: Peter Bacsko <[email protected]> Committed: Tue May 22 16:56:58 2018 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/oozie/jms/TestJMSJobEventListener.java | 2 ++ .../java/org/apache/oozie/service/TestJMSAccessorService.java | 3 +++ core/src/test/java/org/apache/oozie/test/XTestCase.java | 2 +- release-log.txt | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/05946265/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java b/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java index 8e8db51..77be04f 100644 --- a/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java +++ b/core/src/test/java/org/apache/oozie/jms/TestJMSJobEventListener.java @@ -288,6 +288,7 @@ public class TestJMSJobEventListener extends XTestCase { broker = new BrokerService(); broker.setDataDirectory(getTestCaseDir()); broker.addConnector(brokerURl); + broker.setUseJmx(false); broker.start(); ConnectionContext jmsContext = getConnectionContext(); assertNotNull(jmsContext); @@ -298,6 +299,7 @@ public class TestJMSJobEventListener extends XTestCase { broker = new BrokerService(); broker.setDataDirectory(getTestCaseDir()); broker.addConnector(brokerURl); + broker.setUseJmx(false); broker.start(); WorkflowJobEvent wfe = new WorkflowJobEvent("wfId1", "caId1", WorkflowJob.Status.FAILED, "user1", "wf-app-name1", new Date(), new Date()); http://git-wip-us.apache.org/repos/asf/oozie/blob/05946265/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java index dbf892e..e21a01d 100644 --- a/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java +++ b/core/src/test/java/org/apache/oozie/service/TestJMSAccessorService.java @@ -155,6 +155,7 @@ public class TestJMSAccessorService extends XTestCase { try { broker.addConnector(brokerURl); broker.setDataDirectory(getTestCaseDir()); + broker.setUseJmx(false); broker.start(); waitFor(JMS_TIMEOUT_MS, new Predicate() { @@ -195,6 +196,7 @@ public class TestJMSAccessorService extends XTestCase { broker = new BrokerService(); broker.addConnector(brokerURL); broker.setDataDirectory(getTestCaseDir()); + broker.setUseJmx(false); broker.start(); JMSConnectionInfo connInfo = hcatService.getJMSConnectionInfo(new URI("hcat://hcat.server.com:8020")); jmsService.registerForNotification(connInfo, topic, new HCatMessageHandler(publisherAuthority)); @@ -223,6 +225,7 @@ public class TestJMSAccessorService extends XTestCase { broker.addConnector(brokerURL); broker.setDataDirectory(getTestCaseDir()); + broker.setUseJmx(false); broker.start(); waitFor(JMS_TIMEOUT_MS, new Predicate() { @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/05946265/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index 436cfc2..661970d 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -137,7 +137,7 @@ public abstract class XTestCase extends TestCase { protected static final String SYSTEM_LINE_SEPARATOR = System.getProperty("line.separator"); public static float WAITFOR_RATIO = Float.parseFloat(System.getProperty("oozie.test.waitfor.ratio", "1")); - protected static final String localActiveMQBroker = "vm://localhost?broker.persistent=false"; + protected static final String localActiveMQBroker = "vm://localhost?broker.persistent=false&broker.useJmx=false"; protected static final String ActiveMQConnFactory = "org.apache.activemq.jndi.ActiveMQInitialContextFactory"; static { http://git-wip-us.apache.org/repos/asf/oozie/blob/05946265/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 11e8576..4411d60 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3251 Disable JMX for ActiveMQ in the tests (pbacsko) OOZIE-2826 Upgrade joda-time to 2.9.9 (dbist13 via andras.piros) OOZIE-3094 [Docs] Fix for grammar mistake in DG_ActionAuthentication.twiki (dbist13 via andras.piros) OOZIE-2867 [Coordinators] Emphasize Region/City timezone format (dbist13 via rkanter, andras.piros)
