[CONF] Apache Camel Camel 2.13.0 Release

2013-12-16 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Camel 2.13.0 Release   






...

The MBean names registered by Camel JMX no longer include the hostname in the context part, eg before context=myHost/myCamelId and now after context=myCamelId. Having the hostname in the MBean name does not bring much value, and in fact makes things more complicated as the mbean name changes depending on the host running Camel.
 MBean naming in OSGi cleaned up to use simpler naming with symbolicName. Before we could have MBean names with duplicate bundle ids such as context=114-114-camel-6, which now is using the symbolic name instead, context=MyApplication.
When using multiple OSGi Blueprint cm:property-placeholder's then Camel now favors using non-default placeholders, or the last property-placeholder defined in the Blueprint XML file. This allows for example to define default properties in one placeholder, and override these values in other placeholders.
 FTP consumer allow to download a single named file without using the FTP LIST command. This allows to download a known file from a FTP server even when the user account does not have permission to do FTP LIST command.
 FTP consumer allow to ignore file not found or insufficient file permission errors.
 Data Format using marshal now leverages Stream Cachingcaching out of the box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based.
Improved using Bean when the bean is looked up in the Registry, when using concurrent processing in the route.
Added cache option to beanRef and bean in the DSL. This avoids looking up the Bean from the Registry on each usage; this can safely be done for singleton beans.
Configuring Data Formats in XML attributes now supports reference lookup using the # syntax, eg jaxb xmlStreamWriterWrapper=#myWriterWrapper .. 
 JDBC component now also support outputType to specify the expected output as either a List or single Object. As well allow to map to a bean using a BeanRowMapper to control the mapping of ROW names to bean properties.
Both Quartz as well as Quartz2 based ScheduledRoutePolicy has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster).
Reduced the work the Aggregate EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases.
 JndiRegistry now implements all the find methods.
 VM component now supports multipleConsumers=true across deployment units.
Added @PreConsumed to JPA consumer.
Added CamelFileName header support to the hdfs HDFS producer
Like as JpaConsumer now also JpaProducer of the JPA component supports the CamelEntityManager header.
 Restlet consumer now supports returning custom headers as HTTP headers from the Camel Message.
   

[CONF] Apache Camel Twitter

2013-12-16 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Twitter   






...
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-twitter/artifactId
version${camel-version}/version
/dependency
 



URI format



 Code Block




 

twitter://endpoint[?options]
 



...



 Wiki Markup




 {div:class=confluenceTableSmall}
|| Name || Default Value || Description ||
| type | {{direct}} | direct, event, or polling |
| delay | {{60}} | in seconds |
| consumerKey | {{null}} | Consumer Key. Can also be configured on the {{TwitterComponent}} level instead. |
| consumerSecret | {{null}} | Consumer Secret. Can also be configured on the {{TwitterComponent}} level instead. |
| accessToken | {{null}} | Access Token. Can also be configured on the {{TwitterComponent}} level instead. |
| accessTokenSecret | {{null}} | Access Token 

buildbot success in ASF Buildbot on camel-site-production

2013-12-16 Thread buildbot
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/15278

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





[CONF] Apache Camel RabbitMQ

2013-12-16 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


RabbitMQ   




 Comment: CAMEL-6868 


...
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-rabbitmq/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
/dependency
 



URI format



 Code Block




 

rabbitmq://hostname[:port]/exchangeName?[options]
 



...



 Wiki Markup




 {div:class=confluenceTableSmall}
|| Property || Default || Description ||
| {{autoAck}} | {{true}} | If messages should be auto acknowledged |
| {{autoDelete}} | {{true}} | If it is true, the exchange will be deleted when it is no longer in use |
| {{durable}} | {{true}} | If we are declaring a durable exchange (the exchange will survive a server restart) |
| {{queue}} | {{random uuid}} | The queue 

[CONF] Apache Camel Spring Security Example

2013-12-16 Thread Colm O hEigeartaigh (Confluence)














  


Colm O hEigeartaigh edited the page:
 


Spring Security Example   






Spring Security Example
 This example shows you how to leverage the Spring Security already provides authentication mechanism and authoriationPolicy which is provided in The camel-spring-security module provides authentication and authorization capabilities via Spring Security. This example shows you how to use this functionality to implement a role based authorization application.
