Author: janstey
Date: Wed Nov 2 18:19:55 2011
New Revision: 1196732
URL: http://svn.apache.org/viewvc?rev=1196732&view=rev
Log:
Fix CS with last commit..
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceRefTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithNoExecutorServiceTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceRefTest.java?rev=1196732&r1=1196731&r2=1196732&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceRefTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceRefTest.java
Wed Nov 2 18:19:55 2011
@@ -1,9 +1,21 @@
+/**
+ * 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.processor.aggregator;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.naming.Context;
-
import org.apache.camel.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
@@ -25,9 +37,9 @@ public class AggregateTimeoutWithExecuto
for (int i = 0; i < NUM_AGGREGATORS; ++i) {
from("direct:start" + i)
- // aggregate timeout after 3th seconds
- .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000).timeoutCheckerExecutorServiceRef("MyThreadPool")
- .to("mock:result" + i);
+ // aggregate timeout after 3th seconds
+ .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000).timeoutCheckerExecutorServiceRef("MyThreadPool")
+ .to("mock:result" + i);
}
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java?rev=1196732&r1=1196731&r2=1196732&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithExecutorServiceTest.java
Wed Nov 2 18:19:55 2011
@@ -73,9 +73,9 @@ public class AggregateTimeoutWithExecuto
ScheduledExecutorService threadPool =
context.getExecutorServiceManager().newScheduledThreadPool(this,
"MyThreadPool", 8);
for (int i = 0; i < NUM_AGGREGATORS; ++i) {
from("direct:start" + i)
- // aggregate timeout after 3th seconds
- .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000).timeoutCheckerExecutorService(threadPool)
- .to("mock:result" + i);
+ // aggregate timeout after 3th seconds
+ .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000).timeoutCheckerExecutorService(threadPool)
+ .to("mock:result" + i);
}
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithNoExecutorServiceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithNoExecutorServiceTest.java?rev=1196732&r1=1196731&r2=1196732&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithNoExecutorServiceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutWithNoExecutorServiceTest.java
Wed Nov 2 18:19:55 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.processor.aggregator;
import org.apache.camel.ContextTestSupport;
@@ -31,9 +47,9 @@ public class AggregateTimeoutWithNoExecu
public void configure() throws Exception {
for (int i = 0; i <
AggregateTimeoutWithExecutorServiceTest.NUM_AGGREGATORS; ++i) {
from("direct:start" + i)
- // aggregate timeout after 3th seconds
- .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000)
- .to("mock:result" + i);
+ // aggregate timeout after 3th seconds
+ .aggregate(header("id"), new
UseLatestAggregationStrategy()).completionTimeout(3000)
+ .to("mock:result" + i);
}
}
};
