camel git commit: Upgrade Joda-time to version 2.9.6

2016-11-15 Thread acosentino
Repository: camel
Updated Branches:
  refs/heads/master 057bbaeab -> 36089587b


Upgrade Joda-time to version 2.9.6


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

Branch: refs/heads/master
Commit: 36089587b05d3808cf6c23da655cde58aeaa3669
Parents: 057bbae
Author: Andrea Cosentino 
Authored: Wed Nov 16 08:47:26 2016 +0100
Committer: Andrea Cosentino 
Committed: Wed Nov 16 08:47:26 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/36089587/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0e0c95f..fa9b8f9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -339,7 +339,7 @@
 2.0.0-m30
 1.5
 1.6.2
-2.9.4
+2.9.6
 1.3.5
 0.0.23
 0.0.23_1



svn commit: r1001168 - in /websites/production/camel/content: book-in-one-page.html book-tutorials.html cache/main.pageCache tutorial-jmsremoting.html

2016-11-15 Thread buildbot
Author: buildbot
Date: Tue Nov 15 23:19:21 2016
New Revision: 1001168

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-tutorials.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/tutorial-jmsremoting.html

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 Tue Nov 15 23:19:21 
2016
@@ -3966,11 +3966,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMS ThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org"; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -3978,10 +3978,10 @@ div.rbtoc1479248269946 li {margin-left:
 Writing The 
Clients
 Client Using The 
ProducerTemplateClient Using Spring 
RemotingClient Using Message 
Endpoint EIP PatternRun the Clients
 Using 
the Camel Maven PluginUsing Camel JMXSee Also
-PrerequisitesThis tutorial 
uses Maven to setup the Camel project and for dependencies for 
artifacts.DistributionThis 
sample is distributed with the Camel distribution as 
examples/camel-example-spring-jms.AboutThis tutorial is a simple example that 
demonstrates more the fact how well Camel is seamless integrated with Spring to 
leverage the best of both worlds. This sample is client server solution using 
JMS messaging as the transport. The sample has two flavors of servers and also 
for clients demonstrating different techniques for easy 
communication.The Server is a JMS message broker that routes incoming 
messages to a business service that does computations on the received message 
and returns a response. The EIP patterns used in this sample 
are:
 PatternDescriptionMessage ChannelWe need a channel so the Clients can 
communicate with the server.Message 
The 
information is exchanged using the Camel Message 
interface.Message 
TranslatorThis 
is where Camel shines as the message exchange between the Server and the 
Clients are text based strings with numbers. However our business service uses 
int 
 for numbers. So Camel can do the message translation 
automatically.Message 
EndpointIt 
should be easy to send messages to the Server from the the clients. This is 
achieved with Camels powerful Endpoint pattern that even can be more powerful 
combined with Spring remoting. The tutorial has clients using each kind of 
technique for this.Point to Point ChannelThe client and server exchanges 
data using point to point using a JMS queue.Event Driven ConsumerThe JMS broker is event driven and is invoked when the client 
sends a message to the server.We 
use the following Camel components:ComponentDescriptionActiveMQWe use Apache ActiveMQ as the JMS broker on the Server 
sideBeanWe use the bean binding to easily route the messages to 
our business service. This is a very powerful component in 
Camel.FileIn the AOP enabled Server we store audit trails as 
files.JMSUsed for the JMS 
messagingCreate the Camel ProjectFor the purposes of the tutorial a 
single Maven project will be used for both the client and server. Ideally you 
would break your application down into the appropriate 
components.
+PrerequisitesThis tutorial 
uses Maven to setup the Camel project and for dependencies for 
artifacts.DistributionThis 
sample is distributed with the Camel distribution as 
examples/camel-example-spring-jms.AboutThis tutorial is a simple example that 
demonstrates more the fact how well Camel is seamless integrated with Spring to 
leverage the best of both worlds. This sample is client server solution using 
JMS messaging as the transport. The sample has two flavors of servers and also 
for clients demonstrating different techniques for easy 
communication.The Server is a JMS message broker that routes incoming 
messages to a business service that does computations on the received message 
and returns a r

