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/05/21 08:58:35 UTC
svn commit: r658569 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/model/
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/
components/camel-mina/src/test/java/org...
Author: ningjiang
Date: Tue May 20 23:58:35 2008
New Revision: 658569
URL: http://svn.apache.org/viewvc?rev=658569&view=rev
Log:
Fix some CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/ConvertersMojo.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java Tue May 20 23:58:35 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,16 +16,15 @@
*/
package org.apache.camel.model;
-import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAccessType;
/**
* Represents a description element which can be used on any element in the EIP route
- *
+ *
* @version $Revision: 1.1 $
*/
@XmlRootElement(name = "description")
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Tue May 20 23:58:35 2008
@@ -16,20 +16,22 @@
*/
package org.apache.camel.model;
+import java.rmi.registry.Registry;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import java.util.HashSet;
import java.util.concurrent.ThreadPoolExecutor;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAccessType;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -38,26 +40,26 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.DataFormatClause;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.builder.NoErrorHandlerBuilder;
import org.apache.camel.builder.ProcessorBuilder;
-import org.apache.camel.impl.RouteContext;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.dataformat.DataFormatType;
import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.model.language.LanguageExpression;
import org.apache.camel.processor.ConvertBodyProcessor;
import org.apache.camel.processor.DelegateProcessor;
-import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.MulticastProcessor;
+import org.apache.camel.processor.Pipeline;
+import org.apache.camel.processor.RecipientList;
import org.apache.camel.processor.aggregate.AggregationCollection;
import org.apache.camel.processor.aggregate.AggregationStrategy;
-import org.apache.camel.processor.idempotent.MessageIdRepository;
import org.apache.camel.processor.idempotent.IdempotentConsumer;
+import org.apache.camel.processor.idempotent.MessageIdRepository;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.Policy;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java Tue May 20 23:58:35 2008
@@ -22,7 +22,6 @@
import javax.xml.bind.Marshaller;
import org.apache.camel.model.language.GroovyExpression;
-import org.apache.camel.model.language.ELExpression;
import org.apache.camel.model.language.XQueryExpression;
/**
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Tue May 20 23:58:35 2008
@@ -81,7 +81,7 @@
throw new CamelException("serviceClass setting missing from CXF endpoint configuration");
}
try {
- serviceClass = ClassLoaderUtils.loadClass(endpoint.getServiceClass(), this.getClass());
+ serviceClass = ClassLoaderUtils.loadClass(endpoint.getServiceClass(), this.getClass());
} catch (ClassNotFoundException e) {
throw new CamelException(e);
}
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java Tue May 20 23:58:35 2008
@@ -21,6 +21,8 @@
import java.net.InetAddress;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -58,7 +60,11 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina:udp://127.0.0.1:" + port).to("mock:result");
+ from("mina:udp://127.0.0.1:" + port).process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ System.out.println("get a message");
+ }
+ }).to("mock:result");
}
};
}
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Tue May 20 23:58:35 2008
@@ -31,13 +31,13 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.processor.interceptor.Debugger;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.IdentifiedType;
import org.apache.camel.model.RouteBuilderRef;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.model.RouteType;
import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.processor.interceptor.Debugger;
import org.apache.camel.spi.InstrumentationAgent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -127,7 +127,7 @@
Debugger debugger = null;
String[] names = getApplicationContext().getBeanNamesForType(Debugger.class, true, true);
if (names.length == 1) {
- debugger = (Debugger) getApplicationContext().getBean(names[0], Debugger.class);
+ debugger = (Debugger) getApplicationContext().getBean(names[0], Debugger.class);
}
if (debugger == null) {
ApplicationContext parentContext = getApplicationContext().getParent();
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Tue May 20 23:58:35 2008
@@ -55,7 +55,7 @@
private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
private String dotOutputDir;
private boolean aggregateDot;
- private boolean debug = false;
+ private boolean debug;
private List<RouteBuilder> routeBuilders = new ArrayList<RouteBuilder>();
private List<SpringCamelContext> camelContexts = new ArrayList<SpringCamelContext>();
private AbstractApplicationContext parentApplicationContext;
@@ -378,10 +378,9 @@
protected AbstractApplicationContext createDefaultApplicationContext() {
String[] args = getApplicationContextUri().split(";");
ApplicationContext parentContext = getParentApplicationContext();
- if (parentContext != null ) {
+ if (parentContext != null) {
return new ClassPathXmlApplicationContext(args, parentContext);
- }
- else {
+ } else {
return new ClassPathXmlApplicationContext(args);
}
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java?rev=658569&r1=658568&r2=658569&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java Tue May 20 23:58:35 2008
@@ -1,25 +1,41 @@
+/**
+ * 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.interceptor;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
import java.io.StringReader;
-import java.util.List;
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.Route;
-import org.apache.camel.hamcrest.Assertions;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.stream.StreamCache;
+import org.apache.camel.hamcrest.Assertions;
+
+import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+
/**
* Test case for enabling stream caching through XML
*/
public class StreamCachingInterceptorTest extends ContextTestSupport {
-
+
public void testStreamCachingInterceptorEnabled() throws Exception {
MockEndpoint a = getMockEndpoint("mock:a");
a.expectedMessageCount(1);
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=658569&r1=658568&r2=658569&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 Tue May 20 23:58:35 2008
@@ -301,8 +301,7 @@
return true;
}
- private File getSkinArtifactFile(DecorationModel decoration)
- throws MojoFailureException {
+ private File getSkinArtifactFile(DecorationModel decoration) throws MojoFailureException {
Skin skin = decoration.getSkin();
if (skin == null) {
@@ -348,7 +347,7 @@
}
private void generateReport(Sink sink, Locale locale, TypeMapping[] mappings)
- throws MojoExecutionException {
+ throws MojoExecutionException {
beginReport(sink, locale);
Set<String> classes;