This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 8a9a6abf9a3 CAMEL-21080: avoid duplicating JMX configuration
8a9a6abf9a3 is described below
commit 8a9a6abf9a385643cfaee9c5e9c51af6f55544cb
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Sep 24 13:16:10 2024 -0300
CAMEL-21080: avoid duplicating JMX configuration
---
.../java/org/apache/camel/component/crypto/ECDSASignatureTest.java | 6 ------
.../test/java/org/apache/camel/component/crypto/SignatureTest.java | 1 -
.../java/org/apache/camel/component/jetty/JettyEnableJmxTest.java | 4 ++--
.../apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java | 2 +-
.../camel/component/xmlsecurity/SignatureDigestMethodTest.java | 2 +-
.../camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java | 5 -----
.../org/apache/camel/component/xmlsecurity/XmlSignatureTest.java | 1 -
7 files changed, 4 insertions(+), 17 deletions(-)
diff --git
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index bc2f713ed97..e025ff20f1c 100644
---
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -125,10 +125,4 @@ public class ECDSASignatureTest extends CamelTestSupport {
context.stop();
}
}
-
- @Override
- public void doPreSetup() {
- disableJMX();
- }
-
}
diff --git
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
index 343f3f08f76..fec744a43ad 100644
---
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
+++
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
@@ -390,7 +390,6 @@ public class SignatureTest extends CamelTestSupport {
@Override
public void doPreSetup() throws Exception {
setUpKeys();
- disableJMX();
}
public void setUpKeys() throws Exception {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
index 4e3a69b430d..0fc4e6374d5 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
@@ -51,12 +51,12 @@ public class JettyEnableJmxTest extends BaseJettyTest {
public void doPostTearDown() throws Exception {
releaseMBeanServers();
mbsc = null;
- disableJMX();
+ testConfigurationBuilder.withDisableJMX();
}
@Override
public void doPreSetup() throws Exception {
- enableJMX();
+ testConfigurationBuilder.withEnableJMX();
releaseMBeanServers();
}
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index 1a5d6c2540a..a02aff5825e 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -466,7 +466,7 @@ public class SignatureAlgorithmTest extends
CamelTestSupport {
@Override
public void doPreSetup() {
setUpKeys("RSA", 2048);
- disableJMX();
+ testConfigurationBuilder.withDisableJMX();
}
public void setUpKeys(String algorithm, int keylength) {
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index 21141d81989..48fc3149aa8 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -358,7 +358,7 @@ public class SignatureDigestMethodTest extends
CamelTestSupport {
@Override
public void doPreSetup() {
setUpKeys("RSA", 1024);
- disableJMX();
+ testConfigurationBuilder.withDisableJMX();
}
public void setUpKeys(String algorithm, int keylength) {
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index 98b3fb8951d..67771fb3fd7 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -90,11 +90,6 @@ public class XAdESSignaturePropertiesTest extends
CamelTestSupport {
+ "<root xmlns=\"http://test/test\";><test>Test
Message</test></root>";
}
- @Override
- public void doPreSetup() {
- disableJMX();
- }
-
@Override
protected void bindToRegistry(Registry registry) throws Exception {
registry.bind("keyAccessorDefault",
TestKeystore.getKeyAccessor("bob"));
diff --git
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index a48395a6f7b..747ca702494 100644
---
a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++
b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -1412,7 +1412,6 @@ public class XmlSignatureTest extends CamelTestSupport {
@Override
public void doPreSetup() {
setUpKeys("RSA", 1024);
- disableJMX();
}
public void setUpKeys(String algorithm, int keylength) {