svn commit: r1001165 - in /websites/production/camel/content: book-cookbook.html book-in-one-page.html cache/main.pageCache testing.html

2016-11-15 Thread buildbot
Author: buildbot
Date: Tue Nov 15 22:18:59 2016
New Revision: 1001165

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-cookbook.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/testing.html

Modified: websites/production/camel/content/book-cookbook.html
==
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Tue Nov 15 22:18:59 
2016
@@ -1361,7 +1361,7 @@ public class IsMockEndpointsAndSkipJUnit
 ]]>
 time unitsIn the example above we use 
seconds as the time unit, but Camel offers 
milliseconds, and minutes as 
well.See Also
 Configuring 
CamelComponentEndpointGetting StartedSpring TestingTesting
-TestingTesting is a crucial activity in 
any piece of software development or integration. Typically Camel Riders use 
various different technologies wired 
together in a variety of patterns with different expression languages together with 
different forms of Bean 
Integration and Dependency 
Injection so its very easy for things to go wrong! https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png";
 data-emoticon-name="smile" alt="(smile)"> . Testing is the crucial weapon to 
ensure that things work as you would expect.Camel is a Java library so 
you can easily wire up tests in whatever un
 it testing framework you use (JUnit 3.x (deprecated), 4.x, or TestNG). However 
the Camel project has tried to make the testing of Camel as easy and powerful 
as possible so we have introduced the following features.Testing mechanismsThe following 
mechanisms are supported:NameComponentDescriptionCamel Testcamel-testIs a standalone Java library letting you 
easily create Camel test cases using a single Java class for all your 
configuration and routing w
 ithout using CDI, Spring or Guice 
for Dependency 
Injection which does not require an in-depth knowledge of Spring + 
Spring Test or Guice.  Supports JUnit 3.x (deprecated) and JUnit 4.x based 
tests.CDI Testingcamel-test-cdiProvides a JUnit 4 runner that 
bootstraps a test environment using CDI so that you don't have to be familiar 
with any CDI testing frameworks and can concentrate on the testing logic of 
your Camel CDI applications. Testing frameworks like http://arquillian.org/"; 
rel="nofollow">Arquillian or https://ops4j1.jira.com/wiki/display/PAXEXAM4"; rel="nofollow">PAX 
Exam, can be used for more advanced test cases, where you need to configure 
your system under test in a very fine-grained way or target specific CDI 
containers.Spring 
Testingcamel-test-springSupports JUnit 3.x (deprecated) or JUnit 
4.x based tests that bootstrap a test environment using Spring without needing 
to be familiar with Spring Test. The plain JUnit 3.x/4.x based tests work very 
similar to the test support classes in camel-test. Also supports 
Spring Test based tests that use the declarative style of test configuration 
and injection common in Spring Test. The Spring Test based tests provide 
feature parity with the
  plain JUnit 3.x/4.x based testing approach. Notice 
camel-test-spring is a new component in Camel 
2.10 onwards. For older Camel release use camel-test 
which has built-in Spring 
Testing.Blueprint 
Testingcamel-test-blueprintCamel 2.10: 
Provides the ability to do unit testing on blueprint 
configurationsGuicecamel-guiceUses Guice to dependency inject your 
 test classesCamel TestNGcamel-testngSupports plain TestNG based tests with 
or without CDI, Spring or Guice for Dependency Injection which does not 
require an in-depth knowledge of CDI, Spring + Spring Test or Guice.  Also 
from Camel 2.10 onwards, this component supports Spring 
Test based tests that use the declarative style of test configuration and 
injection common in Spring Test and described in more detail under Spring 
Testing.In all approaches the test 
classes look pret
 ty much the same in that they all reuse the Camel binding and injection 
annotations.Camel Test 
ExampleHere is the Camel 
Test http://svn.apache.org/repos/asf/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java";>example:
+TestingTesting is a crucial activity in 
any piece of software development or integration. Typically Camel Riders use 
various different technologies wired 
together in a variety of patterns with different expression languages together with 
different forms of Bean 
Integration and Dependency 
Injection so its very easy for things to go wrong! https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/smile.png";
 data-emoticon-name="smile" alt="(smile)"> . Testing is the crucial weapon to 
