[CONF] Apache Camel SJMS

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


SJMS   






...
Maven users will need to add the following dependency to their pom.xml for this component:



 Code Block









xml


 




 

dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-sjms/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
/dependency
 



URI format



 Code Block




 

sjms:[queue:|topic:]destinationName[?options]
 



Where destinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name. For example, to connect to the queue, FOO.BAR use:



 Code Block




 

sjms:FOO.BAR
 



You can include the optional queue: prefix, if you prefer:

[1/2] git commit: CAMEL-7740: Allow pool prefill configuration for SjmsProducer

2014-08-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 593f5b15b - 4f8bf48e7


CAMEL-7740: Allow pool prefill configuration for SjmsProducer

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2132d3c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2132d3c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2132d3c

Branch: refs/heads/master
Commit: f2132d3c83f27694be5d650c227a49a0a82ecaa7
Parents: 86a191f
Author: Cristiano Nicolai cnico...@redhat.com
Authored: Mon Aug 25 12:57:47 2014 +1000
Committer: Cristiano Nicolai cnico...@redhat.com
Committed: Mon Aug 25 13:05:58 2014 +1000

--
 .../camel/component/sjms/SjmsEndpoint.java  | 10 
 .../camel/component/sjms/SjmsProducer.java  | 34 ++--
 .../sjms/producer/PrefillPoolTest.java  | 56 
 3 files changed, 84 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f2132d3c/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
--
diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index d8cd26f..61d4bea 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -74,6 +74,8 @@ public class SjmsEndpoint extends DefaultEndpoint implements 
MultipleConsumersSu
 private boolean asyncStartListener;
 @UriParam
 private boolean asyncStopListener;
+@UriParam
+private boolean prefillPool = true;
 private TransactionCommitStrategy transactionCommitStrategy;
 
 public SjmsEndpoint() {
@@ -469,4 +471,12 @@ public class SjmsEndpoint extends DefaultEndpoint 
implements MultipleConsumersSu
 return asyncStopListener;
 }
 
