You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/03 13:18:06 UTC

[camel] branch master updated (28104c4 -> 5fa18ba)

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

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


    from 28104c4  Merge pull request #3537 from apache/CAMEL-14477
     add 52b8b22  CAMEL-14475: camel-core - Make loading XML pluggable via SPI
     add 9ce8f6b  Polished
     add e7c3676  assertj should be test scope
     add 5fa18ba  Polished

No new revisions were added by this update.

Summary of changes:
 apache-camel/pom.xml                               |   4 +
 apache-camel/src/main/descriptors/common-bin.xml   |   6 +-
 bom/camel-bom/pom.xml                              |   5 +
 .../HipchatXmlDefinedComponentProducerTest.java    |   5 +-
 .../apache/camel/component/kura/KuraRouter.java    |   5 +-
 .../reactive/vertx/VertXReactiveExecutor.java      |   5 +
 .../camel/spring/CamelLoadRoutesFromXMLTest.java   |   7 +-
 .../org/apache/camel/ExtendedCamelContext.java     |  12 ++
 ...Context.java => XMLRoutesDefinitionLoader.java} |  19 ++-
 .../camel/impl/engine/AbstractCamelContext.java    |  20 +++
 .../impl/engine/HeadersMapFactoryResolver.java     |   2 +-
 .../impl/engine/ReactiveExecutorResolver.java      |   2 +-
 .../caffeine/lrucache/CaffeineLRUCacheFactory.java |   5 +-
 .../org/apache/camel/impl/DefaultCamelContext.java |   8 +
 .../impl/DefaultXMLRoutesDefinitionLoader.java     | 172 +++++++++++++++++++++
 .../impl/XMLRoutesDefinitionLoaderResolver.java}   |  30 ++--
 .../java/org/apache/camel/model/ModelHelper.java   |   9 ++
 .../DefaultPackageScanResourceResolverTest.java    |   6 +-
 .../apache/camel/model/LoadRestFromXmlTest.java    |   4 +-
 .../apache/camel/model/LoadRouteFromXmlTest.java   |   4 +-
 .../model/LoadRouteFromXmlWithInterceptTest.java   |   4 +-
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |   4 +-
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   4 +-
 .../model/LoadRouteFromXmlWithPolicyTest.java      |   4 +-
 .../camel-headersmap/src/main/docs/headersmap.adoc |   2 +-
 .../headersmap/FastHeadersMapFactory.java          |   5 +
 core/camel-main/pom.xml                            |  10 ++
 .../apache/camel/main/DefaultRoutesCollector.java  |   7 +-
 .../management/mbean/ManagedCamelContext.java      |   3 +-
 .../camel/support/DefaultLRUCacheFactory.java      |  28 ++--
 .../org/apache/camel/support/LRUCacheFactory.java  |  15 +-
 .../in/ModelParserXMLRoutesDefinitionLoader.java   |  48 ++++++
 .../services/org/apache/camel/xmlroutes-loader     |   2 +-
 examples/camel-example-main-xml/pom.xml            |  17 +-
 .../src/main/resources/application.properties      |   4 +-
 parent/pom.xml                                     |   5 +
 tooling/camel-tooling-model/pom.xml                |   1 +
 37 files changed, 420 insertions(+), 73 deletions(-)
 copy core/camel-api/src/main/java/org/apache/camel/spi/{HasCamelContext.java => XMLRoutesDefinitionLoader.java} (68%)
 create mode 100644 core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultXMLRoutesDefinitionLoader.java
 copy core/{camel-base/src/main/java/org/apache/camel/impl/engine/HeadersMapFactoryResolver.java => camel-core-engine/src/main/java/org/apache/camel/impl/XMLRoutesDefinitionLoaderResolver.java} (63%)
 create mode 100644 core/camel-xml-io/src/main/java/org/apache/camel/xml/in/ModelParserXMLRoutesDefinitionLoader.java
 copy components/camel-bean/src/main/resources/META-INF/services/org/apache/camel/bean-proxy-factory => core/camel-xml-io/src/main/resources/META-INF/services/org/apache/camel/xmlroutes-loader (92%)