git commit: CAMEL-7717: camel-jsch - Should throw UnsupportedOperationException when creating a consumer instead of causing a NPE
Repository: camel Updated Branches: refs/heads/master c112e8f23 - 40b4e80d5 CAMEL-7717: camel-jsch - Should throw UnsupportedOperationException when creating a consumer instead of causing a NPE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40b4e80d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40b4e80d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40b4e80d Branch: refs/heads/master Commit: 40b4e80d524f19d45876e3bf92ff4e90a9db6ba9 Parents: c112e8f Author: Claus Ibsen davscl...@apache.org Authored: Tue Aug 19 08:30:20 2014 +0200 Committer: Claus Ibsen davscl...@apache.org Committed: Tue Aug 19 08:30:20 2014 +0200 -- .../main/java/org/apache/camel/component/jsch/ScpEndpoint.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/40b4e80d/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java -- diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java b/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java index 5030dfc..4131f73 100644 --- a/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java +++ b/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpEndpoint.java @@ -43,13 +43,15 @@ public class ScpEndpoint extends RemoteFileEndpointScpFile { @Override protected RemoteFileConsumerScpFile buildConsumer(Processor processor) { -return null; // new ScpConsumer(this, processor, createRemoteFileOperations()); +throw new UnsupportedOperationException(This component does not support consuming from this endpoint); } +@Override protected GenericFileProducerScpFile buildProducer() { return new ScpProducer(this, createRemoteFileOperations()); } +@Override public RemoteFileOperationsScpFile createRemoteFileOperations() { ScpOperations operations = new ScpOperations(); operations.setEndpoint(this);
git commit: CAMEL-7719 Set the XMLReader for the SAXSource in XmlConverter
Repository: camel Updated Branches: refs/heads/master 40b4e80d5 - 4ef3d6f43 CAMEL-7719 Set the XMLReader for the SAXSource in XmlConverter Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ef3d6f4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ef3d6f4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ef3d6f4 Branch: refs/heads/master Commit: 4ef3d6f43ba7a82103a2cde0e0c471e08b061da8 Parents: 40b4e80 Author: Willem Jiang willem.ji...@gmail.com Authored: Tue Aug 19 15:17:46 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 15:20:19 2014 +0800 -- .../camel/converter/jaxp/XmlConverter.java | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4ef3d6f4/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 37cf7f4..0532011 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -36,6 +36,8 @@ import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.OutputKeys; @@ -59,6 +61,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; import org.apache.camel.BytesSource; import org.apache.camel.Converter; @@ -567,7 +570,21 @@ public class XmlConverter { } inputSource.setSystemId(source.getSystemId()); inputSource.setPublicId(source.getPublicId()); -return new SAXSource(inputSource); +XMLReader xmlReader = null; +//Need to setup XMLReader security feature by default +try { +SAXParserFactory sfactory = SAXParserFactory.newInstance(); +try { + sfactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); +} catch (Exception e) { +LOG.warn(SAXParser doesn't support the feature {} with value {}, due to {}., new Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true, e}); +} +SAXParser parser = sfactory.newSAXParser(); +xmlReader = parser.getXMLReader(); +} catch (Exception ex) { +LOG.warn(Cannot create the SAXParser XMLReader, due to {}, ex); +} +return new SAXSource(xmlReader, inputSource); } /**
[3/3] git commit: CAMEL-7721 Support to setup the SaxParserFactory from the exchange property
CAMEL-7721 Support to setup the SaxParserFactory from the exchange property Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cdff24b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cdff24b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cdff24b Branch: refs/heads/master Commit: 2cdff24bb8ebafedc540fdde7b39bafcd55db8aa Parents: 7e346f9 Author: Willem Jiang willem.ji...@gmail.com Authored: Tue Aug 19 15:44:58 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 15:44:58 2014 +0800 -- .../main/java/org/apache/camel/Exchange.java| 4 ++- .../camel/converter/jaxp/XmlConverter.java | 29 +++- 2 files changed, 25 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2cdff24b/camel-core/src/main/java/org/apache/camel/Exchange.java -- diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java index 642e9a4..587f17d 100644 --- a/camel-core/src/main/java/org/apache/camel/Exchange.java +++ b/camel-core/src/main/java/org/apache/camel/Exchange.java @@ -167,7 +167,7 @@ public interface Exchange { String OVERRULE_FILE_NAME = CamelOverruleFileName; String PARENT_UNIT_OF_WORK = CamelParentUnitOfWork; - + String RECIPIENT_LIST_ENDPOINT = CamelRecipientListEndpoint; String RECEIVED_TIMESTAMP = CamelReceivedTimestamp; String REDELIVERED = CamelRedelivered; @@ -178,6 +178,8 @@ public interface Exchange { String ROLLBACK_ONLY = CamelRollbackOnly; String ROLLBACK_ONLY_LAST = CamelRollbackOnlyLast; String ROUTE_STOP = CamelRouteStop; + +String SAXPARSER_FACTORY = CamelSAXParserFactory; String SOAP_ACTION= CamelSoapAction; String SKIP_GZIP_ENCODING = CamelSkipGzipEncoding; http://git-wip-us.apache.org/repos/asf/camel/blob/2cdff24b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 2f066a0..cdef86c 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -469,7 +469,7 @@ public class XmlConverter { } else if (source instanceof DOMSource) { return toSAXSourceFromDOM((DOMSource) source, exchange); } else if (source instanceof StreamSource) { -return toSAXSourceFromStream((StreamSource) source); +return toSAXSourceFromStream((StreamSource) source, exchange); } else if (source instanceof StAXSource) { return toSAXSourceFromStAX((StAXSource) source, exchange); } else { @@ -569,8 +569,16 @@ public class XmlConverter { return new StringSource(result); } -@Converter +/** + * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters. + */ +@Deprecated public SAXSource toSAXSourceFromStream(StreamSource source) throws SAXException { +return toSAXSourceFromStream(source, (Exchange) null); +} + +@Converter +public SAXSource toSAXSourceFromStream(StreamSource source, Exchange exchange) throws SAXException { InputSource inputSource; if (source.getReader() != null) { inputSource = new InputSource(source.getReader()); @@ -580,13 +588,20 @@ public class XmlConverter { inputSource.setSystemId(source.getSystemId()); inputSource.setPublicId(source.getPublicId()); XMLReader xmlReader = null; +SAXParserFactory sfactory = null; //Need to setup XMLReader security feature by default try { -SAXParserFactory sfactory = SAXParserFactory.newInstance(); -try { - sfactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); -} catch (Exception e) { -LOG.warn(SAXParser doesn't support the feature {} with value {}, due to {}., new Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true, e}); +// use the SAXPaserFactory which is set from exchange +if (exchange != null) { +sfactory = exchange.getProperty(Exchange.SAXPARSER_FACTORY, SAXParserFactory.class); +} +if (sfactory == null) { +sfactory = SAXParserFactory.newInstance(); +try { +
[1/3] git commit: CAMEL-7720 Support to set the DocumentBuilderFactory from the exchange property
Repository: camel Updated Branches: refs/heads/master 4ef3d6f43 - 2cdff24bb CAMEL-7720 Support to set the DocumentBuilderFactory from the exchange property Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e346f9e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e346f9e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e346f9e Branch: refs/heads/master Commit: 7e346f9eec0c4859db6b09e0a00dcfdd734631bb Parents: 09627f6 Author: Willem Jiang willem.ji...@gmail.com Authored: Tue Aug 19 15:28:36 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 15:29:07 2014 +0800 -- .../main/java/org/apache/camel/Exchange.java| 3 + .../camel/converter/jaxp/XmlConverter.java | 170 --- 2 files changed, 150 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7e346f9e/camel-core/src/main/java/org/apache/camel/Exchange.java -- diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java index f8c6a90..642e9a4 100644 --- a/camel-core/src/main/java/org/apache/camel/Exchange.java +++ b/camel-core/src/main/java/org/apache/camel/Exchange.java @@ -104,6 +104,8 @@ public interface Exchange { String DESTINATION_OVERRIDE_URL = CamelDestinationOverrideUrl; String DISABLE_HTTP_STREAM_CACHE = CamelDisableHttpStreamCache; String DUPLICATE_MESSAGE = CamelDuplicateMessage; + +String DOCUMENT_BUILDER_FACTORY = CamelDocumentBuilderFactory; String EXCEPTION_CAUGHT = CamelExceptionCaught; String EXCEPTION_HANDLED = CamelExceptionHandled; @@ -199,6 +201,7 @@ public interface Exchange { String TRANSFER_ENCODING = Transfer-Encoding; String UNIT_OF_WORK_EXHAUSTED= CamelUnitOfWorkExhausted; + /** * @deprecated UNIT_OF_WORK_PROCESS_SYNC is not in use and will be removed in future Camel release */ http://git-wip-us.apache.org/repos/asf/camel/blob/7e346f9e/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 0532011..2f066a0 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -69,7 +69,6 @@ import org.apache.camel.Exchange; import org.apache.camel.StringSource; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -288,15 +287,25 @@ public class XmlConverter { /** * Converts the source instance to a {@link DOMSource} or returns null if the conversion is not * supported (making it easy to derive from this class to add new kinds of conversion). + * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters. */ -@Converter +@Deprecated public DOMSource toDOMSource(Source source) throws ParserConfigurationException, IOException, SAXException, TransformerException { +return toDOMSource(source, (Exchange)null); +} + +/** + * Converts the source instance to a {@link DOMSource} or returns null if the conversion is not + * supported (making it easy to derive from this class to add new kinds of conversion). + */ +@Converter +public DOMSource toDOMSource(Source source, Exchange exchange) throws ParserConfigurationException, IOException, SAXException, TransformerException { if (source instanceof DOMSource) { return (DOMSource) source; } else if (source instanceof SAXSource) { return toDOMSourceFromSAX((SAXSource) source); } else if (source instanceof StreamSource) { -return toDOMSourceFromStream((StreamSource) source); +return toDOMSourceFromStream((StreamSource) source, exchange); } else if (source instanceof StAXSource) { return toDOMSourceFromStAX((StAXSource)source); } else { @@ -561,7 +570,7 @@ public class XmlConverter { } @Converter -public SAXSource toSAXSourceFromStream(StreamSource source) { +public SAXSource toSAXSourceFromStream(StreamSource source) throws SAXException { InputSource inputSource; if (source.getReader() != null) { inputSource = new InputSource(source.getReader()); @@ -605,27 +614,52 @@ public class XmlConverter { return r; } -
[2/3] git commit: Fixed the build error of camel-swagger with JDK8
Fixed the build error of camel-swagger with JDK8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09627f69 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09627f69 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09627f69 Branch: refs/heads/master Commit: 09627f69cd2c86ba40212cb2621acbe1bae4abb7 Parents: 4ef3d6f Author: Willem Jiang willem.ji...@gmail.com Authored: Tue Aug 19 09:40:24 2014 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 15:29:07 2014 +0800 -- components/camel-swagger/pom.xml | 11 ++- parent/pom.xml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/09627f69/components/camel-swagger/pom.xml -- diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml index 9997f98..29c945a 100644 --- a/components/camel-swagger/pom.xml +++ b/components/camel-swagger/pom.xml @@ -44,7 +44,7 @@ artifactIdcamel-core/artifactId /dependency -!-- +!-- TODO: we should avoid spring dependency and have some plugin/spi -- dependency @@ -57,11 +57,20 @@ artifactIdswagger-annotations/artifactId version${swagger-version}/version /dependency + +!-- To override the scala-library version of swagger-jaxrs-2.10 for supporting Java8 -- +dependency + groupIdorg.scala-lang/groupId + artifactIdscala-library/artifactId + version${scala-2.10-version}/version +/dependency + dependency groupIdcom.wordnik/groupId artifactIdswagger-jaxrs_2.10/artifactId version${swagger-version}/version /dependency + dependency groupIdcom.wordnik/groupId artifactIdswagger-servlet_2.10/artifactId http://git-wip-us.apache.org/repos/asf/camel/blob/09627f69/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index a96ef12..ebaf300 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -361,6 +361,7 @@ saxon-bundle-version9.5.1-5_1/saxon-bundle-version saxon-version9.5.1-5/saxon-version scala-version2.11.2/scala-version +scala-2.10-version2.10.4/scala-2.10-version scala-maven-plugin-version3.2.0/scala-maven-plugin-version scalatest-version2.2.0/scalatest-version scalaxml-version1.0.2/scalaxml-version
git commit: CAMEL-7718 Constants used in camel-infinispan component have restricted access
Repository: camel Updated Branches: refs/heads/master 2cdff24bb - 8945cf186 CAMEL-7718 Constants used in camel-infinispan component have restricted access Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8945cf18 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8945cf18 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8945cf18 Branch: refs/heads/master Commit: 8945cf1863f43fbe79948f7b51f9b5f51e906bbd Parents: 2cdff24 Author: Roman Jakubco rjaku...@redhat.com Authored: Tue Aug 19 11:05:32 2014 +0200 Committer: Roman Jakubco rjaku...@redhat.com Committed: Tue Aug 19 11:05:32 2014 +0200 -- .../org/apache/camel/component/infinispan/InfinispanConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8945cf18/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java -- diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java index 7654e74..2a6b27e 100644 --- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java +++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConstants.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.infinispan; -interface InfinispanConstants { +public interface InfinispanConstants { String EVENT_TYPE = CamelInfinispanEventType; String IS_PRE = CamelInfinispanIsPre; String CACHE_NAME = CamelInfinispanCacheName;
[3/3] git commit: CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer.
CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa237356 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa237356 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa237356 Branch: refs/heads/camel-2.12.x Commit: fa23735629ba6c5e56b2d7b59605774c549e81cc Parents: a6a68e4 Author: Cristiano Nicolai cristiano.nico...@gmail.com Authored: Tue Aug 19 11:21:24 2014 +1000 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 18:24:56 2014 +0800 -- .../camel/component/sjms/SjmsConsumer.java | 7 +- .../camel/component/sjms/SjmsProducer.java | 7 +- .../sjms/threadpool/ThreadPoolTest.java | 112 +++ 3 files changed, 122 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fa237356/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index 5b01c3a..4ae566d 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -48,7 +48,7 @@ import org.apache.camel.spi.Synchronization; public class SjmsConsumer extends DefaultConsumer { protected MessageConsumerPool consumers; -private final ExecutorService executor; +private ExecutorService executor; /** * A pool of MessageConsumerResources created at the initialization of the associated consumer. @@ -135,7 +135,6 @@ public class SjmsConsumer extends DefaultConsumer { public SjmsConsumer(Endpoint endpoint, Processor processor) { super(endpoint, processor); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); } @Override @@ -146,6 +145,7 @@ public class SjmsConsumer extends DefaultConsumer { @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); consumers = new MessageConsumerPool(); consumers.fillPool(); } @@ -157,6 +157,9 @@ public class SjmsConsumer extends DefaultConsumer { consumers.drainPool(); consumers = null; } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } /** http://git-wip-us.apache.org/repos/asf/camel/blob/fa237356/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java index c5d9c1f..582d657 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java @@ -123,16 +123,16 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { } private MessageProducerPool producers; -private final ExecutorService executor; +private ExecutorService executor; public SjmsProducer(Endpoint endpoint) { super(endpoint); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); } @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); if (getProducers() == null) { setProducers(new MessageProducerPool()); getProducers().fillPool(); @@ -146,6 +146,9 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { getProducers().drainPool(); setProducers(null); } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } public abstract MessageProducerResources doCreateProducerModel() throws Exception; http://git-wip-us.apache.org/repos/asf/camel/blob/fa237356/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
[1/3] git commit: CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer.
Repository: camel Updated Branches: refs/heads/camel-2.12.x a6a68e453 - fa2373562 refs/heads/camel-2.13.x 49821e854 - dff3b533b refs/heads/master 8945cf186 - 67ee84ed0 CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67ee84ed Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67ee84ed Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67ee84ed Branch: refs/heads/master Commit: 67ee84ed03ca8cd63df8d783bfc256c646e67067 Parents: 8945cf1 Author: Cristiano Nicolai cristiano.nico...@gmail.com Authored: Tue Aug 19 11:21:24 2014 +1000 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 18:24:07 2014 +0800 -- .../camel/component/sjms/SjmsConsumer.java | 7 +- .../camel/component/sjms/SjmsProducer.java | 7 +- .../sjms/threadpool/ThreadPoolTest.java | 112 +++ 3 files changed, 122 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/67ee84ed/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index 5b01c3a..4ae566d 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -48,7 +48,7 @@ import org.apache.camel.spi.Synchronization; public class SjmsConsumer extends DefaultConsumer { protected MessageConsumerPool consumers; -private final ExecutorService executor; +private ExecutorService executor; /** * A pool of MessageConsumerResources created at the initialization of the associated consumer. @@ -135,7 +135,6 @@ public class SjmsConsumer extends DefaultConsumer { public SjmsConsumer(Endpoint endpoint, Processor processor) { super(endpoint, processor); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); } @Override @@ -146,6 +145,7 @@ public class SjmsConsumer extends DefaultConsumer { @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); consumers = new MessageConsumerPool(); consumers.fillPool(); } @@ -157,6 +157,9 @@ public class SjmsConsumer extends DefaultConsumer { consumers.drainPool(); consumers = null; } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } /** http://git-wip-us.apache.org/repos/asf/camel/blob/67ee84ed/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java index c5d9c1f..582d657 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java @@ -123,16 +123,16 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { } private MessageProducerPool producers; -private final ExecutorService executor; +private ExecutorService executor; public SjmsProducer(Endpoint endpoint) { super(endpoint); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); } @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); if (getProducers() == null) { setProducers(new MessageProducerPool()); getProducers().fillPool(); @@ -146,6 +146,9 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { getProducers().drainPool(); setProducers(null); } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } public abstract MessageProducerResources doCreateProducerModel() throws
[2/3] git commit: CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer.
CAMEL-7715: Fix SJMS ThreadPool for SjmsConsumer and SjmsProducer. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dff3b533 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dff3b533 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dff3b533 Branch: refs/heads/camel-2.13.x Commit: dff3b533bccc7d4830704dc430233ba11ef1f71b Parents: 49821e8 Author: Cristiano Nicolai cristiano.nico...@gmail.com Authored: Tue Aug 19 11:21:24 2014 +1000 Committer: Willem Jiang willem.ji...@gmail.com Committed: Tue Aug 19 18:24:47 2014 +0800 -- .../camel/component/sjms/SjmsConsumer.java | 7 +- .../camel/component/sjms/SjmsProducer.java | 7 +- .../sjms/threadpool/ThreadPoolTest.java | 112 +++ 3 files changed, 122 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/dff3b533/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index 5b01c3a..4ae566d 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -48,7 +48,7 @@ import org.apache.camel.spi.Synchronization; public class SjmsConsumer extends DefaultConsumer { protected MessageConsumerPool consumers; -private final ExecutorService executor; +private ExecutorService executor; /** * A pool of MessageConsumerResources created at the initialization of the associated consumer. @@ -135,7 +135,6 @@ public class SjmsConsumer extends DefaultConsumer { public SjmsConsumer(Endpoint endpoint, Processor processor) { super(endpoint, processor); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); } @Override @@ -146,6 +145,7 @@ public class SjmsConsumer extends DefaultConsumer { @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsConsumer); consumers = new MessageConsumerPool(); consumers.fillPool(); } @@ -157,6 +157,9 @@ public class SjmsConsumer extends DefaultConsumer { consumers.drainPool(); consumers = null; } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } /** http://git-wip-us.apache.org/repos/asf/camel/blob/dff3b533/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java index c5d9c1f..582d657 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java @@ -123,16 +123,16 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { } private MessageProducerPool producers; -private final ExecutorService executor; +private ExecutorService executor; public SjmsProducer(Endpoint endpoint) { super(endpoint); -this.executor = endpoint.getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); } @Override protected void doStart() throws Exception { super.doStart(); +this.executor = getEndpoint().getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, SjmsProducer); if (getProducers() == null) { setProducers(new MessageProducerPool()); getProducers().fillPool(); @@ -146,6 +146,9 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { getProducers().drainPool(); setProducers(null); } +if(this.executor!=null){ + getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); +} } public abstract MessageProducerResources doCreateProducerModel() throws Exception; http://git-wip-us.apache.org/repos/asf/camel/blob/dff3b533/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
[CONF] Apache Camel Articles
Claus Ibsen edited the page: Articles ... Linkedin Apache Camel group - Linkedin group for the Apache Camel project. Google Plus Apache Camel community - G+ community for the Apache Camel project. EIP printable flashcards - A 6 page PDF with printable EIP cards. There are several companies that provide extra documentation, examples, tutorials, etc... See the Commercial Camel Offerings page for more details. Apache Camel Reference Card at DZone by Claus Ibsen The Top Twelve Integration Patterns for Apache Camel Reference Card at DZone by Claus Ibsen Essential Camel Components Reference Card at DZone by Christian Posta The Apache Camel Components Poster (PDF,PDF w/ crops and bleed,JPG image,Printed)by Gliesian LLC.(October, 2013) ... View Online Like View Changes Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
svn commit: r919815 - in /websites/production/camel/content: articles.html cache/main.pageCache
Author: buildbot Date: Tue Aug 19 13:18:42 2014 New Revision: 919815 Log: Production update by buildbot for camel Modified: websites/production/camel/content/articles.html websites/production/camel/content/cache/main.pageCache Modified: websites/production/camel/content/articles.html == --- websites/production/camel/content/articles.html (original) +++ websites/production/camel/content/articles.html Tue Aug 19 13:18:42 2014 @@ -82,7 +82,7 @@ pSee also a shape=rect class=external-link href=http://camel.apache.org/user-stories.html;Camel User Stories/a./p /div /div -pIf you have never used or seen Camel before, then you should start with a shape=rect class=external-link href=http://www.kai-waehner.de/blog/2012/05/04/apache-camel-tutorial-introduction/; rel=nofollowApache Camel Tutorial #8211; Introduction to EIP, Routes, Components, Testing, and other Concepts/a - an article by Kai W#228;hner, where he puts EIP and Camel into the big picture and gives a run down of the important Camel concepts. a shape=rect class=external-link href=https://github.com/megachucky/camel-infoq; rel=nofollowDemo source code/a can be downloaded at github to get started with your first Camel project easily./ph3 id=Articles-ArchivedWebinarsandScreencastsArchived Webinars and Screencasts/h3ullia shape=rect class=external-link href=http://www.youtube.com/watch?v=_pEwoztbfYIamp;feature=youtu.beamp;a; rel=nofollowIntegration using Apache Camel and Groovy (June 2014)/a by Claus Ibsen, presenting Camel, Groovy, and a shape= rect class=external-link href=http://hawt.io/; rel=nofollowhawtio/a at a shape=rect class=external-link href=http://gr8conf.eu/#/; rel=nofollowgr8conf/a 2014./lilia shape=rect class=external-link href=https://skillsmatter.com/skillscasts/5074-effective-system-integrations-with-apache-camel; rel=nofollowEffective System Integrations with Apache Camel (March 2014)/a by Jakub Korab/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=lOxUs_JleSsamp;feature=youtu.beamp;a; rel=nofollowGetting started with Apache Camel video from BarcelonaJUG (January 2014)/a by Claus Ibsen/lilia shape=rect class=external-link href=http://vimeo.com/68442425; rel=nofollowCamel in the cloud demo from CamelOne 2013/a - Video presentation from CamelOne 2013 demonstrating Camel in the cloud using a shape=rect class=external-link href=http://fuse.fusesource.org/fabric/; rel=nofollowFuse Fabric/a and a shape=rect class=external-link href=http://hawt.io/; rel=nofollowhawtio/a/lilia shape=rect class=external-link href=http://javagruppen.dk/index.php/moder/historiske-moder/285-javagruppemode-115-apache-camel-i-aarhus; rel=nofollowGetting started with Apache Camel/a - Video presentation from Javagruppen meeting emby Claus Ibsen/em (May 2013)/lilia shape=rect class=external-link href=http://blip.tv/dzone/apache-camel-essential-components-6511579; rel=nofollowApache Camel Essential Components/a emby Christian Posta/em (January 2013)/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=i_g91CzHgxg; rel=nofollowLeverage Enterprise Integration Patterns with Apache Camel and Twitter/a emby Bruno Borges/em (JavaOne 2012)/lilia shape=rect class=external-link href=http://www.infoq.com/presentations/Riding-Apache-Camel-Cloud; rel=nofollowRiding the Apache Camel into the cloud/a emJames Strachan/em (QC on 2012)/lilia shape=rect class=external-link href=http://skillsmatter.com/podcast/scala/akka-2-x; rel=nofollowMigrating akka-camel module to Akka 2.x/a emby Peter Gabryanczy/em (ScalaDays 2012)/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=YiG5_rGLapU; rel=nofollowConfident Data Transfers with Apache Camel Security/a emby Dominik Schadow/em (JavaOne 2012)/lilia shape=rect class=external-link href=http://fusesource.com/apache-camel-conference-2012/camelone_speakers_2012/; rel=nofollowCamelOne 2012 Videos/a - All the videos from the a shape=rect class=external-link href=http://fusesource.com/apache-camel-conference-2012; rel=nofollowCamelOne 2012 conference/a (May 2012)/lilia shape=rect class=external-link href=http://java.dzone.com/articles/leverage-enterprise; rel=nofollowJavaOne 2012 - Leverage Enterprise Integration Patterns with Apache Camel and Twitter/a emby Bruno Borges /em (JavaOne 2012)/lilia shape=rect class=external-link href=http://www.java-tv.com/2012/02/28/using-apache-camel-and-java-ee-in-an-osgi-world/; rel=nofollowUsing Apache Camel and Java EE in an OSGi World/a emby Jeff Genender and Johan Edstrom/em (JavaOne 2011)/lilia shape=rect class=external-link href=http://vimeo.com/28760446; rel=nofollowEr Apache Camel riktig valg for deg? Lytt til erfarne Camel spotters/a#160; emby Rune Peter Bj#248;rnstad, and Bj#248;rn Nordlund/em(September 2011)/lilia shape=rect
git commit: Use a specific yoda-time version instead of the range that the aws pom specifies so we can get a consistent version and one that matches the rest of camel
Repository: camel Updated Branches: refs/heads/master 67ee84ed0 - 9bd85b6ab Use a specific yoda-time version instead of the range that the aws pom specifies so we can get a consistent version and one that matches the rest of camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bd85b6a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bd85b6a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bd85b6a Branch: refs/heads/master Commit: 9bd85b6ab2bdb60a2f0963bf0e0eb97888f33b39 Parents: 67ee84e Author: Daniel Kulp dk...@apache.org Authored: Tue Aug 19 12:19:36 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Tue Aug 19 12:19:36 2014 -0400 -- components/camel-aws/pom.xml | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9bd85b6a/components/camel-aws/pom.xml -- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index 05e1591..8b51456 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -50,6 +50,11 @@ artifactIdcamel-core/artifactId /dependency dependency +groupIdjoda-time/groupId +artifactIdjoda-time/artifactId +version${jodatime2-bundle-version}/version +/dependency +dependency groupIdcom.amazonaws/groupId artifactIdaws-java-sdk/artifactId version${aws-java-sdk-version}/version @@ -59,6 +64,10 @@ artifactIdjackson-core/artifactId /exclusion exclusion +groupIdjoda-time/groupId +artifactIdjoda-time/artifactId +/exclusion +exclusion groupIdcom.fasterxml.jackson.core/groupId artifactIdjackson-databind/artifactId /exclusion
git commit: Fix checkstyle/formatting issues
Repository: camel Updated Branches: refs/heads/master 9bd85b6ab - c4f5f8ce7 Fix checkstyle/formatting issues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4f5f8ce Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4f5f8ce Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4f5f8ce Branch: refs/heads/master Commit: c4f5f8ce7282f6c0dbfdf90ea4e17129d6222170 Parents: 9bd85b6 Author: Daniel Kulp dk...@apache.org Authored: Tue Aug 19 12:38:21 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Tue Aug 19 12:38:21 2014 -0400 -- .../camel/component/sjms/SjmsConsumer.java | 2 +- .../camel/component/sjms/SjmsProducer.java | 2 +- .../sjms/threadpool/ThreadPoolTest.java | 128 +-- 3 files changed, 66 insertions(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c4f5f8ce/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index 4ae566d..017acbe 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -157,7 +157,7 @@ public class SjmsConsumer extends DefaultConsumer { consumers.drainPool(); consumers = null; } -if(this.executor!=null){ +if (this.executor != null) { getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); } } http://git-wip-us.apache.org/repos/asf/camel/blob/c4f5f8ce/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java -- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java index 582d657..8e9e878 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsProducer.java @@ -146,7 +146,7 @@ public abstract class SjmsProducer extends DefaultAsyncProducer { getProducers().drainPool(); setProducers(null); } -if(this.executor!=null){ +if (this.executor != null) { getEndpoint().getCamelContext().getExecutorServiceManager().shutdownGraceful(this.executor); } } http://git-wip-us.apache.org/repos/asf/camel/blob/c4f5f8ce/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java -- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java index 1bff29e..cec28c4 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java @@ -36,77 +36,77 @@ import org.slf4j.LoggerFactory; */ public class ThreadPoolTest extends JmsTestSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(ThreadPoolTest.class); - private static final String FROM_ROUTE = from; - private static final String TO_ROUTE = to; +private static final Logger LOGGER = LoggerFactory.getLogger(ThreadPoolTest.class); +private static final String FROM_ROUTE = from; +private static final String TO_ROUTE = to; - @Override - protected boolean useJmx() { - return true; - } +@Override +protected boolean useJmx() { +return true; +} - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from(direct:start).to(sjms:queue:foo).routeId(FROM_ROUTE); - from(sjms:queue:foo).to(log:test.log.1?showBody=true).routeId(TO_ROUTE); - } - }; - } +@Override +protected RouteBuilder createRouteBuilder() throws Exception { +return new RouteBuilder() { +@Override +public void
buildbot failure in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/2870 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/2871 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot