You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/06/11 20:28:43 UTC

svn commit: r546214 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/component/mock/ camel-core/src/main/java/org/apache/camel/processor/ components/camel-bam/src/main/java/org/apache/camel/bam/ components/camel-bam/src/main/java/o...

Author: jstrachan
Date: Mon Jun 11 11:28:42 2007
New Revision: 546214

URL: http://svn.apache.org/viewvc?view=rev&rev=546214
Log:
some spring cleaning of the code, tidying imports and removing some cruft

Removed:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LifecycleProcessor.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
    activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
    activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Mon Jun 11 11:28:42 2007
@@ -29,6 +29,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
+import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultProducer;
@@ -196,7 +197,10 @@
                     Exchange exchange = getReceivedExchanges().get(counter++);
                     assertTrue("No exchange received for counter: " + counter, exchange != null);
 
-                    Object actualBody = exchange.getIn().getBody();
+                    Message in = exchange.getIn();
+
+                    Object actualBody = (expectedBody != null)
+                            ? in.getBody(expectedBody.getClass()) : in.getBody();
 
                     assertEquals("Body of message: " + counter, expectedBody, actualBody);
 

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ActivityBuilder.java Mon Jun 11 11:28:42 2007
@@ -20,13 +20,11 @@
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
-import org.apache.camel.processor.LifecycleProcessor;
-import org.apache.camel.impl.EventDrivenConsumerRoute;
 import org.apache.camel.bam.model.ActivityState;
 import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.camel.bam.processor.ActivityMonitorEngine;
 import org.apache.camel.builder.ProcessorFactory;
+import org.apache.camel.impl.EventDrivenConsumerRoute;
 
 import java.util.Date;
 
@@ -62,7 +60,6 @@
         return new EventDrivenConsumerRoute(getEndpoint(), processor);
     }
 
-
     // Builder methods
     //-----------------------------------------------------------------------
     public ActivityBuilder correlate(Expression correlationExpression) {
@@ -110,5 +107,4 @@
     public ProcessBuilder getProcessBuilder() {
         return processBuilder;
     }
-
 }

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java Mon Jun 11 11:28:42 2007
@@ -19,20 +19,18 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.Processor;
 import org.apache.camel.Route;
-import org.apache.camel.impl.EventDrivenConsumerRoute;
-import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.model.ActivityDefinition;
 import org.apache.camel.bam.model.ProcessDefinition;
-import org.apache.camel.bam.processor.JpaBamProcessor;
+import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.processor.ActivityMonitorEngine;
+import org.apache.camel.bam.processor.JpaBamProcessor;
 import org.apache.camel.bam.rules.ProcessRules;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.processor.LifecycleProcessor;
 import static org.apache.camel.util.ObjectHelper.notNull;
 import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -124,7 +122,6 @@
         return processName;
     }
 
-
     public ProcessDefinition getProcessDefinition() {
         if (processDefinition == null) {
             processDefinition = findOrCreateProcessDefinition();
@@ -141,21 +138,6 @@
     protected void populateRoutes(List<Route> routes) throws Exception {
         boolean first = true;
         for (ActivityBuilder builder : activityBuilders) {
-/*
-            Endpoint from = builder.getEndpoint();
-            Processor processor = builder.createProcessor();
-            if (processor == null) {
-                throw new IllegalArgumentException("No processor created for ActivityBuilder: " + builder);
-            }
-
-            // lets add extra services to the first processor lifecycle
-            // TODO this is a little bit of a hack; we might want to add an ability to add dependent services to routes etc
-            if (first) {
-                processor = new LifecycleProcessor(processor, new ActivityMonitorEngine(getJpaTemplate(), getTransactionTemplate(), getProcessRules()));
-                first = false;
-            }
-*/
-
             Route route = builder.createRoute();
             if (first) {
                 route.getServices().add(new ActivityMonitorEngine(getJpaTemplate(), getTransactionTemplate(), getProcessRules()));
@@ -165,7 +147,6 @@
         }
     }
 
-
     // Implementation methods
     //-------------------------------------------------------------------------
     public ActivityDefinition findOrCreateActivityDefinition(String activityName) {
@@ -195,7 +176,4 @@
             return answer;
         }
     }
-
-
-
 }

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/TimeExpression.java Mon Jun 11 11:28:42 2007
@@ -18,8 +18,8 @@
 
 import org.apache.camel.bam.model.ActivityState;
 import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.TemporalRule;
 import org.apache.camel.bam.rules.ActivityRules;
+import org.apache.camel.bam.rules.TemporalRule;
 import org.apache.camel.util.ObjectHelper;
 
 import java.util.Date;

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java Mon Jun 11 11:28:42 2007
@@ -40,12 +40,11 @@
         return super.getId();
     }
 
-
     @Override
     public String toString() {
         return "Activity[" + getId() + " name: " + getName() + "]";
     }
-    
+
     public String getName() {
         return name;
     }

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?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- 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 Mon Jun 11 11:28:42 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.bam.model;
 
-import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.camel.bam.processor.ProcessContext;
+import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.camel.util.ObjectHelper;
 
 import javax.persistence.CascadeType;

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/EntitySupport.java Mon Jun 11 11:28:42 2007
@@ -16,7 +16,8 @@
  */
 package org.apache.camel.bam.model;
 
-import javax.persistence.*;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 /**
  * A base class for persistent entities

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java Mon Jun 11 11:28:42 2007
@@ -16,20 +16,20 @@
  */
 package org.apache.camel.bam.model;
 
+import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.camel.bam.rules.ActivityRules;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Id;
 import javax.persistence.GeneratedValue;
