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/12/11 02:53:24 UTC
svn commit: r725536 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/converter/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/language/ camel-co...
Author: ningjiang
Date: Wed Dec 10 17:53:21 2008
New Revision: 725536
URL: http://svn.apache.org/viewvc?rev=725536&view=rev
Log:
CAMEL-1180 removed the generate parameter<?> in camel-core model package and fixed the CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.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/model/ExpressionNode.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.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/view/NodeData.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ScatterGatherTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringExchangePatternTest.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/exchangePattern.xml
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being the body of an inbound {@link Message}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Subscribes a method to an {@link Endpoint} either via its
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* An annotation used to mark classes and methods to indicate code capable of
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
import org.apache.camel.spi.Registry;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being the exception set on an exchange
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,12 @@
*/
package org.apache.camel;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
/**
* Represents the kind of message exchange pattern
*
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being a header on an inbound {@link Message}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the headers of an inbound {@link Message}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks methods as being {@link ExchangePattern#InOnly}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a method as being {@link ExchangePattern#InOut} when a class or interface has been annotated with
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Used to indicate a method on a POJO which is used as a {@link Consumer} of
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the headers of an outbound {@link Message}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a method as having a specific kind of {@link ExchangePattern} for use with
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a field or property as being a producer to an {@link org.apache.camel.Endpoint} either via its
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the properties of an {@link Exchange}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of a property of an {@link Exchange}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Indicates that this method is to be used as a
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.converter;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Used to indicate that the actual type of a parameter on a converter method must have the given annotation class
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLifecycleStrategy.java Wed Dec 10 17:53:21 2008
@@ -54,13 +54,13 @@
RouteType routeType = routeContext.getRoute();
if (routeType.getInputs() != null && !routeType.getInputs().isEmpty()) {
// configure the outputs
- List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>(routeType.getOutputs());
+ List<ProcessorType> outputs = new ArrayList<ProcessorType>(routeType.getOutputs());
// clearing the outputs
routeType.clearOutput();
// add the output configure the outputs with the routeType
- for (ProcessorType<?> processorType : outputs) {
+ for (ProcessorType processorType : outputs) {
routeType.addOutput(processorType);
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Used to inject a bean expression into a field, property, method or parameter when using
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Used to inject a constant expression into a field, property, method or parameter when using
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
import org.apache.camel.component.bean.DefaultAnnotationExpressionFactory;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Base annotation for language expressions.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Creates a namespace prefix for an XPath
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
/**
* Used to inject a simple expression into a field, property, method or parameter when using
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java Wed Dec 10 17:53:21 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.language;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.Documented;
import org.apache.camel.component.bean.XPathAnnotationExpressionFactory;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Wed Dec 10 17:53:21 2008
@@ -202,8 +202,8 @@
Endpoint endpoint = routeType.getInputs().get(0).getEndpoint();
- List<ProcessorType<?>> exceptionHandlers = new ArrayList<ProcessorType<?>>();
- List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ List<ProcessorType> exceptionHandlers = new ArrayList<ProcessorType>();
+ List<ProcessorType> outputs = new ArrayList<ProcessorType>();
// separate out the exception handers in the outputs
for (ProcessorType output : routeType.getOutputs()) {
@@ -225,7 +225,7 @@
routeType.intercept(processor);
// add the output
- for (ProcessorType<?> processorType : outputs) {
+ for (ProcessorType processorType : outputs) {
routeType.addOutput(processorType);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java Wed Dec 10 17:53:21 2008
@@ -51,7 +51,7 @@
@XmlTransient
private ExpressionType expression;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlTransient
@@ -388,11 +388,11 @@
this.expression = expression;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java Wed Dec 10 17:53:21 2008
@@ -42,7 +42,7 @@
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
@XmlTransient
private List<Class> exceptionClasses;
@@ -79,11 +79,11 @@
return new CatchProcessor(getExceptionClasses(), childProcessor);
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java Wed Dec 10 17:53:21 2008
@@ -138,7 +138,7 @@
this.whenClauses = whenClauses;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
if (otherwise != null) {
return otherwise.getOutputs();
} else if (whenClauses.isEmpty()) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java Wed Dec 10 17:53:21 2008
@@ -70,7 +70,7 @@
}
@Override
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
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=725536&r1=725535&r2=725536&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 Wed Dec 10 17:53:21 2008
@@ -62,7 +62,7 @@
@XmlElement(name = "handled", required = false)
private ExpressionSubElementType handled;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
@XmlTransient
private List<Class> exceptionClasses;
@XmlTransient
@@ -333,11 +333,11 @@
// Properties
//-------------------------------------------------------------------------
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Wed Dec 10 17:53:21 2008
@@ -40,7 +40,7 @@
@XmlElementRef
private ExpressionType expression;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
public ExpressionNode() {
}
@@ -74,11 +74,11 @@
this.expression = expression;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java Wed Dec 10 17:53:21 2008
@@ -16,14 +16,13 @@
*/
package org.apache.camel.model;
-import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
-
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 org.apache.camel.Endpoint;
+import org.apache.camel.ExchangePattern;
+
/**
* Represents an XML <inOnly/> element
*
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java Wed Dec 10 17:53:21 2008
@@ -16,14 +16,13 @@
*/
package org.apache.camel.model;
-import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
-
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 org.apache.camel.Endpoint;
+import org.apache.camel.ExchangePattern;
+
/**
* Represents an XML <inOut/> element
*
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java Wed Dec 10 17:53:21 2008
@@ -156,7 +156,7 @@
if (index >= 0) {
processor.addOutput(proxy);
// replace original proceed with proxy
- List<ProcessorType<?>> outs = processor.getOutputs();
+ List<ProcessorType> outs = processor.getOutputs();
outs.remove(proxy);
outs.set(index, proxy);
} else if (force) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java Wed Dec 10 17:53:21 2008
@@ -62,7 +62,7 @@
private LoadBalancerType loadBalancerType;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
public LoadBalanceType() {
}
@@ -72,11 +72,11 @@
return "loadbalance";
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
if (outputs != null) {
for (ProcessorType output : outputs) {
@@ -110,7 +110,7 @@
loadBalancerType = loadbalancer;
}
- protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType<?>> outputs)
+ protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType> outputs)
throws Exception {
LoadBalancer loadBalancer = LoadBalancerType.getLoadBalancer(routeContext, loadBalancerType, ref);
for (ProcessorType processorType : outputs) {
@@ -189,8 +189,8 @@
@Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer();
- List<ProcessorType<?>> list = getOutputs();
- for (ProcessorType<?> processorType : list) {
+ List<ProcessorType> list = getOutputs();
+ for (ProcessorType processorType : list) {
buffer.append(processorType.getLabel());
}
return buffer.toString();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java Wed Dec 10 17:53:21 2008
@@ -38,13 +38,13 @@
private static final transient Log LOG = LogFactory.getLog(OutputType.class);
@XmlElementRef
- protected List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ protected List<ProcessorType> outputs = new ArrayList<ProcessorType>();
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
if (outputs != null) {
for (ProcessorType output : outputs) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java Wed Dec 10 17:53:21 2008
@@ -23,8 +23,8 @@
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Processor;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <process/> element
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=725536&r1=725535&r2=725536&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 Wed Dec 10 17:53:21 2008
@@ -77,12 +77,12 @@
private Boolean inheritErrorHandlerFlag;
private NodeFactory nodeFactory;
private LinkedList<Block> blocks = new LinkedList<Block>();
- private ProcessorType<? extends ProcessorType> parent;
+ private ProcessorType parent;
private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
private String errorHandlerRef;
// else to use an optional attribute in JAXB2
- public abstract List<ProcessorType<?>> getOutputs();
+ public abstract List<ProcessorType> getOutputs();
public Processor createProcessor(RouteContext routeContext) throws Exception {
@@ -90,7 +90,7 @@
}
public Processor createOutputsProcessor(RouteContext routeContext) throws Exception {
- Collection<ProcessorType<?>> outputs = getOutputs();
+ Collection<ProcessorType> outputs = getOutputs();
return createOutputsProcessor(routeContext, outputs);
}
@@ -1887,7 +1887,7 @@
return new Pipeline(list);
}
- protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType<?>> outputs)
+ protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType> outputs)
throws Exception {
List<Processor> list = new ArrayList<Processor>();
for (ProcessorType output : outputs) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Wed Dec 10 17:53:21 2008
@@ -44,7 +44,7 @@
@XmlElementRef
private List<ExpressionType> expressions = new ArrayList<ExpressionType>();
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
// Binding annotation at setter
private BatchResequencerConfig batchConfig;
// Binding annotation at setter
@@ -193,11 +193,11 @@
return expressions;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteType.java Wed Dec 10 17:53:21 2008
@@ -53,7 +53,7 @@
private static final transient Log LOG = LogFactory.getLog(RouteType.class);
private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
private List<FromType> inputs = new ArrayList<FromType>();
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
private String group;
private CamelContext camelContext;
private Boolean streamCaching;
@@ -173,12 +173,12 @@
this.inputs = inputs;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
@XmlElementRef
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
// TODO I don't think this is called when using JAXB!
@@ -241,7 +241,7 @@
camelContext.getLifecycleStrategy().onRouteContextCreate(routeContext);
}
- List<ProcessorType<?>> list = new ArrayList<ProcessorType<?>>(outputs);
+ List<ProcessorType> list = new ArrayList<ProcessorType>(outputs);
for (ProcessorType output : list) {
output.addRoutes(routeContext, routes);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java Wed Dec 10 17:53:21 2008
@@ -73,7 +73,7 @@
}
@Override
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendType.java Wed Dec 10 17:53:21 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,6 +16,14 @@
*/
package org.apache.camel.model;
+import java.util.Collections;
+import java.util.List;
+
+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 org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
@@ -24,14 +31,6 @@
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
-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 javax.xml.bind.annotation.XmlType;
-import java.util.Collections;
-import java.util.List;
-
/**
* Base class for sending to an endpoint with an optional {@link ExchangePattern}
*
@@ -90,7 +89,7 @@
return null;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java Wed Dec 10 17:53:21 2008
@@ -57,7 +57,7 @@
@XmlAttribute(required = false)
private Long stackSize;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
@XmlTransient
private BlockingQueue<Runnable> taskQueue;
@XmlTransient
@@ -78,7 +78,7 @@
}
@Override
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java Wed Dec 10 17:53:21 2008
@@ -42,7 +42,7 @@
@XmlAttribute
private long timePeriodMillis = 1000;
@XmlElementRef
- private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
+ private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
public ThrottlerType() {
}
@@ -106,11 +106,11 @@
this.timePeriodMillis = timePeriodMillis;
}
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
this.outputs = outputs;
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java Wed Dec 10 17:53:21 2008
@@ -92,7 +92,7 @@
}
@Override
- public List<ProcessorType<?>> getOutputs() {
+ public List<ProcessorType> getOutputs() {
return Collections.EMPTY_LIST;
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Wed Dec 10 17:53:21 2008
@@ -16,21 +16,13 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
-
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.XmlTransient;
import org.apache.camel.Endpoint;
-import org.apache.camel.Processor;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.processor.SendProcessor;
-import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.ObjectHelper;
/**
* Represents an XML <to/> element
@@ -75,4 +67,5 @@
public void setPattern(ExchangePattern pattern) {
this.pattern = pattern;
}
+
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java Wed Dec 10 17:53:21 2008
@@ -44,7 +44,7 @@
@XmlTransient
private boolean initialized;
@XmlTransient
- private List<ProcessorType<?>> outputsWithoutCatches;
+ private List<ProcessorType> outputsWithoutCatches;
@Override
public String toString() {
@@ -126,14 +126,14 @@
return finallyClause;
}
- public List<ProcessorType<?>> getOutputsWithoutCatches() {
+ public List<ProcessorType> getOutputsWithoutCatches() {
if (outputsWithoutCatches == null) {
checkInitialized();
}
return outputsWithoutCatches;
}
- public void setOutputs(List<ProcessorType<?>> outputs) {
+ public void setOutputs(List<ProcessorType> outputs) {
initialized = false;
super.setOutputs(outputs);
}
@@ -150,7 +150,7 @@
protected void checkInitialized() {
if (!initialized) {
initialized = true;
- outputsWithoutCatches = new ArrayList<ProcessorType<?>>();
+ outputsWithoutCatches = new ArrayList<ProcessorType>();
catchClauses = new ArrayList<CatchType>();
finallyClause = null;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Wed Dec 10 17:53:21 2008
@@ -20,9 +20,9 @@
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
import org.apache.camel.Service;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.util.ObjectHelper;
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=725536&r1=725535&r2=725536&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 Wed Dec 10 17:53:21 2008
@@ -28,8 +28,8 @@
import org.apache.camel.spi.Language;
import org.apache.camel.spi.Registry;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
import static org.apache.camel.util.ObjectHelper.isEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
import static org.apache.camel.util.ObjectHelper.notNull;
/**
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=725536&r1=725535&r2=725536&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 Wed Dec 10 17:53:21 2008
@@ -33,8 +33,8 @@
import org.apache.camel.model.ToType;
import org.apache.camel.model.WhenType;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
import static org.apache.camel.util.ObjectHelper.isEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
/**
* Represents a node in the EIP diagram tree
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=725536&r1=725535&r2=725536&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 Wed Dec 10 17:53:21 2008
@@ -47,7 +47,7 @@
route.filter(new GroovyExpression("in.headers.any { h -> h.startsWith('foo') }")).
to("seda:b");
route.description(null, "This is a description of the route", "en");
- List<ProcessorType<?>> list = route.getOutputs();
+ List<ProcessorType> list = route.getOutputs();
assertEquals("Size of list: " + list, 1, list.size());
dump(context);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Wed Dec 10 17:53:21 2008
@@ -273,7 +273,7 @@
}
protected void assertChildTo(ProcessorType<?> route, String... uris) {
- List<ProcessorType<?>> list = assertListSize(route.getOutputs(), uris.length);
+ List<ProcessorType> list = assertListSize(route.getOutputs(), uris.length);
int idx = 0;
for (String uri : uris) {
assertTo("output[" + idx + "] ", list.get(idx++), uri);
@@ -281,7 +281,7 @@
}
protected void assertChildTo(ProcessorType<?> route, String uri, int toIdx) {
- List<ProcessorType<?>> list = route.getOutputs();
+ List<ProcessorType> list = route.getOutputs();
assertTo("to and idx=" + toIdx, list.get(toIdx), uri);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ScatterGatherTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ScatterGatherTest.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ScatterGatherTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ScatterGatherTest.java Wed Dec 10 17:53:21 2008
@@ -72,7 +72,7 @@
}
public static class MyVendor {
- int quoteResult = 0;
+ int quoteResult;
public MyVendor(int quoteResult) {
this.quoteResult = quoteResult;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java Wed Dec 10 17:53:21 2008
@@ -50,7 +50,7 @@
return result;
}
- protected SplitterType firstSplitterType(List<ProcessorType<?>> outputs) {
+ protected SplitterType firstSplitterType(List<ProcessorType> outputs) {
SplitterType result = null;
for (ProcessorType processorType : outputs) {
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Wed Dec 10 17:53:21 2008
@@ -25,10 +25,7 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
@@ -48,7 +45,6 @@
import org.apache.camel.spring.remoting.CamelServiceExporter;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
-import org.apache.camel.ExchangePattern;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -57,6 +53,10 @@
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
/**
* Camel namespace for the spring XML configuration file.
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java Wed Dec 10 17:53:21 2008
@@ -46,7 +46,7 @@
FromType fromType = inputs.get(0);
assertEquals("from URI", "seda:test.a", fromType.getEndpoint().getEndpointUri());
- List<ProcessorType<?>> outputs = route.getOutputs();
+ List<ProcessorType> outputs = route.getOutputs();
assertEquals("Number of outputs", 1, outputs.size());
}
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringExchangePatternTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringExchangePatternTest.java?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringExchangePatternTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringExchangePatternTest.java Wed Dec 10 17:53:21 2008
@@ -6,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/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/exchangePattern.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/exchangePattern.xml?rev=725536&r1=725535&r2=725536&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/exchangePattern.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/exchangePattern.xml Wed Dec 10 17:53:21 2008
@@ -32,8 +32,7 @@
<route>
<from uri="direct:inOut"/>
- <setExchangePattern pattern="InOnly"/>
- <to uri="mock:result"/>
+ <inOnly uri="mock:result"/>
</route>
</camelContext>