This example consumes messages from a servlet endpoint which is secured by Spring Security with http basic authentication, there are two serviceservices:



 Code Block




 
 http://localhost:8080/camel/user is for the authenticated user whose role is ROLE_USER
 http://localhost:8080/camel/admin is for the authenticated user whose role is ROLE_ADMIN
 



You will need to compile this example first:



 Code Block




 
 cd $CAMEL_HOME/examples/camel-example-spring-security
  mvn clean install
 



To run the example, you need to start up the server by typing



 Code Block




 
 mvn jetty:run
 



To stop the server hit ctrl + c
...






 View Online   Like   View Changes  
 Stop 

[CONF] Apache Camel Articles

2013-12-16 Thread James Strachan (Confluence)














  


James Strachan edited the page:
 


Articles   






...

 Camel in the cloud demo from CamelOne 2013 - Video presentation from CamelOne 2013 demonstrating Camel in the cloud using Fuse Fabric and hawtio 
 Getting started with Apache Camel - Video presentation from Javagruppen meeting by Claus Ibsen (May 2013)
 Apache Camel Essential Components by Christian Posta (January 2013)
 Leverage Enterprise Integration Patterns with Apache Camel and Twitter by Bruno Borges (JavaOne 2012)
 Riding the Apache Camel into the cloud James Strachan (QCon 2012)
 Migrating akka-camel module to Akka 2.x by Peter Gabryanczy (ScalaDays 2012)
 Confident Data Transfers with Apache Camel Security by Dominik Schadow (JavaOne 2012)
 CamelOne 2012 Videos - All the videos from the CamelOne 2012 conference (May 2012)
 JavaOne 2012 - Leverage Enterprise Integration Patterns with Apache Camel and Twitter by Bruno Borges (JavaOne 2012)
 Using Apache Camel and Java EE in an OSGi World by Jeff Genender and Johan Edstrom (JavaOne 2011)
 Er Apache Camel riktig valg for deg? Lytt til erfarne Camel spotters by Rune Peter Bjrnstad, and Bjrn Nordlund(September 2011)
 In the brain of James Strachan, riding the Camel - by James Strachan (August 2011)
 CamelOne 2011 Video presentations CamelOne 2011 conference (May 2011)
 What Riding the Camel can make integration easier for you by Claus Ibsen (September 2011)
 Paris JUG 2011 - Integration with Apache Camel and ESB by Charles Moulliard 
 JEEConf 2011 - What riding the Camel can do to make integration easier for you by Claus Ibsen (May 2011).
 Belgium JUG 2011 - Integration with Apache ServiceMix and Camel by Charles Moulliard 
 Devoxx 2011 - Introduction to Apache ActiveMQ, ServiceMix, Camel and CXF by Charles Moulliard and Gert Vanthienen 
 Claus Ibsen's Devoxx 2010 talk is all about Apache Camel
 Introduction to messaging with ActiveMQ at redev 2008 conference by Bruce Snyder 
 James Strachan's Devoxx 2009 talk is mostly about Camel and ActiveMQ
ScreenCast: an introduction to Apache Camel and the use of Enterprise Integration Patterns in Medium Resolution or High Resolution by James Strachan 
 Taking Camel for a ride by Bruce Snyder 
 JavaZone Conference - Taking Apache Camel for a Rider - Video presentation by Bruce Snyder (September 2008)
 Videos de las charlas de la 9a reunin de JavaMexico (Spanish) by Domingo Suarez 
 Screencast/Demo of Smooks and Apache 

[CONF] Apache Camel Articles

2013-12-16 Thread James Strachan (Confluence)














  


James Strachan edited the page:
 


Articles   






...

 @davsclaus - Claus Ibsen (@davsclaus) tweets often about Camel, open source, and integration.
 @bibryam - Bilgin Ibryam (@bibryam) tweets often about Camel.
 @jstrachan - James Strachan (@jstrachan) tweets about Camel, open source and integration.

...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel Books

2013-12-16 Thread Jakub Korab (Confluence)














  


Jakub Korab added a file to the page
Books
 


 






 CamelCookbookCover.png  - 333 kB PNG File 







 View Attachments  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel Books

2013-12-16 Thread Jakub Korab (Confluence)














  


Jakub Korab edited the page:
 


Books   






...
This page lists the known books about Apache Camel. If you happen to know a book which is not listed then please contact us, for example using the Mailing Lists.

 Camel in Action 
 Apache Camel Developer's Cookbook 
 Instant Apache Camel Message Routing 
 Instant Apache Camel Messaging System 
 Enterprise Integration Patterns 

