You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/08/27 03:24:00 UTC

svn commit: r689325 - in /activemq/camel/trunk: camel-core/src/test/java/org/apache/camel/processor/ components/camel-spring/src/test/java/org/apache/camel/spring/processor/ components/camel-spring/src/test/resources/org/apache/camel/spring/processor/

Author: ningjiang
Date: Tue Aug 26 18:24:00 2008
New Revision: 689325

URL: http://svn.apache.org/viewvc?rev=689325&view=rev
Log:
CAMEL-393 Fixed the SpringAggregatorTest failure

Added:
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java   (with props)
Modified:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java
    activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java?rev=689325&r1=689324&r2=689325&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MyAggregationStrategy.java Tue Aug 26 18:24:00 2008
@@ -40,7 +40,6 @@
      */
     public boolean isCompleted(@Header(name = "aggregated")
                                Integer aggregated) {
-        System.out.println("calling the isCompleted with aggregated" + aggregated);
         if (aggregated == null) {
             return false;
         }

Added: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java?rev=689325&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java (added)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java Tue Aug 26 18:24:00 2008
@@ -0,0 +1,39 @@
+/**
+ * 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.spring.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+
+public class SetHeaderProcessor implements Processor {
+    private String headerName;
+    private Object headerValue;
+
+    public void setHeaderName(String name) {
+        headerName = name;
+    }
+
+    public void setHeaderValue(Object value) {
+        headerValue = value;
+    }
+
+    public void process(Exchange exchange) throws Exception {
+        exchange.getIn().setHeader(headerName, headerValue);
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SetHeaderProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=689325&r1=689324&r2=689325&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml Tue Aug 26 18:24:00 2008
@@ -33,6 +33,20 @@
     </route>
 
     <route>
+      <from uri="seda:header"/>
+      <process ref="setHeaderProcessor"/>
+      <to uri="direct:temp"/>
+    </route>
+
+    <route>
+      <from uri="direct:temp"/>
+      <aggregator>
+        <simple>header.cheese</simple>
+        <to uri="mock:result"/>
+      </aggregator>
+    </route>
+
+    <route>
       <from uri="direct:predicate"/>
       <aggregator strategyRef="myAggregatorStrategy">
         <simple>header.cheese</simple>
@@ -46,4 +60,9 @@
   <!-- END SNIPPET: example -->
 
   <bean id="myAggregatorStrategy" class="org.apache.camel.processor.MyAggregationStrategy"/>
+  <bean id="setHeaderProcessor" class="org.apache.camel.spring.processor.SetHeaderProcessor">
+  	<property name="headerName" value ="visited"/>
+  	<property name="headerValue" value ="true"/>
+  </bean>
+
 </beans>