svn commit: r1064473 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

2011-01-27 Thread ningjiang 
Author: ningjiang
Date: Fri Jan 28 07:33:28 2011
New Revision: 1064473

URL: http://svn.apache.org/viewvc?rev=1064473&view=rev
Log:
CAMEL-3596  CxfProducer should throw a more meaningful exception when it can't 
find the binding operation info

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1064473&r1=1064472&r2=1064473&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Fri Jan 28 07:33:28 2011
@@ -354,6 +354,10 @@ public class CxfProducer extends Default
 }
 
 answer = 
client.getEndpoint().getEndpointInfo().getBinding().getOperation(qname);
+if (answer == null) {
+throw new IllegalArgumentException("Can't find the 
BindingOperationInfo with operation name " + qname
+   + ". Please check the 
message headers of operationName and operationNamespace."); 
+}
 }
 return answer;
 }

svn commit: r1064202 - in /camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz: ScheduledJob.java ScheduledRoutePolicy.java

2011-01-27 Thread akarpe 
Author: akarpe
Date: Thu Jan 27 17:12:27 2011
New Revision: 1064202

URL: http://svn.apache.org/viewvc?rev=1064202&view=rev
Log:
Removed commented code for CAMEL-3575

Modified:

camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java

camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java?rev=1064202&r1=1064201&r2=1064202&view=diff
==
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
 Thu Jan 27 17:12:27 2011
@@ -41,8 +41,6 @@ public class ScheduledJob implements Job
 throw new JobExecutionException("Failed to obtain scheduler 
context for job " + jobExecutionContext.getJobDetail().getName());
 }
 
-/*Action storedAction = (Action) 
schedulerContext.get(SCHEDULED_ACTION);
-storedRoute = (Route) schedulerContext.get(SCHEDULED_ROUTE);*/
 ScheduledJobState state = (ScheduledJobState) 
schedulerContext.get(jobExecutionContext.getJobDetail().getName());
 Action storedAction = state.getAction(); 
 storedRoute = state.getRoute();

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java?rev=1064202&r1=1064201&r2=1064202&view=diff
==
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
 Thu Jan 27 17:12:27 2011
@@ -154,8 +154,6 @@ public abstract class ScheduledRoutePoli
 }
 
 protected void loadCallbackDataIntoSchedulerContext(JobDetail jobDetail, 
Action action, Route route) throws SchedulerException {
-/*getScheduler().getContext().put(SCHEDULED_ACTION, action);
-getScheduler().getContext().put(SCHEDULED_ROUTE, route);*/
 getScheduler().getContext().put(jobDetail.getName(), new 
ScheduledJobState(action, route));
 }

svn commit: r1064176 - /camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java

2011-01-27 Thread akarpe 
Author: akarpe
Date: Thu Jan 27 16:15:23 2011
New Revision: 1064176

URL: http://svn.apache.org/viewvc?rev=1064176&view=rev
Log:
Removed unnecessary imports

Modified:

camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java

Modified: 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java?rev=1064176&r1=1064175&r2=1064176&view=diff
==
--- 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
 Thu Jan 27 16:15:23 2011
@@ -17,15 +17,12 @@
 package org.apache.camel.routepolicy.quartz;
 
 import java.util.Date;
-import java.util.concurrent.TimeUnit;
 
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.quartz.QuartzComponent;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.ServiceHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;

svn commit: r1064154 - in /camel/trunk/components/camel-quartz/src: main/java/org/apache/camel/routepolicy/quartz/ test/java/org/apache/camel/routepolicy/quartz/

2011-01-27 Thread akarpe 
Author: akarpe
Date: Thu Jan 27 15:21:27 2011
New Revision: 1064154

URL: http://svn.apache.org/viewvc?rev=1064154&view=rev
Log:
CAMEL-3575 Fixed issues in allowing ScheduledRoutePolicy to handle
more than one action (start, stop, resume, pause)

Added:

camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java

camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
Modified:

camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java

camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java?rev=1064154&r1=1064153&r2=1064154&view=diff
==
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJob.java
 Thu Jan 27 15:21:27 2011
@@ -41,8 +41,11 @@ public class ScheduledJob implements Job
 throw new JobExecutionException("Failed to obtain scheduler 
context for job " + jobExecutionContext.getJobDetail().getName());
 }
 
-Action storedAction = (Action) schedulerContext.get(SCHEDULED_ACTION);
-storedRoute = (Route) schedulerContext.get(SCHEDULED_ROUTE);
+/*Action storedAction = (Action) 
schedulerContext.get(SCHEDULED_ACTION);
+storedRoute = (Route) schedulerContext.get(SCHEDULED_ROUTE);*/
+ScheduledJobState state = (ScheduledJobState) 
schedulerContext.get(jobExecutionContext.getJobDetail().getName());
+Action storedAction = state.getAction(); 
+storedRoute = state.getRoute();
 
 ScheduledRoutePolicy policy = (ScheduledRoutePolicy) 
storedRoute.getRouteContext().getRoutePolicy();
 try {

Added: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java?rev=1064154&view=auto
==
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
 (added)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledJobState.java
 Thu Jan 27 15:21:27 2011
@@ -0,0 +1,37 @@
+/**
+ * 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.routepolicy.quartz;
+
+import org.apache.camel.Route;
+
+public class ScheduledJobState {
+private final ScheduledRoutePolicyConstants.Action action;
+private final Route route;
+
+public ScheduledJobState(ScheduledRoutePolicyConstants.Action action, 
Route route) {
+this.action = action;
+this.route = route;
+}
+
+public ScheduledRoutePolicyConstants.Action getAction() {
+return action;
+}
+
+public Route getRoute() {
+return route;
+}
+}

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java?rev=1064154&r1=1064153&r2=1064154&view=diff
==
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
 Thu Jan 27 15:21:27 2011
@@ -78,7 +78,7 @@ public abstract class ScheduledRoutePoli
 Trigger trigger

svn commit: r1064020 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java

2011-01-27 Thread ningjiang 
Author: ningjiang
Date: Thu Jan 27 08:13:09 2011
New Revision: 1064020

URL: http://svn.apache.org/viewvc?rev=1064020&view=rev
Log:
Try to fix the camel-core test error on a slow box

Modified:

camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java?rev=1064020&r1=1064019&r2=1064020&view=diff
==
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java
 Thu Jan 27 08:13:09 2011
@@ -66,7 +66,7 @@ public class MulticastParallelTimeout2Te
 
 from("direct:a").to("mock:A").setBody(constant("A"));
 
-
from("direct:b").delay(500).to("mock:B").setBody(constant("B"));
+
from("direct:b").delay(1000).to("mock:B").setBody(constant("B"));
 
 from("direct:c").to("mock:C").setBody(constant("C"));
 // END SNIPPET: e1