Author: cschneider
Date: Thu Aug 25 10:04:23 2011
New Revision: 1161476
URL: http://svn.apache.org/viewvc?rev=1161476&view=rev
Log:
Move Ordered interface from util to api as it is needed in
SynchronizationAdapter
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/Ordered.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/SynchronizationAdapter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/OrderedComparator.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptorStrategyOrderedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/Ordered.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Ordered.java?rev=1161476&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Ordered.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Ordered.java Thu Aug
25 10:04:23 2011
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel;
+
+/**
+ * Interface to be implement by objects that should be orderable, such as in a
{@link java.util.Collection}.
+ *
+ * @version
+ */
+public interface Ordered {
+
+ /**
+ * The highest precedence
+ */
+ int HIGHEST = Integer.MIN_VALUE;
+
+ /**
+ * The lowest precedence
+ */
+ int LOWEST = Integer.MAX_VALUE;
+
+
+ /**
+ * Gets the order.
+ * <p/>
+ * Use low numbers for higher priority. Normally the sorting will start
from 0 and move upwards.
+ * So if you want to be last then use {@link Integer#MAX_VALUE} or eg
{@link #LOWEST}.
+ *
+ * @return the order
+ */
+ int getOrder();
+}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
Thu Aug 25 10:04:23 2011
@@ -23,12 +23,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
+import org.apache.camel.Ordered;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.camel.util.Ordered;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/support/SynchronizationAdapter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/SynchronizationAdapter.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/support/SynchronizationAdapter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/support/SynchronizationAdapter.java
Thu Aug 25 10:04:23 2011
@@ -17,9 +17,9 @@
package org.apache.camel.support;
import org.apache.camel.Exchange;
+import org.apache.camel.Ordered;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.SynchronizationVetoable;
-import org.apache.camel.util.Ordered;
/**
* Simple {@link Synchronization} adapter with empty methods for easier
overriding
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Thu Aug 25 10:04:23 2011
@@ -45,6 +45,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.Ordered;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.TypeConverter;
import org.apache.camel.component.file.GenericFile;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/OrderedComparator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/OrderedComparator.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/OrderedComparator.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/OrderedComparator.java
Thu Aug 25 10:04:23 2011
@@ -18,6 +18,8 @@ package org.apache.camel.util;
import java.util.Comparator;
+import org.apache.camel.Ordered;
+
/**
* A comparator to sort {@link Ordered}
*
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptorStrategyOrderedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptorStrategyOrderedTest.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptorStrategyOrderedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/InterceptorStrategyOrderedTest.java
Thu Aug 25 10:04:23 2011
@@ -19,11 +19,11 @@ package org.apache.camel.processor.inter
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.Ordered;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.util.Ordered;
/**
* @version
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java?rev=1161476&r1=1161475&r2=1161476&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
Thu Aug 25 10:04:23 2011
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.camel.Ordered;
+
import junit.framework.TestCase;
/**