ensure that things work as you would expect.Camel 

camel git commit: CAMEL-10477 - jruby 1.7.26

2016-11-15 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master f0cebafe0 -> 057bbaeab


CAMEL-10477 - jruby 1.7.26


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

Branch: refs/heads/master
Commit: 057bbaeab3a947b67803ed500d9565bb63d105e8
Parents: f0cebaf
Author: Paolo Antinori 
Authored: Mon Nov 14 18:33:21 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 15 22:49:36 2016 +0100

--
 .../org/apache/camel/builder/script/RubyScriptTextTest.java| 6 ++
 .../apache/camel/builder/script/example/RubyFilterTest.java| 6 ++
 parent/pom.xml | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
--
diff --git 
a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
index b340092..8876e45 100755
--- 
a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
+++ 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -34,6 +35,11 @@ public class RubyScriptTextTest extends CamelTestSupport {
 
 final int messageCount = 500;
 
+@Before
+public void configEnv(){
+System.setProperty("org.jruby.embed.localcontext.scope", "threadsafe");
+}
+
 @Test
 public void parallelExecutionWithCachedScriptAndReusedScriptEngine() 
throws Exception {
 context.addRoutes(new RouteBuilder() {

http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
--
diff --git 
a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
index 07beadd..56be196 100644
--- 
a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
+++ 
b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.script.example;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spring.SpringCamelContext;
+import org.junit.Before;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -25,6 +26,11 @@ import 
org.springframework.context.support.ClassPathXmlApplicationContext;
  */
 public class RubyFilterTest extends XPathFilterTest {
 
+@Before
+public void setUpEnv() {
+System.setProperty("org.jruby.embed.localcontext.scope", "threadsafe");
+}
+
 @Override
 public void testSendMatchingMessage() throws Exception {
 super.testSendMatchingMessage();

http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 48a4db9..0e0c95f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,7 +346,7 @@
 0.9.5
 1.5_5
 1.5
-1.7.18
+1.7.26
 1.3.1
 2.3.0
 0.1.54



camel git commit: [CAMEL-10481] Camel does not expose cassandra-all any more

2016-11-15 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master bed325e1f -> f0cebafe0


[CAMEL-10481] Camel does not expose cassandra-all any more


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

Branch: refs/heads/master
Commit: f0cebafe02fd0620b4c6f022f8c131d4c709031f
Parents: bed325e
Author: Thomas Diesler 
Authored: Tue Nov 15 12:37:44 2016 +0100
Committer: Claus Ibsen 
Committed: Tue Nov 15 22:47:35 2016 +0100

--
 parent/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f0cebafe/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index edf90bf..48a4db9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3113,6 +3113,11 @@
 
   
   
+org.apache.cassandra
+cassandra-all
+${cassandra-version}
+  
+  
 com.datastax.cassandra
 cassandra-driver-core
 ${cassandra-driver-version}



svn commit: r1001141 - in /websites/production/camel/content: cache/main.pageCache twitter-websocket-example.html

2016-11-15 Thread buildbot
Author: buildbot
Date: Tue Nov 15 11:18:53 2016
New Revision: 1001141

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/twitter-websocket-example.html

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

Modified: websites/production/camel/content/twitter-websocket-example.html
==
--- websites/production/camel/content/twitter-websocket-example.html (original)
+++ websites/production/camel/content/twitter-websocket-example.html Tue Nov 15 
11:18:53 2016
@@ -84,69 +84,20 @@

 
 
-Twitter Websocket 
Example
-Available as of Camel 2.10
-
-This example is located in the Camel distribution at 
examples/camel-example-twitter-websocket.
-
-
-There is a Twitter Websocket Blueprint 
Example for OSGi Blueprint users.
-
-The example is demonstrating how to poll a constant feed of twitter 
searches and publish results in real time using web socket to a web page.
-As usual the code in Camel is very simple. All it takes is roughly
-
-
-

Twitter Websocket Example

Available as of Camel 2.10

This example is located in the Camel distribution at examples/camel-example-twitter-websocket.

There is a Twitter Websocket Blueprint Example for OSGi Blueprint users.

The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page.
As usual the code in Camel is very simple. All it takes is roughly

+