...
 Camel in Action is a Camel tutorial full of small examples showing how to work with the integration patterns. It starts with core concepts like sending, receiving, routing, and transforming data. It then shows you the entire lifecycle and goes in depth on how to test, deal with errors, scale, deploy, and even monitor your app—details you can find only in the Camel code itself. Written by the developers of Camel, this book distills their experience and practical insights so that you can tackle integration tasks like a pro.
 Apache Camel Developer's Cookbook 
 Apache Camel Developer's Cookbook by Scott Cranton and Jakub Korab. Published by Packt publishing in December 2013. 
 Image Added 
 Apache Camel Developer's Cookbook is a collection of over 100 how-to recipes for working with Apache Camel. It is intended for use by busy developers who may not necessarily have time to learn the whole framework in order to be productive. It does this without sacrificing any of the detail needed to build performant, reliable system integrations. Developers new to Apache Camel will find useful information on how to set up Camel in both regular Java and Spring-based applications, through to the ins-and-outs of the various Enterprise Integration Patterns (EIPs) (how they are affected by multithreading, transactions etc.), payload transformations and testing. Experienced developers will also benefit from coverage of parallel and asynchronous processing, error handling and compensation, transactions and idempotency, monitoring and debugging, as well as Camel’s support for security. All recipes are backed by fully unit-tested example code in both the Java and XML DSLs, all of which is available on github at CamelCookbook/camel-cookbook-examples. 
Instant Apache Camel Message Routing
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel Articles

2013-12-16 Thread Jakub Korab (Confluence)














  


Jakub Korab edited the page:
 


Articles   






...

 James Strachan was interviewed by Dana Gardner 
 Episode 35 - A few beers with Chariot's Open Source Integration Experts - Chariot TechCast Episode 35 where they talk about: ServiceMix, Camel, FUSE, Mule, Spring Integration, EIP, ESB etc.
 The Basement Coders Episode 14 - Apache Camel - Basement Coders discusses Apache Camel. You may want to skip to the 25 minute where they start talking about Camel.
 JBoss Asylum Podcast Episode 28 - Fuse stories - Podcast from January 2013 with James Strachan and Rob Davies with the background history and how they got into creating Apache Camel, and how they tink Camel has become such successful.
 Podcast James Strachan - Mr Apache Camel - Podcast from February 2013 with James Strachan about Apache Camel, integration and the cloud.

 Books 

 Apache Camel Developer's Cookbook by Scott Cranton and Jakub Korab (Packt Publishing, December 2013) 
Instant Apache Camel Messaging System by Evgeniy Sharapov (Packt Publishing, September 2013)
 Instant Apache Camel Message Routing by Bilgin Ibryam (Packt Publishing, August 2013) 
 Camel in Action by Claus Ibsen and Jonathan Anstey (Manning, December 2010)
Enterprise Integration Patterns by Gregor Hohpe and Bobby Woolf (Addison Wesley, October 2003)

...






 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: r890576 - /websites/production/camel/content/cache/main.pageCache

2013-12-16 Thread ningjiang
Author: ningjiang
Date: Mon Dec 16 14:20:57 2013
New Revision: 890576

Log:
Export the camel wiki

Removed:
websites/production/camel/content/cache/main.pageCache



buildbot failure in ASF Buildbot on camel-site-production

2013-12-16 Thread buildbot
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/15285

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

2013-12-16 Thread buildbot
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/15287

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





svn commit: r890599 - in /websites/production/camel/content: ./ 2007/08/17/ 2007/08/20/ 2007/10/01/ 2007/10/28/ 2008/04/08/ 2008/04/22/ 2008/04/28/ 2008/07/22/ 2008/10/31/ 2009/01/19/ 2009/02/03/ 2009

2013-12-16 Thread buildbot
Author: buildbot
Date: Mon Dec 16 17:23:51 2013
New Revision: 890599

Log:
Production update by buildbot for camel


[This commit notification would consist of 312 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]


[CONF] Apache Camel Download

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


Download   






...
To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is:



 Code Block








language
xml


 




 dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-core/artifactId
  version2.12.2/version
/dependency
 



...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel Recipient List

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


Recipient List   






...
Note: In Java DSL you use the tokenizer to archive the same. The route above in Java DSL:



 Code Block




 
 from(direct:a).recipientList(header(myHeader).tokenize(,));
 



