Author: ningjiang
Date: Thu Oct 23 01:07:22 2008
New Revision: 707305
URL: http://svn.apache.org/viewvc?rev=707305&view=rev
Log:
Fixed a bunch of CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
Thu Oct 23 01:07:22 2008
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.seda;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
Thu Oct 23 01:07:22 2008
@@ -26,9 +26,9 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.util.ObjectHelper;
/**
* An implementation of the <a
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
Thu Oct 23 01:07:22 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,18 +16,27 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.*;
+import java.lang.reflect.Method;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Consume;
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.MessageDriven;
+import org.apache.camel.PollingConsumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.Service;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.ProxyHelper;
import org.apache.camel.util.CamelContextHelper;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
-import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.bind.annotation.XmlTransient;
-import java.lang.reflect.Method;
-
/**
* A helper class for Camel based injector or post processing hooks which can
be reused by
* both the <a href="http://activemq.apache.org/camel/spring.html";>Spring</a>
@@ -93,8 +101,7 @@
if (camelContext instanceof DefaultCamelContext) {
DefaultCamelContext defaultCamelContext = (DefaultCamelContext)
camelContext;
defaultCamelContext.addService(service);
- }
- else {
+ } else {
service.start();
}
}
@@ -121,8 +128,7 @@
// endpoint is optional for this injection point
Endpoint endpoint = getEndpointInjection(endpointUri, endpointRef,
injectionPointName, false);
return new DefaultProducerTemplate(getCamelContext(), endpoint);
- }
- else {
+ } else {
Endpoint endpoint = getEndpointInjection(endpointUri, endpointRef,
injectionPointName, true);
if (endpoint != null) {
if (type.isInstance(endpoint)) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
Thu Oct 23 01:07:22 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,
@@ -25,8 +24,8 @@
* @version $Revision: 1.1 $
*/
public class ProxyInstantiationException extends RuntimeException {
- private Class<?> type;
- private Endpoint endpoint;
+ private final Class<?> type;
+ private final Endpoint endpoint;
public ProxyInstantiationException(Class<?> type, Endpoint endpoint,
Throwable cause) {
super("Could not instantiate proxy of type " + type.getName() + " on
endpoint " + endpoint, cause);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
Thu Oct 23 01:07:22 2008
@@ -31,7 +31,6 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.model.language.ExpressionType;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.language.constant.ConstantLanguage;
import org.apache.camel.processor.CatchProcessor;
@@ -41,7 +40,6 @@
import static org.apache.camel.builder.PredicateBuilder.toPredicate;
-
/**
* Represents an XML <onException/> element
*
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
Thu Oct 23 01:07:22 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.util;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -29,11 +28,10 @@
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.Registry;
-import static org.apache.camel.util.ObjectHelper.notNull;
+
import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-
+import static org.apache.camel.util.ObjectHelper.notNull;
/**
* A number of helper methods
*
@@ -199,8 +197,7 @@
}
if (mandatory) {
endpoint = mandatoryLookup(camelContext, name, Endpoint.class);
- }
- else {
+ } else {
endpoint = lookup(camelContext, name, Endpoint.class);
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MainSupport.java
Thu Oct 23 01:07:22 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,41 +16,42 @@
*/
package org.apache.camel.util;
-import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.processor.interceptor.Debugger;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.view.RouteDotGenerator;
-import org.apache.camel.view.ModelFileGenerator;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.bind.JAXBException;
-import java.util.LinkedList;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.io.IOException;
+
+import javax.xml.bind.JAXBException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.processor.interceptor.Debugger;
+import org.apache.camel.view.ModelFileGenerator;
+import org.apache.camel.view.RouteDotGenerator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @version $Revision$
*/
public abstract class MainSupport extends ServiceSupport {
protected static final Log LOG = LogFactory.getLog(MainSupport.class);
+ protected String dotOutputDir;
private List<Option> options = new ArrayList<Option>();
private CountDownLatch latch = new CountDownLatch(1);
private AtomicBoolean completed = new AtomicBoolean(false);
private long duration = -1;
- private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
- protected String dotOutputDir;
+ private TimeUnit timeUnit = TimeUnit.MILLISECONDS;
private String routesOutputFile;
private boolean aggregateDot;
private boolean debug;
@@ -314,8 +314,8 @@
* Displays the header message for the command line options
*/
public void showOptionsHeader() {
- System.out.println("Apache Camel Runner takes the following options");
- System.out.println();
+ System.out.println("Apache Camel Runner takes the following options");
+ System.out.println();
}
public List<CamelContext> getCamelContexts() {
@@ -351,7 +351,7 @@
protected abstract ProducerTemplate findOrCreateCamelTemplate();
- protected abstract Map<String,CamelContext> getCamelContextMap();
+ protected abstract Map<String, CamelContext> getCamelContextMap();
protected void postProcessContext() throws Exception {
Map<String, CamelContext> map = getCamelContextMap();
@@ -402,8 +402,7 @@
private CamelContext aggregateCamelContext() throws Exception {
if (camelContexts.size() == 1) {
return camelContexts.get(0);
- }
- else {
+ } else {
DefaultCamelContext answer = new DefaultCamelContext();
for (CamelContext camelContext : camelContexts) {
answer.addRouteDefinitions(camelContext.getRouteDefinitions());
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/ModelFileGenerator.java
Thu Oct 23 01:07:22 2008
@@ -25,9 +25,9 @@
import java.util.List;
import java.util.Properties;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBContext;
import javax.xml.bind.Binder;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
@@ -40,7 +40,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.RuntimeTransformException;
import org.apache.camel.builder.xml.Namespaces;
@@ -50,6 +49,8 @@
import org.apache.camel.util.ObjectHelper;
+
+
public class ModelFileGenerator {
private static final String DEFAULT_ROOT_ELEMENT_NAME = "routes";
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
Thu Oct 23 01:07:22 2008
@@ -32,14 +32,26 @@
*/
package org.apache.camel.view;
-
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.model.*;
+import org.apache.camel.model.AggregatorType;
+import org.apache.camel.model.BeanRef;
+import org.apache.camel.model.ChoiceType;
+import org.apache.camel.model.FilterType;
+import org.apache.camel.model.FromType;
+import org.apache.camel.model.OtherwiseType;
+import org.apache.camel.model.ProcessorType;
+import org.apache.camel.model.RecipientListType;
+import org.apache.camel.model.ResequencerType;
+import org.apache.camel.model.RoutingSlipType;
+import org.apache.camel.model.SplitterType;
+import org.apache.camel.model.ToType;
+import org.apache.camel.model.WhenType;
import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
import static org.apache.camel.util.ObjectHelper.isNullOrBlank;
+
/**
* Represents a node in the EIP diagram tree
*
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
Thu Oct 23 01:07:22 2008
@@ -22,12 +22,14 @@
import java.util.Set;
import org.apache.camel.model.FromType;
+import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.MulticastType;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
-import org.apache.camel.model.InterceptorRef;
+
import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
+
/**
* A <a href="http://www.graphviz.org/";>DOT</a> file creator plugin which
* creates a DOT file showing the current routes
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
Thu Oct 23 01:07:22 2008
@@ -83,7 +83,7 @@
// lets try convert to the type of the expected
if (expectedValue != null) {
- value = ExchangeHelper.convertToType(exchange,
expectedValue.getClass(), value);
+ value = ExchangeHelper.convertToType(exchange,
expectedValue.getClass(), value);
}
log.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
Modified:
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
Thu Oct 23 01:07:22 2008
@@ -16,17 +16,15 @@
*/
package org.apache.camel.guice;
-import com.google.inject.AbstractModule;
-import com.google.inject.matcher.Matchers;
-import com.google.inject.jsr250.Jsr250;
import com.google.inject.jsr250.Jsr250Module;
+import com.google.inject.matcher.Matchers;
import org.apache.camel.CamelContext;
-import org.apache.camel.Routes;
-import org.apache.camel.MessageDriven;
import org.apache.camel.Consume;
+import org.apache.camel.MessageDriven;
+import org.apache.camel.Routes;
+import org.apache.camel.guice.impl.ConsumerInjection;
import org.apache.camel.guice.impl.EndpointInjector;
import org.apache.camel.guice.impl.ProduceInjector;
-import org.apache.camel.guice.impl.ConsumerInjection;
/**
* A base Guice module for creating a [EMAIL PROTECTED] CamelContext} leaving
it up to the users module
Modified:
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
Thu Oct 23 01:07:22 2008
@@ -16,13 +16,19 @@
*/
package org.apache.camel.guice;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.naming.Context;
+
import com.google.inject.Inject;
-import com.google.inject.Binding;
-import com.google.inject.ProvisionException;
+
import org.apache.camel.Route;
import org.apache.camel.Routes;
-import org.apache.camel.TypeConverter;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.TypeConverter;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.guice.impl.GuiceInjector;
import org.apache.camel.impl.DefaultCamelContext;
@@ -34,14 +40,6 @@
import org.apache.camel.spi.LanguageResolver;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.Registry;
-import org.guiceyfruit.jndi.internal.JndiContext;
-
-import javax.naming.Context;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.List;
-import java.util.Set;
-import java.util.Hashtable;
/**
* The default CamelContext implementation for working with Guice.
@@ -164,8 +162,7 @@
protected Context createContext() {
try {
return (Context) injector.getInstance(Context.class);
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new RuntimeCamelException(e);
}
}
Modified:
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
Thu Oct 23 01:07:22 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,16 @@
*/
package org.apache.camel.guice.impl;
+import java.lang.reflect.Method;
+
+import com.google.common.base.Objects;
+import com.google.inject.Inject;
+
import org.aopalliance.intercept.ConstructorInterceptor;
import org.aopalliance.intercept.ConstructorInvocation;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.CamelPostProcessorHelper;
-import java.lang.reflect.Method;
-
-import com.google.inject.Inject;
-import com.google.common.base.Objects;
-
/**
* @version $Revision: 1.1 $
*/
Modified:
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
Thu Oct 23 01:07:22 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,20 +16,20 @@
*/
package org.apache.camel.guice.impl;
-import com.google.inject.spi.AnnotationProviderFactory;
-import com.google.inject.spi.InjectionAnnotation;
-import com.google.inject.Provider;
-import com.google.inject.Inject;
-import com.google.common.base.Objects;
-
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import org.apache.camel.EndpointInject;
+import com.google.common.base.Objects;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.spi.AnnotationProviderFactory;
+import com.google.inject.spi.InjectionAnnotation;
+
import org.apache.camel.CamelContext;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.EndpointInject;
import org.apache.camel.impl.CamelPostProcessorHelper;
+import org.apache.camel.util.ObjectHelper;
/**
* Injects values into the [EMAIL PROTECTED] EndpointInject} injection point
@@ -59,19 +58,16 @@
Field field = (Field) member;
type = field.getType();
injectionPointName = field.getName();
- }
- else if (member instanceof Method) {
+ } else if (member instanceof Method) {
Method method = (Method) member;
Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length == 1) {
type = parameterTypes[0];
injectionPointName = ObjectHelper.getPropertyName(method);
- }
- else {
+ } else {
throw new UnsupportedOperationException("Only a single method
parameter value supported for @EndpointInject on " + method);
}
- }
- else {
+ } else {
throw new UnsupportedOperationException("Annotated element " +
member + " not supported");
}
Modified:
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
Thu Oct 23 01:07:22 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,20 +16,20 @@
*/
package org.apache.camel.guice.impl;
-import com.google.inject.spi.AnnotationProviderFactory;
-import com.google.inject.spi.InjectionAnnotation;
-import com.google.inject.Provider;
-import com.google.inject.Inject;
-import com.google.common.base.Objects;
-
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import com.google.common.base.Objects;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.spi.AnnotationProviderFactory;
+import com.google.inject.spi.InjectionAnnotation;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Produce;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.impl.CamelPostProcessorHelper;
+import org.apache.camel.util.ObjectHelper;
/**
* Injects values into the [EMAIL PROTECTED] Produce} injection point
@@ -59,19 +58,16 @@
Field field = (Field) member;
type = field.getType();
injectionPointName = field.getName();
- }
- else if (member instanceof Method) {
+ } else if (member instanceof Method) {
Method method = (Method) member;
Class<?>[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length == 1) {
type = parameterTypes[0];
injectionPointName = ObjectHelper.getPropertyName(method);
- }
- else {
+ } else {
throw new UnsupportedOperationException("Only a single method
parameter value supported for @Produce on " + method);
}
- }
- else {
+ } else {
throw new UnsupportedOperationException("Annotated element " +
member + " not supported");
}
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
Thu Oct 23 01:07:22 2008
@@ -16,24 +16,27 @@
*/
package org.apache.camel.guice;
-import com.google.inject.Guice;
+import java.util.Hashtable;
+
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
+
import com.google.inject.Injector;
import com.google.inject.Provides;
-import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.component.mock.MockComponent;
import org.apache.camel.component.mock.MockEndpoint;
-import org.guiceyfruit.jndi.JndiBind;
-import org.guiceyfruit.jndi.GuiceInitialContextFactory;
import org.guiceyfruit.Injectors;
+import org.guiceyfruit.jndi.GuiceInitialContextFactory;
+import org.guiceyfruit.jndi.JndiBind;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import javax.naming.InitialContext;
-import java.util.Hashtable;
-
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
Thu Oct 23 01:07:22 2008
@@ -16,21 +16,20 @@
*/
package org.apache.camel.guice;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
import com.google.common.collect.Lists;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.name.Named;
-import junit.framework.TestCase;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-import org.apache.camel.Routes;
+
import org.apache.camel.EndpointInject;
+import org.apache.camel.Routes;
import org.apache.camel.component.mock.MockEndpoint;
-import java.util.Collection;
-import java.util.List;
-
/**
* Create a collection of routes via a provider method
*
@@ -55,7 +54,7 @@
}
public static class MyBean {
- @EndpointInject(uri="mock:foo")
+ @EndpointInject(uri = "mock:foo")
MockEndpoint endpoint;
}
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
Thu Oct 23 01:07:22 2008
@@ -16,16 +16,12 @@
*/
package org.apache.camel.guice.consume;
-import junit.framework.Assert;
-import org.apache.camel.Produce;
+import com.google.inject.Inject;
import org.apache.camel.Consume;
-import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.apache.camel.guice.produce.MyListener;
-import org.apache.camel.guice.produce.MyListenerService;
import org.guiceyfruit.testing.junit3.GuiceyFruitTestCase;
-import com.google.inject.Inject;
/**
* @version $Revision: 697494 $
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
Thu Oct 23 01:07:22 2008
@@ -22,7 +22,6 @@
import org.apache.camel.Endpoint;
import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.IntrospectionSupport;
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Thu Oct 23 01:07:22 2008
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.http;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.HashSet;
@@ -39,23 +39,21 @@
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD;
-
/**
* @version $Revision$
*/
public class HttpProducer extends DefaultProducer<HttpExchange> implements
Producer<HttpExchange> {
- private static final transient Log LOG =
LogFactory.getLog(HttpProducer.class);
public static final String HTTP_RESPONSE_CODE = "http.responseCode";
- public static final String QUERY = "org.apache.camel.component.http.query";
-
+ public static final String QUERY =
"org.apache.camel.component.http.query";
// This should be a set of lower-case strings
@Deprecated
public static final Set<String> HEADERS_TO_SKIP =
new HashSet<String>(Arrays.asList("content-length", "content-type",
HTTP_RESPONSE_CODE.toLowerCase()));
+ private static final transient Log LOG =
LogFactory.getLog(HttpProducer.class);
private HttpClient httpClient;
public HttpProducer(HttpEndpoint endpoint) {
Modified:
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
Thu Oct 23 01:07:22 2008
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.http;
+import java.io.IOException;
+
import org.apache.camel.ContextTestSupport;
-import static org.apache.camel.component.http.HttpMethods.*;
import org.apache.commons.httpclient.HttpMethod;
-import java.io.IOException;
+import static org.apache.camel.component.http.HttpMethods.GET;
+import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD;
+import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test to verify the algorithm for selecting either GET or POST.
Modified:
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
(original)
+++
activemq/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConvertTest.java
Thu Oct 23 01:07:22 2008
@@ -16,10 +16,11 @@
*/
package org.apache.camel.example;
-import javax.xml.bind.UnmarshalException;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import javax.xml.bind.UnmarshalException;
+
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
Thu Oct 23 01:07:22 2008
@@ -24,7 +24,10 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.camel.*;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Endpoint;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
import org.apache.camel.impl.CamelPostProcessorHelper;
import org.apache.camel.spring.util.ReflectionUtils;
import org.apache.camel.util.ObjectHelper;
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
Thu Oct 23 01:07:22 2008
@@ -16,47 +16,49 @@
*/
package org.apache.camel.spring.processor.onexception;
+import java.util.Map;
+
import org.apache.camel.Body;
import org.apache.camel.Headers;
import org.apache.camel.OutHeaders;
-import java.util.Map;
-
/**
* Order service as a plain POJO class
*/
public class OrderService {
- /**
- * This method handle our order input and return the order
- *
- * @param in the in headers
- * @param payload the in payload
- * @param out the out headers
- * @return the out payload
- * @throws OrderFailedException is thrown if the order can not be
processed
- */
- public Object handleOrder(@Headers Map in, @Body String payload,
@OutHeaders Map out)
- throws OrderFailedException {
- out.put("customerid", in.get("customerid"));
- if ("Order: kaboom".equals(payload)) {
- throw new OrderFailedException("Can not order: kaboom");
- } else {
- out.put("orderid", "123");
- return "Order OK";
- }
+ /**
+ * This method handle our order input and return the order
+ *
+ * @param in the in headers
+ * @param payload the in payload
+ * @param out the out headers
+ * @return the out payload
+ * @throws OrderFailedException is thrown if the order can not be processed
+ */
+ public Object handleOrder(@Headers Map in, @Body String payload,
@OutHeaders Map out)
+ throws OrderFailedException {
+ out.put("customerid", in.get("customerid"));
+ if ("Order: kaboom".equals(payload)) {
+ throw new OrderFailedException("Can not order: kaboom");
+ } else {
+ out.put("orderid", "123");
+ return "Order OK";
}
+ }
- /**
- * This method creates the response to the caller if the order could
not be processed
- * @param in the in headers
- * @param payload the in payload
- * @param out the out headers
- * @return the out payload
- */
- public Object orderFailed(@Headers Map in, @Body String payload,
@OutHeaders Map out) {
- out.put("customerid", in.get("customerid"));
- out.put("orderid", "failed");
- return "Order ERROR";
- }
+ /**
+ * This method creates the response to the caller if the order could not be
+ * processed
+ *
+ * @param in the in headers
+ * @param payload the in payload
+ * @param out the out headers
+ * @return the out payload
+ */
+ public Object orderFailed(@Headers Map in, @Body String payload,
@OutHeaders Map out) {
+ out.put("customerid", in.get("customerid"));
+ out.put("orderid", "failed");
+ return "Order ERROR";
+ }
}
Modified:
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
(original)
+++
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
Thu Oct 23 01:07:22 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,12 @@
*/
package org.apache.camel.example.guice.jms;
-import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.apache.camel.component.jms.JmsComponent;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.guiceyfruit.jndi.JndiBind;
import com.google.inject.Provides;
import com.google.inject.name.Named;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
+import org.guiceyfruit.jndi.JndiBind;
/**
* Configures the CamelContext, RouteBuilder, Component and Endpoint instances
using
Modified:
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
(original)
+++
activemq/camel/trunk/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/SomeBean.java
Thu Oct 23 01:07:22 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/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java?rev=707305&r1=707304&r2=707305&view=diff
==============================================================================
---
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
(original)
+++
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
Thu Oct 23 01:07:22 2008
@@ -81,16 +81,7 @@
* @parameter expression="true"
*/
protected boolean runCamel;
-
- /**
- * The main class to execute.
- *
- * @parameter expression="${camel.mainClass}"
- * default-value="org.apache.camel.spring.Main"
- * @required
- */
- private String mainClass;
-
+
/**
* Should we try run the DOT executable on the generated .DOT file to
* generate images
@@ -113,7 +104,15 @@
*/
protected String fileApplicationContextUri;
-
+ /**
+ * The main class to execute.
+ *
+ * @parameter expression="${camel.mainClass}"
+ * default-value="org.apache.camel.spring.Main"
+ * @required
+ */
+ private String mainClass;
+
/**
* Reference to Maven 2 Project.
*
