camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r701583 - in /activemq/camel/trunk: apache-camel/src/main/descriptors/ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/ components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ components/camel-jp...
Date Sat, 04 Oct 2008 02:03:43 GMT
Author: ningjiang
Date: Fri Oct  3 19:03:42 2008
New Revision: 701583

URL: http://svn.apache.org/viewvc?rev=701583&view=rev
Log:
Fixed the CS errors

Modified:
    activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml   (props changed)
    activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
    activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
    activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
    activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
    activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
    activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
    activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsTest.java
    activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/TestSupport.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
    activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
    activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java

Propchange: activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
(original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
Fri Oct  3 19:03:42 2008
@@ -18,8 +18,8 @@
 
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.camel.Processor;
 import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
 import org.apache.camel.impl.ScheduledPollConsumer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
(original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
Fri Oct  3 19:03:42 2008
@@ -20,8 +20,8 @@
 
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
-import org.apache.camel.util.UuidGenerator;
 import org.apache.camel.impl.ScheduledPollEndpoint;
+import org.apache.camel.util.UuidGenerator;
 
 public abstract class RemoteFileEndpoint<T extends RemoteFileExchange> extends ScheduledPollEndpoint<T>
{
     private RemoteFileBinding binding;
@@ -84,9 +84,9 @@
     /**
       * Return the file name that will be auto-generated for the given message if none is
provided
       */
-     public String getGeneratedFileName(Message message) {
-         return getFileFriendlyMessageId(message.getMessageId());
-     }
+    public String getGeneratedFileName(Message message) {
+        return getFileFriendlyMessageId(message.getMessageId());
+    }
 
     protected String getFileFriendlyMessageId(String id) {
         return UuidGenerator.generateSanitizedId(id);

Modified: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
(original)
+++ activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
Fri Oct  3 19:03:42 2008
@@ -18,8 +18,8 @@
 
 import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.GregorianCalendar;
 
 import org.apache.camel.component.file.FileComponent;

Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
(original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/MessageProcessed.java
Fri Oct  3 19:03:42 2008
@@ -27,8 +27,8 @@
  */
 @Entity
 @Table(
-    name="MESSAGEPROCESSED",
-    uniqueConstraints=@UniqueConstraint(columnNames = {"processorName", "messageId"})
+    name = "MESSAGEPROCESSED",
+    uniqueConstraints = @UniqueConstraint(columnNames = {"processorName", "messageId"})
 )
 public class MessageProcessed {
     private Long id;

Modified: activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
(original)
+++ activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
Fri Oct  3 19:03:42 2008
@@ -1,5 +1,4 @@
 /**
- *
  * 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.
@@ -7,7 +6,7 @@
  * (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
+ *      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,
@@ -17,12 +16,13 @@
  */
 package org.apache.camel.rest.util;
 
-import com.sun.jersey.api.core.PackagesResourceConfig;
-
-import javax.ws.rs.core.MediaType;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.ws.rs.core.MediaType;
+
+import com.sun.jersey.api.core.PackagesResourceConfig;
+
 /**
  * @version $Revision: 1.1 $
  */

Modified: activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
(original)
+++ activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
Fri Oct  3 19:03:42 2008
@@ -18,9 +18,11 @@
 
 import java.util.List;
 
+import com.sun.jersey.api.client.WebResource;
+
 import org.apache.camel.rest.model.EndpointLink;
 import org.apache.camel.rest.model.Endpoints;
-import com.sun.jersey.api.client.WebResource;
+
 
 /**
  * @version $Revision$

Modified: activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsTest.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsTest.java
(original)
+++ activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/EndpointsTest.java
Fri Oct  3 19:03:42 2008
@@ -18,9 +18,11 @@
 
 import java.util.List;
 
+import com.sun.jersey.api.client.WebResource;
+
 import org.apache.camel.rest.model.EndpointLink;
 import org.apache.camel.rest.model.Endpoints;
-import com.sun.jersey.api.client.WebResource;
+
 
 /**
  * @version $Revision$
@@ -36,7 +38,7 @@
     }
 
     // TODO test as JSON
-    
+
     protected void assertValidEndpoints(Endpoints endpoints) {
         assertNotNull("Should have found endpoints", endpoints);
 

Modified: activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/TestSupport.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/TestSupport.java
(original)
+++ activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/resources/TestSupport.java
Fri Oct  3 19:03:42 2008
@@ -16,11 +16,13 @@
  */
 package org.apache.camel.rest.resources;
 
+import junit.framework.TestCase;
+
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
-import junit.framework.TestCase;
+
 import org.apache.camel.rest.Main;
 
 /**

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
(original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanWithRecipientListTest.java
Fri Oct  3 19:03:42 2008
@@ -16,11 +16,8 @@
  */
 package org.apache.camel.component.bean;
 
-import javax.annotation.Resource;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.ProducerTemplate;
 import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
(original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/RouterBean.java
Fri Oct  3 19:03:42 2008
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.bean;
 
-import org.apache.camel.RecipientList;
 import org.apache.camel.MessageDriven;
+import org.apache.camel.RecipientList;
 
 /**
  * An example POJO which has a method {@link #route) which can be used as a

Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
(original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringLoopTest.java
Fri Oct  3 19:03:42 2008
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.spring.processor;
 
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.processor.LoopTest;
 
+import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
 /**
  * @version $Revision$
  */

Modified: activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java?rev=701583&r1=701582&r2=701583&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
(original)
+++ activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
Fri Oct  3 19:03:42 2008
@@ -231,19 +231,13 @@
                 .getContextClassLoader();
         try {
             // TODO: this badly needs some refactoring
-            // mojo.createClassLoader creates a URLClassLoader with whatever is
-            // in
-            // ${project.testClasspathElements}, reason why we don't see all
-            // converters
-            // in the report. First we need a list of classpath elements the
-            // user
-            // could customize via plugin configuration, and elements of that
-            // list
-            // be added to the URLClassLoader. This should also be factored out
-            // into
+            // mojo.createClassLoader creates a URLClassLoader with whatever is in
+            // ${project.testClasspathElements}, reason why we don't see all converters
+            // in the report. First we need a list of classpath elements the user
+            // could customize via plugin configuration, and elements of that list
+            // be added to the URLClassLoader. This should also be factored out into
             // a utility class.
-            // TODO: there is some interference with the site plugin that needs
-            // investigated.
+            // TODO: there is some interference with the site plugin that needs investigated.
             List<?> list = project.getTestClasspathElements();
             EmbeddedMojo mojo = new EmbeddedMojo();
             mojo.setClasspathElements(list);



Mime
View raw message