In Camel 2.1 its a bit easier as you can pass in the delimiter as 2nd parameter:



 Code Block




 
 from(direct:a).recipientList(header(myHeader), #);
 



...
The Recipient List now supports parallelProcessing that for example Splitter also supports. You can use it to use a thread pool to have concurrent tasks sending the Exchange to multiple recipients concurrently.



 Code Block




 
 from(direct:a).recipientList(header(myHeader)).parallelProcessing();
 



And in Spring XML its an attribute on the recipient list tag.



 Code Block




 
 route
   from uri=direct:a/
   recipientList parallelProcessing=true
   headermyHeader/header
   /recipientList
   /route
 

   

svn commit: r890608 - /websites/production/camel/content/styles/site.css

2013-12-16 Thread dkulp
Author: dkulp
Date: Mon Dec 16 18:44:05 2013
New Revision: 890608

Log:
Add some stuff needed by new confluence

Modified:
websites/production/camel/content/styles/site.css

Modified: websites/production/camel/content/styles/site.css
==
--- websites/production/camel/content/styles/site.css (original)
+++ websites/production/camel/content/styles/site.css Mon Dec 16 18:44:05 2013
@@ -199,3 +199,82 @@ div.warning {
   background: #FF; 
   margin-right:20px;
 } 
+
+
+
+
+
+
+
+p:first-child, ul:first-child, ol:first-child, dl:first-child, h1:first-child, 
h2:first-child, h3:first-child, h4:first-child, h5:first-child, h6:first-child, 
blockquote:first-child, pre:first-child, form.aui:first-child, 
table.aui:first-child, .aui-tabs:first-child, .aui-panel:first-child, 
.aui-group:first-child {
+margin-top: 0;
+}
+
+/*  Warning/Icon things /
+.aui-message{
+background:#fcfcfc;
+border:1px solid #ccc;
+-moz-border-radius:5px;
+-webkit-border-radius:5px;
+border-radius:5px;
+color:#333;
+margin:10px 0 0 0;
+padding:10px 10px 10px 36px;
+position:relative;
+}
+.aui-message.shadowed{
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+box-shadow:none;
+}
+.aui-popup .aui-message.closeable,.aui-dialog 
.aui-message.closeable{z-index:4000;}
+.aui-message.error{background:#d04437;border-color:#d04437;color:#fff;}
+.aui-message.warning{background:#fffdf6;border-color:#ffeaae;}
+.aui-message.info{background:#fcfcfc;border-color:#8c9fb2;}
+.aui-message.success{background:#f3f9f4;border-color:#91c89c;}
+.aui-message.hint{background:#fcfcfc;border-color:#aab8c6;}
+.aui-message.error a{color:#fff;text-decoration:none;border-bottom:1px solid 
#fff;}
+.aui-message p.title{font-weight:bold;}
+.aui-message p.title strong{font-weight:inherit;}
+.aui-message .aui-icon{left:10px;position:absolute;top:12px;}
+.aui-message.closeable{padding-right:36px;}
+.aui-message.closeable 
.icon-close{cursor:pointer;left:auto;right:10px;top:10px;}
+.aui-message .svg-icon{left:10px;position:absolute;top:10px;}
+.aui-message.closeable 
.svg-icon.close{cursor:pointer;left:auto;position:absolute;right:10px;top:10px;}
+#header 
.aui-message{border-bottom:none;border-left:none;border-right:none;border-width:2px;margin:0;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;}
+#footer .aui-message{margin-left:20px;margin-right:20px;text-align:left;}
+.aui-message p{margin-bottom:0px;}
+
+.aui-icon{background-repeat:no-repeat;background-position:0 
0;border:none;display:inline-block;height:16px;margin:0;padding:0;text-align:left;text-indent:-999em;vertical-align:text-bottom;width:16px;}
+.icon-move,.icon-move-d,.icon-dropdown,.icon-dropdown-d,.icon-dropdown-active,.icon-dropdown-active-d,.icon-minimize,.icon-minimize-d,.icon-maximize,.icon-maximize-d{background-repeat:no-repeat;}
+.aui-icon.icon-move,.aui-icon.icon-move-d,.aui-icon.icon-dropdown,.aui-icon.icon-dropdown-d,.aui-icon.icon-dropdown-active,.aui-icon.icon-dropdown-active-d,.aui-icon.icon-minimize,.aui-icon.icon-minimize-d,.aui-icon.icon-maximize,.aui-icon.icon-maximize-d{background-position:0
 0!important;height:13px;vertical-align:baseline;width:13px;}
+
+
+
+.icon-move{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8PUlEQVR42rWRMQoAMAjE+v9P29syBeFKs50YVDzGBKmbACKZACIV69G0ZqQJqwQJBcWk8iYD6eufTHha7wLFyOcZBIC2HgBJRU5ErkJggg==);cursor:move;}
+.icon-move-d{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NAQMAAABIJXY/BlBMVEUAAABtbW0GOOmzAXRSTlMAQObYZgAAACZJREFUCFtjYGJgYGdg4G9gADKUFBiSDBj+/wCRQDYTWBwoy8QAAF4LBNTKhGdbAElFTkSuQmCC);cursor:move;}
+.icon-dropdown{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8NUlEQVQoz2NgIBH8//8fziAKwDX9h2slypb/A6gJn1/w2oRLA0HnYdMwCAKCaE1kpQhy0h4AvZXuEh7/K88ASUVORK5CYII=);}
+.icon-dropdown-d{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8OElEQVQoz2NgIBH8//8fwsjNzf1PDIZrgnGIASC1A6gJn1/w2oRLA0HnYdMwCAKCaE1kpQhy0h4AVz6Yhl8Qyr8ASUVORK5CYII=);}
+.icon-dropdown-active{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8MElEQVQoz2NgIBH8//8fziAKwDX9Jx0MlCY8nsdvEwENuJ2HR8P/oRB6ZKUIctIeACdj9RnXT1HMAElFTkSuQmCC);}
+.icon-dropdown-active-d{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8NklEQVQokWNgIBH8//8fwsjNzf1PDIZrIlYDDA+gJlyeJ2gTPg14nYdLwwAHBNGayEoR5KQ9AH2/LqGCzCmZAElFTkSuQmCC);}
+.icon-minimize{background-image:url(data:image/png;base64,iVBORw0KGgoNSUhEUg0NCAYAAABy6+R8J0lEQVQoz2NgIBH8//8fziAKwDX9Jx3QWxMJgTCqCUUTWSmCnLQHAMrBNdnApUZIAElFTkSuQmCC);}

[CONF] Apache Camel JSON

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


JSON   






...
Then we can configure the org.apache.camel.component.gson.GsonDataFormat in a Spring XML files as shown below. Notice we use fieldNamingPolicy property to set the field mapping. This property is an enum from GSon com.google.gson.FieldNamingPolicy which has a number of pre defined mappings. If you need full control you can use the property FieldNamingStrategy and implement a custom com.google.gson.FieldNamingStrategy where you can control the mapping.



 Code Block








title
Configuring GsonDataFromat in Spring XML file


xml:title
Configuring GsonDataFormat in Spring XML file


language
xml


 




 !-- define the gson data format, where we configure the data format using the properties --
bean id=gson class=org.apache.camel.component.gson.GsonDataFormat
!-- we want to unmarshal to person pojo --
property name=unmarshalType value=org.apache.camel.component.gson.PersonPojo/
!-- we want to map fields to use lower case and underscores --
property name=fieldNamingPolicy value=LOWER_CASE_WITH_UNDERSCORES/
/bean
 



And use it in Camel routes by referring to its bean id as shown:



 Code Block


   

[CONF] Apache Camel Camel 2.11.2 release

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


Camel 2.11.2 release   






...
To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is:



 Code Block








language
xml


 




 

dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-core/artifactId
  version2.11.2/version
/dependency
 



Git Tag Checkout



 Code Block




 

git clone https://git-wip-us.apache.org/repos/asf/camel.git
cd camel
git checkout camel-2.11.2
 



...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel Camel 2.12.2 Release

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


Camel 2.12.2 Release   






...
To use this release in your maven project, the proper dependency configuration that you should use in your Maven POM is:



 Code Block








language
xml


 




 

dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-core/artifactId
  version2.12.2/version
/dependency
 



Git Tag Checkout



 Code Block




 

git clone https://git-wip-us.apache.org/repos/asf/camel.git
cd camel
git checkout camel-2.12.2
 



...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






[CONF] Apache Camel ServletListener Component

2013-12-16 Thread Daniel Kulp (Confluence)














  


Daniel Kulp edited the page:
 


ServletListener Component   






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



 Code Block








language
xml


 




 

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



...
By default Camel will assume the param-value is a FQN classname for a Camel RouteBuilder class, as shown below:



 Code Block








language
xml


 




 
 context-param
param-namerouteBuilder-MyRoute/param-name
param-valueorg.apache.camel.component.servletlistener.MyRoute/param-value
  /context-param
 
   

svn commit: r890614 [1/4] - in /websites/production/camel/content: ./ cache/

2013-12-16 Thread dkulp
Author: dkulp
Date: Mon Dec 16 20:05:17 2013
New Revision: 890614

Log:
UPdate some pages

Modified:
websites/production/camel/content/avro.html
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-cookbook.html
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-pattern-appendix.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2112-release.html
websites/production/camel/content/camel-2122-release.html
websites/production/camel/content/camel-30-ideas.html
websites/production/camel/content/camel-jmx.html
websites/production/camel/content/cxf.html
websites/production/camel/content/disruptor.html
websites/production/camel/content/download.html
websites/production/camel/content/http.html
websites/production/camel/content/json.html
websites/production/camel/content/jt400.html
websites/production/camel/content/recipient-list.html
websites/production/camel/content/scala-dsl-eip.html
websites/production/camel/content/siteindex.html
websites/production/camel/content/spring-testing.html
websites/production/camel/content/tutorial-axis-camel.html
websites/production/camel/content/tutorial-jmsremoting.html
websites/production/camel/content/tutorial-osgi-camel-part2c.html
websites/production/camel/content/user-guide.html
websites/production/camel/content/zip-dataformat.html
websites/production/camel/content/zip-file-dataformat.html

Modified: websites/production/camel/content/avro.html
==
--- websites/production/camel/content/avro.html (original)
+++ websites/production/camel/content/avro.html Mon Dec 16 20:05:17 2013
@@ -253,11 +253,11 @@ avro:[transport]:[host]:[port][/messageN
 
 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;routegt;
-            lt;from uri=quot;direct:startquot;/gt;
-            lt;to 
uri=quot;avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocolquot;/gt;
-            lt;to uri=quot;log:avroquot;/gt;
-        lt;/routegt;
+Ê Ê Ê Ê lt;routegt;
+Ê Ê Ê Ê Ê Ê lt;from uri=quot;direct:startquot;/gt;
+Ê Ê Ê Ê Ê Ê lt;to 
uri=quot;avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocolquot;/gt;
+Ê Ê Ê Ê Ê Ê lt;to uri=quot;log:avroquot;/gt;
+Ê Ê Ê Ê lt;/routegt;
 ]]/script
 /div/div
 pAn example of consuming messages using camel avro consumers via netty:/p

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 Dec 16 
20:05:17 2013
@@ -1930,11 +1930,11 @@ template.send(quot;direct:alias-verify
 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./p
 
 style type=text/css/*![CDATA[*/
-div.rbtoc1387214478844 {padding: 0px;}
-div.rbtoc1387214478844 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1387214478844 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1387223939589 {padding: 0px;}
+div.rbtoc1387223939589 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1387223939589 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//stylediv class=toc-macro rbtoc1387214478844
+/*]]*//stylediv class=toc-macro rbtoc1387223939589
 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
@@ -7812,9 +7812,9 @@ ProtocolSocketFactory factory =
 
 Protocol.registerProtocol(quot;httpsquot;,
 new Protocol(
-        quot;httpsquot;,
-        factory,
-        443));
+ÊÊÊ quot;httpsquot;,
+ÊÊÊ factory,
+ÊÊÊ 443));
 
 from(quot;direct:startquot;)
 
