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/08 09:50:40 UTC
svn commit: r724291 [1/2] - in /activemq/camel/trunk/components:
camel-atom/src/main/java/org/apache/camel/component/feed/
camel-cometd/src/main/java/org/apache/camel/component/cometd/
camel-guice/src/main/java/org/apache/camel/guice/impl/ camel-guice/...
Author: ningjiang
Date: Mon Dec 8 00:50:38 2008
New Revision: 724291
URL: http://svn.apache.org/viewvc?rev=724291&view=rev
Log:
Applied svn properties and fix the cs erros in camel components modules
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java (contents, props changed)
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java (props changed)
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java (contents, props changed)
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java (props changed)
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java (props changed)
activemq/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java (contents, props changed)
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java (contents, props changed)
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java (contents, props changed)
activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/DefaultIBatisProcessingStategy.java (props changed)
activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java (props changed)
activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java (props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java (contents, props changed)
activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java (contents, props changed)
activemq/camel/trunk/components/camel-ognl/src/test/resources/jndi.properties (props changed)
activemq/camel/trunk/components/camel-rss/pom.xml (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssPollingConsumer.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java (contents, props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java (props changed)
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/data/rss20.xml (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java (props changed)
activemq/camel/trunk/components/camel-rss/src/test/resources/log4j.properties (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala (props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/pom.xml (props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/resources/META-INF/LICENSE.txt (props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/main/resources/META-INF/NOTICE.txt (props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/package-info.java (props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/Cheese.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/MyConfig.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/MyPostProcessor.java (contents, props changed)
activemq/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/package-info.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java (contents, props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/package-info.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringAggregatorWithCustomCollectionTest.java (contents, props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringNormalizerTest.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSplitterWithCustomThreadPoolExecutorTest.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceInterceptorWithOutBodyTraceTest.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringExceptionBuilderWithRetryLoggingLevelSetTest.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator-custom-collection.xml (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/normalizer.xml (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/exceptionBuilderWithRetryLoggingLevelSet.xml (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/splitterWithCustomThreadPoolExecutor.xml (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml (props changed)
activemq/camel/trunk/components/camel-test/pom.xml (props changed)
activemq/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java (contents, props changed)
activemq/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java (contents, props changed)
activemq/camel/trunk/components/camel-test/src/main/resources/META-INF/LICENSE.txt (props changed)
activemq/camel/trunk/components/camel-test/src/main/resources/META-INF/NOTICE.txt (props changed)
activemq/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java (contents, props changed)
activemq/camel/trunk/components/camel-test/src/test/resources/jndi.properties (props changed)
activemq/camel/trunk/components/camel-test/src/test/resources/log4j.properties (props changed)
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java Mon Dec 8 00:50:38 2008
@@ -21,7 +21,7 @@
* Filter used by the {@link org.apache.camel.component.feed.FeedEntryPollingConsumer} to filter entries
* from the feed.
*
- * @version $Revision: 656106 $
+ * @version $Revision$
*/
public interface EntryFilter {
Propchange: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/EntryFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java Mon Dec 8 00:50:38 2008
@@ -35,7 +35,7 @@
protected Date lastUpdate;
protected boolean filter = true;
private boolean feedHeader = true;
- private boolean sortEntries = false;
+ private boolean sortEntries;
public FeedEndpoint(String endpointUri, FeedComponent component, String feedUri) {
super(endpointUri, component);
@@ -172,7 +172,7 @@
}
public boolean isSortEntries() {
- return sortEntries ;
+ return sortEntries;
}
// Implementation methods
Propchange: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedEntryPollingConsumer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/feed/FeedPollingConsumer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java (original)
+++ activemq/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java Mon Dec 8 00:50:38 2008
@@ -28,7 +28,7 @@
import org.mortbay.cometd.BayeuxService;
/**
- * A Consumer for receving messages using Cometd and Bayeux protocol.
+ * A Consumer for receiving messages using Cometd and Bayeux protocol.
*
* @version $Revision$
*/
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=724291&r1=724290&r2=724291&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 Mon Dec 8 00:50:38 2008
@@ -27,7 +27,7 @@
import org.apache.camel.impl.CamelPostProcessorHelper;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class ConsumerInjection extends CamelPostProcessorHelper implements ConstructorInterceptor {
public Object construct(ConstructorInvocation invocation) throws Throwable {
Propchange: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=724291&r1=724290&r2=724291&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 Mon Dec 8 00:50:38 2008
@@ -34,7 +34,7 @@
/**
* Injects values into the {@link EndpointInject} injection point
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@InjectionAnnotation(EndpointInject.class)
public class EndpointInjector extends CamelPostProcessorHelper implements AnnotationProviderFactory {
Propchange: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=724291&r1=724290&r2=724291&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 Mon Dec 8 00:50:38 2008
@@ -34,7 +34,7 @@
/**
* Injects values into the {@link Produce} injection point
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@InjectionAnnotation(Produce.class)
public class ProduceInjector extends CamelPostProcessorHelper implements AnnotationProviderFactory {
Propchange: activemq/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=724291&r1=724290&r2=724291&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 Mon Dec 8 00:50:38 2008
@@ -35,7 +35,7 @@
/**
* Create a collection of routes via a provider method
*
- * @version $Revision: 705742 $
+ * @version $Revision$
*/
public class EndpointInjectionTest extends TestCase {
Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=724291&r1=724290&r2=724291&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 Mon Dec 8 00:50:38 2008
@@ -24,7 +24,7 @@
import org.guiceyfruit.testing.junit3.GuiceyTestCase;
/**
- * @version $Revision: 697494 $
+ * @version $Revision$
*/
public class ConsumeTest extends GuiceyTestCase {
Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java Mon Dec 8 00:50:38 2008
@@ -17,7 +17,7 @@
package org.apache.camel.guice.produce;
/**
- * @version $Revision: 697494 $
+ * @version $Revision$
*/
public interface MyListener {
Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java Mon Dec 8 00:50:38 2008
@@ -21,7 +21,7 @@
import org.apache.commons.logging.LogFactory;
/**
- * @version $Revision: 697494 $
+ * @version $Revision$
*/
public class MyListenerService implements MyListener {
Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/MyListenerService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java (original)
+++ activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java Mon Dec 8 00:50:38 2008
@@ -22,7 +22,7 @@
import org.guiceyfruit.testing.junit3.GuiceyTestCase;
/**
- * @version $Revision: 697494 $
+ * @version $Revision$
*/
public class ProduceTest extends GuiceyTestCase {
Propchange: activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java Mon Dec 8 00:50:38 2008
@@ -1,113 +1,113 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.http;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.camel.Message;
-import org.apache.camel.spi.HeaderFilterStrategy;
-
-/**
- * A plugable strategy for configuring the http binding so reading request and writing response
- * can be customized using the Java Servlet API.
- * <p/>
- * This is used by the camel-jetty.
- *
- * @version $Revision$
- */
-public interface HttpBinding {
-
- /**
- * Startegy to read the given request and bindings it to the given message.
- *
- * @param request the request
- * @param message the message to populate with data from request
- */
- void readRequest(HttpServletRequest request, HttpMessage message);
-
- /**
- * Parses the body from a {@link org.apache.camel.component.http.HttpMessage}
- *
- * @return the parsed body returned as either a {@link java.io.InputStream} or a {@link java.io.Reader}
- * depending on the {@link #setUseReaderForPayload(boolean)} property.
- * @throws java.io.IOException can be thrown
- */
- Object parseBody(HttpMessage httpMessage) throws IOException;
-
- /**
- * Writes the exchange to the servlet response.
- * <p/>
- * Default implementation will delegate to the following methods depending on the status of the exchange
- * <ul>
- * <li>doWriteResponse - processing returns a OUT message </li>
- * <li>doWriteFaultResponse - processing returns a fault message</li>
- * <li>doWriteResponse - processing returns an exception and status code 500</li>
- * </ul>
- *
- * @param exchange the exchange
- * @param response the http response
- * @throws java.io.IOException can be thrown from http response
- */
- void writeResponse(HttpExchange exchange, HttpServletResponse response) throws IOException;
-
- /**
- * Strategy method that writes the response to the http response stream when an exception occuerd
- *
- * @param exception the exception occured
- * @param response the http response
- * @throws java.io.IOException can be thrown from http response
- */
- void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException;
-
- /**
- * Strategy method that writes the response to the http response stream for a fault message
- *
- * @param message the fault message
- * @param response the http response
- * @throws java.io.IOException can be thrown from http response
- */
- void doWriteFaultResponse(Message message, HttpServletResponse response) throws IOException;
-
- /**
- * Strategy method that writes the response to the http response stream for an OUT message
- *
- * @param message the OUT message
- * @param response the http response
- * @throws java.io.IOException can be thrown from http response
- */
- void doWriteResponse(Message message, HttpServletResponse response) throws IOException;
-
- boolean isUseReaderForPayload();
-
- /**
- * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages in the Camel
- * {@link org.apache.camel.Message#getBody()} or not. If false then the {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
- */
- void setUseReaderForPayload(boolean useReaderForPayload);
-
- HeaderFilterStrategy getHeaderFilterStrategy();
-
- /**
- * Sets the header filter stratety to use.
- * <p/>
- * Will default use {@link org.apache.camel.component.http.HttpHeaderFilterStrategy}
- */
- void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy);
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.http;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.Message;
+import org.apache.camel.spi.HeaderFilterStrategy;
+
+/**
+ * A plugable strategy for configuring the http binding so reading request and writing response
+ * can be customized using the Java Servlet API.
+ * <p/>
+ * This is used by the camel-jetty.
+ *
+ * @version $Revision$
+ */
+public interface HttpBinding {
+
+ /**
+ * Startegy to read the given request and bindings it to the given message.
+ *
+ * @param request the request
+ * @param message the message to populate with data from request
+ */
+ void readRequest(HttpServletRequest request, HttpMessage message);
+
+ /**
+ * Parses the body from a {@link org.apache.camel.component.http.HttpMessage}
+ *
+ * @return the parsed body returned as either a {@link java.io.InputStream} or a {@link java.io.Reader}
+ * depending on the {@link #setUseReaderForPayload(boolean)} property.
+ * @throws java.io.IOException can be thrown
+ */
+ Object parseBody(HttpMessage httpMessage) throws IOException;
+
+ /**
+ * Writes the exchange to the servlet response.
+ * <p/>
+ * Default implementation will delegate to the following methods depending on the status of the exchange
+ * <ul>
+ * <li>doWriteResponse - processing returns a OUT message </li>
+ * <li>doWriteFaultResponse - processing returns a fault message</li>
+ * <li>doWriteResponse - processing returns an exception and status code 500</li>
+ * </ul>
+ *
+ * @param exchange the exchange
+ * @param response the http response
+ * @throws java.io.IOException can be thrown from http response
+ */
+ void writeResponse(HttpExchange exchange, HttpServletResponse response) throws IOException;
+
+ /**
+ * Strategy method that writes the response to the http response stream when an exception occuerd
+ *
+ * @param exception the exception occured
+ * @param response the http response
+ * @throws java.io.IOException can be thrown from http response
+ */
+ void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException;
+
+ /**
+ * Strategy method that writes the response to the http response stream for a fault message
+ *
+ * @param message the fault message
+ * @param response the http response
+ * @throws java.io.IOException can be thrown from http response
+ */
+ void doWriteFaultResponse(Message message, HttpServletResponse response) throws IOException;
+
+ /**
+ * Strategy method that writes the response to the http response stream for an OUT message
+ *
+ * @param message the OUT message
+ * @param response the http response
+ * @throws java.io.IOException can be thrown from http response
+ */
+ void doWriteResponse(Message message, HttpServletResponse response) throws IOException;
+
+ boolean isUseReaderForPayload();
+
+ /**
+ * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages in the Camel
+ * {@link org.apache.camel.Message#getBody()} or not. If false then the {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
+ */
+ void setUseReaderForPayload(boolean useReaderForPayload);
+
+ HeaderFilterStrategy getHeaderFilterStrategy();
+
+ /**
+ * Sets the header filter stratety to use.
+ * <p/>
+ * Will default use {@link org.apache.camel.component.http.HttpHeaderFilterStrategy}
+ */
+ void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy);
+
+}
Propchange: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/DefaultIBatisProcessingStategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/DefaultIBatisProcessingStategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/strategy/IBatisProcessingStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java Mon Dec 8 00:50:38 2008
@@ -1,123 +1,123 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty;
-
-import java.io.IOException;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.io.IOUtils;
-
-public class InterfacesTest extends ContextTestSupport {
-
- private String remoteInterfaceAddress;
-
-
- public InterfacesTest() throws IOException {
- // Retrieve an address of some remote network interface
- Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
-
- while (remoteInterfaceAddress == null && interfaces.hasMoreElements()) {
- NetworkInterface interfaze = interfaces.nextElement();
- Enumeration<InetAddress> addresses = interfaze.getInetAddresses();
- if (addresses.hasMoreElements()) {
- InetAddress nextAddress = addresses.nextElement();
- if (nextAddress.isLoopbackAddress() || !nextAddress.isReachable(2000)) {
- continue;
- }
- if (nextAddress instanceof Inet6Address) {
- continue;
- } else {
- remoteInterfaceAddress = nextAddress.getHostAddress();
- }
- }
- }
- }
-
- public void testLocalInterfaceHandled() throws IOException, InterruptedException {
- int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2;
- getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
-
- URL localUrl = new URL("http://localhost:4567/testRoute");
- String localResponse = IOUtils.toString(localUrl.openStream());
- assertEquals("local", localResponse);
-
- // 127.0.0.1 is an alias of localhost so should work
- localUrl = new URL("http://127.0.0.1:4568/testRoute");
- localResponse = IOUtils.toString(localUrl.openStream());
- assertEquals("local-differentPort", localResponse);
-
- if (remoteInterfaceAddress != null) {
- URL url = new URL("http://" + remoteInterfaceAddress + ":4567/testRoute");
- String remoteResponse = IOUtils.toString(url.openStream());
- assertEquals("remote", remoteResponse);
- }
-
- assertMockEndpointsSatisfied();
- }
-
-
- public void testAllInterfaces() throws Exception {
- int expectedMessages = (remoteInterfaceAddress != null) ? 2 : 1;
- getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
-
- URL localUrl = new URL("http://localhost:4569/allInterfaces");
- String localResponse = IOUtils.toString(localUrl.openStream());
- assertEquals("allInterfaces", localResponse);
-
- if (remoteInterfaceAddress != null) {
- URL url = new URL("http://" + remoteInterfaceAddress + ":4569/allInterfaces");
- String remoteResponse = IOUtils.toString(url.openStream());
- assertEquals("allInterfaces", remoteResponse);
- }
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
-
- @Override
- public void configure() throws Exception {
- from("jetty:http://localhost:4567/testRoute")
- .setBody().constant("local")
- .to("mock:endpoint");
-
- from("jetty:http://localhost:4568/testRoute")
- .setBody().constant("local-differentPort")
- .to("mock:endpoint");
-
- if (remoteInterfaceAddress != null) {
- from("jetty:http://" + remoteInterfaceAddress + ":4567/testRoute")
- .setBody().constant("remote")
- .to("mock:endpoint");
- }
-
- from("jetty:http://0.0.0.0:4569/allInterfaces")
- .setBody().constant("allInterfaces")
- .to("mock:endpoint");
-
- }
- };
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import java.io.IOException;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.commons.io.IOUtils;
+
+public class InterfacesTest extends ContextTestSupport {
+
+ private String remoteInterfaceAddress;
+
+
+ public InterfacesTest() throws IOException {
+ // Retrieve an address of some remote network interface
+ Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+
+ while (remoteInterfaceAddress == null && interfaces.hasMoreElements()) {
+ NetworkInterface interfaze = interfaces.nextElement();
+ Enumeration<InetAddress> addresses = interfaze.getInetAddresses();
+ if (addresses.hasMoreElements()) {
+ InetAddress nextAddress = addresses.nextElement();
+ if (nextAddress.isLoopbackAddress() || !nextAddress.isReachable(2000)) {
+ continue;
+ }
+ if (nextAddress instanceof Inet6Address) {
+ continue;
+ } else {
+ remoteInterfaceAddress = nextAddress.getHostAddress();
+ }
+ }
+ }
+ }
+
+ public void testLocalInterfaceHandled() throws IOException, InterruptedException {
+ int expectedMessages = (remoteInterfaceAddress != null) ? 3 : 2;
+ getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
+
+ URL localUrl = new URL("http://localhost:4567/testRoute");
+ String localResponse = IOUtils.toString(localUrl.openStream());
+ assertEquals("local", localResponse);
+
+ // 127.0.0.1 is an alias of localhost so should work
+ localUrl = new URL("http://127.0.0.1:4568/testRoute");
+ localResponse = IOUtils.toString(localUrl.openStream());
+ assertEquals("local-differentPort", localResponse);
+
+ if (remoteInterfaceAddress != null) {
+ URL url = new URL("http://" + remoteInterfaceAddress + ":4567/testRoute");
+ String remoteResponse = IOUtils.toString(url.openStream());
+ assertEquals("remote", remoteResponse);
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+
+ public void testAllInterfaces() throws Exception {
+ int expectedMessages = (remoteInterfaceAddress != null) ? 2 : 1;
+ getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
+
+ URL localUrl = new URL("http://localhost:4569/allInterfaces");
+ String localResponse = IOUtils.toString(localUrl.openStream());
+ assertEquals("allInterfaces", localResponse);
+
+ if (remoteInterfaceAddress != null) {
+ URL url = new URL("http://" + remoteInterfaceAddress + ":4569/allInterfaces");
+ String remoteResponse = IOUtils.toString(url.openStream());
+ assertEquals("allInterfaces", remoteResponse);
+ }
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ from("jetty:http://localhost:4567/testRoute")
+ .setBody().constant("local")
+ .to("mock:endpoint");
+
+ from("jetty:http://localhost:4568/testRoute")
+ .setBody().constant("local-differentPort")
+ .to("mock:endpoint");
+
+ if (remoteInterfaceAddress != null) {
+ from("jetty:http://" + remoteInterfaceAddress + ":4567/testRoute")
+ .setBody().constant("remote")
+ .to("mock:endpoint");
+ }
+
+ from("jetty:http://0.0.0.0:4569/allInterfaces")
+ .setBody().constant("allInterfaces")
+ .to("mock:endpoint");
+
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java Mon Dec 8 00:50:38 2008
@@ -1,75 +1,75 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Unit test for content-type
- */
-public class JettyContentTypeTest extends ContextTestSupport {
-
- public void testSameContentType() throws Exception {
- Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
- Exchange exchange = endpoint.createExchange();
- exchange.getIn().setBody("<order>123</order>");
- exchange.getIn().setHeader("user", "Claus");
- exchange.getIn().setHeader("content-type", "text/xml");
- template.send(endpoint, exchange);
-
- String body = exchange.getOut().getBody(String.class);
- assertEquals("<order>OK</order>", body);
- assertOutMessageHeader(exchange, "content-type", "text/xml");
- }
-
- public void testMixedContentType() throws Exception {
- Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
- Exchange exchange = endpoint.createExchange();
- exchange.getIn().setBody("<order>123</order>");
- exchange.getIn().setHeader("Content-Type", "text/xml");
- template.send(endpoint, exchange);
-
- String body = exchange.getOut().getBody(String.class);
- assertEquals("FAIL", body);
- assertOutMessageHeader(exchange, "Content-Type", "text/plain");
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from("jetty:http://localhost:8080/myapp/myservice").process(new MyBookService());
- }
- };
- }
-
- public class MyBookService implements Processor {
- public void process(Exchange exchange) throws Exception {
- if (exchange.getIn().getHeader("user") != null) {
- exchange.getOut().setBody("<order>OK</order>");
- } else {
- exchange.getOut().setBody("FAIL");
- exchange.getOut().setHeader("Content-Type", "text/plain");
- }
- }
- }
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for content-type
+ */
+public class JettyContentTypeTest extends ContextTestSupport {
+
+ public void testSameContentType() throws Exception {
+ Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
+ Exchange exchange = endpoint.createExchange();
+ exchange.getIn().setBody("<order>123</order>");
+ exchange.getIn().setHeader("user", "Claus");
+ exchange.getIn().setHeader("content-type", "text/xml");
+ template.send(endpoint, exchange);
+
+ String body = exchange.getOut().getBody(String.class);
+ assertEquals("<order>OK</order>", body);
+ assertOutMessageHeader(exchange, "content-type", "text/xml");
+ }
+
+ public void testMixedContentType() throws Exception {
+ Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
+ Exchange exchange = endpoint.createExchange();
+ exchange.getIn().setBody("<order>123</order>");
+ exchange.getIn().setHeader("Content-Type", "text/xml");
+ template.send(endpoint, exchange);
+
+ String body = exchange.getOut().getBody(String.class);
+ assertEquals("FAIL", body);
+ assertOutMessageHeader(exchange, "Content-Type", "text/plain");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("jetty:http://localhost:8080/myapp/myservice").process(new MyBookService());
+ }
+ };
+ }
+
+ public class MyBookService implements Processor {
+ public void process(Exchange exchange) throws Exception {
+ if (exchange.getIn().getHeader("user") != null) {
+ exchange.getOut().setBody("<order>OK</order>");
+ } else {
+ exchange.getOut().setBody("FAIL");
+ exchange.getOut().setHeader("Content-Type", "text/plain");
+ }
+ }
+ }
+
}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java Mon Dec 8 00:50:38 2008
@@ -1,87 +1,87 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.DefaultHttpBinding;
-import org.apache.camel.impl.JndiRegistry;
-
-/**
- * Unit test for http binding ref option.
- */
-public class JettyHttpBindingRefTest extends ContextTestSupport {
-
- public void testDefaultHttpBinding() throws Exception {
- Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World");
- assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out));
- }
-
- public void testCustomHttpBinding() throws Exception {
- Object out = template.requestBody("http://localhost:8081/myapp/myotherservice", "Hello World");
- assertEquals("Something went wrong but we dont care", context.getTypeConverter().convertTo(String.class, out));
- }
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("default", new DefaultHttpBinding());
- jndi.bind("myownbinder", new MyHttpBinding());
- return jndi;
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- errorHandler(noErrorHandler());
-
- from("jetty:http://localhost:8080/myapp/myservice?httpBindingRef=default").transform().constant("Bye World");
-
- from("jetty:http://localhost:8081/myapp/myotherservice?httpBindingRef=myownbinder").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- throw new IllegalStateException("Not implemented");
- }
- });
- }
- };
- }
-
- // START SNIPPET: e1
- public class MyHttpBinding extends DefaultHttpBinding {
-
- @Override
- public void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException {
- // we override the doWriteExceptionResponse as we only want to alter the binding how exceptions is
- // written back to the client.
-
- // we just return HTTP 200 so the client thinks its okay
- response.setStatus(200);
- // and we return this fixed text
- response.getWriter().write("Something went wrong but we dont care");
- }
- }
- // END SNIPPET: e1
-
-}
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http.DefaultHttpBinding;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ * Unit test for http binding ref option.
+ */
+public class JettyHttpBindingRefTest extends ContextTestSupport {
+
+ public void testDefaultHttpBinding() throws Exception {
+ Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World");
+ assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out));
+ }
+
+ public void testCustomHttpBinding() throws Exception {
+ Object out = template.requestBody("http://localhost:8081/myapp/myotherservice", "Hello World");
+ assertEquals("Something went wrong but we dont care", context.getTypeConverter().convertTo(String.class, out));
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("default", new DefaultHttpBinding());
+ jndi.bind("myownbinder", new MyHttpBinding());
+ return jndi;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ errorHandler(noErrorHandler());
+
+ from("jetty:http://localhost:8080/myapp/myservice?httpBindingRef=default").transform().constant("Bye World");
+
+ from("jetty:http://localhost:8081/myapp/myotherservice?httpBindingRef=myownbinder").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ throw new IllegalStateException("Not implemented");
+ }
+ });
+ }
+ };
+ }
+
+ // START SNIPPET: e1
+ public class MyHttpBinding extends DefaultHttpBinding {
+
+ @Override
+ public void doWriteExceptionResponse(Throwable exception, HttpServletResponse response) throws IOException {
+ // we override the doWriteExceptionResponse as we only want to alter the binding how exceptions is
+ // written back to the client.
+
+ // we just return HTTP 200 so the client thinks its okay
+ response.setStatus(200);
+ // and we return this fixed text
+ response.getWriter().write("Something went wrong but we dont care");
+ }
+ }
+ // END SNIPPET: e1
+
+}
+
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpBindingRefTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java Mon Dec 8 00:50:38 2008
@@ -1,48 +1,48 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Unit test for http client options.
- */
-public class JettyHttpClientOptionsTest extends ContextTestSupport {
-
- public void testCustomHttpBinding() throws Exception {
- // assert jetty was configured with our timeout
- JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
- assertNotNull(jetty);
- assertEquals(5555, jetty.getHttpClient().getIdleTimeout());
-
- // send and receive
- Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World");
- assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out));
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("jetty:http://localhost:8080/myapp/myservice?httpClient.idleTimeout=5555").transform().constant("Bye World");
- }
- };
- }
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for http client options.
+ */
+public class JettyHttpClientOptionsTest extends ContextTestSupport {
+
+ public void testCustomHttpBinding() throws Exception {
+ // assert jetty was configured with our timeout
+ JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class);
+ assertNotNull(jetty);
+ assertEquals(5555, jetty.getHttpClient().getIdleTimeout());
+
+ // send and receive
+ Object out = template.requestBody("http://localhost:8080/myapp/myservice", "Hello World");
+ assertEquals("Bye World", context.getTypeConverter().convertTo(String.class, out));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("jetty:http://localhost:8080/myapp/myservice?httpClient.idleTimeout=5555").transform().constant("Bye World");
+ }
+ };
+ }
+
}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpClientOptionsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java Mon Dec 8 00:50:38 2008
@@ -1,57 +1,57 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty;
-
-import java.io.File;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-
-/**
- * Unit test for exposing a http server that returns images
- */
-public class JettyImageFileTest extends ContextTestSupport {
-
- public void testImageContentType() throws Exception {
- Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
- Exchange exchange = endpoint.createExchange();
- template.send(endpoint, exchange);
-
- assertNotNull(exchange.getOut().getBody());
- assertOutMessageHeader(exchange, "Content-Type", "image/jpeg");
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from("jetty:http://localhost:8080/myapp/myservice").process(new MyImageService());
- }
- };
- }
-
- public class MyImageService implements Processor {
- public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody(new File("src/test/data/logo.jpeg"));
- exchange.getOut().setHeader("Content-Type", "image/jpeg");
- }
- }
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jetty;
+
+import java.io.File;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for exposing a http server that returns images
+ */
+public class JettyImageFileTest extends ContextTestSupport {
+
+ public void testImageContentType() throws Exception {
+ Endpoint endpoint = context.getEndpoint("http://localhost:8080/myapp/myservice");
+ Exchange exchange = endpoint.createExchange();
+ template.send(endpoint, exchange);
+
+ assertNotNull(exchange.getOut().getBody());
+ assertOutMessageHeader(exchange, "Content-Type", "image/jpeg");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("jetty:http://localhost:8080/myapp/myservice").process(new MyImageService());
+ }
+ };
+ }
+
+ public class MyImageService implements Processor {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getOut().setBody(new File("src/test/data/logo.jpeg"));
+ exchange.getOut().setHeader("Content-Type", "image/jpeg");
+ }
+ }
+
}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java Mon Dec 8 00:50:38 2008
@@ -37,7 +37,7 @@
* {@link #newInstance(org.apache.camel.CamelContext, org.apache.camel.ProducerTemplate)}
* you can send the message exchange into a Camel endpoint for processing.
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class CamelMessageListener implements MessageListener, Processor {
private final CamelContext camelContext;
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/CamelMessageListener.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java (original)
+++ activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java Mon Dec 8 00:50:38 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,22 +16,21 @@
*/
package org.apache.camel.language.ognl.patterns;
-import org.apache.camel.test.CamelTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.CamelTestSupport;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class FilterTest extends CamelTestSupport {
- @EndpointInject(uri="mock:result")
+ @EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
- @Produce(uri="direct:start")
+ @Produce(uri = "direct:start")
protected ProducerTemplate template;
public void testSendMatchingMessage() throws Exception {
Propchange: activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ognl/src/test/resources/jndi.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ognl/src/test/resources/jndi.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: activemq/camel/trunk/components/camel-rss/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssPollingConsumer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java Mon Dec 8 00:50:38 2008
@@ -29,7 +29,7 @@
* Filters out all entries which occur before the last time of the entry we saw (assuming
* entries arrive sorted in order).
*
- * @version $Revision: 656106 $
+ * @version $Revision$
*/
public class UpdatedDateFilter implements EntryFilter {
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/data/rss20.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/data/rss20.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-rss/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java (original)
+++ activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java Mon Dec 8 00:50:38 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,25 +16,23 @@
*/
package org.apache.camel.spring.javaconfig;
-import org.apache.camel.Routes;
+import java.util.List;
+
import org.apache.camel.CamelContext;
+import org.apache.camel.Routes;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.CamelBeanPostProcessor;
import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.config.java.annotation.Bean;
import org.springframework.config.java.annotation.Configuration;
import org.springframework.config.java.support.ConfigurationSupport;
-import java.util.List;
-
/**
* A useful base class for writing
* <a href="http://www.springsource.org/javaconfig">Spring JavaConfig</a>
* configurations for working with Camel
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@Configuration
public abstract class CamelConfiguration extends ConfigurationSupport {
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/CamelConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java?rev=724291&r1=724290&r2=724291&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java (original)
+++ activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java Mon Dec 8 00:50:38 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,18 @@
*/
package org.apache.camel.spring.javaconfig;
-import org.apache.camel.Routes;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.camel.builder.RouteBuilder;
import org.springframework.config.java.annotation.Bean;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
-
/**
* A useful base class for writing
* <a href="http://www.springsource.org/javaconfig">Spring JavaConfig</a>
* configurations to configure a CamelContext with a single {@link RouteBuilder} instance
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public abstract class SingleRouteCamelConfiguration extends CamelConfiguration {
@Bean
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/java/org/apache/camel/spring/javaconfig/SingleRouteCamelConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-spring-javaconfig/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native