You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/10/27 15:21:04 UTC
svn commit: r830197 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/converter/jaxp/
main/java/org/apache/camel/impl/ main/java/org/apache/camel/impl/converter/
main/java/org/apache/camel/spi/ test/java/org/apach...
Author: davsclaus
Date: Tue Oct 27 14:21:03 2009
New Revision: 830197
URL: http://svn.apache.org/viewvc?rev=830197&view=rev
Log:
CAMEL-2115: Moved PollingConsumerPollStrategy to spi package. Fixed spelling.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java (contents, props changed)
- copied, changed from r830141, camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumerPollStrategy.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumerPollStrategy.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EndpointStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ServicePool.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java Tue Oct 27 14:21:03 2009
@@ -42,6 +42,22 @@
return buffer.toString();
}
+ @Converter
+ public static Integer toInteger(NodeList nodeList) {
+ StringBuffer buffer = new StringBuffer();
+ append(buffer, nodeList);
+ String s = buffer.toString();
+ return Integer.valueOf(s);
+ }
+
+ @Converter
+ public static Long toLong(NodeList nodeList) {
+ StringBuffer buffer = new StringBuffer();
+ append(buffer, nodeList);
+ String s = buffer.toString();
+ return Long.valueOf(s);
+ }
+
private static void append(StringBuffer buffer, NodeList nodeList) {
int size = nodeList.getLength();
for (int i = 0; i < size; i++) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingConsumerPollStrategy.java Tue Oct 27 14:21:03 2009
@@ -18,7 +18,7 @@
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
-import org.apache.camel.PollingConsumerPollStrategy;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java Tue Oct 27 14:21:03 2009
@@ -22,8 +22,8 @@
import java.util.concurrent.TimeUnit;
import org.apache.camel.Endpoint;
-import org.apache.camel.PollingConsumerPollStrategy;
import org.apache.camel.Processor;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
import org.apache.commons.logging.Log;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Tue Oct 27 14:21:03 2009
@@ -131,7 +131,7 @@
if (value == null) {
// lets avoid NullPointerException when converting to boolean for null values
- if (boolean.class.isAssignableFrom(type)) {
+ if (boolean.class.isAssignableFrom(type) || Boolean.class.isAssignableFrom(type)) {
return Boolean.FALSE;
}
return null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/DataFormat.java Tue Oct 27 14:21:03 2009
@@ -37,7 +37,7 @@
*
* @param exchange the current exchange
* @param graph the object to be marshalled
- * @param stream the output stream to write the marshalled rersult to
+ * @param stream the output stream to write the marshalled result to
* @throws Exception can be thrown
*/
void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EndpointStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EndpointStrategy.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EndpointStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EndpointStrategy.java Tue Oct 27 14:21:03 2009
@@ -20,7 +20,7 @@
/**
* Endpoint strategy with callback invoked when an {@link org.apache.camel.Endpoint} is about to be registered to the
- * endopoint registry in {@link org.apache.camel.CamelContext}. This callback allows you to interveave
+ * endpoint registry in {@link org.apache.camel.CamelContext}. This callback allows you to intervene
* and return a mixed in {@link org.apache.camel.Endpoint}.
* <p/>
* The {@link org.apache.camel.model.InterceptSendToEndpointDefinition} uses this to allow it to proxy
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java (from r830141, camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumerPollStrategy.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumerPollStrategy.java&r1=830141&r2=830197&rev=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumerPollStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java Tue Oct 27 14:21:03 2009
@@ -14,14 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.spi;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
/**
* Strategy for a {@link org.apache.camel.PollingConsumer} when polling an {@link org.apache.camel.Endpoint}.
* <p/>
* This pluggable strategy allows to plugin different implementations what to do, most noticeable what to
- * do in case the polling goes wrong. This can be handled in the {@link #rollback(Consumer, Endpoint, int, Exception) rollback}
- * method.
+ * do in case the polling goes wrong. This can be handled in the
+ * {@link #rollback(org.apache.camel.Consumer , org.apache.camel.Endpoint , int, Exception) rollback} method.
*
* @version $Revision$
*/
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ServicePool.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ServicePool.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ServicePool.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ServicePool.java Tue Oct 27 14:21:03 2009
@@ -36,7 +36,7 @@
Service addAndAcquire(Key key, Service service);
/**
- * Tries to acquire the servie with the given key
+ * Tries to acquire the service with the given key
*
* @param key the key
* @return the acquired service, or <tt>null</tt> if no free in pool
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java Tue Oct 27 14:21:03 2009
@@ -20,10 +20,10 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.PollingConsumerPollStrategy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.util.ObjectHelper;
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java Tue Oct 27 14:21:03 2009
@@ -20,10 +20,10 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.PollingConsumerPollStrategy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
import org.apache.camel.util.ObjectHelper;
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java Tue Oct 27 14:21:03 2009
@@ -20,10 +20,10 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.PollingConsumerPollStrategy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
/**
* Unit test for poll strategy
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerTest.java?rev=830197&r1=830196&r2=830197&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ScheduledPollConsumerTest.java Tue Oct 27 14:21:03 2009
@@ -19,7 +19,7 @@
import org.apache.camel.Consumer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
-import org.apache.camel.PollingConsumerPollStrategy;
+import org.apache.camel.spi.PollingConsumerPollStrategy;
public class ScheduledPollConsumerTest extends ContextTestSupport {