.to(quot;https://mail.google.com/mail/quot;).to(quot;mock:resultsquot;);
@@ -10695,7 +10695,7 @@ public class Jt400RouteBuilder extends R
 public class Jt400RouteBuilder extends RouteBuilder {
 @Override
 public void configure() throws Exception {
-   

svn commit: r890626 [5/5] - in /websites/production/camel/content: ./ cache/

2013-12-16 Thread dkulp
Modified: websites/production/camel/content/vtd-xml.html
==
--- websites/production/camel/content/vtd-xml.html (original)
+++ websites/production/camel/content/vtd-xml.html Mon Dec 16 21:25:53 2013
@@ -40,6 +40,7 @@
   link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
   script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
   script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
   
   script type=text/javascript
   SyntaxHighlighter.defaults['toolbar'] = false;

Modified: websites/production/camel/content/walk-through-another-example.html
==
--- websites/production/camel/content/walk-through-another-example.html 
(original)
+++ websites/production/camel/content/walk-through-another-example.html Mon Dec 
16 21:25:53 2013
@@ -39,7 +39,7 @@
   link 
href='http://camel.apache.org/styles/highlighter/styles/shCoreCamel.css' 
rel='stylesheet' type='text/css' /
   link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
   script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
-  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
   
   script type=text/javascript
   SyntaxHighlighter.defaults['toolbar'] = false;

Modified: websites/production/camel/content/weather.html
==
--- websites/production/camel/content/weather.html (original)
+++ websites/production/camel/content/weather.html Mon Dec 16 21:25:53 2013
@@ -40,6 +40,7 @@
   link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
   script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
   script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
   
   script type=text/javascript
   SyntaxHighlighter.defaults['toolbar'] = false;

Modified: websites/production/camel/content/websocket.html
==
--- websites/production/camel/content/websocket.html (original)
+++ websites/production/camel/content/websocket.html Mon Dec 16 21:25:53 2013
@@ -40,6 +40,7 @@
   link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
   script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
   script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
   
   script type=text/javascript
   SyntaxHighlighter.defaults['toolbar'] = false;

Modified: 
websites/production/camel/content/why-does-camel-use-too-many-threads-with-producertemplate.html
==
--- 
websites/production/camel/content/why-does-camel-use-too-many-threads-with-producertemplate.html
 (original)
+++ 
websites/production/camel/content/why-does-camel-use-too-many-threads-with-producertemplate.html
 Mon Dec 16 21:25:53 2013
@@ -39,7 +39,7 @@
   link 
href='http://camel.apache.org/styles/highlighter/styles/shCoreCamel.css' 
rel='stylesheet' type='text/css' /
   link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
   script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
-  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
   
   script type=text/javascript
   SyntaxHighlighter.defaults['toolbar'] = false;

Modified: websites/production/camel/content/xml-reference.html
==
--- websites/production/camel/content/xml-reference.html (original)
+++ websites/production/camel/content/xml-reference.html Mon Dec 16 21:25:53 
2013
@@ -39,7 +39,7 @@
   link 

git commit: CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to it.

2013-12-16 Thread ningjiang
Updated Branches:
  refs/heads/master 2e7a7c8ad - 58f4845e0


CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to 
it.


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

Branch: refs/heads/master
Commit: 58f4845e04303eba65718b9f37a2ee2449e7069e
Parents: 2e7a7c8
Author: David Keen dkk...@gmail.com
Authored: Mon Dec 16 15:43:49 2013 +
Committer: David Keen dkk...@gmail.com
Committed: Mon Dec 16 15:43:49 2013 +

--
 .../restlet/DefaultRestletBinding.java  |  3 +-
 .../component/restlet/RestletPostFormTest.java  | 72 
 2 files changed, 73 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/58f4845e/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index ddbff14..ebef445 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -274,8 +274,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 
 // set HTTP headers so we return these in the response
 if (!series.isEmpty()) {
-SeriesHeader httpHeaders = (SeriesHeader) 
response.getAttributes().get(HeaderConstants.ATTRIBUTE_HEADERS);
-httpHeaders.addAll(series);
+response.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
series);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/58f4845e/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
new file mode 100644
index 000..41f05e6
--- /dev/null
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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.restlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.message.BasicNameValuePair;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @version 
+ */
+public class RestletPostFormTest extends RestletTestSupport {
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(restlet:http://localhost:; + portNum + 
/users?restletMethod=POST)
+.process(new PostProcessor());
+}
+};
+}
+
+class PostProcessor implements Processor {
+public void process(Exchange exchange) throws Exception {   
+assertEquals(bar, exchange.getIn().getHeader(foo, 
String.class));
+}
+}
+
+@Test
+public void testPostBody() throws Exception {
+

git commit: CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to it.

2013-12-16 Thread ningjiang
Updated Branches:
  refs/heads/camel-2.12.x df567f9c2 - 20671d6ea


CAMEL-7073: Overwrite org.restlet.http.headers in response instead of adding to 
it.


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

Branch: refs/heads/camel-2.12.x
Commit: 20671d6eacbf227baf8eaf43b09727fedac9beb4
Parents: df567f9
Author: David Keen dkk...@gmail.com
Authored: Mon Dec 16 15:43:49 2013 +
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Dec 17 10:56:30 2013 +0800

--
 .../restlet/DefaultRestletBinding.java  |  3 +-
 .../component/restlet/RestletPostFormTest.java  | 72 
 2 files changed, 73 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/20671d6e/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
--
diff --git 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index ddbff14..ebef445 100644
--- 
a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ 
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -274,8 +274,7 @@ public class DefaultRestletBinding implements 
RestletBinding, HeaderFilterStrate
 
 // set HTTP headers so we return these in the response
 if (!series.isEmpty()) {
-SeriesHeader httpHeaders = (SeriesHeader) 
response.getAttributes().get(HeaderConstants.ATTRIBUTE_HEADERS);
-httpHeaders.addAll(series);
+response.getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, 
series);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/20671d6e/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
--
diff --git 
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
new file mode 100644
index 000..41f05e6
--- /dev/null
+++ 
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostFormTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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.restlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.message.BasicNameValuePair;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @version 
+ */
+public class RestletPostFormTest extends RestletTestSupport {
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(restlet:http://localhost:; + portNum + 
/users?restletMethod=POST)
+.process(new PostProcessor());
+}
+};
+}
+
+class PostProcessor implements Processor {
+public void process(Exchange exchange) throws Exception {   
+assertEquals(bar, exchange.getIn().getHeader(foo, 
String.class));
+}
+}
+
+@Test
+public void testPostBody() 

