You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2020/03/30 15:11:32 UTC

[camel] 01/01: Merge pull request #3692 from apache/CAMEL-14811

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 36b55f9cfa50a2056c70f98d66c29a95ddc724e1
Merge: 13ed009 b954402
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Mon Mar 30 16:11:17 2020 +0100

    Merge pull request #3692 from apache/CAMEL-14811
    
    CAMEL-14811 - Remove JMX Connector configuration

 .../camel/spring/JMXAgentPropertiesTest.java       |   9 +-
 .../java/org/apache/camel/spring/JMXAgentTest.java |  70 --------
 .../org/apache/camel/spring/jmxConfig.xml          |  43 -----
 .../camel/spring/jmxConfigUsingProperties.xml      |   3 +-
 .../java/org/apache/camel/spi/ManagementAgent.java |  72 +--------
 .../org/apache/camel/core/xml/jmxAgent.json        |   4 -
 .../core/xml/AbstractCamelContextFactoryBean.java  |  12 --
 .../camel/core/xml/CamelJMXAgentDefinition.java    |  64 --------
 .../MainConfigurationPropertiesConfigurer.java     |   2 -
 .../camel-main-configuration-metadata.json         |   1 -
 .../camel/main/DefaultConfigurationConfigurer.java |   1 -
 .../camel/main/DefaultConfigurationProperties.java |  24 ---
 .../api/management/JmxSystemPropertyKeys.java      |  12 --
 .../camel/management/DefaultManagementAgent.java   | 180 +--------------------
 .../management/DefaultManagementAgentMockTest.java |   2 -
 .../JmxInstrumentationUsingDefaultsTest.java       |   2 -
 .../JmxInstrumentationWithConnectorTest.java       | 139 ----------------
 .../camel/management/ManagedComponentTest.java     |   1 -
 .../ManagedRouteWithOnExceptionTest.java           |  16 --
 .../management/ManagedServiceUrlPathTest.java      | 106 ------------
 .../camel/management/ManagementTestSupport.java    |  18 ---
 docs/user-manual/modules/ROOT/pages/jmx.adoc       |  18 ++-
 .../camel/maven/packaging/MyConfiguration.java     |  13 --
 23 files changed, 24 insertions(+), 788 deletions(-)