Author: davsclaus
Date: Mon Aug 25 10:57:10 2008
New Revision: 688802
URL: http://svn.apache.org/viewvc?rev=688802&view=rev
Log:
CAMEL-845: added firedtime property
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
(with props)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=688802&r1=688801&r2=688802&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
Mon Aug 25 10:57:10 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.timer;
+import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
@@ -87,6 +88,7 @@
exchange.setProperty("org.apache.camel.timer.name",
endpoint.getTimerName());
exchange.setProperty("org.apache.camel.timer.time",
endpoint.getTime());
exchange.setProperty("org.apache.camel.timer.period",
endpoint.getPeriod());
+ exchange.setProperty("org.apache.camel.timer.firedtime", new Date());
try {
getProcessor().process(exchange);
} catch (Exception e) {
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java?rev=688802&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
(added)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
Mon Aug 25 10:57:10 2008
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.timer;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for fired time exchange property
+ */
+public class TimerFiredTimeTest extends ContextTestSupport {
+
+ public void testFired() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ assertMockEndpointsSatisifed();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ assertEquals("hello",
exchange.getProperty("org.apache.camel.timer.name"));
+
assertNotNull(exchange.getProperty("org.apache.camel.timer.firedtime"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("timer://hello").to("mock:result");
+ }
+ };
+ }
+}
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