git commit: Fixed the ExchangeBuilder javadoc with thanks to gzurowski

2013-12-16 Thread ningjiang
Updated Branches:
  refs/heads/master 58f4845e0 - 96d5b9e7d


Fixed the ExchangeBuilder javadoc with thanks to gzurowski


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

Branch: refs/heads/master
Commit: 96d5b9e7d884d9cc520090eacbe895abbc2c9ca4
Parents: 58f4845
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Dec 17 11:30:30 2013 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Dec 17 11:30:30 2013 +0800

--
 .../src/main/java/org/apache/camel/builder/ExchangeBuilder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/96d5b9e7/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
index d4ca400..61d5513 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
@@ -78,7 +78,8 @@ public final class ExchangeBuilder {
 
 /**
  * Set the exchange property
- * @param pattern exchange pattern
+ * @param key the key of the exchange property
+ * @param value the value of the exchange property
  * @return exchange builder
  */
 public ExchangeBuilder withProperty(String key, Object value) {



[2/2] git commit: Fixed the ExchangeBuilder javadoc with thanks to gzurowski

2013-12-16 Thread ningjiang
Fixed the ExchangeBuilder javadoc with thanks to gzurowski


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

Branch: refs/heads/camel-2.11.x
Commit: bb150dab332eec84a914338cb41404ea04464f42
Parents: 1014dc8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Dec 17 11:30:30 2013 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Dec 17 11:33:12 2013 +0800

--
 .../src/main/java/org/apache/camel/builder/ExchangeBuilder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb150dab/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
index d4ca400..61d5513 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
@@ -78,7 +78,8 @@ public final class ExchangeBuilder {
 
 /**
  * Set the exchange property
- * @param pattern exchange pattern
+ * @param key the key of the exchange property
+ * @param value the value of the exchange property
  * @return exchange builder
  */
 public ExchangeBuilder withProperty(String key, Object value) {



[1/2] git commit: Fixed the ExchangeBuilder javadoc with thanks to gzurowski

2013-12-16 Thread ningjiang
Updated Branches:
  refs/heads/camel-2.11.x 1014dc8e2 - bb150dab3
  refs/heads/camel-2.12.x 20671d6ea - 0ab99f90a


Fixed the ExchangeBuilder javadoc with thanks to gzurowski


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

Branch: refs/heads/camel-2.12.x
Commit: 0ab99f90ac3d1926eafc5a0cd25b9a13e55e5e15
Parents: 20671d6
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Dec 17 11:30:30 2013 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Dec 17 11:33:03 2013 +0800

--
 .../src/main/java/org/apache/camel/builder/ExchangeBuilder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0ab99f90/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
index d4ca400..61d5513 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
@@ -78,7 +78,8 @@ public final class ExchangeBuilder {
 
 /**
  * Set the exchange property
- * @param pattern exchange pattern
+ * @param key the key of the exchange property
+ * @param value the value of the exchange property
  * @return exchange builder
  */
 public ExchangeBuilder withProperty(String key, Object value) {