Author: ningjiang
Date: Fri Jun 6 19:24:44 2008
New Revision: 664245
URL: http://svn.apache.org/viewvc?rev=664245&view=rev
Log:
Fixed a bunch of CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanInvocationThrowsExceptionTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/CamelChoiceWithManagementTest.java
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DebugInterceptor.java
Fri Jun 6 19:24:44 2008
@@ -55,12 +55,10 @@
addTraceExchange(exchange);
try {
super.proceed(exchange);
- }
- catch (Exception e) {
+ } catch (Exception e) {
onException(exchange, e);
throw e;
- }
- catch (Error e) {
+ } catch (Error e) {
onException(exchange, e);
throw e;
}
@@ -110,7 +108,7 @@
*/
protected void onException(Exchange exchange, Throwable e) {
if (shouldTraceExceptionEvents(exchange, e)) {
- exceptions.add(new ExceptionEvent(this, exchange, e));
+ exceptions.add(new ExceptionEvent(this, exchange, e));
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/ExceptionEvent.java
Fri Jun 6 19:24:44 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,
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanInvocationThrowsExceptionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanInvocationThrowsExceptionTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanInvocationThrowsExceptionTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanInvocationThrowsExceptionTest.java
Fri Jun 6 19:24:44 2008
@@ -17,8 +17,8 @@
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
/**
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
Fri Jun 6 19:24:44 2008
@@ -115,8 +115,8 @@
public ProducerTemplate<Exchange> getCamelTemplate() {
if (camelTemplate == null) {
- CamelContext ctx = camelContext != null ? camelContext : new
DefaultCamelContext();
- camelTemplate = ctx.createProducerTemplate();
+ CamelContext ctx = camelContext != null ? camelContext : new
DefaultCamelContext();
+ camelTemplate = ctx.createProducerTemplate();
}
return camelTemplate;
}
@@ -124,7 +124,7 @@
public void setCamelTemplate(ProducerTemplate<Exchange> template) {
camelTemplate = template;
}
-
+
private class CamelOutputStream extends CachedOutputStream {
private Message outMessage;
private boolean isOneWay;
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
Fri Jun 6 19:24:44 2008
@@ -114,8 +114,8 @@
public ProducerTemplate<Exchange> getCamelTemplate() {
if (camelTemplate == null) {
- CamelContext ctx = camelContext != null ? camelContext : new
DefaultCamelContext();
- camelTemplate = ctx.createProducerTemplate();
+ CamelContext ctx = camelContext != null ? camelContext : new
DefaultCamelContext();
+ camelTemplate = ctx.createProducerTemplate();
}
return camelTemplate;
}
Modified:
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
(original)
+++
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
Fri Jun 6 19:24:44 2008
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.jpa;
-import static org.apache.camel.util.ServiceHelper.startServices;
-import static org.apache.camel.util.ServiceHelper.stopServices;
-
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -41,6 +38,8 @@
import org.springframework.orm.jpa.JpaCallback;
import org.springframework.orm.jpa.JpaTemplate;
+import static org.apache.camel.util.ServiceHelper.startServices;
+import static org.apache.camel.util.ServiceHelper.stopServices;
/**
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
Fri Jun 6 19:24:44 2008
@@ -44,11 +44,11 @@
public ProducerTemplate<Exchange> getCamelTemplate() {
if (camelTemplate == null) {
- CamelContext ctx = getCamelContext();
- if (ctx == null) {
- ctx = new DefaultCamelContext();
- }
- camelTemplate = ctx.createProducerTemplate();
+ CamelContext ctx = getCamelContext();
+ if (ctx == null) {
+ ctx = new DefaultCamelContext();
+ }
+ camelTemplate = ctx.createProducerTemplate();
}
return camelTemplate;
}
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
Fri Jun 6 19:24:44 2008
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component;
-import java.io.IOException;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.InputStream;
import org.apache.camel.Component;
@@ -41,7 +41,7 @@
private final String resourceUri;
private ResourceLoader resourceLoader = new DefaultResourceLoader();
private Resource resource;
- private boolean contentCache = false;
+ private boolean contentCache;
private byte[] buffer;
public ResourceBasedEndpoint(String endpointUri, Component component,
String resourceUri, Processor processor) {
@@ -85,7 +85,7 @@
* <p/>
* If cache is enabled then the resource content is cached in an internal
buffer and this content is
* returned to avoid loading the resource over and over again.
- *
+ *
* @return the input stream
* @throws IOException is thrown if error loading the content of the
resource to the local cache buffer
*/
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/CamelChoiceWithManagementTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/CamelChoiceWithManagementTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/CamelChoiceWithManagementTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/CamelChoiceWithManagementTest.java
Fri Jun 6 19:24:44 2008
@@ -16,9 +16,6 @@
*/
package org.apache.camel.spring.managment;
-
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -26,6 +23,8 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringInstrumentationAgent;
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
/**
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
(original)
+++
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
Fri Jun 6 19:24:44 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.velocity;
+package org.apache.camel.component.stringtemplate;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.builder.RouteBuilder;
/**
* Unit test the cahce when reloading .tm files in the classpath
@@ -48,7 +48,7 @@
template.sendBodyAndHeader("direct:a", "Body", "name", "Paris");
mock.assertIsSatisfied();
- }
+ }
public void testCached() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
Modified:
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
(original)
+++
activemq/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateLetterTest.java
Fri Jun 6 19:24:44 2008
@@ -1,10 +1,26 @@
-package org.apache.camel.component.velocity;
+/**
+ * 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.component.stringtemplate;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Message;
import org.apache.camel.Exchange;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Unit test for wiki documentation
Modified:
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
(original)
+++
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
Fri Jun 6 19:24:44 2008
@@ -17,12 +17,12 @@
package org.apache.camel.component.velocity;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.builder.RouteBuilder;
/**
- * Unit test the cahce when reloading .vm files in the classpath
+ * Unit test the cache when reloading .vm files in the classpath
*/
public class VelocityContentCacheTest extends ContextTestSupport {
@@ -48,7 +48,7 @@
template.sendBodyAndHeader("direct:a", "Body", "name", "Paris");
mock.assertIsSatisfied();
- }
+ }
public void testCached() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
Modified:
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
(original)
+++
activemq/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
Fri Jun 6 19:24:44 2008
@@ -1,10 +1,26 @@
+/**
+ * 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.component.velocity;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Message;
import org.apache.camel.Exchange;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Unit test for wiki documentation
Modified:
activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=664245&r1=664244&r2=664245&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
(original)
+++
activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Fri Jun 6 19:24:44 2008
@@ -90,7 +90,7 @@
.completedPredicate(header("aggregated").isEqualTo(3))
// Here we do some translation and put the message back to
loanReplyQueue
- .process(new Translator()).to("test-jms:queue:loanReplyQueue");
+ .process(new Translator()).to("test-jms:queue:loanReplyQueue");
// END SNIPPET: dsl
}
