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 2019/03/08 10:10:12 UTC
[camel] branch master updated (171a875 -> 283d014)
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 171a875 CAMEL-13284: camel-box - Fix error "Did not find balanced marker at ..."
new e3d1c19 feat: CAMEL-12450 - Step EIP
new e079208 feat: CAMEL-12450 - Step EIP
new 49122861 feat: CAMEL-12450 - Step EIP
new a13e3e9 feat: CAMEL-12450 - Step EIP
new b5f11bd fix: CAMEL-13296 fix dump xml stats to output empty timestamp if not in use yet, otherwise 1970-1-1 was used.
new 7bf7554 feat: CAMEL-12450 - Step EIP
new 00820db feat: CAMEL-12450 - Step EIP
new 685edd2 feat: CAMEL-12450 - Step EIP
new 934f96e feat: CAMEL-12450 - Step EIP
new 260ed05 feat: CAMEL-12450 - Step EIP
new 4ce5a61 feat: CAMEL-12450 - Step EIP
new ced0106 Regen
new d96fe96 feat: CAMEL-12450 - Step EIP
new 9fffb84 CAMEL-13303: Fixed using JMX with OSGi
new 283d014 feat: CAMEL-12450 - Step EIP
The 35947 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/spring/processor/SpringStepTest.java | 29 +++++
.../org/apache/camel/spring/processor/step.xml | 42 +++++++
.../src/main/java/org/apache/camel/Exchange.java | 1 +
.../main/java/org/apache/camel/spi/CamelEvent.java | 26 ++++-
.../java/org/apache/camel/spi/EventFactory.java | 27 +++++
.../java/org/apache/camel/spi/EventNotifier.java | 4 +
.../camel/spi/ManagementObjectNameStrategy.java | 2 +
.../main/java/org/apache/camel/spi/UnitOfWork.java | 1 +
.../apache/camel/impl/event/AbstractStepEvent.java | 37 +++++++
.../camel/impl/event/DefaultEventFactory.java | 12 ++
.../camel/impl/event/StepCompletedEvent.java | 35 ++++++
.../apache/camel/impl/event/StepFailedEvent.java | 40 +++++++
.../apache/camel/impl/event/StepStartedEvent.java | 35 ++++++
.../apache/camel/support/dump/RouteStatDump.java | 13 +++
.../dump/{RouteStatDump.java => StepStatDump.java} | 69 +++---------
core/camel-core/readme-eip.adoc | 5 +-
core/camel-core/src/main/docs/eips/step-eip.adoc | 98 ++++++++++++++++
core/camel-core/src/main/docs/simple-language.adoc | 3 +
.../apache/camel/builder/ExpressionBuilder.java | 16 +++
.../apache/camel/impl/AbstractCamelContext.java | 14 ++-
.../java/org/apache/camel/impl/MDCUnitOfWork.java | 22 +++-
.../simple/ast/SimpleFunctionExpression.java | 2 +
.../apache/camel/model/ProcessorDefinition.java | 24 ++++
.../camel/model/ProcessorDefinitionHelper.java | 24 ++--
.../org/apache/camel/model/StepDefinition.java | 46 ++++++++
.../org/apache/camel/processor/StepProcessor.java | 89 +++++++++++++++
.../org/apache/camel/reifier/ProcessorReifier.java | 2 +
.../java/org/apache/camel/reifier/StepReifier.java | 43 +++++++
.../apache/camel/language/simple/SimpleTest.java | 7 ++
.../java/org/apache/camel/processor/MDCTest.java | 14 ++-
.../camel/processor/StepEventNotifierTest.java | 98 ++++++++++++++++
.../java/org/apache/camel/processor/StepTest.java | 58 ++++++++++
.../camel/api/management/ManagedCamelContext.java | 9 ++
.../management/mbean/ManagedCamelContextMBean.java | 3 +
.../management/mbean/ManagedProcessorMBean.java | 3 +
.../api/management/mbean/ManagedRouteMBean.java | 3 +
.../api/management/mbean/ManagedStepMBean.java | 22 ++++
.../DefaultManagementObjectNameStrategy.java | 15 ++-
.../DefaultManagementObjectStrategy.java | 4 +
.../camel/management/ManagedCamelContextImpl.java | 24 ++++
.../management/mbean/ManagedCamelContext.java | 58 ++++++++++
.../management/mbean/ManagedEventNotifier.java | 11 +-
.../mbean/ManagedEventNotifierMBean.java | 5 +
.../mbean/ManagedPerformanceCounter.java | 2 +-
.../camel/management/mbean/ManagedProcessor.java | 14 +++
.../camel/management/mbean/ManagedRoute.java | 56 ++++++++++
.../apache/camel/management/mbean/ManagedStep.java | 37 +++++++
.../camel/management/ManagementStrategyFactory} | 2 +-
.../apache/camel/management/ManagedStepTest.java | 123 +++++++++++++++++++++
.../java/org/apache/camel/support/EventHelper.java | 28 +++++
.../apache/camel/support/EventNotifierSupport.java | 9 ++
.../modules/ROOT/pages/digitalocean-component.adoc | 6 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 11 ++
.../commands/AbstractLocalCamelController.java | 29 ++++-
.../org/apache/camel/commands/CamelController.java | 11 ++
.../apache/camel/commands/RouteStepCommand.java | 83 ++++++++++++++
.../org/apache/camel/karaf/commands/RouteStep.java | 36 ++++++
.../commands/internal/CamelControllerImpl.java | 21 ++--
.../src/main/resources/OSGI-INF/bundle.info | 1 +
59 files changed, 1471 insertions(+), 93 deletions(-)
create mode 100644 components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringStepTest.java
create mode 100644 components/camel-spring/src/test/resources/org/apache/camel/spring/processor/step.xml
create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractStepEvent.java
create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java
create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java
create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java
copy core/camel-base/src/main/java/org/apache/camel/support/dump/{RouteStatDump.java => StepStatDump.java} (82%)
create mode 100644 core/camel-core/src/main/docs/eips/step-eip.adoc
create mode 100644 core/camel-core/src/main/java/org/apache/camel/model/StepDefinition.java
create mode 100644 core/camel-core/src/main/java/org/apache/camel/processor/StepProcessor.java
create mode 100644 core/camel-core/src/main/java/org/apache/camel/reifier/StepReifier.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/StepEventNotifierTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/StepTest.java
create mode 100644 core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedStepMBean.java
create mode 100644 core/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedStep.java
rename core/camel-management-impl/src/main/resources/META-INF/services/{org.apache.camel.spi.ManagementStrategyFactory => org/apache/camel/management/ManagementStrategyFactory} (92%)
create mode 100644 core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedStepTest.java
create mode 100644 platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
create mode 100644 platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStep.java