You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2009/01/30 21:17:26 UTC
svn commit: r739400 - in /camel/trunk/components:
camel-mail/src/main/java/org/apache/camel/component/mail/
camel-quartz/src/main/java/org/apache/camel/component/quartz/
camel-quartz/src/test/java/org/apache/camel/component/quartz/
camel-rest/src/main/...
Author: janstey
Date: Fri Jan 30 20:17:26 2009
New Revision: 739400
URL: http://svn.apache.org/viewvc?rev=739400&view=rev
Log:
Fix up some CS errors
Modified:
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/ResourceSupport.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java Fri Jan 30 20:17:26 2009
@@ -23,8 +23,8 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
+import org.apache.camel.impl.ScheduledPollEndpoint;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.JavaMailSenderImpl;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java Fri Jan 30 20:17:26 2009
@@ -34,7 +34,7 @@
/**
* A <a href="http://camel.apache.org/quartz.html">Quartz Component</a>
- *
+ *
* @version $Revision:520964 $
*/
public class QuartzComponent extends DefaultComponent {
@@ -156,8 +156,8 @@
}
protected Scheduler createScheduler() throws SchedulerException {
- Scheduler scheduler = getFactory().getScheduler();
- scheduler.getContext().put(QuartzEndpoint.CONTEXT_KEY, getCamelContext());
+ Scheduler scheduler = getFactory().getScheduler();
+ scheduler.getContext().put(QuartzEndpoint.CONTEXT_KEY, getCamelContext());
return scheduler;
}
}
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java Fri Jan 30 20:17:26 2009
@@ -41,14 +41,14 @@
/**
* A <a href="http://activemq.apache.org/quartz.html">Quartz Endpoint</a>
- *
+ *
* @version $Revision:520964 $
*/
public class QuartzEndpoint extends DefaultEndpoint {
- private static final transient Log LOG = LogFactory.getLog(QuartzEndpoint.class);
-
public static final String ENDPOINT_KEY = "org.apache.camel.quartz";
public static final String CONTEXT_KEY = "org.apache.camel.CamelContext";
+
+ private static final transient Log LOG = LogFactory.getLog(QuartzEndpoint.class);
private Scheduler scheduler;
private LoadBalancer loadBalancer;
@@ -110,7 +110,7 @@
/**
* This method is invoked when a Quartz job is fired.
- *
+ *
* @param jobExecutionContext the Quartz Job context
*/
public void onJobExecute(final JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -146,7 +146,7 @@
@Override
public QuartzComponent getComponent() {
- return (QuartzComponent)super.getComponent();
+ return (QuartzComponent) super.getComponent();
}
public boolean isSingleton() {
@@ -189,7 +189,7 @@
public void setTrigger(final Trigger trigger) {
this.trigger = trigger;
}
-
+
/**
* @return the stateful mode
*/
@@ -198,7 +198,8 @@
}
/**
- * @param stateful sets the stateful mode
+ * @param stateful
+ * sets the stateful mode
*/
public void setStateful(final boolean stateful) {
this.stateful = stateful;
Modified: camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java (original)
+++ camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java Fri Jan 30 20:17:26 2009
@@ -26,13 +26,15 @@
/**
* @author martin.gilday
- *
+ *
*/
public class StatefulCamelJob implements StatefulJob {
- /* (non-Javadoc)
- * @see org.quartz.Job#execute(org.quartz.JobExecutionContext)
- */
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.quartz.Job#execute(org.quartz.JobExecutionContext)
+ */
public void execute(final JobExecutionContext context) throws JobExecutionException {
SchedulerContext schedulerContext;
@@ -44,7 +46,7 @@
CamelContext camelContext = (CamelContext) schedulerContext.get(QuartzEndpoint.CONTEXT_KEY);
String endpointUri = (String) context.getJobDetail().getJobDataMap().get(QuartzEndpoint.ENDPOINT_KEY);
- QuartzEndpoint quartzEndpoint = (QuartzEndpoint) camelContext.getEndpoint(endpointUri);
+ QuartzEndpoint quartzEndpoint = (QuartzEndpoint) camelContext.getEndpoint(endpointUri);
quartzEndpoint.onJobExecute(context);
}
}
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java Fri Jan 30 20:17:26 2009
@@ -27,10 +27,10 @@
/**
* @author martin.gilday
- *
+ *
*/
public class StatefulQuartzRouteTest extends ContextTestSupport {
- protected MockEndpoint resultEndpoint;
+ protected MockEndpoint resultEndpoint;
public void testSendAndReceiveMails() throws Exception {
resultEndpoint = getMockEndpoint("mock:result");
@@ -48,8 +48,9 @@
}
}
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.camel.ContextTestSupport#createRouteBuilder()
*/
@Override
Modified: camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/ResourceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/ResourceSupport.java?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/ResourceSupport.java (original)
+++ camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/ResourceSupport.java Fri Jan 30 20:17:26 2009
@@ -17,9 +17,9 @@
package org.apache.camel.rest.resources;
import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import com.sun.jersey.api.view.Viewable;
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml?rev=739400&r1=739399&r2=739400&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml Fri Jan 30 20:17:26 2009
@@ -23,7 +23,7 @@
">
<!--
- from("direct:a").recipientList(header("myHeader"));
+ from("direct:a").recipientList(header("myHeader").tokenize(","));
-->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">