This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit d37f7aef2b607151d893f8d5c187f67c52e21c90 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Fri Oct 12 09:07:12 2018 +0200 Move o.a.c.management.event to o.a.c.impl.event --- .../event/AbstractContextEvent.java | 2 +- .../event/AbstractExchangeEvent.java | 2 +- .../event/AbstractRouteEvent.java | 2 +- .../event/CamelContextResumeFailureEvent.java | 2 +- .../event/CamelContextResumedEvent.java | 2 +- .../event/CamelContextResumingEvent.java | 2 +- .../event/CamelContextStartedEvent.java | 2 +- .../event/CamelContextStartingEvent.java | 2 +- .../event/CamelContextStartupFailureEvent.java | 2 +- .../event/CamelContextStopFailureEvent.java | 2 +- .../event/CamelContextStoppedEvent.java | 2 +- .../event/CamelContextStoppingEvent.java | 2 +- .../event/CamelContextSuspendedEvent.java | 2 +- .../event/CamelContextSuspendingEvent.java | 2 +- .../event/DefaultEventFactory.java | 2 +- .../event/ExchangeCompletedEvent.java | 2 +- .../event/ExchangeCreatedEvent.java | 2 +- .../event/ExchangeFailedEvent.java | 2 +- .../event/ExchangeFailureHandledEvent.java | 2 +- .../event/ExchangeFailureHandlingEvent.java | 2 +- .../event/ExchangeRedeliveryEvent.java | 2 +- .../event/ExchangeSendingEvent.java | 4 +-- .../event/ExchangeSentEvent.java | 2 +- .../event/RouteAddedEvent.java | 2 +- .../event/RouteRemovedEvent.java | 2 +- .../event/RouteStartedEvent.java | 2 +- .../event/RouteStoppedEvent.java | 2 +- .../event/ServiceStartupFailureEvent.java | 2 +- .../event/ServiceStopFailureEvent.java | 2 +- .../camel/{management => impl}/event/package.html | 0 .../management/DefaultManagementStrategy.java | 2 +- .../event}/EventNotifierEventsTest.java | 37 +++++++++++----------- .../event}/EventNotifierExchangeCompletedTest.java | 4 +-- .../EventNotifierExchangeSentParallelTest.java | 3 +- .../event}/EventNotifierExchangeSentTest.java | 6 ++-- .../EventNotifierFailureHandledEventsTest.java | 23 +++++++------- .../event}/EventNotifierRedeliveryEventsTest.java | 16 +++++----- ...ventNotifierServiceStoppingFailedEventTest.java | 13 ++++---- .../event}/MultipleEventNotifierEventsTest.java | 29 ++++++++--------- .../camel/processor/PipelineStepWithEventTest.java | 2 +- 40 files changed, 94 insertions(+), 101 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java index bda88b2..116c0c4 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import java.util.EventObject; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java index cba4d30..7be1685 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import java.util.EventObject; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java index b003264..9d735ec 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import java.util.EventObject; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java index f5c8e1b..a33bb66 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java index ad736a7..5fb0cef 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java index 05c2793..337e8d9 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java index 865a61d..c4763bd 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java index 6422da7..93f5ca5 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java index 4392fa1..7ccaa6e 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java index ed53ada..1f63726 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java index 9ff2c2f..f7346ef 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java index 9a38c35..a959c67 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java index 697df31..67af77f 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java index 26ecafb..d71b4d7 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java b/camel-core/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java similarity index 99% rename from camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java rename to camel-core/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java index 53aa7ac..8e48b5e 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/DefaultEventFactory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.CamelContext; import org.apache.camel.DelegateProcessor; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java index 1b1ad57..d9f2a4c 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCompletedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java index 1b7f1d5..5268c39 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeCreatedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java index 0dcf2cb..1937d8e 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java similarity index 98% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java index 7e683f0..2192322 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java similarity index 98% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java index 1c2228e..56dd2a7 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandlingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java index 53910e9..6e420bc 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeRedeliveryEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Exchange; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java index 23d9702..83a2992 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java @@ -14,9 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; - -import java.util.EventObject; +package org.apache.camel.impl.event; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java index 3805eb6..94dbfb7 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java index df5adf8..aa6565f 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Route; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java index d8ca90c..6de9095 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Route; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java index 758d884..32ba822 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Route; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java similarity index 96% rename from camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java index ddb60fd..7baa342 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import org.apache.camel.Route; import org.apache.camel.spi.CamelEvent; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java index c3b3256..e60921e 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import java.util.EventObject; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java similarity index 97% rename from camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java rename to camel-core/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java index 1486a54..fe68b4c 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java +++ b/camel-core/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management.event; +package org.apache.camel.impl.event; import java.util.EventObject; diff --git a/camel-core/src/main/java/org/apache/camel/management/event/package.html b/camel-core/src/main/java/org/apache/camel/impl/event/package.html similarity index 100% rename from camel-core/src/main/java/org/apache/camel/management/event/package.html rename to camel-core/src/main/java/org/apache/camel/impl/event/package.html diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java index 262822e..088af57 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java @@ -22,7 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.NamedNode; -import org.apache.camel.management.event.DefaultEventFactory; +import org.apache.camel.impl.event.DefaultEventFactory; import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.EventFactory; import org.apache.camel.spi.EventNotifier; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierEventsTest.java similarity index 85% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierEventsTest.java index cd2dada..9bce692 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierEventsTest.java @@ -14,32 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.CamelContextResumedEvent; -import org.apache.camel.management.event.CamelContextResumingEvent; -import org.apache.camel.management.event.CamelContextStartedEvent; -import org.apache.camel.management.event.CamelContextStartingEvent; -import org.apache.camel.management.event.CamelContextStoppedEvent; -import org.apache.camel.management.event.CamelContextStoppingEvent; -import org.apache.camel.management.event.CamelContextSuspendedEvent; -import org.apache.camel.management.event.CamelContextSuspendingEvent; -import org.apache.camel.management.event.ExchangeCompletedEvent; -import org.apache.camel.management.event.ExchangeCreatedEvent; -import org.apache.camel.management.event.ExchangeFailedEvent; -import org.apache.camel.management.event.ExchangeSendingEvent; -import org.apache.camel.management.event.ExchangeSentEvent; -import org.apache.camel.management.event.RouteAddedEvent; -import org.apache.camel.management.event.RouteRemovedEvent; -import org.apache.camel.management.event.RouteStartedEvent; -import org.apache.camel.management.event.RouteStoppedEvent; +import org.apache.camel.impl.event.CamelContextResumedEvent; +import org.apache.camel.impl.event.CamelContextResumingEvent; +import org.apache.camel.impl.event.CamelContextStartedEvent; +import org.apache.camel.impl.event.CamelContextStartingEvent; +import org.apache.camel.impl.event.CamelContextStoppedEvent; +import org.apache.camel.impl.event.CamelContextStoppingEvent; +import org.apache.camel.impl.event.CamelContextSuspendedEvent; +import org.apache.camel.impl.event.CamelContextSuspendingEvent; +import org.apache.camel.impl.event.ExchangeCompletedEvent; +import org.apache.camel.impl.event.ExchangeCreatedEvent; +import org.apache.camel.impl.event.ExchangeFailedEvent; +import org.apache.camel.impl.event.ExchangeSendingEvent; +import org.apache.camel.impl.event.ExchangeSentEvent; +import org.apache.camel.impl.event.RouteAddedEvent; +import org.apache.camel.impl.event.RouteRemovedEvent; +import org.apache.camel.impl.event.RouteStartedEvent; +import org.apache.camel.impl.event.RouteStoppedEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeCompletedTest.java similarity index 97% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeCompletedTest.java index 120faa0..bfb3d34 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeCompletedTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeCompletedTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; import java.util.Date; @@ -24,7 +24,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.ExchangeCompletedEvent; +import org.apache.camel.impl.event.ExchangeCompletedEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentParallelTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java similarity index 96% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentParallelTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java index aa32660..9c114dd 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentParallelTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentParallelTest.java @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.management.event.ExchangeSendingEvent; import org.apache.camel.spi.CamelEvent; import org.junit.Test; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java similarity index 98% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java index bdd12ef..24962ac 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; import java.util.List; @@ -24,8 +24,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.ExchangeSendingEvent; -import org.apache.camel.management.event.ExchangeSentEvent; +import org.apache.camel.impl.event.ExchangeSendingEvent; +import org.apache.camel.impl.event.ExchangeSentEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierFailureHandledEventsTest.java similarity index 92% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierFailureHandledEventsTest.java index 7e041d9..a30e4d3 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierFailureHandledEventsTest.java @@ -14,25 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.CamelContextStartedEvent; -import org.apache.camel.management.event.CamelContextStartingEvent; -import org.apache.camel.management.event.ExchangeCompletedEvent; -import org.apache.camel.management.event.ExchangeCreatedEvent; -import org.apache.camel.management.event.ExchangeFailureHandledEvent; -import org.apache.camel.management.event.ExchangeFailureHandlingEvent; -import org.apache.camel.management.event.ExchangeSendingEvent; -import org.apache.camel.management.event.ExchangeSentEvent; -import org.apache.camel.management.event.RouteAddedEvent; -import org.apache.camel.management.event.RouteStartedEvent; +import org.apache.camel.impl.event.CamelContextStartedEvent; +import org.apache.camel.impl.event.CamelContextStartingEvent; +import org.apache.camel.impl.event.ExchangeCompletedEvent; +import org.apache.camel.impl.event.ExchangeCreatedEvent; +import org.apache.camel.impl.event.ExchangeFailureHandledEvent; +import org.apache.camel.impl.event.ExchangeFailureHandlingEvent; +import org.apache.camel.impl.event.ExchangeSendingEvent; +import org.apache.camel.impl.event.ExchangeSentEvent; +import org.apache.camel.impl.event.RouteAddedEvent; +import org.apache.camel.impl.event.RouteStartedEvent; import org.apache.camel.processor.SendProcessor; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierRedeliveryEventsTest.java similarity index 91% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierRedeliveryEventsTest.java index 18670e8..bd0754e 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierRedeliveryEventsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; import java.util.List; @@ -23,13 +23,13 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.ExchangeCompletedEvent; -import org.apache.camel.management.event.ExchangeCreatedEvent; -import org.apache.camel.management.event.ExchangeFailureHandledEvent; -import org.apache.camel.management.event.ExchangeFailureHandlingEvent; -import org.apache.camel.management.event.ExchangeRedeliveryEvent; -import org.apache.camel.management.event.ExchangeSendingEvent; -import org.apache.camel.management.event.ExchangeSentEvent; +import org.apache.camel.impl.event.ExchangeCompletedEvent; +import org.apache.camel.impl.event.ExchangeCreatedEvent; +import org.apache.camel.impl.event.ExchangeFailureHandledEvent; +import org.apache.camel.impl.event.ExchangeFailureHandlingEvent; +import org.apache.camel.impl.event.ExchangeRedeliveryEvent; +import org.apache.camel.impl.event.ExchangeSendingEvent; +import org.apache.camel.impl.event.ExchangeSentEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java similarity index 90% rename from camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java index 88e59ac..5d3260e 100644 --- a/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java @@ -14,19 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Service; -import org.apache.camel.management.event.CamelContextStartedEvent; -import org.apache.camel.management.event.CamelContextStartingEvent; -import org.apache.camel.management.event.CamelContextStoppedEvent; -import org.apache.camel.management.event.CamelContextStoppingEvent; -import org.apache.camel.management.event.ServiceStopFailureEvent; +import org.apache.camel.impl.event.CamelContextStartedEvent; +import org.apache.camel.impl.event.CamelContextStartingEvent; +import org.apache.camel.impl.event.CamelContextStoppedEvent; +import org.apache.camel.impl.event.CamelContextStoppingEvent; +import org.apache.camel.impl.event.ServiceStopFailureEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java b/camel-core/src/test/java/org/apache/camel/impl/event/MultipleEventNotifierEventsTest.java similarity index 89% rename from camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java rename to camel-core/src/test/java/org/apache/camel/impl/event/MultipleEventNotifierEventsTest.java index 199f0b7..ada378c 100644 --- a/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/event/MultipleEventNotifierEventsTest.java @@ -14,28 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.management; +package org.apache.camel.impl.event; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.management.event.CamelContextStartedEvent; -import org.apache.camel.management.event.CamelContextStartingEvent; -import org.apache.camel.management.event.CamelContextStoppedEvent; -import org.apache.camel.management.event.CamelContextStoppingEvent; -import org.apache.camel.management.event.ExchangeCompletedEvent; -import org.apache.camel.management.event.ExchangeCreatedEvent; -import org.apache.camel.management.event.ExchangeFailedEvent; -import org.apache.camel.management.event.ExchangeSendingEvent; -import org.apache.camel.management.event.ExchangeSentEvent; -import org.apache.camel.management.event.RouteAddedEvent; -import org.apache.camel.management.event.RouteRemovedEvent; -import org.apache.camel.management.event.RouteStartedEvent; -import org.apache.camel.management.event.RouteStoppedEvent; +import org.apache.camel.impl.event.CamelContextStartedEvent; +import org.apache.camel.impl.event.CamelContextStartingEvent; +import org.apache.camel.impl.event.CamelContextStoppedEvent; +import org.apache.camel.impl.event.CamelContextStoppingEvent; +import org.apache.camel.impl.event.ExchangeCompletedEvent; +import org.apache.camel.impl.event.ExchangeCreatedEvent; +import org.apache.camel.impl.event.ExchangeFailedEvent; +import org.apache.camel.impl.event.ExchangeSendingEvent; +import org.apache.camel.impl.event.ExchangeSentEvent; +import org.apache.camel.impl.event.RouteAddedEvent; +import org.apache.camel.impl.event.RouteRemovedEvent; +import org.apache.camel.impl.event.RouteStartedEvent; +import org.apache.camel.impl.event.RouteStoppedEvent; import org.apache.camel.spi.CamelEvent; import org.apache.camel.support.EventNotifierSupport; import org.junit.Before; diff --git a/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java b/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java index b2f6247..644a774 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.NamedNode; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.management.event.AbstractExchangeEvent; +import org.apache.camel.impl.event.AbstractExchangeEvent; import org.apache.camel.model.PipelineDefinition; import org.apache.camel.spi.InterceptStrategy; import org.apache.camel.support.ServiceSupport;