-import java.util.HashSet;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 
 /**
  * Represents a single business process
@@ -39,7 +39,6 @@
 @Entity
 public class ProcessInstance extends TemporalEntity {
     private static final transient Log log = LogFactory.getLog(ProcessInstance.class);
-
     private ProcessDefinition processDefinition;
     private Collection<ActivityState> activityStates = new HashSet<ActivityState>();
     private String correlationKey;
@@ -59,7 +58,7 @@
     public Long getId() {
         return super.getId();
     }
-    
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
     public ProcessDefinition getProcessDefinition() {
         return processDefinition;
@@ -86,10 +85,9 @@
         this.correlationKey = correlationKey;
     }
 
-
     // Helper methods
     //-------------------------------------------------------------------------
-    
+
     /**
      * Returns the activity state for the given activity
      *
@@ -118,7 +116,6 @@
 
         return state;
     }
-
 
     protected ActivityState createActivityState() {
         return new ActivityState();

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/TemporalEntity.java Mon Jun 11 11:28:42 2007
@@ -17,7 +17,6 @@
 package org.apache.camel.bam.model;
 
 import javax.persistence.Transient;
-import javax.persistence.Entity;
 import java.util.Date;
 
 /**

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java Mon Jun 11 11:28:42 2007
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.bam.processor;
 
-import org.apache.camel.bam.model.*;
-import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
+import org.apache.camel.bam.model.ActivityState;
+import org.apache.camel.bam.model.ProcessInstance;
+import org.apache.camel.bam.rules.ActivityRules;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.orm.jpa.JpaTemplate;
@@ -58,5 +58,4 @@
 
         rules.getProcessRules().processExchange(exchange, process);
     }
-
 }

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java Mon Jun 11 11:28:42 2007
@@ -18,7 +18,6 @@
 
 import org.apache.camel.CamelException;
 import org.apache.camel.Exchange;
-import org.apache.camel.bam.processor.BamProcessorSupport;
 
 /**
  * An exception thrown if no correlation key could be found for a message
@@ -38,7 +37,6 @@
         this.processor = processor;
         this.exchange = exchange;
     }
-
 
     public Exchange getExchange() {
         return exchange;

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ProcessContext.java Mon Jun 11 11:28:42 2007
@@ -18,20 +18,18 @@
 package org.apache.camel.bam.processor;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.rules.ProcessRules;
+import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.rules.ActivityRules;
+import org.apache.camel.bam.rules.ProcessRules;
 
 /**
  * @version $Revision: 1.1 $
  */
 public class ProcessContext {
     private Exchange exchange;
-
     private ProcessRules processRules;
     private ActivityRules activityRules;
-
     private ProcessInstance processInstance;
     private ActivityState activityState;
 

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java Mon Jun 11 11:28:42 2007
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.bam.rules;
 
+import org.apache.camel.Exchange;
+import org.apache.camel.bam.ProcessBuilder;
 import org.apache.camel.bam.model.ActivityDefinition;
 import org.apache.camel.bam.model.ActivityState;
 import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.ProcessBuilder;
-import org.apache.camel.Exchange;
-import org.apache.camel.util.ServiceHelper;
 import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.util.ServiceHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,7 +36,6 @@
  */
 public class ActivityRules extends ServiceSupport {
     private static final transient Log log = LogFactory.getLog(ActivityRules.class);
-
     private int expectedMessages = 1;
     private ProcessRules processRules;
     private List<TemporalRule> rules = new ArrayList<TemporalRule>();
@@ -49,7 +48,7 @@
         this.processRules = builder.getProcessRules();
         processRules.getActivities().add(this);
     }
-    
+
     public void addRule(TemporalRule rule) {
         rules.add(rule);
     }
@@ -98,7 +97,6 @@
     public void setActivityName(String activityName) {
         this.activityName = activityName;
     }
-
 
     // Implementation methods
     //-------------------------------------------------------------------------

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ProcessRules.java Mon Jun 11 11:28:42 2007
@@ -18,8 +18,8 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.bam.model.ActivityState;
-import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.bam.model.ProcessDefinition;
+import org.apache.camel.bam.model.ProcessInstance;
 import org.apache.camel.impl.ServiceSupport;
 import org.apache.camel.util.ServiceHelper;
 

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Mon Jun 11 11:28:42 2007
@@ -16,17 +16,17 @@
  */
 package org.apache.camel.bam.rules;
 
-import static org.apache.camel.util.ServiceHelper.startServices;
-import static org.apache.camel.util.ServiceHelper.stopServices;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.bam.TimeExpression;
 import org.apache.camel.bam.model.ActivityState;
 import org.apache.camel.bam.model.ProcessInstance;
-import org.apache.camel.bam.TimeExpression;
 import org.apache.camel.builder.FromBuilder;
 import org.apache.camel.builder.ProcessorFactory;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.ServiceSupport;
+import static org.apache.camel.util.ServiceHelper.startServices;
+import static org.apache.camel.util.ServiceHelper.stopServices;
 import org.apache.camel.util.Time;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -115,7 +115,6 @@
             }
         }
     }
-
 
     public void processExpired(ActivityState activityState) throws Exception {
         Processor processor = getOverdueAction();

Modified: activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java?view=diff&rev=546214&r1=546213&r2=546214
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java Mon Jun 11 11:28:42 2007
@@ -52,7 +52,6 @@
         camelContext.addRoutes(createRouteBuilder());
 
         overdueEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:overdue");
-
     }
 
     protected RouteBuilder createRouteBuilder() throws Exception {