+public boolean isPrefillPool() {
+return prefillPool;
+}
+
+public void setPrefillPool(boolean prefillPool) {
+this.prefillPool = prefillPool;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/f2132d3c/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 533b2f1..27a0ab5 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
@@ -83,24 +83,26 @@ public abstract class SjmsProducer extends 
DefaultAsyncProducer {
 setProducers(new GenericObjectPoolMessageProducerResources(new 
MessageProducerResourcesFactory()));
 getProducers().setMaxActive(getProducerCount());
 getProducers().setMaxIdle(getProducerCount());
-if (getEndpoint().isAsyncStartListener()) {
-asyncStart = 
getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new 
Runnable() {
-@Override
-public void run() {
-try {
-fillProducersPool();
-} catch (Throwable e) {
-log.warn(Error starting listener container on 
destination:  + getDestinationName() + . This exception will be ignored., e);
+if (getEndpoint().isPrefillPool()) {
+if (getEndpoint().isAsyncStartListener()) {
+asyncStart = 
getEndpoint().getComponent().getAsyncStartStopExecutorService().submit(new 
Runnable() {
+@Override
+public void run() {
+try {
+fillProducersPool();
+} catch (Throwable e) {
+log.warn(Error starting listener container on 
destination:  + getDestinationName() + . This exception will be ignored., e);
+}
 }
-}
 
-@Override
-public String toString() {
-return AsyncStartListenerTask[ + 
getDestinationName() + ];
-}
-});
-} else {
-fillProducersPool();
+@Override
+public String toString() {
+return AsyncStartListenerTask[ + 
getDestinationName() + ];
+

[CONF] Apache Camel SJMS

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


SJMS   






...



 Info








title
Why the S in SJMS


 




 S stands for Simple and Standard and Springless. Also camel-jms was already taken.  






 Warning




  This is a rather new component in a complex world of JMS messaging. So this component is ongoing development and hardening.   The classic JMS component based on Spring JMS has been hardened and battle tested extensively.  



  
Maven users will need to add the following dependency to their pom.xml for this component:
...



 div








class
confluenceTableSmall

[1/2] git commit: CAMEL-7403: hl7 improvements. Thanks to Christian Ohr for the patch.

2014-08-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 4f8bf48e7 - 6482bf78b


CAMEL-7403: hl7 improvements. Thanks to Christian Ohr for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cf432211
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf432211
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf432211

Branch: refs/heads/master
Commit: cf432211608731e4d2b7d17f2426b084dbf4becc
Parents: 4f8bf48
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 08:30:56 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 08:30:56 2014 +0200

--
 .../camel/component/hl7/HL7DataFormat.java  | 25 ++--
 .../hl7/ValidationContextPredicate.java |  5 
 2 files changed, 28 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cf432211/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
--
diff --git 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
index 949aaed..f3d16c7 100644
--- 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
+++ 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7DataFormat.java
@@ -21,6 +21,8 @@ import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import ca.uhn.hl7v2.DefaultHapiContext;
+import ca.uhn.hl7v2.HapiContext;
 import ca.uhn.hl7v2.model.Message;
 import ca.uhn.hl7v2.parser.GenericParser;
 import ca.uhn.hl7v2.parser.Parser;
@@ -82,7 +84,8 @@ public class HL7DataFormat implements DataFormat {
 
 private static final MapString, String HEADER_MAP = new HashMapString, 
String();
 
-private Parser parser = new GenericParser();
+private HapiContext hapiContext = new DefaultHapiContext();
+private Parser parser = hapiContext.getGenericParser();
 
 static {
 HEADER_MAP.put(HL7_SENDING_APPLICATION, MSH-3);
@@ -117,20 +120,38 @@ public class HL7DataFormat implements DataFormat {
 return message;
 }
 
+/**
+ * @deprecated configure validation by means of {@link 
ca.uhn.hl7v2.HapiContext}
+ */
 public boolean isValidate() {
-return !(parser.getValidationContext() instanceof NoValidation);
+return (parser.getValidationContext() != null  
!(parser.getValidationContext() instanceof NoValidation));
 }
 
+/**
+ * @deprecated configure validation by means of {@link 
ca.uhn.hl7v2.HapiContext}
+ */
 public void setValidate(boolean validate) {
 if (!validate) {
 parser.setValidationContext(new NoValidation());
 }
 }
 
+public HapiContext getHapiContext() {
+return hapiContext;
+}
+
+public void setHapiContext(HapiContext context) {
+this.hapiContext = context;
+this.parser = context.getGenericParser();
+}
+
 public Parser getParser() {
 return parser;
 }
 
+/**
+ * @deprecated configure the parser by means of {@link 
ca.uhn.hl7v2.HapiContext}
+ */
 public void setParser(Parser parser) {
 this.parser = parser;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cf432211/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/ValidationContextPredicate.java
--
diff --git 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/ValidationContextPredicate.java
 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/ValidationContextPredicate.java
index fb99497..6138377 100644
--- 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/ValidationContextPredicate.java
+++ 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/ValidationContextPredicate.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.hl7;
 
 import ca.uhn.hl7v2.HL7Exception;
+import ca.uhn.hl7v2.HapiContext;
 import ca.uhn.hl7v2.model.Message;
 import ca.uhn.hl7v2.validation.MessageValidator;
 import ca.uhn.hl7v2.validation.ValidationContext;
@@ -32,6 +33,10 @@ public class ValidationContextPredicate implements Predicate 
{
 
 private Expression validatorExpression;
 
+public ValidationContextPredicate(HapiContext hapiContext) {
+this(hapiContext.getValidationContext());
+}
+
 public ValidationContextPredicate(ValidationContext validationContext) {
 this(ExpressionBuilder.constantExpression(validationContext));
 }

[2/2] git commit: CAMEL-7403: hl7 improvements. Thanks to Christian Ohr for the patch.

2014-08-25 Thread davsclaus 
CAMEL-7403: hl7 improvements. Thanks to Christian Ohr for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6482bf78
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6482bf78
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6482bf78

Branch: refs/heads/master
Commit: 6482bf78ba0f9d3cc7e51274d2fa12e474055c77
Parents: cf43221
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 08:48:18 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 08:48:18 2014 +0200

--
 .gitignore  |   1 +
 .../org/apache/camel/component/hl7/AckCode.java |   3 +
 .../camel/component/hl7/AckExpression.java  |  36 +--
 .../org/apache/camel/component/hl7/HL7.java |  22 +++-
 .../camel/component/hl7/HL7Constants.java   |   1 +
 .../camel/component/hl7/HL7Converter.java   |  18 ++--
 .../camel/component/hl7/HL7DataFormat.java  |  51 +
 .../camel/component/hl7/HL7MLLPConfig.java  |  25 +++--
 .../hl7/ValidationContextPredicate.java |  16 ++-
 .../camel/component/hl7/HL7DataFormatTest.java  |  11 +-
 .../component/hl7/MessageValidatorTest.java | 108 +++
 11 files changed, 190 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6482bf78/.gitignore
--
diff --git a/.gitignore b/.gitignore
index b74e107..2105a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ target
 *.log
 test-salesforce-login.properties
 dependency-reduced-pom.xml
+id_file
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/6482bf78/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java
--
diff --git 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java
 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java
index b8e768f..493caf2 100644
--- 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java
+++ 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckCode.java
@@ -18,6 +18,9 @@ package org.apache.camel.component.hl7;
 
 import ca.uhn.hl7v2.AcknowledgmentCode;
 
+/**
+ * @deprecated use {@link ca.uhn.hl7v2.AcknowledgmentCode}
+ */
 public enum AckCode {
 AA(false), CA(false), AR(true), CR(true), AE(true), CE(true);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/6482bf78/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckExpression.java
--
diff --git 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckExpression.java
 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckExpression.java
index 5a3ab37..25c1834 100644
--- 
a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckExpression.java
+++ 
b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/AckExpression.java
@@ -27,27 +27,43 @@ import org.apache.camel.util.ObjectHelper;
 
 public class AckExpression extends ExpressionAdapter {
 
-private AckCode acknowledgementCode;
+private AcknowledgmentCode acknowledgementCode;
 private String errorMessage;
 private ErrorCode errorCode;
 
 public AckExpression() {
-this(null, null, ErrorCode.APPLICATION_INTERNAL_ERROR);
+this((AcknowledgmentCode)null, null, 
ErrorCode.APPLICATION_INTERNAL_ERROR);
 }
 
+/**
+ * @deprecated use {@link #AckExpression(ca.uhn.hl7v2.AcknowledgmentCode)}
+ */
+@Deprecated
 public AckExpression(AckCode acknowledgementCode) {
-this(acknowledgementCode, null, ErrorCode.APPLICATION_INTERNAL_ERROR);
+this(acknowledgementCode.toAcknowledgmentCode());
 }
 
 /**
- * @deprecated Use {@link #AckExpression(AckCode, String, ErrorCode)}
+ * @deprecated Use {@link #AckExpression(AcknowledgmentCode, String, 
ErrorCode)}
  */
 @Deprecated
 public AckExpression(AckCode acknowledgementCode, String errorMessage, int 
errorCode) {
 this(acknowledgementCode, errorMessage, 
ErrorCode.errorCodeFor(errorCode));
 }
 
+/**
+ * @deprecated Use {@link #AckExpression(AcknowledgmentCode, String, 
ErrorCode)}
+ */
+@Deprecated
 public AckExpression(AckCode acknowledgementCode, String errorMessage, 
ErrorCode errorCode) {
+this(acknowledgementCode.toAcknowledgmentCode(), errorMessage, 
errorCode);
+}
+
+public AckExpression(AcknowledgmentCode acknowledgementCode) {
+this(acknowledgementCode, null, ErrorCode.APPLICATION_INTERNAL_ERROR);
+}
+
+public

svn commit: r920350 - in /websites/production/camel/content: cache/main.pageCache sjms.html

2014-08-25 Thread buildbot 
Author: buildbot
Date: Mon Aug 25 07:18:23 2014
New Revision: 920350

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/sjms.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/sjms.html
==
--- websites/production/camel/content/sjms.html (original)
+++ websites/production/camel/content/sjms.html Mon Aug 25 07:18:23 2014
@@ -85,108 +85,40 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 id=SJMS-SJMSComponentSJMS 
Component/h2
-pstrongAvailable as of Camel 2.11/strong/p
-
-pThe Simple JMS Component, or SJMS, is a JMS client for use with Camel that 
uses well known best practices when it comes to JMS client creation and 
configuration. SJMS contains a brand new JMS client API written explicitly for 
Camel eliminating third party messaging implementations keeping it light and 
resilient.  The following features is included:/p
-
-ulliStandard Queue and Topic Support (Durable amp; 
Non-Durable)/liliInOnly amp; InOut MEP Support/liliAsynchronous 
Producer and Consumer Processing/liliInternal JMS Transaction 
Support/li/ul
-
-
-pAdditional key features include:/p
-
-ulliPlugable Connection Resource Management/liliSession, Consumer, 
amp; Producer Pooling amp; Caching Management/liliBatch Consumers and 
Producers/liliTransacted Batch Consumers amp; Producers/liliSupport 
for Customizable Transaction Commit Strategies (Local JMS Transactions 
only)/li/ul
-
-
-div class=aui-message hint shadowed information-macro
+div class=wiki-content maincontenth2 id=SJMS-SJMSComponentSJMS 
Component/h2pstrongAvailable as of Camel 2.11/strong/ppThe Simple 
JMS Component, or SJMS, is a JMS client for use with Camel that uses well known 
best practices when it comes to JMS client creation and configuration. SJMS 
contains a brand new JMS client API written explicitly for Camel eliminating 
third party messaging implementations keeping it light and resilient. The 
following features is included:/pulliStandard Queue and Topic Support 
(Durable amp; Non-Durable)/liliInOnly amp; InOut MEP 
Support/liliAsynchronous Producer and Consumer Processing/liliInternal 
JMS Transaction Support/li/ulpAdditional key features 
include:/pulliPlugable Connection Resource Management/liliSession, 
Consumer, amp; Producer Pooling amp; Caching Management/liliBatch 
Consumers and Producers/liliTransacted Batch Consumers amp; 
Producers/liliSupport for Customizable Transactio
 n Commit Strategies (Local JMS Transactions only)/li/uldiv 
class=aui-message hint shadowed information-macro
 p class=titleWhy the S in SJMS/p
 span class=aui-icon icon-hintIcon/span
 div class=message-content
-
-pS stands for Simple and Standard and Springless.  Also camel-jms was 
already taken. img class=emoticon emoticon-smile 
src=https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/smile.png;
 data-emoticon-name=smile alt=(smile)/p
+pS stands for Simple and Standard and 
Springless. Also camel-jms was already taken. img class=emoticon 
emoticon-smile 
src=https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/smile.png;
 data-emoticon-name=smile alt=(smile)/p
 /div
 /div
-
-
-div class=aui-message problem shadowed information-macro
-span class=aui-icon icon-problemIcon/span
-div class=message-content
-
-pThis is a rather new component in a complex world of JMS messaging. So this 
component is ongoing development and hardening.br clear=none
-The classic a shape=rect href=jms.htmlJMS/a component based on Spring 
JMS has been hardened and battle tested extensively./p
-/div
-/div
-
-
-pMaven users will need to add the following dependency to their 
codepom.xml/code for this component:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[
-lt;dependencygt;
+p#160;/ppMaven users will need to add the following dependency to their 
codepom.xml/code for this component:/pdiv class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[lt;dependencygt;
 lt;groupIdgt;org.apache.camellt;/groupIdgt;
 lt;artifactIdgt;camel-sjmslt;/artifactIdgt;

[CONF] Apache Camel Camel 2.14.0 Release

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


Camel 2.14.0 Release   






...

Support for running on Java 1.8 JVMs
Spring 4.x supported.
 REST DSL to define REST services using a REST style with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML DSL.
 REST DSL integrated with Swagger to expose the service as swagger apis.
Simple language defined in routes using resultType as boolean is now evaluated as predicate instead of as _expression_.
Introduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.
Added event notification for routes added and removed.
Allow to configure cache size in Recipient List, Routing Slip and Dynamic Router EIPs; and as well turn caching off.
 Netty HTTPproducer now supports the CamelHttpPath header to define a dynamic context-path and query parameters to call the remote http server. 
 Polling Consumerallows to configure initial queue size and whether to block when full when using the defaultEventDrivenPollingConsumer which most components does. We now block by default, as otherwise the message may be lost if the queue was full, and a new message was offered. 
 Added a generic callback to configure the APNS service builder. 
 AddedStreamList option to theJDBC component 
Allow to define Simple expressions for sql parameters of the SQL component.   
A new XML tokenizer that is truly XML-aware (e.g., supporting XML namespaces and complex hierarchical structures)
Added optionparallelAggregate to Multicast, Splitter and Recipient ListEIPs
Support to set the variable map from message header in Velocity, Freemarker, StringTemplate.
 Added HazelcastInstance option toHazelcast component. 
Producers from static EIPs such as to is is now also enlisted in JMX when Camel is starting routes.
Unmarshal json to pojo usingcamel-jackson now supports a header to tell Camel what the pojo class name is, to allow more dynamic behavior, as otherwise the class name would be hardcoded.
Also allow to configurecamel-jackson to skip null values, by setting includes toNOT_NULL.
Andcamel-jackson can now easily be configured to unmarshal to aListpojoor ListMapinstead of either a single pojo orMap type.
IntroducedSynchronizationRouteAware allowing to have callbacks before/after an Exchange is being routed. This allows to trigger custom code at these points, for example after a route, but before a Consumer writes any response back to a caller (InOut mode).
 JDBCnow supports outputClass for SelectList type.

git commit: CAMEL-7663: QuartzScheduledPollConsumerScheduler supports jdbc datastore and is cluster aware.

2014-08-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 6482bf78b - ddf9e0be5


CAMEL-7663: QuartzScheduledPollConsumerScheduler supports jdbc datastore and is 
cluster aware.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddf9e0be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddf9e0be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddf9e0be

Branch: refs/heads/master
Commit: ddf9e0be50858c7ed43fc401e4417b62a73152db
Parents: 6482bf7
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 10:01:03 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 10:01:03 2014 +0200

--
 .../camel/component/quartz2/CamelJob.java   |  6 ++--
 .../camel/component/quartz2/QuartzEndpoint.java | 12 +--
 .../camel/component/quartz2/QuartzHelper.java   | 15 +
 .../quartz2/QuartzScheduledPollConsumerJob.java | 33 +---
 .../QuartzScheduledPollConsumerScheduler.java   | 21 -
 5 files changed, 67 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ddf9e0be/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
--
diff --git 
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
 
b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
index df580a0..1d5d88d 100644
--- 
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
+++ 
b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
@@ -69,7 +69,7 @@ public class CamelJob implements Job {
 }
 }
 
-private CamelContext getCamelContext(JobExecutionContext context) throws 
JobExecutionException {
+protected CamelContext getCamelContext(JobExecutionContext context) throws 
JobExecutionException {
 SchedulerContext schedulerContext = getSchedulerContext(context);
 String camelContextName = 
context.getMergedJobDataMap().getString(QuartzConstants.QUARTZ_CAMEL_CONTEXT_NAME);
 CamelContext result = 
(CamelContext)schedulerContext.get(QuartzConstants.QUARTZ_CAMEL_CONTEXT + - + 
camelContextName);
@@ -79,7 +79,7 @@ public class CamelJob implements Job {
 return result;
 }
 
-private SchedulerContext getSchedulerContext(JobExecutionContext context) 
throws JobExecutionException {
+protected SchedulerContext getSchedulerContext(JobExecutionContext 
context) throws JobExecutionException {
 try {
 return context.getScheduler().getContext();
 } catch (SchedulerException e) {
@@ -87,7 +87,7 @@ public class CamelJob implements Job {
 }
 }
 
-private QuartzEndpoint lookupQuartzEndpoint(CamelContext camelContext, 
JobExecutionContext quartzContext) throws JobExecutionException {
+protected QuartzEndpoint lookupQuartzEndpoint(CamelContext camelContext, 
JobExecutionContext quartzContext) throws JobExecutionException {
 TriggerKey triggerKey = quartzContext.getTrigger().getKey();
 if (LOG.isDebugEnabled()) {
 LOG.debug(Looking up existing QuartzEndpoint with triggerKey={}, 
triggerKey);

http://git-wip-us.apache.org/repos/asf/camel/blob/ddf9e0be/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
--
diff --git 
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
 
b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
index 6d2167d..c4cb731 100644
--- 
a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++ 
b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
@@ -240,7 +240,7 @@ public class QuartzEndpoint extends DefaultEndpoint {
 jobDetail = createJobDetail();
 trigger = createTrigger(jobDetail);
 
-updateJobDataMap(jobDetail);
+QuartzHelper.updateJobDataMap(getCamelContext(), jobDetail, 
getEndpointUri());
 
 // Schedule it now. Remember that scheduler might not be started 
it, but we can schedule now.
 Date nextFireDate = scheduler.scheduleJob(jobDetail, trigger);
@@ -274,16 +274,6 @@ public class QuartzEndpoint extends DefaultEndpoint {
 }
 }
 
-private void updateJobDataMap(JobDetail jobDetail) {
-// Store this camelContext name into the job data
-JobDataMap jobDataMap = jobDetail.getJobDataMap();
-String camelContextName = 
QuartzHelper.getQuartzContextName(getCamelContext());
-String endpointUri

svn commit: r920356 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html

2014-08-25 Thread buildbot 
Author: buildbot
Date: Mon Aug 25 08:18:21 2014
New Revision: 920356

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2140-release.html
==
--- websites/production/camel/content/camel-2140-release.html (original)
+++ websites/production/camel/content/camel-2140-release.html Mon Aug 25 
08:18:21 2014
@@ -84,7 +84,7 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth1 
id=Camel2.14.0Release-Camel2.14.0release(currentlyinprogress)Camel 2.14.0 
release (currently in progress)/h1div 
style=padding-right:20px;float:left;margin-left:-20px;pimg 
class=confluence-embedded-image confluence-external-resource 
src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv
 style=min-height:200px#160;/divh2 
id=Camel2.14.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to 
the 2.14.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)/pulliSupport for running on Java 1.8 
JVMs/liliSpring 4.x supported./lilia shape=rect 
href=rest-dsl.htmlREST DSL/a to define REST services using a REST style 
with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML 
DSL./lilia shape=rect href=rest-dsl.htmlREST DSL
 /a integrated with a shape=rect href=swagger.htmlSwagger/a to expose 
the service as swagger apis./liliSimple language defined in routes using 
resultType as boolean is now evaluated as predicate instead of as 
expression./liliIntroduced RuntimeEndpointRegistry to capture runtime usage 
of endpoints in use during routing, such as dynamic endpoints from dynamic a 
shape=rect href=eip.htmlEIP/as./liliAdded event notification for 
routes added and removed./liliAllow to configure cache size in Recipient 
List, Routing Slip and Dynamic Router EIPs; and as well turn caching 
off./lilia shape=rect href=netty-http.htmlNetty 
HTTP/a#160;producer now supports the spanCamelHttpPath header to define a 
dynamic context-path and query parameters to call the remote http 
server./span/lilispana shape=rect 
href=polling-consumer.htmlPolling Consumer/a#160;allows to configure 
initial queue size and whether to block when full when using the default
 #160;codeEventDrivenPollingConsumer/code which most components does. We 
now block by default, as otherwise the message may be lost if the queue was 
full, and a new message was offered./span/lilispana shape=rect 
class=external-link 
href=https://issues.apache.org/jira/browse/CAMEL-7435;Added/a a generic 
callback to configure the a shape=rect href=apns.htmlAPNS/a service 
builder./span/lilispanAdded#160;codeStreamList/code option to 
the#160;a shape=rect href=jdbc.htmlJDBC/a 
component/span/liliAllow to define Simple expressions for sql parameters 
of the a shape=rect href=sql-component.htmlSQL/a component.spanbr 
clear=none/span/liliA new XML tokenizer that is truly XML-aware (e.g., 
supporting XML namespaces and complex hierarchical structures)/liliAdded 
option#160;codeparallelAggregate/code to a shape=rect 
href=multicast.htmlMulticast/a, a shape=rect 
href=splitter.htmlSplitter/a and a s
 hape=rect href=recipient-list.htmlRecipient 
List/a#160;EIPs/liliSupport to set the variable map from message header 
in a shape=rect href=velocity.htmlVelocity/a, a shape=rect 
href=freemarker.htmlFreemarker/a, a shape=rect 
href=stringtemplate.htmlStringTemplate/a./lilispanAdded 
HazelcastInstance option to#160;spana shape=rect 
href=hazelcast-component.htmlHazelcast/a 
component./span/span/liliProducers from static a shape=rect 
href=eip.htmlEIPs/a such as lt;togt; is is now also enlisted in a 
shape=rect href=camel-jmx.htmlJMX/a when Camel is starting 
routes./liliUnmarshal json to pojo using#160;codecamel-jackson/code 
now supports a header to tell Camel what the pojo class name is, to allow more 
dynamic behavior, as otherwise the class name would be hardcoded./liliAlso 
allow to configure#160;codecamel-jackson/code to skip null values, by 
setting includes to#160;codeNOT_NULL/code./lili
 And#160;codecamel-jackson/code can now easily be configured to unmarshal 
 to a#160;codeListlt;pojogt;/code#160;or 
 codeListlt;Mapgt;/code#160;instead of either a single pojo 
 or#160;codeMap/code 
 type.#160;/liliIntroduced#160;codeSynchronizationRouteAware/code 
 allowing to have callbacks before/after an Exchange is being routed. This 
 allows to trigger custom code at these points, for example after a route, but 
 before a Consumer writes any response back to a caller

git commit: Remove Pattern from @DataField defintion of Math class test and it is not yet supported by BigDecimal FormatFactory

2014-08-25 Thread cmoulliard 
Repository: camel
Updated Branches:
  refs/heads/master ddf9e0be5 - f846d6b57


Remove Pattern from @DataField defintion of Math class test and it is not yet 
supported by BigDecimal FormatFactory


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f846d6b5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f846d6b5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f846d6b5

Branch: refs/heads/master
Commit: f846d6b57823eb8d8f48be3675d17404249b2c0c
Parents: ddf9e0b
Author: Charles Moulliard ch0...@gmail.com
Authored: Mon Aug 25 11:21:33 2014 +0200
Committer: Charles Moulliard ch0...@gmail.com
Committed: Mon Aug 25 11:21:33 2014 +0200

--
 .../dataformat/bindy/model/simple/oneclassmath/Math.java | 11 ++-
 .../jms/issues/JmsTXForceShutdownIssueTest.java  |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f846d6b5/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmath/Math.java
--
diff --git 
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmath/Math.java
 
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmath/Math.java
index fd19d7a..25c6838 100644
--- 
a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmath/Math.java
+++ 
b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmath/Math.java
@@ -27,7 +27,16 @@ public class Math {
 @DataField(pos = 1, pattern = 00)
 private Integer intAmount;
 
-@DataField(pos = 2, precision = 2, pattern = 00.00)
+@DataField(pos = 2, precision = 2)
+/*
+   Pattern is not yet supported by BigDecimal.
+   FormatFactory class --
+
+   } else if (clazz == BigDecimal.class) {
+return new BigDecimalFormat(impliedDecimalSeparator, precision, 
getLocale(locale));
+
+So we should remove it from the model pattern = 00.00
+  */
 private BigDecimal bigDecimal;
 
 public Integer getIntAmount() {

http://git-wip-us.apache.org/repos/asf/camel/blob/f846d6b5/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTXForceShutdownIssueTest.java
--
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTXForceShutdownIssueTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTXForceShutdownIssueTest.java
index d94b048..0cb0461 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTXForceShutdownIssueTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTXForceShutdownIssueTest.java
@@ -40,7 +40,7 @@ public class JmsTXForceShutdownIssueTest extends 
CamelSpringTestSupport {
 }
 
 @Test
-@Ignore(This is a manual test, start Apache ActiveMQ broker manually 
first, using bin/activemq console)
+//@Ignore(This is a manual test, start Apache ActiveMQ broker manually 
first, using bin/activemq console)
 // and make sure to setup tcp transport connector on the remote AMQ broker 
in the conf/activemq.xml file
 // transportConnectors
 //   transportConnector name=openwire uri=tcp://0.0.0.0:61616/

[CONF] Apache Camel Camel 2.14.0 Release

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


Camel 2.14.0 Release   






...

Support for running on Java 1.8 JVMs
Spring 4.x supported.
 REST DSL to define REST services using a REST style with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML DSL.
 REST DSL integrated with Swagger to expose the service as swagger apis.
Simple language defined in routes using resultType as boolean is now evaluated as predicate instead of as _expression_.
Introduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.
Added event notification for routes added and removed.
Allow to configure cache size in Recipient List, Routing Slip and Dynamic Router EIPs; and as well turn caching off.
 Netty HTTPproducer now supports the CamelHttpPath header to define a dynamic context-path and query parameters to call the remote http server. 
 Polling Consumerallows to configure initial queue size and whether to block when full when using the defaultEventDrivenPollingConsumer which most components does. We now block by default, as otherwise the message may be lost if the queue was full, and a new message was offered. 
 Added a generic callback to configure the APNS service builder. 
 AddedStreamList option to theJDBC component 
Allow to define Simple expressions for sql parameters of the SQL component.   
A new XML tokenizer that is truly XML-aware (e.g., supporting XML namespaces and complex hierarchical structures)
Added optionparallelAggregate to Multicast, Splitter and Recipient ListEIPs
Support to set the variable map from message header in Velocity, Freemarker, StringTemplate.
 Added HazelcastInstance option toHazelcast component. 
Producers from static EIPs such as to is is now also enlisted in JMX when Camel is starting routes.
Unmarshal json to pojo usingcamel-jackson now supports a header to tell Camel what the pojo class name is, to allow more dynamic behavior, as otherwise the class name would be hardcoded.
Also allow to configurecamel-jackson to skip null values, by setting includes toNOT_NULL.
Andcamel-jackson can now easily be configured to unmarshal to aListpojoor ListMapinstead of either a single pojo orMap type.
IntroducedSynchronizationRouteAware allowing to have callbacks before/after an Exchange is being routed. This allows to trigger custom code at these points, for example after a route, but before a Consumer writes any response back to a caller (InOut mode).
 JDBCnow supports outputClass for SelectList type.

[1/2] git commit: CAMEL-7495: component createParameterJsonSchema now uses jscon shcema types to honor the spec. For object types we include a description that tells you the java type it is.

2014-08-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master f846d6b57 - ffc12ed93


CAMEL-7495: component createParameterJsonSchema now uses jscon shcema types to 
honor the spec. For object types we include a description that tells you the 
java type it is.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ffc12ed9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ffc12ed9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ffc12ed9

Branch: refs/heads/master
Commit: ffc12ed9363f0cd285ba65fb2d02338ede058e96
Parents: 5353e40
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 11:25:03 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 11:33:00 2014 +0200

--
 .../camel/impl/ParameterConfiguration.java  |  21 ++--
 .../org/apache/camel/util/JsonSchemaHelper.java | 102 +++
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 .../camel/component/jdbc/JdbcEndpoint.java  |   3 +
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 .../component/netty/NettyConfiguration.java |   1 +
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 .../component/netty4/NettyConfiguration.java|   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   6 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   2 +-
 ...ponentConfigurationAndDocumentationTest.java |   5 +-
 ...ponentConfigurationAndDocumentationTest.java |   4 +-
 52 files changed, 188 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java 
b/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java
index 652746a..d5b57ee 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Field;
 
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.util.CollectionStringBuffer;
+import org.apache.camel.util.JsonSchemaHelper;
 
 import static org.apache.camel.util.StringQuoteHelper.doubleQuote;
 
@@ -66,19 +67,25 @@ public class ParameterConfiguration {
  * Returns the JSON format of this parameter configuration
  */
 public String toJson() {

[2/2] git commit: Polished

2014-08-25 Thread davsclaus 
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5353e405
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5353e405
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5353e405

Branch: refs/heads/master
Commit: 5353e405ed654e74dd8afa5f5703516c46f703b8
Parents: f846d6b
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 10:10:58 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 11:33:00 2014 +0200

--
 .../java/org/apache/camel/ComponentConfiguration.java | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5353e405/camel-core/src/main/java/org/apache/camel/ComponentConfiguration.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/ComponentConfiguration.java 
b/camel-core/src/main/java/org/apache/camel/ComponentConfiguration.java
index 9e0deb5..bcf8ae4 100644
--- a/camel-core/src/main/java/org/apache/camel/ComponentConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/ComponentConfiguration.java
@@ -50,7 +50,7 @@ public interface ComponentConfiguration {
 void setBaseUri(String baseUri);
 
 /**
- * Returns the current parameters of the configuration (usually encoded as 
?foo=barwhatnot=something URI query parameters)
+ * Returns the current parameters of the configuration (usually encoded as 
tt?foo=barwhatnot=something/tt URI query parameters)
  */
 MapString, Object getParameters();
 
@@ -75,7 +75,6 @@ public interface ComponentConfiguration {
  */
 void setParameter(String name, Object value);
 
-
 /**
  * Returns the URI string (without schema) with query parameters for the 
current
  * configuration which can then be used to create an {@link 
org.apache.camel.Endpoint}
@@ -111,7 +110,7 @@ public interface ComponentConfiguration {
  * p/
  * Note that typically parts of the URI are not injected into the 
Endpoint; this method purely
  *
- * @param endpoint
+ * @param endpoint the endpoint instance
  */
 void configureEndpoint(Endpoint endpoint);
 
@@ -137,15 +136,12 @@ public interface ComponentConfiguration {
 
 /**
  * A helper method for tools such as CLIs, IDEs or web tools that provides 
a completion list for Endpoint Paths
- * rather like bash tab completion or Karaf attribute or option completion 
handers.
+ * rather like bash tab completion or Karaf attribute or option completion 
handlers.
  *
  * So given the current configuration data, return a list of completions 
given the specified text.
- *
  * e.g. return the files in a directory, the matching queues in a message 
broker, the database tables in a database component etc
  *
  * @param completionText the prefix text used to complete on (usually a 
matching bit of text)
- *
- * @return a list of matches
  * @return a list of matches
  */
 ListString completeEndpointPath(String completionText);

[CONF] Apache Camel Kafka

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen created a page:
 


Kafka   





Kafka Component
 Available as of Camel 2.13 
The kafka: component is used for communicating with Apache Kafkamessage broker.
 Maven users will need to add the following dependency to their pom.xml for this component: 


dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-kafka/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
/dependency



URI format


kafka:server:port[?options]




Options





 Property 
 Default 
 Description 


 zookeeperHost 
  
 The zookeeper host to use 


 zookeeperPort 
 2181 
 The zookeeper port to use 


 topic 
  
 The topic to use 


groupId




partitioner




consumerStreams
10

svn commit: r920360 - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache camel-2140-release.html component-list.html components.html kafka.html tr

2014-08-25 Thread buildbot 
Author: buildbot
Date: Mon Aug 25 10:18:45 2014
New Revision: 920360

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/kafka.html
Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html
websites/production/camel/content/component-list.html
websites/production/camel/content/components.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Mon Aug 25 
10:18:45 2014
@@ -357,7 +357,9 @@ disruptor-vm:someName[?lt;optiongt;]
 /div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpSupport 
for the scp protocol/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpa shape=rect href=jt400.htmlJT/400 /a / 
camel-jt400/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[jt400://user:pwd@system/lt;path_to_dtaqgt;[?options]
 ]]/script
-/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
integrating with data queues on an AS/400 (aka System i, IBM i, i5, ...) 
system/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=kestrel.htmlKestrel/a / camel-kestrel/pdiv 
class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
integrating with data queues on an AS/400 (aka System i, IBM i, i5, ...) 
system/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpspana shape=rect href=kafka.htmlKafka/a / 
camel-kafka/span/pdiv class=code panel pdl style=border-width: 
1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[kafka://server:port[?options]]]/script
+/div/divpspanbr clear=none/span/p/tdtd colspan=1 
rowspan=1 class=confluenceTdspanFor producing to or consuming from a 
shape=rect class=external-link href=http://kafka.apache.org/;Apache 
Kafka/a message brokers./span/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpa shape=rect href=kestrel.htmlKestrel/a / 
camel-kestrel/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[kestrel://[addresslist/]queueName[?options]
 ]]/script
 /div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
producing to or consuming from a shape=rect class=external-link 
href=https://github.com/robey/kestrel; rel=nofollowKestrel/a 
queues/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=krati.htmlKrati/a / camel-krati/pdiv class=code 
panel pdl style=border-width: 1px;div class=codeContent panelContent pdl

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Mon Aug 25 10:18:45 
2014
@@ -741,7 +741,9 @@ disruptor-vm:someName[?lt;optiongt;]
 /div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpSupport 
for the scp protocol/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpa shape=rect href=jt400.htmlJT/400 /a / 
camel-jt400/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[jt400://user:pwd@system/lt;path_to_dtaqgt;[?options]
 ]]/script
-/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
integrating with data queues on an AS/400 (aka System i, IBM i, i5, ...) 
system/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=kestrel.htmlKestrel/a / camel-kestrel/pdiv 
class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
integrating with data queues on an AS/400 (aka System i, IBM i, i5, ...) 
system/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpspana shape=rect href=kafka.htmlKafka/a / 
camel-kafka/span/pdiv class=code panel pdl style=border-width: 
1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[kafka://server:port[?options]]]/script
+/div/divpspanbr clear=none/span/p/tdtd colspan=1 
rowspan=1 class=confluenceTdspanFor producing to or consuming from a 
shape=rect class=external-link href=http://kafka.apache.org/;Apache 
Kafka/a message

[CONF] Apache Camel Camel 2.14.0 Release

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


Camel 2.14.0 Release   






...

Support for running on Java 1.8 JVMs
Spring 4.x supported.
 REST DSL to define REST services using a REST style with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML DSL.
 REST DSL integrated with Swagger to expose the service as swagger apis.
Simple language defined in routes using resultType as boolean is now evaluated as predicate instead of as _expression_.
Introduced RuntimeEndpointRegistry to capture runtime usage of endpoints in use during routing, such as dynamic endpoints from dynamic EIPs.
Added event notification for routes added and removed.
Allow to configure cache size in Recipient List, Routing Slip and Dynamic Router EIPs; and as well turn caching off.
 Netty HTTPproducer now supports the CamelHttpPath header to define a dynamic context-path and query parameters to call the remote http server. 
 Polling Consumerallows to configure initial queue size and whether to block when full when using the defaultEventDrivenPollingConsumer which most components does. We now block by default, as otherwise the message may be lost if the queue was full, and a new message was offered. 
 Added a generic callback to configure the APNS service builder. 
 AddedStreamList option to theJDBC component 
Allow to define Simple expressions for sql parameters of the SQL component.   
A new XML tokenizer that is truly XML-aware (e.g., supporting XML namespaces and complex hierarchical structures)
Added optionparallelAggregate to Multicast, Splitter and Recipient ListEIPs
Support to set the variable map from message header in Velocity, Freemarker, StringTemplate.
 Added HazelcastInstance option toHazelcast component. 
Producers from static EIPs such as to is is now also enlisted in JMX when Camel is starting routes.
Unmarshal json to pojo usingcamel-jackson now supports a header to tell Camel what the pojo class name is, to allow more dynamic behavior, as otherwise the class name would be hardcoded.
Also allow to configurecamel-jackson to skip null values, by setting includes toNOT_NULL.
Andcamel-jackson can now easily be configured to unmarshal to aListpojoor ListMapinstead of either a single pojo orMap type.
IntroducedSynchronizationRouteAware allowing to have callbacks before/after an Exchange is being routed. This allows to trigger custom code at these points, for example after a route, but before a Consumer writes any response back to a caller (InOut mode).
 JDBCnow supports outputClass for SelectList type.

svn commit: r920366 - in /websites/production/camel/content: cache/main.pageCache camel-2140-release.html

2014-08-25 Thread buildbot 
Author: buildbot
Date: Mon Aug 25 12:19:08 2014
New Revision: 920366

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2140-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2140-release.html
==
--- websites/production/camel/content/camel-2140-release.html (original)
+++ websites/production/camel/content/camel-2140-release.html Mon Aug 25 
12:19:08 2014
@@ -84,7 +84,7 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth1 
id=Camel2.14.0Release-Camel2.14.0release(currentlyinprogress)Camel 2.14.0 
release (currently in progress)/h1div 
style=padding-right:20px;float:left;margin-left:-20px;pimg 
class=confluence-embedded-image confluence-external-resource 
src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv
 style=min-height:200px#160;/divh2 
id=Camel2.14.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to 
the 2.14.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)/pulliSupport for running on Java 1.8 
JVMs/liliSpring 4.x supported./lilia shape=rect 
href=rest-dsl.htmlREST DSL/a to define REST services using a REST style 
with verbs such as get/post/put/delete etc. The Rest DSL supports Java and XML 
DSL./lilia shape=rect href=rest-dsl.htmlREST DSL
 /a integrated with a shape=rect href=swagger.htmlSwagger/a to expose 
the service as swagger apis./liliSimple language defined in routes using 
resultType as boolean is now evaluated as predicate instead of as 
expression./liliIntroduced RuntimeEndpointRegistry to capture runtime usage 
of endpoints in use during routing, such as dynamic endpoints from dynamic a 
shape=rect href=eip.htmlEIP/as./liliAdded event notification for 
routes added and removed./liliAllow to configure cache size in Recipient 
List, Routing Slip and Dynamic Router EIPs; and as well turn caching 
off./lilia shape=rect href=netty-http.htmlNetty 
HTTP/a#160;producer now supports the spanCamelHttpPath header to define a 
dynamic context-path and query parameters to call the remote http 
server./span/lilispana shape=rect 
href=polling-consumer.htmlPolling Consumer/a#160;allows to configure 
initial queue size and whether to block when full when using the default
 #160;codeEventDrivenPollingConsumer/code which most components does. We 
now block by default, as otherwise the message may be lost if the queue was 
full, and a new message was offered./span/lilispana shape=rect 
class=external-link 
href=https://issues.apache.org/jira/browse/CAMEL-7435;Added/a a generic 
callback to configure the a shape=rect href=apns.htmlAPNS/a service 
builder./span/lilispanAdded#160;codeStreamList/code option to 
the#160;a shape=rect href=jdbc.htmlJDBC/a 
component/span/liliAllow to define Simple expressions for sql parameters 
of the a shape=rect href=sql-component.htmlSQL/a component.spanbr 
clear=none/span/liliA new XML tokenizer that is truly XML-aware (e.g., 
supporting XML namespaces and complex hierarchical structures)/liliAdded 
option#160;codeparallelAggregate/code to a shape=rect 
href=multicast.htmlMulticast/a, a shape=rect 
href=splitter.htmlSplitter/a and a s
 hape=rect href=recipient-list.htmlRecipient 
List/a#160;EIPs/liliSupport to set the variable map from message header 
in a shape=rect href=velocity.htmlVelocity/a, a shape=rect 
href=freemarker.htmlFreemarker/a, a shape=rect 
href=stringtemplate.htmlStringTemplate/a./lilispanAdded 
HazelcastInstance option to#160;spana shape=rect 
href=hazelcast-component.htmlHazelcast/a 
component./span/span/liliProducers from static a shape=rect 
href=eip.htmlEIPs/a such as lt;togt; is is now also enlisted in a 
shape=rect href=camel-jmx.htmlJMX/a when Camel is starting 
routes./liliUnmarshal json to pojo using#160;codecamel-jackson/code 
now supports a header to tell Camel what the pojo class name is, to allow more 
dynamic behavior, as otherwise the class name would be hardcoded./liliAlso 
allow to configure#160;codecamel-jackson/code to skip null values, by 
setting includes to#160;codeNOT_NULL/code./lili
 And#160;codecamel-jackson/code can now easily be configured to unmarshal 
 to a#160;codeListlt;pojogt;/code#160;or 
 codeListlt;Mapgt;/code#160;instead of either a single pojo 
 or#160;codeMap/code 
 type.#160;/liliIntroduced#160;codeSynchronizationRouteAware/code 
 allowing to have callbacks before/after an Exchange is being routed. This 
 allows to trigger custom code at these points, for example after a route, but 
 before a Consumer writes any response back to a caller

[CONF] Apache Camel XSLT

2014-08-25 Thread Claus Ibsen (Confluence) 














  


Claus Ibsen edited the page:
 


XSLT   






...



 div








class
confluenceTableSmall


 









 Name 
 Default Value 
 Description 


  converter  
  null  
 Option to override default XmlConverter. Will lookup for the converter in the Registry. The provided converted must be of type org.apache.camel.converter.jaxp.XmlConverter. 


  transformerFactory  
  null  
 Option to override default TransformerFactory. Will lookup for the transformerFactory in the Registry. The provided transformer factory must be of type javax.xml.transform.TransformerFactory. 


  transformerFactoryClass  
  null  
 Option to override default TransformerFactory. Will create a TransformerFactoryClass instance and set it to

[2/3] git commit: CAMEL-7744: xslt allow to configure custom error listener.

2014-08-25 Thread davsclaus 
CAMEL-7744: xslt allow to configure custom error listener.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd97b75f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd97b75f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd97b75f

Branch: refs/heads/master
Commit: fd97b75f423e29f10b92fed6bcabc8ce2c43a7f6
Parents: 5e15108
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 14:42:25 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 14:56:35 2014 +0200

--
 .../apache/camel/builder/xml/XsltBuilder.java   | 20 +---
 .../camel/component/xslt/XsltComponent.java |  8 +++-
 2 files changed, 24 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fd97b75f/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
index 908bd8f..944e214 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
@@ -252,8 +252,14 @@ public class XsltBuilder implements Processor {
 setAllowStAX(true);
 return this;
 }
-
-
+
+/**
+ * Used for caching {@link Transformer}s.
+ * p/
+ * By default no caching is in use.
+ *
+ * @param numberToCache  the maximum number of transformers to cache
+ */
 public XsltBuilder transformerCacheSize(int numberToCache) {
 if (numberToCache  0) {
 transformers = new ArrayBlockingQueueTransformer(numberToCache);
@@ -263,7 +269,15 @@ public class XsltBuilder implements Processor {
 return this;
 }
 
-// Properties
+/**
+ * Uses a custom {@link javax.xml.transform.ErrorListener}.
+ */
+public XsltBuilder errorListener(ErrorListener errorListener) {
+setErrorListener(errorListener);
+return this;
+}
+
+// Properties
 // 
-
 
 public MapString, Object getParameters() {

http://git-wip-us.apache.org/repos/asf/camel/blob/fd97b75f/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java 
b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
index 5c7adde..095cdb2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.xslt;
 
 import java.util.Map;
+import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.URIResolver;
 
@@ -129,9 +130,14 @@ public class XsltComponent extends UriEndpointComponent {
 String output = getAndRemoveParameter(parameters, output, 
String.class);
 configureOutput(xslt, output);
 
-Integer cs = getAndRemoveParameter(parameters, transformerCacheSize, 
Integer.class, Integer.valueOf(0));
+Integer cs = getAndRemoveParameter(parameters, transformerCacheSize, 
Integer.class, 0);
 xslt.transformerCacheSize(cs);
 
+ErrorListener errorListener = getAndRemoveParameter(parameters, 
errorListener, ErrorListener.class);
+if (errorListener != null) {
+xslt.errorListener(errorListener);
+}
+
 // default to use the cache option from the component if the endpoint 
did not have the contentCache parameter
 boolean cache = getAndRemoveParameter(parameters, contentCache, 
Boolean.class, contentCache);

[1/3] git commit: CAMEL-7744: xslt allow to configure custom error listener.

2014-08-25 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master e86aa1e75 - b70c4189c


CAMEL-7744: xslt allow to configure custom error listener.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b70c4189
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b70c4189
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b70c4189

Branch: refs/heads/master
Commit: b70c4189c61bd5f9b87e40c93f19fa98b74e3620
Parents: fd97b75
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 14:56:05 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 14:56:35 2014 +0200

--
 .../camel/component/xslt/XsltComponent.java |  2 +-
 .../xslt/XsltCustomErrorListenerTest.java   | 98 
 2 files changed, 99 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b70c4189/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java 
b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
index 095cdb2..7f4b0ad 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java
@@ -133,7 +133,7 @@ public class XsltComponent extends UriEndpointComponent {
 Integer cs = getAndRemoveParameter(parameters, transformerCacheSize, 
Integer.class, 0);
 xslt.transformerCacheSize(cs);
 
-ErrorListener errorListener = getAndRemoveParameter(parameters, 
errorListener, ErrorListener.class);
+ErrorListener errorListener = 
resolveAndRemoveReferenceParameter(parameters, errorListener, 
ErrorListener.class);
 if (errorListener != null) {
 xslt.errorListener(errorListener);
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/b70c4189/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
new file mode 100644
index 000..07f2d09
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
@@ -0,0 +1,98 @@
+/**
+ * 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.xslt;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.FailedToCreateRouteException;
+import org.apache.camel.TestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.SimpleRegistry;
+
+/**
+ *
+ */
+public class XsltCustomErrorListenerTest extends TestSupport {
+
+private MyErrorListener listener = new MyErrorListener();
+
+private class MyErrorListener implements ErrorListener {
+
+private boolean warning;
+private boolean error;
+private boolean fatalError;
+
+@Override
+public void warning(TransformerException exception) throws 
TransformerException {
+warning = true;
+}
+
+@Override
+public void error(TransformerException exception) throws 
TransformerException {
+error = true;
+}
+
+@Override
+public void fatalError(TransformerException exception) throws 
TransformerException {
+fatalError = true;
+}
+
+public boolean isWarning() {
+return warning;
+}
+
+public boolean isError() {
+return error;
+}
+
+public boolean isFatalError() {
+return fatalError;
+}
+}
+
+public void testErrorListener()

[3/3] git commit: CAMEL-7548: Property palceholders now supported in dataFormats in XML DSL.

2014-08-25 Thread davsclaus 
CAMEL-7548: Property palceholders now supported in dataFormats in XML DSL.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e151086
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e151086
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e151086

Branch: refs/heads/master
Commit: 5e151086390ac1d36c6cb4f5398aabc8e60d0ca0
Parents: e86aa1e
Author: Claus Ibsen davscl...@apache.org
Authored: Mon Aug 25 14:02:56 2014 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Aug 25 14:56:35 2014 +0200

--
 .../camel/model/DataFormatDefinition.java   |   8 +
 .../apache/camel/model/ProcessorDefinition.java | 147 ++-
 .../camel/model/ProcessorDefinitionHelper.java  | 133 +
 ...StringDataFormatPropertyPlaceholderTest.java |  31 
 .../camel/spring/issues/myprop.properties   |   4 +-
 .../stringDataFormatPropertyPlaceholderTest.xml |  50 +++
 6 files changed, 237 insertions(+), 136 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5e151086/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
index 6125068..48e49fb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
@@ -83,6 +83,14 @@ public class DataFormatDefinition extends IdentifiedType {
 
 public DataFormat getDataFormat(RouteContext routeContext) {
 if (dataFormat == null) {
+
+// resolve properties before we create the data format
+try {
+
ProcessorDefinitionHelper.resolvePropertyPlaceholders(routeContext, this);
+} catch (Exception e) {
+throw new IllegalArgumentException(Error resolving property 
placeholders on data format:  + this, e);
+}
+
 dataFormat = createDataFormat(routeContext);
 if (dataFormat != null) {
 configureDataFormat(dataFormat, 
routeContext.getCamelContext());

http://git-wip-us.apache.org/repos/asf/camel/blob/5e151086/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java 
b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 3d2714e..6af6ca6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -407,10 +407,10 @@ public abstract class ProcessorDefinitionType extends 
ProcessorDefinitionType
 output.preCreateProcessor();
 
 // resolve properties before we create the processor
-resolvePropertyPlaceholders(routeContext, output);
+
ProcessorDefinitionHelper.resolvePropertyPlaceholders(routeContext, output);
 
 // resolve constant fields (eg Exchange.FILE_NAME)
-resolveKnownConstantFields(output);
+ProcessorDefinitionHelper.resolveKnownConstantFields(output);
 
 // also resolve properties and constant fields on embedded 
expressions
 ProcessorDefinition? me = (ProcessorDefinition?) output;
@@ -419,10 +419,10 @@ public abstract class ProcessorDefinitionType extends 
ProcessorDefinitionType
 ExpressionDefinition expressionDefinition = 
exp.getExpression();
 if (expressionDefinition != null) {
 // resolve properties before we create the processor
-resolvePropertyPlaceholders(routeContext, 
expressionDefinition);
+
ProcessorDefinitionHelper.resolvePropertyPlaceholders(routeContext, 
expressionDefinition);
 
 // resolve constant fields (eg Exchange.FILE_NAME)
-resolveKnownConstantFields(expressionDefinition);
+
ProcessorDefinitionHelper.resolveKnownConstantFields(expressionDefinition);
 }
 }
 
@@ -472,10 +472,10 @@ public abstract class ProcessorDefinitionType extends 
ProcessorDefinitionType
 preCreateProcessor();
 
 // resolve properties before we create the processor
-resolvePropertyPlaceholders(routeContext, this);
+ProcessorDefinitionHelper.resolvePropertyPlaceholders(routeContext, 
this);
 
 // resolve constant fields (eg Exchange.FILE_NAME)
-resolveKnownConstantFields(this);
+

svn commit: r920371 - in /websites/production/camel/content: book-architecture.html book-component-appendix.html book-in-one-page.html cache/main.pageCache component-list.html components.html transpor

2014-08-25 Thread buildbot 
Author: buildbot
Date: Mon Aug 25 13:20:26 2014
New Revision: 920371

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/component-list.html
websites/production/camel/content/components.html
websites/production/camel/content/transport.html
websites/production/camel/content/uris.html
websites/production/camel/content/xslt.html

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Mon Aug 25 
13:20:26 2014
@@ -298,7 +298,7 @@ disruptor-vm:someName[?lt;optiongt;]
 /div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
reading/writing from/to an a shape=rect class=external-link 
href=http://hadoop.apache.org/hbase/;HBase/a store (Hadoop 
database)/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpa shape=rect href=hdfs.htmlHDFS/a / 
camel-hdfs/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[hdfs://hostName[:port][/path][?options]
 ]]/script
-/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
reading/writing from/to an a shape=rect class=external-link 
href=http://hadoop.apache.org/hdfs/;HDFS/a filesystem using Hadoop 
1.x/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=hdfs.htmlHDFS2/a / camel-hdfs2/pdiv class=code panel 
pdl style=border-width: 1px;div class=codeContent panelContent pdl
+/div/div/tdtd colspan=1 rowspan=1 class=confluenceTdpFor 
reading/writing from/to an a shape=rect class=external-link 
href=http://hadoop.apache.org/hdfs/;HDFS/a filesystem using Hadoop 
1.x/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=hdfs2.htmlHDFS2/a / camel-hdfs2/pdiv class=code 
panel pdl style=border-width: 1px;div class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[ 
hdfs2://hostName[:port][/path][?options]]]/script
 /div/div/tdtd colspan=1 rowspan=1 class=confluenceTdspanFor 
reading/writing from/to an /spana shape=rect class=external-link 
href=http://hadoop.apache.org/hdfs/;HDFS/aspan filesystem using Hadoop 
2.x/span/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa 
shape=rect href=hl7.htmlHL7/a / camel-hl7/pdiv class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
 script class=theme: Default; brush: plain; gutter: false 
type=syntaxhighlighter![CDATA[mina2:tcp://hostName[:port][?options]

Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Mon Aug 25 
13:20:26 2014
@@ -1529,11 +1529,11 @@ template.send(quot;direct:alias-verify
 /div
 /div
 pThe strongcxf:/strong component provides integration with a 
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to 
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1408083426414 {padding: 0px;}
-div.rbtoc1408083426414 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1408083426414 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1408972730480 {padding: 0px;}
+div.rbtoc1408972730480 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1408972730480 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1408083426414
+/*]]*//style/pdiv class=toc-macro rbtoc1408972730480
 ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF 
Component/a
 ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI 
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
 ul class=toc-indentationlia shape=rect 
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the 
dataformats/a
@@ -13632,15 +13632,13 @@ from(quot;activemq:My.Queuequot;).
 h2 id=BookComponentAppendix-XSLTXSLT/h2pThe strongxslt:/strong 
component allows you to process a message using an a shape=rect 
class=external-link href=http://www.w3.org/TR/xslt; rel=nofollowXSLT/a 
template. This can be ideal when using a shape=rect 
href=templating.htmlTemplating/a to generate respopnses for 
requests./ph3 id=BookComponentAppendix-URIformat.77URI format/h3div 
class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
 script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[xslt:templateName[?options]
 ]]/script