Author: davsclaus
Date: Fri Jul 11 09:41:56 2008
New Revision: 676025
URL: http://svn.apache.org/viewvc?rev=676025&view=rev
Log:
CAMEL-677: BAM example now works again.
Modified:
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
activemq/camel/trunk/components/camel-bam/src/test/resources/log4j.properties
activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
Modified:
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java?rev=676025&r1=676024&r2=676025&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
(original)
+++
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
Fri Jul 11 09:41:56 2008
@@ -31,6 +31,8 @@
import org.apache.camel.bam.processor.ProcessContext;
import org.apache.camel.bam.rules.ActivityRules;
import org.apache.camel.util.ObjectHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* The default state for a specific activity within a process
@@ -39,6 +41,7 @@
*/
@Entity
public class ActivityState extends TemporalEntity {
+ private static final transient Log LOG =
LogFactory.getLog(ActivityState.class);
private ProcessInstance processInstance;
private Integer receivedMessageCount = 0;
private ActivityDefinition activityDefinition;
@@ -167,6 +170,9 @@
if (!isStarted()) {
setTimeStarted(currentTime());
context.onStarted(this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Activity first message: " + this);
+ }
}
}
@@ -176,7 +182,12 @@
protected void onExpectedMessage(ProcessContext context) {
if (!isCompleted()) {
setTimeCompleted(currentTime());
+ // must also clear overdue otherwise we will get failures
+ setTimeOverdue(null);
context.onCompleted(this);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Activity complete: " + this);
+ }
}
}
Modified:
activemq/camel/trunk/components/camel-bam/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/test/resources/log4j.properties?rev=676025&r1=676024&r2=676025&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-bam/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-bam/src/test/resources/log4j.properties
Fri Jul 11 09:41:56 2008
@@ -22,6 +22,7 @@
# uncomment the next line to debug Camel
#log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel.bam=DEBUG
log4j.logger.org.springframework=WARN
log4j.logger.org.hibernate=WARN
Modified:
activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java?rev=676025&r1=676024&r2=676025&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
(original)
+++
activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
Fri Jul 11 09:41:56 2008
@@ -42,13 +42,13 @@
ActivityBuilder purchaseOrder =
activity("file:src/data/purchaseOrders?noop=true")
.correlate(xpath("/purchaseOrder/@id").stringResult());
- ActivityBuilder invoice = activity("file:src/data/invoices?noop=true")
+ ActivityBuilder invoice =
activity("file:src/data/invoices?noop=true&consumer.initialDelay=5000")
.correlate(xpath("/invoice/@purchaseOrderId").stringResult());
// now let's add some BAM rules
invoice.starts().after(purchaseOrder.completes())
- .expectWithin(seconds(1))
-
.errorIfOver(seconds(2)).to("log:org.apache.camel.example.bam.BamFailures?level=error");
+ .expectWithin(seconds(10))
+
.errorIfOver(seconds(20)).to("log:org.apache.camel.example.bam.BamFailures?level=error");
}
}
// END SNIPPET: demo
Modified:
activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties?rev=676025&r1=676024&r2=676025&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
(original)
+++
activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
Fri Jul 11 09:41:56 2008
@@ -18,21 +18,26 @@
#
# The logging properties used for eclipse testing, We want to see INFO output
on the console.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, stdout
# uncomment the next line to debug Camel
+#log4j.logger.org.apache.camel.bam=DEBUG
#log4j.logger.org.apache.camel=DEBUG
log4j.logger.org.apache.camel.impl.converter=INFO
log4j.logger.org.apache.camel.util.ResolverUtil=INFO
-
-#log4j.logger.org.apache.activemq=DEBUG
-
log4j.logger.org.springframework=WARN
log4j.logger.org.hibernate=WARN
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1}
- %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.out.file=target/camel-example-bam.log
+log4j.appender.out.append=true
+
