[1/2] camel git commit: CAMEL-9048: Fixed CS

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 9166b94d6 - b087f1640
  refs/heads/master f50e38209 - 20b24d7c1


CAMEL-9048: Fixed CS


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

Branch: refs/heads/master
Commit: 20b24d7c11de5951169e9a29ed920e574c722e29
Parents: f50e382
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 09:47:25 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 09:47:25 2015 +0200

--
 .../java/org/apache/camel/impl/osgi/Activator.java   | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/20b24d7c/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 97729b5..b7554cf 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl.osgi;
 
-import static org.osgi.framework.wiring.BundleRevision.PACKAGE_NAMESPACE;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -72,6 +70,8 @@ import org.osgi.framework.wiring.BundleWiring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.osgi.framework.wiring.BundleRevision.PACKAGE_NAMESPACE;
+
 public class Activator implements BundleActivator, BundleTrackerCustomizer {
 
 public static final String META_INF_COMPONENT = 
META-INF/services/org/apache/camel/component/;
@@ -86,11 +86,11 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
 
 private BundleTracker tracker;
-private MapLong, ListBaseService resolvers = new 
ConcurrentHashMapLong, ListBaseService();
+private final MapLong, ListBaseService resolvers = new 
ConcurrentHashMapLong, ListBaseService();
 private long bundleId;
 
 // Map from package name to the capability we export for this package
-private MapString, BundleCapability packageCapabilities = new 
HashMap();
+private final MapString, BundleCapability packageCapabilities = new 
HashMap();
 
 public void start(BundleContext context) throws Exception {
 LOG.info(Camel activator starting);
@@ -110,8 +110,6 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 
 /**
  * Caches the package capabilities that are needed for a set of interface 
classes
- *  
- * @param classes interfaces we want to track
  */
 private void cachePackageCapabilities(BundleContext context) {
 BundleWiring ourWiring = context.getBundle().adapt(BundleWiring.class);
@@ -236,9 +234,6 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 
 /**
  * Check if bundle can see the given class
- * @param bundle
- * @param clazz
- * @return
  */
 protected boolean canSee(Bundle bundle, Class? clazz) {
 BundleCapability packageCap = 
packageCapabilities.get(clazz.getPackage().getName());
@@ -357,7 +352,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 public void register() {
 if (hasFallbackTypeConverter) {
 // The FallbackTypeConverter should have a higher ranking
-doRegister(TypeConverterLoader.class, 
Constants.SERVICE_RANKING, new Integer(100));
+doRegister(TypeConverterLoader.class, 
Constants.SERVICE_RANKING, 100);
 } else {
 // The default service ranking is Integer(0);
 doRegister(TypeConverterLoader.class);

[2/2] camel git commit: CAMEL-9048: Fixed CS

[davsclaus]

CAMEL-9048: Fixed CS

Conflicts:
camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java


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

Branch: refs/heads/camel-2.15.x
Commit: b087f1640a876056c9536637680e5281772eb8dc
Parents: 9166b94
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 09:47:25 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 09:49:44 2015 +0200

--
 .../java/org/apache/camel/impl/osgi/Activator.java | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b087f164/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index df58189..db1303a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.impl.osgi;
 
-import static org.osgi.framework.wiring.BundleRevision.PACKAGE_NAMESPACE;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -72,6 +70,8 @@ import org.osgi.framework.wiring.BundleWiring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.osgi.framework.wiring.BundleRevision.PACKAGE_NAMESPACE;
+
 public class Activator implements BundleActivator, BundleTrackerCustomizer {
 
 public static final String META_INF_COMPONENT = 
META-INF/services/org/apache/camel/component/;
@@ -84,10 +84,11 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
 
 private BundleTracker tracker;
-private MapLong, ListBaseService resolvers = new 
ConcurrentHashMapLong, ListBaseService();
-
+private final MapLong, ListBaseService resolvers = new 
ConcurrentHashMapLong, ListBaseService();
+private long bundleId;
+
 // Map from package name to the capability we export for this package
-private MapString, BundleCapability packageCapabilities = new 
HashMap();
+private final MapString, BundleCapability packageCapabilities = new 
HashMap();
 
 public void start(BundleContext context) throws Exception {
 LOG.info(Camel activator starting);
@@ -105,7 +106,6 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 
 /**
  * Caches the package capabilities that are needed for a set of interface 
classes
- *  
  */
 private void cachePackageCapabilities(BundleContext context) {
 BundleWiring ourWiring = context.getBundle().adapt(BundleWiring.class);
@@ -207,9 +207,6 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 
 /**
  * Check if bundle can see the given class
- * @param bundle
- * @param clazz
- * @return
  */
 protected boolean canSee(Bundle bundle, Class? clazz) {
 BundleCapability packageCap = 
packageCapabilities.get(clazz.getPackage().getName());
@@ -328,7 +325,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 public void register() {
 if (hasFallbackTypeConverter) {
 // The FallbackTypeConverter should have a higher ranking
-doRegister(TypeConverterLoader.class, 
Constants.SERVICE_RANKING, new Integer(100));
+doRegister(TypeConverterLoader.class, 
Constants.SERVICE_RANKING, 100);
 } else {
 // The default service ranking is Integer(0);
 doRegister(TypeConverterLoader.class);

[1/2] camel git commit: Add Host IP Address to JMX properties

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 20b24d7c1 - 8a414c3d9


Add Host IP Address to JMX properties


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

Branch: refs/heads/master
Commit: a003434805705ab1df1e1b66f9d55a6bb9441573
Parents: 20b24d7
Author: Yamini Sadu ys...@tdktech.com
Authored: Tue Aug 4 11:07:36 2015 -0500
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 09:50:54 2015 +0200

--
 .../management/DefaultManagementAgent.java  | 23 ++-
 .../camel/management/JmxSystemPropertyKeys.java |  4 ++
 .../org/apache/camel/spi/ManagementAgent.java   | 13 ++
 .../DefaultManagementAgentMockTest.java | 42 
 .../xml/AbstractCamelContextFactoryBean.java|  3 ++
 .../camel/core/xml/CamelJMXAgentDefinition.java | 19 -
 .../camel/spring/JMXAgentPropertiesTest.java| 11 +
 .../org/apache/camel/spring/JMXAgentTest.java   |  3 ++
 .../org/apache/camel/spring/jmxConfig.xml   |  3 +-
 .../camel/spring/jmxConfigUsingProperties.xml   |  3 +-
 10 files changed, 111 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a0034348/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
 
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index a65fffc..e2f40b8 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -84,6 +84,7 @@ public class DefaultManagementAgent extends ServiceSupport 
implements Management
 private Boolean registerNewRoutes = true;
 private Boolean mask = true;
 private Boolean includeHostName = false;
+private Boolean useHostIPAddress= false;
 private String managementNamePattern = #name#;
 private ManagementStatisticsLevel statisticsLevel = 
ManagementStatisticsLevel.Default;
 
@@ -166,6 +167,10 @@ public class DefaultManagementAgent extends ServiceSupport 
implements Management
 managementNamePattern = 
System.getProperty(JmxSystemPropertyKeys.MANAGEMENT_NAME_PATTERN);
 values.put(JmxSystemPropertyKeys.MANAGEMENT_NAME_PATTERN, 
managementNamePattern);
 }
+if (System.getProperty(JmxSystemPropertyKeys.USE_HOST_IP_ADDRESS) != 
null) {
+useHostIPAddress = 
Boolean.getBoolean(JmxSystemPropertyKeys.USE_HOST_IP_ADDRESS);
+values.put(JmxSystemPropertyKeys.USE_HOST_IP_ADDRESS, 
useHostIPAddress);
+}
 
 if (!values.isEmpty()) {
 LOG.info(ManagementAgent detected JVM system properties: {}, 
values);
@@ -275,8 +280,18 @@ public class DefaultManagementAgent extends ServiceSupport 
implements Management
 public void setIncludeHostName(Boolean includeHostName) {
 this.includeHostName = includeHostName;
 }
+
+@Override
+public Boolean getUseHostIPAddress() {
+   return useHostIPAddress !=null  useHostIPAddress;
+   }
+
+@Override
+   public void setUseHostIPAddress(Boolean useHostIPAddress) {
+   this.useHostIPAddress = useHostIPAddress;
+   }
 
-public String getManagementNamePattern() {
+   public String getManagementNamePattern() {
 return managementNamePattern;
 }
 
@@ -465,7 +480,11 @@ public class DefaultManagementAgent extends ServiceSupport 
implements Management
 
 if (canAccessSystemProps) {
 try {
-hostName = InetAddress.getLocalHost().getHostName();
+   if(useHostIPAddress){
+   hostName = InetAddress.getLocalHost().getHostAddress();
+   }else{
+   hostName = InetAddress.getLocalHost().getHostName();
+   }
 } catch (UnknownHostException uhe) {
 LOG.info(Cannot determine localhost name. Using default:  + 
DEFAULT_REGISTRY_PORT, uhe);
 hostName = DEFAULT_HOST;

http://git-wip-us.apache.org/repos/asf/camel/blob/a0034348/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
 
b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
index 5684e5d..8fc9040 100644
--- 

[2/2] camel git commit: CAMEL-8880: Fix CS.

[davsclaus]

CAMEL-8880: Fix CS.


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

Branch: refs/heads/master
Commit: 8a414c3d9da3e26b26bca4f3f7374c525c287b10
Parents: a003434
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 10:03:52 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 10:03:52 2015 +0200

--
 .../management/DefaultManagementAgent.java  | 30 +-
 .../DefaultManagementAgentMockTest.java | 60 ++--
 .../camel/core/xml/CamelJMXAgentDefinition.java | 18 +++---
 .../camel/spring/JMXAgentPropertiesTest.java| 16 ++
 4 files changed, 58 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8a414c3d/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
 
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index e2f40b8..60706ce 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -84,7 +84,7 @@ public class DefaultManagementAgent extends ServiceSupport 
implements Management
 private Boolean registerNewRoutes = true;
 private Boolean mask = true;
 private Boolean includeHostName = false;
-private Boolean useHostIPAddress= false;
+private Boolean useHostIPAddress = false;
 private String managementNamePattern = #name#;
 private ManagementStatisticsLevel statisticsLevel = 
ManagementStatisticsLevel.Default;
 
@@ -280,18 +280,16 @@ public class DefaultManagementAgent extends 
ServiceSupport implements Management
 public void setIncludeHostName(Boolean includeHostName) {
 this.includeHostName = includeHostName;
 }
-
-@Override
+
 public Boolean getUseHostIPAddress() {
-   return useHostIPAddress !=null  useHostIPAddress;
-   }
+return useHostIPAddress != null  useHostIPAddress;
+}
 
-@Override
-   public void setUseHostIPAddress(Boolean useHostIPAddress) {
-   this.useHostIPAddress = useHostIPAddress;
-   }
+public void setUseHostIPAddress(Boolean useHostIPAddress) {
+this.useHostIPAddress = useHostIPAddress;
+}
 
-   public String getManagementNamePattern() {
+public String getManagementNamePattern() {
 return managementNamePattern;
 }
 
@@ -480,13 +478,13 @@ public class DefaultManagementAgent extends 
ServiceSupport implements Management
 
 if (canAccessSystemProps) {
 try {
-   if(useHostIPAddress){
-   hostName = InetAddress.getLocalHost().getHostAddress();
-   }else{
-   hostName = InetAddress.getLocalHost().getHostName();
-   }
+if (useHostIPAddress) {
+hostName = InetAddress.getLocalHost().getHostAddress();
+} else {
+hostName = InetAddress.getLocalHost().getHostName();
+}
 } catch (UnknownHostException uhe) {
-LOG.info(Cannot determine localhost name. Using default:  + 
DEFAULT_REGISTRY_PORT, uhe);
+LOG.info(Cannot determine localhost name or address. Using 
default:  + DEFAULT_REGISTRY_PORT, uhe);
 hostName = DEFAULT_HOST;
 }
 } else {

http://git-wip-us.apache.org/repos/asf/camel/blob/8a414c3d/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
 
b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
index efeb20d..bd469a1 100644
--- 
a/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
@@ -16,14 +16,6 @@
  */
 package org.apache.camel.management;
 
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reset;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import javax.management.JMException;
 import 

camel git commit: [CAMEL-9048] Clear map on stop

[cschneider]

Repository: camel
Updated Branches:
  refs/heads/master 8a414c3d9 - 31eea9003


[CAMEL-9048] Clear map on stop


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

Branch: refs/heads/master
Commit: 31eea9003e4f09bd85754f7a6c6ee0b7f0802ea0
Parents: 8a414c3
Author: Christian Schneider ch...@die-schneider.net
Authored: Wed Aug 5 10:04:26 2015 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Wed Aug 5 10:04:43 2015 +0200

--
 camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/31eea900/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index b7554cf..354232b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -105,6 +105,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 public void stop(BundleContext context) throws Exception {
 LOG.info(Camel activator stopping);
 tracker.close();
+packageCapabilities.clear();
 LOG.info(Camel activator stopped);
 }
 

camel git commit: [CAMEL-9048] Clear map on stop

[cschneider]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x b087f1640 - 4f2eb25d7


[CAMEL-9048] Clear map on stop


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

Branch: refs/heads/camel-2.15.x
Commit: 4f2eb25d75c9f7ac6800acafca2c5108376989ba
Parents: b087f16
Author: Christian Schneider ch...@die-schneider.net
Authored: Wed Aug 5 10:04:26 2015 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Wed Aug 5 10:05:30 2015 +0200

--
 camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4f2eb25d/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index db1303a..853dcf8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -101,6 +101,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 public void stop(BundleContext context) throws Exception {
 LOG.info(Camel activator stopping);
 tracker.close();
+packageCapabilities.clear();
 LOG.info(Camel activator stopped);
 }
 

svn commit: r960842 - in /websites/production/camel/content: cache/main.pageCache camel-jmx.html

[buildbot]

Author: buildbot
Date: Wed Aug  5 08:20:02 2015
New Revision: 960842

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-jmx.html
==
--- websites/production/camel/content/camel-jmx.html (original)
+++ websites/production/camel/content/camel-jmx.html Wed Aug  5 08:20:02 2015
@@ -207,7 +207,7 @@ java.lang.SecurityException: Unauthorize
 script class=brush: java; gutter: false; theme: Default 
type=syntaxhighlighter![CDATA[SUNJMX=-Dcom.sun.management.jmxremote=true 
-Dcom.sun.management.jmxremote.port=1616 \
 -Dcom.sun.management.jmxremote.authenticate=false 
-Dcom.sun.management.jmxremote.ssl=false
 ]]/script
-/div/divp(The SUNJMX environment variable is simple used by the startup 
script for Camel, as additional startup parameters for the JVM. If you start 
Camel directly, you'll have to pass these parameters yourself.)/ph4 
id=CamelJMX-jmxAgentPropertiesReferencejmxAgent Properties 
Reference/h4div class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpSpring property/p/thth colspan=1 rowspan=1 
class=confluenceThpSystem property/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeid/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1 
class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpThe JMX agent name, and it is not 
optional/p/td/trtr
 td colspan=1 rowspan=1 
class=confluenceTdpcodeusePlatformMBeanServer/code/p/tdtd 
colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.usePlatformMBeanServer/code/p/tdtd
 colspan=1 rowspan=1 class=confluenceTdpcodefalse/code, 
codetrue/code - Release 1.5 or later/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpIf codetrue/code, it will use the 
codeMBeanServer/code from the JVM/p/td/trtrtd colspan=1 
rowspan=1 
class=confluenceTdpcodembeanServerDefaultDomain/code/p/tdtd 
colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.mbeanServerDefaultDomain/code/p/tdtd
 colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpThe default JMX domain of the 
codeMBeanServer/code/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodembeanObjectDomainName/code
 /p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.mbeanObjectDomainName/code/p/tdtd
 colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpThe JMX domain that all object names will 
use/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodecreateConnector/code/p/tdtd colspan=1 
rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.createRmiConnect/code/p/tdtd
 colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpIf we should create a JMX 
connector (to allow remote management) for the 
codeMBeanServer/code/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcoderegistryPort/code/p/tdtd colspan=1 
rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.rmiConnector.registryPort/code/p/tdtd
 colspan=1 
 rowspan=1 class=confluenceTdpcode1099/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpThe port that the JMX RMI registry will 
use/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodeconnectorPort/code/p/tdtd colspan=1 
rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.rmiConnector.connectorPort/code/p/tdtd
 colspan=1 rowspan=1 class=confluenceTdp-1 (dynamic)/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpThe port that the JMX RMI 
server will use/p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodeserviceUrlPath/code/p/tdtd colspan=1 
rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.serviceUrlPath/code/p/tdtd
 colspan=1 rowspan=1 
class=confluenceTdpcode/jmxrmi/camel/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpThe path that JMX connector will be 
registered under/p/td/trtrtd colspan=1 rowspan=
 1 
class=confluenceTdpcodeonlyRegisterProcessorWithCustomId/code/p/tdtd
 colspan=1 rowspan=1 
class=confluenceTdpcodeorg.apache.camel.jmx.onlyRegisterProcessorWithCustomId/code/p/tdtd
 colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.0:/strong If 
this option is enabled then only processors with a custom id set will be 
registered. This allows you to filer out unwanted processors in the JMX 
console./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodestatisticsLevel/code/p/tdtd colspan=1 
rowspan=1 

camel git commit: CAMEL-9051: Upgrade ServiceMix-Specs to 2.4.0

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 31eea9003 - 415f9549c


CAMEL-9051: Upgrade ServiceMix-Specs to 2.4.0


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

Branch: refs/heads/master
Commit: 415f9549cca5f6c07365dce384d80b5089dd0d4d
Parents: 31eea90
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Aug 5 10:57:30 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Aug 5 10:57:30 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/415f9549/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0a4bf38..891076b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,7 @@
 scribe-bundle-version1.3.7_1/scribe-bundle-version
 scriptengines-version1.1.1/scriptengines-version
 serp-bundle-version1.14.1_1/serp-bundle-version
-servicemix-specs-version2.2.0/servicemix-specs-version
+servicemix-specs-version2.4.0/servicemix-specs-version
 servlet-api-3.0-version1.0/servlet-api-3.0-version
 servlet-version-range[2.5,4)/servlet-version-range
 shiro-version1.2.3/shiro-version

camel git commit: CAMEL-9051: Upgrade ServiceMix-Specs to 2.4.0

[ay]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 4f2eb25d7 - 11e795b91


CAMEL-9051: Upgrade ServiceMix-Specs to 2.4.0


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

Branch: refs/heads/camel-2.15.x
Commit: 11e795b914231d8415fe54dec76afe940f9b480f
Parents: 4f2eb25
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Aug 5 10:57:30 2015 +0200
Committer: Aki Yoshida elak...@gmail.com
Committed: Wed Aug 5 11:03:38 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/11e795b9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b014fc4..f08493b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -410,7 +410,7 @@
 scribe-bundle-version1.3.7_1/scribe-bundle-version
 scriptengines-version1.1.1/scriptengines-version
 serp-bundle-version1.14.1_1/serp-bundle-version
-servicemix-specs-version2.2.0/servicemix-specs-version
+servicemix-specs-version2.4.0/servicemix-specs-version
 servlet-api-3.0-version1.0/servlet-api-3.0-version
 servlet-version-range[2.5,4)/servlet-version-range
 shiro-version1.2.3/shiro-version

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

[buildbot]

Author: buildbot
Date: Wed Aug  5 09:18:52 2015
New Revision: 960849

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2160-release.html
==
--- websites/production/camel/content/camel-2160-release.html (original)
+++ websites/production/camel/content/camel-2160-release.html Wed Aug  5 
09:18:52 2015
@@ -84,7 +84,7 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth1 
id=Camel2.16.0Release-Camel2.16.0release(currentlyinprogress)Camel 
2.16.0#160;release (currently in progress)/h1div 
style=padding-right:20px;float:left;margin-left:-20px;pspan 
class=confluence-embedded-file-wrapperimg 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;/span/p/divdiv
 style=min-height:200px#160;/divh2 
id=Camel2.16.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to 
the 2.16.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)/ppNoteworthy improvements:/pulliThe route 
models (definition classes) preserve property placeholders, which allows round 
trip editing, and also prevents showing potential sensitive 
information/liliAdded onPrepareFailure option to#160;a shape
 =rect href=dead-letter-channel.htmlDead Letter Channel/a to allow a 
custom processor to prepare the Exchange before sending to the dead letter 
queue./lilia shape=rect href=mongodb.htmlMongoDB/a tailable 
consumers now allow setting the codereadPreference/code 
option./liliUsing setFaultBody / setFaultHeader behaves similar to setBody 
/ setHeader to preserve existing headers/attachments by setting on existing IN 
or OUT message./liliJava DSL using choice with end vs endChoice now 
validates you use them as intended. Any misconfiguration now throws an 
exception explaining the problem./lilia shape=rect 
href=pojo-producing.htmlPOJO Producing/a and#160;a shape=rect 
href=pojo-consuming.htmlPOJO Consuming/a lifecycle is now in sync with a 
shape=rect href=camelcontext.htmlCamelContext/a#160;which ensures it 
works as similar to Camel#160;a shape=rect href=routes.htmlRoutes/a 
does. Also the created producer/consumer is stopped 
 when#160;a shape=rect href=camelcontext.htmlCamelContext/a#160;is 
stopping to cleanup properly./lilia shape=rect 
href=jms.htmlJMS/a#160;component now allows configuring 
concurrentConsumers/maxConcurrentConsumers separately between from(jms) vs 
to(jms) using request/reply over JMS/lilispana shape=rect 
class=external-link 
href=https://issues.apache.org/jira/browse/CAMEL-8506;Added SEARCH/a 
operation to Elasticsearch component/span/lilispanThe#160;a 
shape=rect href=properties.htmlProperties/a component (property 
placeholder) now supports an encoding option to allow reading the .properties 
files using a specific charset such as UTF-8. By default ISO-8859-1 is used 
(latin1)/span/lilispanAdded#160;codereceviveBufferSize/code option 
to the a shape=rect href=ftp.htmlFTP/a#160;component to make download 
faster. The size is by default 32kb buffer./span/lilispanThe#160;a 
shape=rect href=aggregator2.html
 Aggregator2/a EIP now allows an external source using 
a#160;codeAggregateController/code to control the aggregator, such as for 
forcing completing a group or all groups, or query runtime information from the 
aggregator. A default controller is provided out of the box if none has been 
configured./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now enlists in JMX using 
a#160;codeManagedAggregateProcessorMBean/code which has more information, 
and also allows using the aggregate controller to control 
it./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now includes more runtime statistics 
which can be accessed from Java and JMX about number of incoming and completed 
exchanges, and per different completion 
triggers./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now supports pre-completion mode if the 
aggregation strategy implements#160;codePreCompletionAwareAg
 gregationStrategy/code. This supports the use-case where an incoming 
Exchange are used to determine if the current aggregated group is completed or 
not. If completed the group is emitted as-is, and the new incoming Exchange is 
used to start a new group from scratch./span/lilispanAdded options 
to#160;a shape=rect href=mail.htmlMail/a consumer so it can skip or 
handle a mail message that cannot be read from the mail 

[2/3] camel git commit: CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer side as well

[davsclaus]

CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer 
side as well


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

Branch: refs/heads/master
Commit: 4803af14b8851f05987f822e446232cce5311a65
Parents: 7099038
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 11:20:05 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 11:44:25 2015 +0200

--
 .../apache/camel/component/ahc/HttpHeaderFilterStrategy.java   | 1 +
 .../camel/component/ahc/HttpHeaderFilterStrategyTest.java  | 6 --
 .../camel/component/http4/HttpHeaderFilterStrategyTest.java| 4 ++--
 .../component/netty/http/NettyHttpHeaderFilterStrategy.java| 1 +
 .../component/netty4/http/NettyHttpHeaderFilterStrategy.java   | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4803af14/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategy.java
--
diff --git 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategy.java
 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategy.java
index 6f3786b..acf1a35 100644
--- 
a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategy.java
+++ 
b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategy.java
@@ -48,6 +48,7 @@ public class HttpHeaderFilterStrategy extends 
DefaultHeaderFilterStrategy {
 // filter headers begin with Camel or org.apache.camel
 // must ignore case for Http based transports
 
setOutFilterPattern((?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*);
+
setInFilterPattern((?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4803af14/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
--
diff --git 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
index adfe3ff..16d2a48 100644
--- 
a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/HttpHeaderFilterStrategyTest.java
@@ -62,8 +62,9 @@ public class HttpHeaderFilterStrategyTest extends 
CamelTestSupport {
 assertFalse(filter.applyFilterToExternalHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertFalse(filter.applyFilterToExternalHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
-assertFalse(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
-
assertFalse(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
+// any Camel header should be filtered
+assertTrue(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
+
assertTrue(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
 
 assertFalse(filter.applyFilterToExternalHeaders(notFilteredHeader, 
test, exchange));
 
@@ -96,6 +97,7 @@ public class HttpHeaderFilterStrategyTest extends 
CamelTestSupport {
 assertTrue(filter.applyFilterToCamelHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertTrue(filter.applyFilterToCamelHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
+// any Camel header should be filtered
 assertTrue(filter.applyFilterToCamelHeaders(CamelHeader, test, 
exchange));
 assertTrue(filter.applyFilterToCamelHeaders(org.apache.camel.header, 
test, exchange));
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4803af14/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
index 3b7189e..803e05f 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
@@ -99,8 

[3/3] camel git commit: CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer side as well

[davsclaus]

CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer 
side as well


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

Branch: refs/heads/master
Commit: 70990381e240155232a90847f22480e350d1be51
Parents: 415f954
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 10:24:01 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 11:44:25 2015 +0200

--
 .../http/common/HttpHeaderFilterStrategy.java   |   1 +
 .../http/HttpHeaderFilterStrategyTest.java  |   6 +-
 .../http4/HttpHeaderFilterStrategyTest.java |  10 +-
 .../component/http4/HttpNoCamelHeaderTest.java  | 100 +++
 .../jetty/HttpFilterNoCamelHeadersTest.java |  75 ++
 5 files changed, 186 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/70990381/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
--
diff --git 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
index 6df5b34..76c6421 100644
--- 
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
+++ 
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHeaderFilterStrategy.java
@@ -45,5 +45,6 @@ public class HttpHeaderFilterStrategy extends 
DefaultHeaderFilterStrategy {
 // filter headers begin with Camel or org.apache.camel
 // must ignore case for Http based transports
 
setOutFilterPattern((?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*);
+
setInFilterPattern((?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/70990381/components/camel-http/src/test/java/org/apache/camel/component/http/HttpHeaderFilterStrategyTest.java
--
diff --git 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpHeaderFilterStrategyTest.java
 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpHeaderFilterStrategyTest.java
index 4f2ac75..4c2ff23 100644
--- 
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpHeaderFilterStrategyTest.java
@@ -63,8 +63,9 @@ public class HttpHeaderFilterStrategyTest extends 
CamelTestSupport {
 assertFalse(filter.applyFilterToExternalHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertFalse(filter.applyFilterToExternalHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
-assertFalse(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
-
assertFalse(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
+// any Camel header should be filtered
+assertTrue(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
+
assertTrue(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
 
 assertFalse(filter.applyFilterToExternalHeaders(notFilteredHeader, 
test, exchange));
 
@@ -97,6 +98,7 @@ public class HttpHeaderFilterStrategyTest extends 
CamelTestSupport {
 assertTrue(filter.applyFilterToCamelHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertTrue(filter.applyFilterToCamelHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
+// any Camel header should be filtered
 assertTrue(filter.applyFilterToCamelHeaders(CamelHeader, test, 
exchange));
 assertTrue(filter.applyFilterToCamelHeaders(org.apache.camel.header, 
test, exchange));
 

http://git-wip-us.apache.org/repos/asf/camel/blob/70990381/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
index 05ca837..3b7189e 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpHeaderFilterStrategyTest.java
@@ -63,8 

[1/3] camel git commit: CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer side as well

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 415f9549c - e61f7f5a2


CAMEL-9052: HttpHeaderFilterStrategy should filter any Camel header on consumer 
side as well


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

Branch: refs/heads/master
Commit: e61f7f5a2d1603c00b2e0571fd59fff616eac19d
Parents: 4803af1
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 11:30:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 11:44:25 2015 +0200

--
 .../camel/component/netty/http/DefaultNettyHttpBinding.java| 5 +
 .../netty/http/NettyHttpHeaderFilterStrategyTest.java  | 6 --
 .../camel/component/netty4/http/DefaultNettyHttpBinding.java   | 5 +
 .../netty4/http/NettyHttpHeaderFilterStrategyTest.java | 6 --
 4 files changed, 10 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e61f7f5a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
--
diff --git 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index c071533..e9e9e83 100644
--- 
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++ 
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -158,10 +158,7 @@ public class DefaultNettyHttpBinding implements 
NettyHttpBinding, Cloneable {
 String value = request.headers().get(name);
 // store a special header that this request was authenticated 
using HTTP Basic
 if (value != null  value.trim().startsWith(Basic)) {
-if (headerFilterStrategy != null
- 
!headerFilterStrategy.applyFilterToExternalHeaders(NettyHttpConstants.HTTP_AUTHENTICATION,
 Basic, exchange)) {
-NettyHttpHelper.appendHeader(headers, 
NettyHttpConstants.HTTP_AUTHENTICATION, Basic);
-}
+NettyHttpHelper.appendHeader(headers, 
NettyHttpConstants.HTTP_AUTHENTICATION, Basic);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e61f7f5a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
--
diff --git 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
index 15de68e..46cd61a 100644
--- 
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
+++ 
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpHeaderFilterStrategyTest.java
@@ -61,8 +61,9 @@ public class NettyHttpHeaderFilterStrategyTest {
 assertFalse(filter.applyFilterToExternalHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertFalse(filter.applyFilterToExternalHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
-assertFalse(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
-
assertFalse(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
+// any Camel header should be filtered
+assertTrue(filter.applyFilterToExternalHeaders(CamelHeader, test, 
exchange));
+
assertTrue(filter.applyFilterToExternalHeaders(org.apache.camel.header, 
test, exchange));
 
 assertFalse(filter.applyFilterToExternalHeaders(notFilteredHeader, 
test, exchange));
 
@@ -95,6 +96,7 @@ public class NettyHttpHeaderFilterStrategyTest {
 assertTrue(filter.applyFilterToCamelHeaders(warning, 199 
Miscellaneous warning, exchange));
 assertTrue(filter.applyFilterToCamelHeaders(Warning, 199 
Miscellaneous warning, exchange));
 
+// any Camel header should be filtered
 assertTrue(filter.applyFilterToCamelHeaders(CamelHeader, test, 
exchange));
 assertTrue(filter.applyFilterToCamelHeaders(org.apache.camel.header, 
test, exchange));
 

svn commit: r960855 - in /websites/production/camel/content: atom.html book-component-appendix.html book-in-one-page.html cache/main.pageCache

[buildbot]

Author: buildbot
Date: Wed Aug  5 10:20:01 2015
New Revision: 960855

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/atom.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

Modified: websites/production/camel/content/atom.html
==
--- websites/production/camel/content/atom.html (original)
+++ websites/production/camel/content/atom.html Wed Aug  5 10:20:01 2015
@@ -97,7 +97,7 @@
 /div/divh3 id=Atom-URIformatURI format/h3div class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
 script class=brush: java; gutter: false; theme: Default 
type=syntaxhighlighter![CDATA[atom://atomUri[?options]
 ]]/script
-/div/divpWhere strongatomUri/strong is the URI to the Atom feed to 
poll./ph3 id=Atom-OptionsOptions/h3div 
class=confluenceTableSmalldiv class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpProperty/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodesplitEntries/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpIf codetrue/code Camel will 
poll the feed and for the subsequent polls return each entry poll by poll. If 
the feed contains 7 entries then Camel will return the first entry on the first 
poll, the 2nd entry on the next poll, until no more entries where as Camel will 
do a new update on the feed. If codefalse/code then Camel will poll a
  fresh feed on every invocation./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodefilter/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodetrue/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpIs only used by the split entries to filter the entries 
to return. Camel will default use the codeUpdateDateFilter/code that only 
return new entries from the feed. So the client consuming from the feed never 
receives the same entry more than once. The filter will return the entries 
ordered by the newest last./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodelastUpdate/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpIs only used by the filter, as the starting 
timestamp for selection never entries (uses the codeentry.updated/code 
timestamp). Syntax format is: code-MM-ddTHH:MM:ss/code. Example:
  code2007-12-24T17:45:59/code./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodethrottleEntries/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.5:/strong 
Sets whether all entries identified in a single feed poll should be delivered 
immediately. If codetrue/code, only one entry is processed per 
codeconsumer.delay/code. Only applicable when codesplitEntries/code is 
set to codetrue/code./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodefeedHeader/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpSets whether to add the Abdera Feed object 
as a header./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodesortEntries/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodef
 alse/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpIf 
codesplitEntries/code is codetrue/code, this sets whether to sort those 
entries by updated date./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodeconsumer.delay/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcode6/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpDelay in millis between each 
poll./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodeconsumer.initialDelay/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcode1000/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpMillis before polling 
starts./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodeconsumer.userFixedDelay/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpIf codetrue/code, use fix
 ed delay between pools, otherwise fixed rate is used. See a shape=rect 
class=external-link 
href=http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html;
 rel=nofollowScheduledExecutorService/a in JDK for 
details./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdcodeusername/code/tdtd colspan=1 rowspan=1 
class=confluenceTd#160;/tdtd colspan=1 rowspan=1 
class=confluenceTdstrongCamel 2.16:/strong For basic authentication when 
polling from a HTTP feed/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdcodepassword/code/tdtd colspan=1 rowspan=1 
class=confluenceTd#160;/tdtd colspan=1 rowspan=1 

svn commit: r960862 [3/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Modified: websites/production/camel/content/ftp.html
==
--- websites/production/camel/content/ftp.html (original)
+++ websites/production/camel/content/ftp.html Wed Aug  5 11:20:07 2015
@@ -99,7 +99,7 @@
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect class=external-link 
href=http://www.jcraft.com/jsch/; rel=nofollowJCraft JSCH/a./ppThe 
FTPS component is only available in Camel 2.2 or newer.br clear=none FTPS 
(also known as FTP Secure) is an extension to FTP that adds support for the 
Transport Layer Security (TLS) and the Secure Sockets Layer (SSL) cryptographic 
protocols./ph3 id=FTP-URIOptionsURI Options/h3pThe options below are 
exclusive for the FTP comp
 onent./pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleMore 
options/pspan class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypSee a shape=rect 
href=file2.htmlFile/a for more options as all the options from a 
shape=rect href=file2.htmlFile/a is inherited./p/div/divdiv 
class=confluenceTableSmalldiv class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpName/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeusername/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the username to use to
  log in to the remote file systen./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodepassword/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the password to use 
to log in to the remote file system./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeaccount/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdcodenull/code/tdtd 
colspan=1 rowspan=1 class=confluenceTdstrongCamel 2.15.2:/strong 
Specified the account to use to login to the remote FTP server (only for FTP 
and FTP Secure)/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodebinary/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpSpecifies the file transfer mode, BINARY or ASCII. 
Default is ASCII (codefalse/code)./p/td/
 trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodedisconnect/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpstrongCamel 2.2:/strong Whether or not 
to disconnect from remote FTP server right after use. Can be used for both 
consumer and producer. Disconnect will only disconnect the current connection 
to the FTP server. If you have a consumer which you want to stop, then you need 
to stop the consumer/route instead./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodelocalWorkDirectory/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpWhen consuming, a local work 
directory can be used to store the remote file content directly in local files, 
to avoid loading the content into memory. This is beneficial, if you consume a 
very big remote file and thus can co
 nserve memory. See below for more details./p/td/trtrtd colspan=1 
rowspan=1 

svn commit: r960862 [2/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

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 Wed Aug  5 11:20:07 
2015
@@ -3685,11 +3685,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various a shape=rect href=examples.htmlExamples/a useful./li/ul
 
 h2 id=BookInOnePage-TutorialonSpringRemotingwithJMSTutorial on Spring 
Remoting with JMS/h2p#160;/pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleThanks/pspan 
class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypThis tutorial was kindly donated 
to Apache Camel by Martin Gilday./p/div/divh2 
id=BookInOnePage-PrefacePreface/h2pThis 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 a shape=rect 
class=external-link href=http://www.springramework.org; 
rel=nofollowSpring/a service. The route works in a synchronous fashion 
returning a response to the client./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1438769902230 {padding: 0px;}
-div.rbtoc1438769902230 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438769902230 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438773512662 {padding: 0px;}
+div.rbtoc1438773512662 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438773512662 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1438769902230
+/*]]*//style/pdiv class=toc-macro rbtoc1438773512662
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-TutorialonSpringRemotingwithJMSTutorial on Spring 
Remoting with JMS/a/lilia shape=rect 
href=#BookInOnePage-PrefacePreface/a/lilia shape=rect 
href=#BookInOnePage-PrerequisitesPrerequisites/a/lilia shape=rect 
href=#BookInOnePage-DistributionDistribution/a/lilia shape=rect 
href=#BookInOnePage-AboutAbout/a/lilia shape=rect 
href=#BookInOnePage-CreatetheCamelProjectCreate the Camel Project/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-UpdatethePOMwithDependenciesUpdate the POM with 
Dependencies/a/li/ul
 /lilia shape=rect href=#BookInOnePage-WritingtheServerWriting the 
Server/a
@@ -5789,11 +5789,11 @@ So we completed the last piece in the pi
 pThis example has been removed from strongCamel 2.9/strong onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use a shape=rect href=cxf.htmlCXF/a instead of Axis./p/div/div
 
 style type=text/css/*![CDATA[*/
-div.rbtoc1438769902528 {padding: 0px;}
-div.rbtoc1438769902528 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438769902528 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438773513028 {padding: 0px;}
+div.rbtoc1438773513028 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438773513028 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//stylediv class=toc-macro rbtoc1438769902528
+/*]]*//stylediv class=toc-macro rbtoc1438773513028
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-TutorialusingAxis1.4withApacheCamelTutorial using Axis 
1.4 with Apache Camel/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-PrerequisitesPrerequisites/a/lilia shape=rect 
href=#BookInOnePage-DistributionDistribution/a/lilia shape=rect 
href=#BookInOnePage-IntroductionIntroduction/a/lilia shape=rect 
href=#BookInOnePage-SettinguptheprojecttorunAxisSetting up the project to 
run Axis/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-Maven2Maven 2/a/lilia shape=rect 
href=#BookInOnePage-wsdlwsdl/a/lilia shape=rect 
href=#BookInOnePage-ConfiguringAxisConfiguring Axis/a/lilia 
shape=rect href=#BookInOnePage-RunningtheExampleRunning the 
Example/a/li/ul
@@ -17742,11 +17742,11 @@ template.send(quot;direct:alias-verify
 ]]/script
 /div/divp/ph3 id=BookInOnePage-SeeAlso.28See Also/h3
 ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulullia 
shape=rect href=crypto.htmlCrypto/a Crypto is also available as a a 
shape=rect href=data-format.htmlData Format/a/li/ul h2 
id=BookInOnePage-CXFComponentCXF Component/h2div 
class=confluence-information-macro confluence-information-macro-notespan 
class=aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF as a consumer, the 
a shape=rect href=cxf-bean-component.htmlCXF Bean Component/a allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to consume web 
 

svn commit: r960862 [4/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Modified: websites/production/camel/content/ftp2.html
==
--- websites/production/camel/content/ftp2.html (original)
+++ websites/production/camel/content/ftp2.html Wed Aug  5 11:20:07 2015
@@ -99,7 +99,7 @@
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect class=external-link 
href=http://www.jcraft.com/jsch/; rel=nofollowJCraft JSCH/a./ppThe 
FTPS component is only available in Camel 2.2 or newer.br clear=none FTPS 
(also known as FTP Secure) is an extension to FTP that adds support for the 
Transport Layer Security (TLS) and the Secure Sockets Layer (SSL) cryptographic 
protocols./ph3 id=FTP2-URIOptionsURI Options/h3pThe options below are 
exclusive for the FTP com
 ponent./pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleMore 
options/pspan class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypSee a shape=rect 
href=file2.htmlFile/a for more options as all the options from a 
shape=rect href=file2.htmlFile/a is inherited./p/div/divdiv 
class=confluenceTableSmalldiv class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpName/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeusername/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the username to use t
 o log in to the remote file systen./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodepassword/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the password to use 
to log in to the remote file system./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeaccount/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdcodenull/code/tdtd 
colspan=1 rowspan=1 class=confluenceTdstrongCamel 2.15.2:/strong 
Specified the account to use to login to the remote FTP server (only for FTP 
and FTP Secure)/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodebinary/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpSpecifies the file transfer mode, BINARY or ASCII. 
Default is ASCII (codefalse/code)./p/td
 /trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodedisconnect/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpstrongCamel 2.2:/strong Whether or not 
to disconnect from remote FTP server right after use. Can be used for both 
consumer and producer. Disconnect will only disconnect the current connection 
to the FTP server. If you have a consumer which you want to stop, then you need 
to stop the consumer/route instead./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodelocalWorkDirectory/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpWhen consuming, a local work 
directory can be used to store the remote file content directly in local files, 
to avoid loading the content into memory. This is beneficial, if you consume a 
very big remote file and thus can c
 onserve memory. See below for more details./p/td/trtrtd colspan=1 
rowspan=1 

svn commit: r960862 [1/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Author: buildbot
Date: Wed Aug  5 11:20:07 2015
New Revision: 960862

Log:
Production update by buildbot for camel

Modified:
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/ftp.html
websites/production/camel/content/ftp2.html

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 Wed Aug  5 
11:20:07 2015
@@ -1219,11 +1219,11 @@ template.send(quot;direct:alias-verify
 ]]/script
 /div/divp/ph3 id=BookComponentAppendix-SeeAlso.8See Also/h3
 ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulullia 
shape=rect href=crypto.htmlCrypto/a Crypto is also available as a a 
shape=rect href=data-format.htmlData Format/a/li/ul h2 
id=BookComponentAppendix-CXFComponentCXF Component/h2div 
class=confluence-information-macro confluence-information-macro-notespan 
class=aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF as a consumer, the 
a shape=rect href=cxf-bean-component.htmlCXF Bean Component/a allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to cons
 ume web services. The bean component's configuration is also simpler and 
provides the fastest method to implement web services using Camel and 
CXF./p/div/divdiv class=confluence-information-macro 
confluence-information-macro-tipspan class=aui-icon aui-icon-small 
aui-iconfont-approve confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF in streaming modes 
(see DataFormat option), then also read about a shape=rect 
href=stream-caching.htmlStream caching/a./p/div/divpThe 
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.rbtoc1438769874020 {padding: 0px;}
-div.rbtoc1438769874020 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438769874020 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438773487315 {padding: 0px;}
+div.rbtoc1438773487315 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438773487315 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1438769874020
+/*]]*//style/pdiv class=toc-macro rbtoc1438773487315
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-CXFComponentCXF Component/a
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-URIformatURI format/a/lilia shape=rect 
href=#BookComponentAppendix-OptionsOptions/a
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-ThedescriptionsofthedataformatsThe descriptions 
of the dataformats/a
@@ -3191,7 +3191,7 @@ protected RouteBuilder createRouteBuilde
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect 

[3/4] camel git commit: CAMEL-9054: sftp - Reduce logging noise from JSCH

[davsclaus]

CAMEL-9054: sftp - Reduce logging noise from JSCH


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

Branch: refs/heads/master
Commit: dac35137d0c8019ea00e789ef739c6738924bc08
Parents: 79e2f13
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:19:07 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:19:07 2015 +0200

--
 .../java/org/apache/camel/LoggingLevel.java | 19 +++-
 .../java/org/apache/camel/LoggingLevelTest.java | 47 
 .../file/remote/SftpConfiguration.java  |  5 +--
 .../component/file/remote/SftpOperations.java   | 10 ++---
 4 files changed, 61 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dac35137/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java 
b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
index 434c9dd..b3c8e88 100644
--- a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
@@ -25,23 +25,18 @@ import javax.xml.bind.annotation.XmlEnum;
  */
 @XmlEnum
 public enum LoggingLevel {
-DEBUG, ERROR, INFO, TRACE, WARN, OFF;
+
+TRACE, DEBUG, INFO, WARN, ERROR, OFF;
 
 /**
  * Is the given logging level equal or higher than the current level.
  */
-public boolean isGE(LoggingLevel level) {
-if (this == OFF) {
+public boolean isEnabled(LoggingLevel level) {
+// off is always false
+if (this == OFF || level == OFF) {
 return false;
-} else if (level == WARN) {
-return this == WARN || this == ERROR;
-} else if (level == INFO) {
-return this == INFO || this == WARN || this == ERROR;
-} else if (level == DEBUG) {
-return this == DEBUG || this == INFO || this == WARN || this == 
ERROR;
-} else if (level == TRACE) {
-return this != OFF;
 }
-return false;
+
+return this.compareTo(level) = 0;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/dac35137/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
--
diff --git a/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java 
b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
new file mode 100644
index 000..508d3bf
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class LoggingLevelTest extends TestCase {
+
+@Test
+public void testLoggingLevelInfo() throws Exception {
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.ERROR));
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.WARN));
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.INFO));
+
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.DEBUG));
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.TRACE));
+
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.OFF));
+}
+
+@Test
+public void testLoggingLevelWARN() throws Exception {
+assertTrue(LoggingLevel.WARN.isEnabled(LoggingLevel.ERROR));
+assertTrue(LoggingLevel.WARN.isEnabled(LoggingLevel.WARN));
+
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.INFO));
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.DEBUG));
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.TRACE));
+
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.OFF));
+}
+}

[1/4] camel git commit: CAMEL-8887: Added unit test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master e61f7f5a2 - 01c0963d4


CAMEL-8887: Added unit test


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

Branch: refs/heads/master
Commit: 82e9fd33ea78d2576a63e2641d89921dafd26bdd
Parents: e61f7f5
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 12:49:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 12:49:38 2015 +0200

--
 .../component/file/GenericFileConsumer.java | 25 +++---
 .../file/remote/FromFtpSedaDeleteFileTest.java  | 90 
 .../remote/sftp/SftpFromSedaDeleteFileTest.java | 80 +
 3 files changed, 185 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/82e9fd33/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index c188ebf..d1f58d6 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -432,17 +432,22 @@ public abstract class GenericFileConsumerT extends 
ScheduledBatchPollingConsum
 
 log.debug(About to process file: {} using exchange: {}, target, 
exchange);
 
-// process the exchange using the async consumer to support async 
routing engine
-// which can be supported by this file consumer as all the done 
work is
-// provided in the GenericFileOnCompletion
-getAsyncProcessor().process(exchange, new AsyncCallback() {
-public void done(boolean doneSync) {
-// noop
-if (log.isTraceEnabled()) {
-log.trace(Done processing file: {} {}, target, 
doneSync ? synchronously : asynchronously);
+if (endpoint.isSynchronous()) {
+// process synchronously
+getProcessor().process(exchange);
+} else {
+// process the exchange using the async consumer to support 
async routing engine
+// which can be supported by this file consumer as all the 
done work is
+// provided in the GenericFileOnCompletion
+getAsyncProcessor().process(exchange, new AsyncCallback() {
+public void done(boolean doneSync) {
+// noop
+if (log.isTraceEnabled()) {
+log.trace(Done processing file: {} {}, target, 
doneSync ? synchronously : asynchronously);
+}
 }
-}
-});
+});
+}
 
 } catch (Exception e) {
 // remove file from the in progress list due to failure

http://git-wip-us.apache.org/repos/asf/camel/blob/82e9fd33/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
new file mode 100644
index 000..dfb8806
--- /dev/null
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
@@ -0,0 +1,90 @@
+/**
+ * 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.file.remote;
+
+import java.io.File;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import 

[2/4] camel git commit: CAMEL-9054: sftp - Reduce logging noise from JSCH

[davsclaus]

CAMEL-9054: sftp - Reduce logging noise from JSCH


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

Branch: refs/heads/master
Commit: 79e2f1354314b01a780314f0ed56b5dd5f05b422
Parents: 82e9fd3
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:00:56 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:00:56 2015 +0200

--
 .../java/org/apache/camel/LoggingLevel.java | 20 +-
 .../file/remote/SftpConfiguration.java  | 16 +++
 .../component/file/remote/SftpOperations.java   | 29 
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/79e2f135/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java 
b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
index a8958bf..434c9dd 100644
--- a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
@@ -25,5 +25,23 @@ import javax.xml.bind.annotation.XmlEnum;
  */
 @XmlEnum
 public enum LoggingLevel {
-DEBUG, ERROR, INFO, TRACE, WARN, OFF
+DEBUG, ERROR, INFO, TRACE, WARN, OFF;
+
+/**
+ * Is the given logging level equal or higher than the current level.
+ */
+public boolean isGE(LoggingLevel level) {
+if (this == OFF) {
+return false;
+} else if (level == WARN) {
+return this == WARN || this == ERROR;
+} else if (level == INFO) {
+return this == INFO || this == WARN || this == ERROR;
+} else if (level == DEBUG) {
+return this == DEBUG || this == INFO || this == WARN || this == 
ERROR;
+} else if (level == TRACE) {
+return this != OFF;
+}
+return false;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/79e2f135/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index ac24e7c..8d56d5d 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.file.remote;
 import java.net.URI;
 import java.security.KeyPair;
 
+import org.apache.camel.LoggingLevel;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 
@@ -59,6 +60,8 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 private int compression;
 @UriParam
 private String preferredAuthentications;
+@UriParam(defaultValue = WARN)
+private LoggingLevel jschLoggingLevel = LoggingLevel.WARN;
 
 public SftpConfiguration() {
 setProtocol(sftp);
@@ -245,4 +248,17 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 public String getPreferredAuthentications() {
 return preferredAuthentications;
 }
+
+public LoggingLevel getJschLoggingLevel() {
+return jschLoggingLevel;
+}
+
+/**
+ * Sets the logging level of JSCH activity.
+ * p/
+ * Because JSCH is verbose by default at INFO level, the default value is 
ttWARN/tt
+ */
+public void setJschLoggingLevel(LoggingLevel jschLoggingLevel) {
+this.jschLoggingLevel = jschLoggingLevel;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/79e2f135/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index dab4b8d..752a678 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -46,6 +46,7 @@ import com.jcraft.jsch.UserInfo;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.LoggingLevel;
 import 

[4/4] camel git commit: CAMEL-8887: SFTP operations is not thread safe

[davsclaus]

CAMEL-8887: SFTP operations is not thread safe


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

Branch: refs/heads/master
Commit: 01c0963d4e90621a6d8d3d1085ed630f5597bd2e
Parents: dac3513
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:26:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:26:04 2015 +0200

--
 .../component/file/remote/SftpOperations.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/01c0963d/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index f19f70b..ab7e649 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -66,6 +66,8 @@ import static org.apache.camel.util.ObjectHelper.isNotEmpty;
 
 /**
  * SFTP remote file operations
+ * p/
+ * The JSCH session and channel are not thread-safe so we need to synchronize 
access to using this operation.
  */
 public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry {
 private static final Logger LOG = 
LoggerFactory.getLogger(SftpOperations.class);
@@ -92,7 +94,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 this.endpoint = (SftpEndpoint) endpoint;
 }
 
-public boolean connect(RemoteFileConfiguration configuration) throws 
GenericFileOperationFailedException {
+public synchronized boolean connect(RemoteFileConfiguration configuration) 
throws GenericFileOperationFailedException {
 if (isConnected()) {
 // already connected
 return true;
@@ -377,11 +379,11 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean isConnected() throws GenericFileOperationFailedException {
+public synchronized boolean isConnected() throws 
GenericFileOperationFailedException {
 return session != null  session.isConnected()  channel != null  
channel.isConnected();
 }
 
-public void disconnect() throws GenericFileOperationFailedException {
+public synchronized void disconnect() throws 
GenericFileOperationFailedException {
 if (session != null  session.isConnected()) {
 session.disconnect();
 }
@@ -390,7 +392,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean deleteFile(String name) throws 
GenericFileOperationFailedException {
+public synchronized boolean deleteFile(String name) throws 
GenericFileOperationFailedException {
 LOG.debug(Deleting file: {}, name);
 try {
 channel.rm(name);
@@ -400,7 +402,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean renameFile(String from, String to) throws 
GenericFileOperationFailedException {
+public synchronized boolean renameFile(String from, String to) throws 
GenericFileOperationFailedException {
 LOG.debug(Renaming file: {} to: {}, from, to);
 try {
 channel.rename(from, to);
@@ -410,7 +412,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean buildDirectory(String directory, boolean absolute) throws 
GenericFileOperationFailedException {
+public synchronized boolean buildDirectory(String directory, boolean 
absolute) throws GenericFileOperationFailedException {
 // must normalize directory first
 directory = endpoint.getConfiguration().normalizePath(directory);
 
@@ -480,7 +482,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 return success;
 }
 
-public String getCurrentDirectory() throws 
GenericFileOperationFailedException {
+public synchronized String getCurrentDirectory() throws 
GenericFileOperationFailedException {
 LOG.trace(getCurrentDirectory());
 try {
 String answer = channel.pwd();
@@ -491,7 +493,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public void changeCurrentDirectory(String path) 

[4/4] camel git commit: CAMEL-9054: sftp - Reduce logging noise from JSCH

[davsclaus]

CAMEL-9054: sftp - Reduce logging noise from JSCH


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

Branch: refs/heads/camel-2.15.x
Commit: 0c268d4a4469c41e40453c351f13cc87fd4cc272
Parents: d9856bd
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:19:07 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:39:57 2015 +0200

--
 .../java/org/apache/camel/LoggingLevel.java | 19 +++-
 .../java/org/apache/camel/LoggingLevelTest.java | 47 
 .../file/remote/SftpConfiguration.java  |  5 +--
 .../component/file/remote/SftpOperations.java   | 10 ++---
 4 files changed, 61 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0c268d4a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java 
b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
index 434c9dd..b3c8e88 100644
--- a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
@@ -25,23 +25,18 @@ import javax.xml.bind.annotation.XmlEnum;
  */
 @XmlEnum
 public enum LoggingLevel {
-DEBUG, ERROR, INFO, TRACE, WARN, OFF;
+
+TRACE, DEBUG, INFO, WARN, ERROR, OFF;
 
 /**
  * Is the given logging level equal or higher than the current level.
  */
-public boolean isGE(LoggingLevel level) {
-if (this == OFF) {
+public boolean isEnabled(LoggingLevel level) {
+// off is always false
+if (this == OFF || level == OFF) {
 return false;
-} else if (level == WARN) {
-return this == WARN || this == ERROR;
-} else if (level == INFO) {
-return this == INFO || this == WARN || this == ERROR;
-} else if (level == DEBUG) {
-return this == DEBUG || this == INFO || this == WARN || this == 
ERROR;
-} else if (level == TRACE) {
-return this != OFF;
 }
-return false;
+
+return this.compareTo(level) = 0;
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0c268d4a/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
--
diff --git a/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java 
b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
new file mode 100644
index 000..508d3bf
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class LoggingLevelTest extends TestCase {
+
+@Test
+public void testLoggingLevelInfo() throws Exception {
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.ERROR));
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.WARN));
+assertTrue(LoggingLevel.INFO.isEnabled(LoggingLevel.INFO));
+
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.DEBUG));
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.TRACE));
+
+assertFalse(LoggingLevel.INFO.isEnabled(LoggingLevel.OFF));
+}
+
+@Test
+public void testLoggingLevelWARN() throws Exception {
+assertTrue(LoggingLevel.WARN.isEnabled(LoggingLevel.ERROR));
+assertTrue(LoggingLevel.WARN.isEnabled(LoggingLevel.WARN));
+
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.INFO));
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.DEBUG));
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.TRACE));
+
+assertFalse(LoggingLevel.WARN.isEnabled(LoggingLevel.OFF));
+}
+}

[2/4] camel git commit: CAMEL-8887: SFTP operations is not thread safe

[davsclaus]

CAMEL-8887: SFTP operations is not thread safe


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

Branch: refs/heads/camel-2.15.x
Commit: 9611cc4f32eb946de69127e5eb47146fca5d0a66
Parents: 7390018
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:26:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:39:38 2015 +0200

--
 .../component/file/remote/SftpOperations.java   | 37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9611cc4f/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index dab4b8d..9790ef9 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -65,6 +65,8 @@ import static org.apache.camel.util.ObjectHelper.isNotEmpty;
 
 /**
  * SFTP remote file operations
+ * p/
+ * The JSCH session and channel are not thread-safe so we need to synchronize 
access to using this operation.
  */
 public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry {
 private static final Logger LOG = 
LoggerFactory.getLogger(SftpOperations.class);
@@ -91,7 +93,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 this.endpoint = (SftpEndpoint) endpoint;
 }
 
-public boolean connect(RemoteFileConfiguration configuration) throws 
GenericFileOperationFailedException {
+public synchronized boolean connect(RemoteFileConfiguration configuration) 
throws GenericFileOperationFailedException {
 if (isConnected()) {
 // already connected
 return true;
@@ -370,11 +372,11 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean isConnected() throws GenericFileOperationFailedException {
+public synchronized boolean isConnected() throws 
GenericFileOperationFailedException {
 return session != null  session.isConnected()  channel != null  
channel.isConnected();
 }
 
-public void disconnect() throws GenericFileOperationFailedException {
+public synchronized void disconnect() throws 
GenericFileOperationFailedException {
 if (session != null  session.isConnected()) {
 session.disconnect();
 }
@@ -383,7 +385,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean deleteFile(String name) throws 
GenericFileOperationFailedException {
+public synchronized boolean deleteFile(String name) throws 
GenericFileOperationFailedException {
 LOG.debug(Deleting file: {}, name);
 try {
 channel.rm(name);
@@ -393,7 +395,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean renameFile(String from, String to) throws 
GenericFileOperationFailedException {
+public synchronized boolean renameFile(String from, String to) throws 
GenericFileOperationFailedException {
 LOG.debug(Renaming file: {} to: {}, from, to);
 try {
 channel.rename(from, to);
@@ -403,7 +405,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public boolean buildDirectory(String directory, boolean absolute) throws 
GenericFileOperationFailedException {
+public synchronized boolean buildDirectory(String directory, boolean 
absolute) throws GenericFileOperationFailedException {
 // must normalize directory first
 directory = endpoint.getConfiguration().normalizePath(directory);
 
@@ -473,7 +475,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 return success;
 }
 
-public String getCurrentDirectory() throws 
GenericFileOperationFailedException {
+public synchronized String getCurrentDirectory() throws 
GenericFileOperationFailedException {
 LOG.trace(getCurrentDirectory());
 try {
 String answer = channel.pwd();
@@ -484,7 +486,7 @@ public class SftpOperations implements 
RemoteFileOperationsChannelSftp.LsEntry
 }
 }
 
-public void changeCurrentDirectory(String 

[3/4] camel git commit: CAMEL-9054: sftp - Reduce logging noise from JSCH

[davsclaus]

CAMEL-9054: sftp - Reduce logging noise from JSCH


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

Branch: refs/heads/camel-2.15.x
Commit: d9856bd2ada938d101ccb49f46d4e32292b05677
Parents: 9611cc4
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 13:00:56 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:39:51 2015 +0200

--
 .../java/org/apache/camel/LoggingLevel.java | 20 +-
 .../file/remote/SftpConfiguration.java  | 16 +++
 .../component/file/remote/SftpOperations.java   | 29 
 3 files changed, 53 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d9856bd2/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java 
b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
index a8958bf..434c9dd 100644
--- a/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
+++ b/camel-core/src/main/java/org/apache/camel/LoggingLevel.java
@@ -25,5 +25,23 @@ import javax.xml.bind.annotation.XmlEnum;
  */
 @XmlEnum
 public enum LoggingLevel {
-DEBUG, ERROR, INFO, TRACE, WARN, OFF
+DEBUG, ERROR, INFO, TRACE, WARN, OFF;
+
+/**
+ * Is the given logging level equal or higher than the current level.
+ */
+public boolean isGE(LoggingLevel level) {
+if (this == OFF) {
+return false;
+} else if (level == WARN) {
+return this == WARN || this == ERROR;
+} else if (level == INFO) {
+return this == INFO || this == WARN || this == ERROR;
+} else if (level == DEBUG) {
+return this == DEBUG || this == INFO || this == WARN || this == 
ERROR;
+} else if (level == TRACE) {
+return this != OFF;
+}
+return false;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/d9856bd2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index f7b21e8..855d84a 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.file.remote;
 import java.net.URI;
 import java.security.KeyPair;
 
+import org.apache.camel.LoggingLevel;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 
@@ -59,6 +60,8 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 private int compression;
 @UriParam
 private String preferredAuthentications;
+@UriParam(defaultValue = WARN)
+private LoggingLevel jschLoggingLevel = LoggingLevel.WARN;
 
 public SftpConfiguration() {
 setProtocol(sftp);
@@ -202,4 +205,17 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 public String getPreferredAuthentications() {
 return preferredAuthentications;
 }
+
+public LoggingLevel getJschLoggingLevel() {
+return jschLoggingLevel;
+}
+
+/**
+ * Sets the logging level of JSCH activity.
+ * p/
+ * Because JSCH is verbose by default at INFO level, the default value is 
ttWARN/tt
+ */
+public void setJschLoggingLevel(LoggingLevel jschLoggingLevel) {
+this.jschLoggingLevel = jschLoggingLevel;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/d9856bd2/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index 9790ef9..e6e7fd9 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -46,6 +46,7 @@ import com.jcraft.jsch.UserInfo;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.LoggingLevel;
 import 

[1/4] camel git commit: CAMEL-8887: Added unit test

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 11e795b91 - 0c268d4a4


CAMEL-8887: Added unit test


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

Branch: refs/heads/camel-2.15.x
Commit: 73900189a25ed3f80fd8acc18f4eb2b9f7e8e3dc
Parents: 11e795b
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 12:49:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 13:39:31 2015 +0200

--
 .../component/file/GenericFileConsumer.java | 25 +++---
 .../file/remote/FromFtpSedaDeleteFileTest.java  | 90 
 .../remote/sftp/SftpFromSedaDeleteFileTest.java | 80 +
 3 files changed, 185 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/73900189/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 00afddc..d867428 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -429,17 +429,22 @@ public abstract class GenericFileConsumerT extends 
ScheduledBatchPollingConsum
 
 log.debug(About to process file: {} using exchange: {}, target, 
exchange);
 
-// process the exchange using the async consumer to support async 
routing engine
-// which can be supported by this file consumer as all the done 
work is
-// provided in the GenericFileOnCompletion
-getAsyncProcessor().process(exchange, new AsyncCallback() {
-public void done(boolean doneSync) {
-// noop
-if (log.isTraceEnabled()) {
-log.trace(Done processing file: {} {}, target, 
doneSync ? synchronously : asynchronously);
+if (endpoint.isSynchronous()) {
+// process synchronously
+getProcessor().process(exchange);
+} else {
+// process the exchange using the async consumer to support 
async routing engine
+// which can be supported by this file consumer as all the 
done work is
+// provided in the GenericFileOnCompletion
+getAsyncProcessor().process(exchange, new AsyncCallback() {
+public void done(boolean doneSync) {
+// noop
+if (log.isTraceEnabled()) {
+log.trace(Done processing file: {} {}, target, 
doneSync ? synchronously : asynchronously);
+}
 }
-}
-});
+});
+}
 
 } catch (Exception e) {
 // remove file from the in progress list due to failure

http://git-wip-us.apache.org/repos/asf/camel/blob/73900189/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
--
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
new file mode 100644
index 000..dfb8806
--- /dev/null
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSedaDeleteFileTest.java
@@ -0,0 +1,90 @@
+/**
+ * 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.file.remote;
+
+import java.io.File;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import 

camel git commit: CAMEL-8857: Polished

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 01c0963d4 - c1b33e990


CAMEL-8857: Polished


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

Branch: refs/heads/master
Commit: c1b33e990ae5da7ca1e0268e79acc728393fd3ae
Parents: 01c0963
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 14:21:22 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 14:21:22 2015 +0200

--
 components/camel-scr/pom.xml  | 3 +--
 .../src/main/java/org/apache/camel/scr/AbstractCamelRunner.java   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c1b33e99/components/camel-scr/pom.xml
--
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 6987ba6..64e0b77 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -30,8 +30,7 @@
   packagingbundle/packaging
 
   properties
-camel.osgi.export.pkgorg.apache.camel.scr.*/camel.osgi.export.pkg
-
camel.osgi.import.camel.versionversion=[2.12,$(version;=+;${camel.osgi.version.clean}))/camel.osgi.import.camel.version
+camel.osgi.export.pkgorg.apache.camel.scr/camel.osgi.export.pkg
   /properties
 
   dependencies

http://git-wip-us.apache.org/repos/asf/camel/blob/c1b33e99/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
--
diff --git 
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
 
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index 0d52927..fbd9431 100644
--- 
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++ 
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -90,7 +90,7 @@ public abstract class AbstractCamelRunner implements Runnable 
{
 }
 
 protected void createCamelContext(final BundleContext bundleContext, final 
MapString, String props) {
-if (null != bundleContext) {
+if (bundleContext != null) {
 context = new OsgiDefaultCamelContext(bundleContext, registry);
 // Setup the application context classloader with the bundle 
classloader
 context.setApplicationContextClassLoader(new 
BundleDelegatingClassLoader(bundleContext.getBundle()));

svn commit: r960869 [4/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Modified: websites/production/camel/content/ftp2.html
==
--- websites/production/camel/content/ftp2.html (original)
+++ websites/production/camel/content/ftp2.html Wed Aug  5 12:19:48 2015
@@ -99,7 +99,7 @@
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect class=external-link 
href=http://www.jcraft.com/jsch/; rel=nofollowJCraft JSCH/a./ppThe 
FTPS component is only available in Camel 2.2 or newer.br clear=none FTPS 
(also known as FTP Secure) is an extension to FTP that adds support for the 
Transport Layer Security (TLS) and the Secure Sockets Layer (SSL) cryptographic 
protocols./ph3 id=FTP2-URIOptionsURI Options/h3pThe options below are 
exclusive for the FTP com
 ponent./pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleMore 
options/pspan class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypSee a shape=rect 
href=file2.htmlFile/a for more options as all the options from a 
shape=rect href=file2.htmlFile/a is inherited./p/div/divdiv 
class=confluenceTableSmalldiv class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpName/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeusername/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the username to use t
 o log in to the remote file systen./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodepassword/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the password to use 
to log in to the remote file system./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeaccount/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdcodenull/code/tdtd 
colspan=1 rowspan=1 class=confluenceTdstrongCamel 2.15.2:/strong 
Specified the account to use to login to the remote FTP server (only for FTP 
and FTP Secure)/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodebinary/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpSpecifies the file transfer mode, BINARY or ASCII. 
Default is ASCII (codefalse/code)./p/td
 /trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodedisconnect/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpstrongCamel 2.2:/strong Whether or not 
to disconnect from remote FTP server right after use. Can be used for both 
consumer and producer. Disconnect will only disconnect the current connection 
to the FTP server. If you have a consumer which you want to stop, then you need 
to stop the consumer/route instead./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodelocalWorkDirectory/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpWhen consuming, a local work 
directory can be used to store the remote file content directly in local files, 
to avoid loading the content into memory. This is beneficial, if you consume a 
very big remote file and thus can c
 onserve memory. See below for more details./p/td/trtrtd colspan=1 
rowspan=1 

svn commit: r960869 [2/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

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 Wed Aug  5 12:19:48 
2015
@@ -3685,11 +3685,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various a shape=rect href=examples.htmlExamples/a useful./li/ul
 
 h2 id=BookInOnePage-TutorialonSpringRemotingwithJMSTutorial on Spring 
Remoting with JMS/h2p#160;/pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleThanks/pspan 
class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypThis tutorial was kindly donated 
to Apache Camel by Martin Gilday./p/div/divh2 
id=BookInOnePage-PrefacePreface/h2pThis 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 a shape=rect 
class=external-link href=http://www.springramework.org; 
rel=nofollowSpring/a service. The route works in a synchronous fashion 
returning a response to the client./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1438773512662 {padding: 0px;}
-div.rbtoc1438773512662 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438773512662 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438777098451 {padding: 0px;}
+div.rbtoc1438777098451 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438777098451 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1438773512662
+/*]]*//style/pdiv class=toc-macro rbtoc1438777098451
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-TutorialonSpringRemotingwithJMSTutorial on Spring 
Remoting with JMS/a/lilia shape=rect 
href=#BookInOnePage-PrefacePreface/a/lilia shape=rect 
href=#BookInOnePage-PrerequisitesPrerequisites/a/lilia shape=rect 
href=#BookInOnePage-DistributionDistribution/a/lilia shape=rect 
href=#BookInOnePage-AboutAbout/a/lilia shape=rect 
href=#BookInOnePage-CreatetheCamelProjectCreate the Camel Project/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-UpdatethePOMwithDependenciesUpdate the POM with 
Dependencies/a/li/ul
 /lilia shape=rect href=#BookInOnePage-WritingtheServerWriting the 
Server/a
@@ -5789,11 +5789,11 @@ So we completed the last piece in the pi
 pThis example has been removed from strongCamel 2.9/strong onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use a shape=rect href=cxf.htmlCXF/a instead of Axis./p/div/div
 
 style type=text/css/*![CDATA[*/
-div.rbtoc1438773513028 {padding: 0px;}
-div.rbtoc1438773513028 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438773513028 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438777098902 {padding: 0px;}
+div.rbtoc1438777098902 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438777098902 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//stylediv class=toc-macro rbtoc1438773513028
+/*]]*//stylediv class=toc-macro rbtoc1438777098902
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-TutorialusingAxis1.4withApacheCamelTutorial using Axis 
1.4 with Apache Camel/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-PrerequisitesPrerequisites/a/lilia shape=rect 
href=#BookInOnePage-DistributionDistribution/a/lilia shape=rect 
href=#BookInOnePage-IntroductionIntroduction/a/lilia shape=rect 
href=#BookInOnePage-SettinguptheprojecttorunAxisSetting up the project to 
run Axis/a
 ul class=toc-indentationlia shape=rect 
href=#BookInOnePage-Maven2Maven 2/a/lilia shape=rect 
href=#BookInOnePage-wsdlwsdl/a/lilia shape=rect 
href=#BookInOnePage-ConfiguringAxisConfiguring Axis/a/lilia 
shape=rect href=#BookInOnePage-RunningtheExampleRunning the 
Example/a/li/ul
@@ -17742,11 +17742,11 @@ template.send(quot;direct:alias-verify
 ]]/script
 /div/divp/ph3 id=BookInOnePage-SeeAlso.28See Also/h3
 ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulullia 
shape=rect href=crypto.htmlCrypto/a Crypto is also available as a a 
shape=rect href=data-format.htmlData Format/a/li/ul h2 
id=BookInOnePage-CXFComponentCXF Component/h2div 
class=confluence-information-macro confluence-information-macro-notespan 
class=aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF as a consumer, the 
a shape=rect href=cxf-bean-component.htmlCXF Bean Component/a allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to consume web 
 

svn commit: r960869 [1/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Author: buildbot
Date: Wed Aug  5 12:19:48 2015
New Revision: 960869

Log:
Production update by buildbot for camel

Modified:
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/ftp.html
websites/production/camel/content/ftp2.html

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 Wed Aug  5 
12:19:48 2015
@@ -1219,11 +1219,11 @@ template.send(quot;direct:alias-verify
 ]]/script
 /div/divp/ph3 id=BookComponentAppendix-SeeAlso.8See Also/h3
 ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulullia 
shape=rect href=crypto.htmlCrypto/a Crypto is also available as a a 
shape=rect href=data-format.htmlData Format/a/li/ul h2 
id=BookComponentAppendix-CXFComponentCXF Component/h2div 
class=confluence-information-macro confluence-information-macro-notespan 
class=aui-icon aui-icon-small aui-iconfont-warning 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF as a consumer, the 
a shape=rect href=cxf-bean-component.htmlCXF Bean Component/a allows 
you to factor out how message payloads are received from their processing as a 
RESTful or SOAP web service. This has the potential of using a multitude of 
transports to cons
 ume web services. The bean component's configuration is also simpler and 
provides the fastest method to implement web services using Camel and 
CXF./p/div/divdiv class=confluence-information-macro 
confluence-information-macro-tipspan class=aui-icon aui-icon-small 
aui-iconfont-approve confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypWhen using CXF in streaming modes 
(see DataFormat option), then also read about a shape=rect 
href=stream-caching.htmlStream caching/a./p/div/divpThe 
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.rbtoc1438773487315 {padding: 0px;}
-div.rbtoc1438773487315 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438773487315 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1438777075963 {padding: 0px;}
+div.rbtoc1438777075963 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1438777075963 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1438773487315
+/*]]*//style/pdiv class=toc-macro rbtoc1438777075963
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-CXFComponentCXF Component/a
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-URIformatURI format/a/lilia shape=rect 
href=#BookComponentAppendix-OptionsOptions/a
 ul class=toc-indentationlia shape=rect 
href=#BookComponentAppendix-ThedescriptionsofthedataformatsThe descriptions 
of the dataformats/a
@@ -3191,7 +3191,7 @@ protected RouteBuilder createRouteBuilde
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect 

svn commit: r960869 [3/4] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache ftp.html ftp2.html

[buildbot]

Modified: websites/production/camel/content/ftp.html
==
--- websites/production/camel/content/ftp.html (original)
+++ websites/production/camel/content/ftp.html Wed Aug  5 12:19:48 2015
@@ -99,7 +99,7 @@
 sftp://[username@]hostname[:port]/directoryname[?options]
 ftps://[username@]hostname[:port]/directoryname[?options]
 ]]/script
-/div/divpWhere strongdirectoryname/strong represents the underlying 
directory. The directory name is a relative path. Absolute path's is 
strongnot/strong supported. The relative path can contain nested folders, 
such as /inbox/us./ppFor Camel versions before strongCamel 2.16/strong, 
the directoryName#160;strongmust/strong exist already as this component 
does not support the#160;codeautoCreate/code option (which the file 
component does). The reason is that its the FTP administrator (FTP server) task 
to properly setup user accounts, and home directories with the right file 
permissions etc./ppFor strongCamel 
2.16/strong,#160;codeautoCreate/code option is supported. When consumer 
starts, before polling is scheduled, there's additional FTP operation performed 
to create the directory configured for endpoint. The default value for 
codeautoCreate/code is#160;codetrue/code./ppIf no 
strongusername/strong is provided, then codeanon
 ymous/code login is attempted using no password.br clear=none If no 
strongport/strong number is provided, Camel will provide default values 
according to the protocol (ftp = 21, sftp = 22, ftps = )./ppYou can 
append query options to the URI in the following format, 
code?option=valueamp;option=valueamp;.../code/ppThis component uses 
two different libraries for the actual FTP work. FTP and FTPS uses a 
shape=rect class=external-link href=http://commons.apache.org/net/;Apache 
Commons Net/a while SFTP uses a shape=rect class=external-link 
href=http://www.jcraft.com/jsch/; rel=nofollowJCraft JSCH/a./ppThe 
FTPS component is only available in Camel 2.2 or newer.br clear=none FTPS 
(also known as FTP Secure) is an extension to FTP that adds support for the 
Transport Layer Security (TLS) and the Secure Sockets Layer (SSL) cryptographic 
protocols./ph3 id=FTP-URIOptionsURI Options/h3pThe options below are 
exclusive for the FTP comp
 onent./pdiv class=confluence-information-macro 
confluence-information-macro-informationp class=titleMore 
options/pspan class=aui-icon aui-icon-small aui-iconfont-info 
confluence-information-macro-icon/spandiv 
class=confluence-information-macro-bodypSee a shape=rect 
href=file2.htmlFile/a for more options as all the options from a 
shape=rect href=file2.htmlFile/a is inherited./p/div/divdiv 
class=confluenceTableSmalldiv class=table-wraptable 
class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThpName/p/thth colspan=1 rowspan=1 
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeusername/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the username to use to
  log in to the remote file systen./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodepassword/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpSpecifies the password to use 
to log in to the remote file system./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodeaccount/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdcodenull/code/tdtd 
colspan=1 rowspan=1 class=confluenceTdstrongCamel 2.15.2:/strong 
Specified the account to use to login to the remote FTP server (only for FTP 
and FTP Secure)/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodebinary/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpSpecifies the file transfer mode, BINARY or ASCII. 
Default is ASCII (codefalse/code)./p/td/
 trtrtd colspan=1 rowspan=1 
class=confluenceTdpcodedisconnect/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpstrongCamel 2.2:/strong Whether or not 
to disconnect from remote FTP server right after use. Can be used for both 
consumer and producer. Disconnect will only disconnect the current connection 
to the FTP server. If you have a consumer which you want to stop, then you need 
to stop the consumer/route instead./p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpcodelocalWorkDirectory/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpWhen consuming, a local work 
directory can be used to store the remote file content directly in local files, 
to avoid loading the content into memory. This is beneficial, if you consume a 
very big remote file and thus can co
 nserve memory. See below for more details./p/td/trtrtd colspan=1 
rowspan=1 

[4/4] camel git commit: CAMEL-8857: Fixed CS

[davsclaus]

CAMEL-8857: Fixed CS


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

Branch: refs/heads/master
Commit: 371f90e75a048a220d8131877100a3af220b4c7a
Parents: aa59cec
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:08:17 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:08:35 2015 +0200

--
 .../main/java/org/apache/camel/scr/AbstractCamelRunner.java   | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/371f90e7/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
--
diff --git 
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
 
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index c1a10e5..32bfe81 100644
--- 
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++ 
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -42,7 +42,6 @@ import 
org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
 import org.apache.camel.impl.SimpleRegistry;
-import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.util.ReflectionHelper;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -55,14 +54,14 @@ public abstract class AbstractCamelRunner implements 
Runnable {
 public static final String PROPERTY_PREFIX = camel.scr.properties.prefix;
 
 protected Logger log = LoggerFactory.getLogger(getClass());
-protected ModelCamelContext context;
+protected CamelContext context;
 protected SimpleRegistry registry = new SimpleRegistry();
+protected boolean active;
 
 private ScheduledExecutorService executor = 
Executors.newSingleThreadScheduledExecutor();
 private ScheduledFuture starter;
 private volatile boolean activated;
 private volatile boolean started;
-protected volatile boolean active;
 
 public synchronized void activate(final BundleContext bundleContext, final 
MapString, String props) throws Exception {
 if (activated) {
@@ -214,7 +213,7 @@ public abstract class AbstractCamelRunner implements 
Runnable {
 }
 }
 
-public ModelCamelContext getContext() {
+public CamelContext getContext() {
 return context;
 }
 

[1/2] camel git commit: Polished karaf command

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 371f90e75 - 06db3cd24


Polished karaf command


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

Branch: refs/heads/master
Commit: 887a21ea213bf52c9f917c0c6af0a7ab7ae3164e
Parents: 371f90e
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:13:37 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:24:11 2015 +0200

--
 .../org/apache/camel/commands/EndpointStatisticCommand.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/887a21ea/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
--
diff --git 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index 9e33f12..d123414 100644
--- 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -222,6 +222,9 @@ public class EndpointStatisticCommand extends 
AbstractCamelCommand {
 int dynamicLen = Math.min(columnWidths.get(DYNAMIC_COLUMN_LABEL) + 
columnWidthIncrement, getMaxColumnWidth());
 dynamicLen = Math.max(MIN_COLUMN_WIDTH, dynamicLen);
 
+int totalLen = Math.min(columnWidths.get(HITS_COLUMN_LABEL) + 
columnWidthIncrement, getMaxColumnWidth());
+totalLen = Math.max(MIN_COLUMN_WIDTH, totalLen);
+
 // last row does not have min width
 
 final StringBuilder retval = new 
StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
@@ -231,7 +234,7 @@ public class EndpointStatisticCommand extends 
AbstractCamelCommand {
 
retval.append(fieldPreamble).append(%-).append(directionLen).append('.').append(directionLen).append('s').append(fieldPostamble).append('
 ');
 
retval.append(fieldPreamble).append(%-).append(staticLen).append('.').append(staticLen).append('s').append(fieldPostamble).append('
 ');
 
retval.append(fieldPreamble).append(%-).append(dynamicLen).append('.').append(dynamicLen).append('s').append(fieldPostamble).append('
 ');
-
retval.append(fieldPreamble).append(%s).append(fieldPostamble).append(' ');
+
retval.append(fieldPreamble).append(%).append(totalLen).append('.').append(totalLen).append('s').append(fieldPostamble).append('
 ');
 
 return retval.toString();
 }

[2/2] camel git commit: Polished karaf command

[davsclaus]

Polished karaf command


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

Branch: refs/heads/master
Commit: 06db3cd24626287cfddaff4dd5c11df419a4500a
Parents: 887a21e
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:23:49 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:24:18 2015 +0200

--
 .../commands/AbstractLocalCamelController.java | 17 +
 .../jolokia/DefaultJolokiaCamelController.java | 16 
 2 files changed, 33 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
--
diff --git 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 4fa7da0..8061b7c 100644
--- 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -457,6 +457,23 @@ public abstract class AbstractLocalCamelController extends 
AbstractCamelControll
 answer.add(row);
 }
 }
+
+// sort the list
+Collections.sort(answer, new ComparatorMapString, String() {
+@Override
+public int compare(MapString, String endpoint1, MapString, 
String endpoint2) {
+String route1 = endpoint1.get(routeId);
+String route2 = endpoint2.get(routeId);
+int num = route1.compareTo(route2);
+if (num == 0) {
+String uri1 = endpoint1.get(uri);
+String uri2 = endpoint2.get(uri);
+num = uri1.compareTo(uri2);
+}
+return num;
+}
+
+});
 }
 return answer;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
--
diff --git 
a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
 
b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index bcf37e2..eb08b71 100644
--- 
a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ 
b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -571,6 +571,22 @@ public class DefaultJolokiaCamelController extends 
AbstractCamelController imple
 answer.add(row);
 }
 }
+
+// sort the list
+Collections.sort(answer, new ComparatorMapString, String() {
+@Override
+public int compare(MapString, String endpoint1, MapString, 
String endpoint2) {
+String route1 = endpoint1.get(routeId);
+String route2 = endpoint2.get(routeId);
+int num = route1.compareTo(route2);
+if (num == 0) {
+String uri1 = endpoint1.get(uri);
+String uri2 = endpoint2.get(uri);
+num = uri1.compareTo(uri2);
+}
+return num;
+}
+});
 }
 
 return answer;

[2/2] camel git commit: CAMEL-9055: camel-aws - SQS should not allow handover the delete task

[davsclaus]

CAMEL-9055: camel-aws - SQS should not allow handover the delete task


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

Branch: refs/heads/camel-2.15.x
Commit: bd10c49bdcdbe6181e35461c449ea61db9a13bf1
Parents: 18859fb
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:33:43 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:36:51 2015 +0200

--
 .../camel/component/aws/sqs/SqsConsumer.java| 40 
 .../camel/component/aws/sqs/SqsProducer.java|  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd10c49b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 0a8d024..d3e0a25 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -34,13 +34,13 @@ import 
com.amazonaws.services.sqs.model.QueueDoesNotExistException;
 import com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ScheduledBatchPollingConsumer;
 import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
@@ -141,17 +141,20 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 
 // schedule task to extend visibility if enabled
 Integer visibilityTimeout = 
getConfiguration().getVisibilityTimeout();
-if (this.scheduledExecutor != null  visibilityTimeout != null  
(visibilityTimeout.intValue() / 2)  0) {
-int delay = visibilityTimeout.intValue() / 2;
-int period = visibilityTimeout.intValue();
+if (this.scheduledExecutor != null  visibilityTimeout != null  
(visibilityTimeout / 2)  0) {
+int delay = visibilityTimeout / 2;
+int period = visibilityTimeout;
 int repeatSeconds = new Double(visibilityTimeout.doubleValue() 
* 1.5).intValue();
 if (LOG.isDebugEnabled()) {
 LOG.debug(Scheduled TimeoutExtender task to start after 
{} delay, and run with {}/{} period/repeat (seconds), to extend exchangeId: {},
 new Object[]{delay, period, repeatSeconds, 
exchange.getExchangeId()});
 }
+
 final ScheduledFuture? scheduledFuture = 
this.scheduledExecutor.scheduleAtFixedRate(
 new TimeoutExtender(exchange, repeatSeconds), delay, 
period, TimeUnit.SECONDS);
-exchange.addOnCompletion(new Synchronization() {
+
+// as the AWS client is not thread-safe we cannot handover the 
task
+exchange.addOnCompletion(new SynchronizationAdapter() {
 @Override
 public void onComplete(Exchange exchange) {
 cancelExtender(exchange);
@@ -162,6 +165,11 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 cancelExtender(exchange);
 }
 
+@Override
+public boolean allowHandover() {
+return false;
+}
+
 private void cancelExtender(Exchange exchange) {
 // cancel task as we are done
 LOG.trace(Processing done so cancelling 
TimeoutExtender task for exchangeId: {}, exchange.getExchangeId());
@@ -170,24 +178,30 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 });
 }
 
-
 // add on completion to handle after work when the exchange is done
-exchange.addOnCompletion(new Synchronization() {
+// as the AWS client is not thread-safe we cannot handover the task
+exchange.addOnCompletion(new SynchronizationAdapter() {
+ 

[1/2] camel git commit: CAMEL-9055: camel-aws - SQS should not allow handover the delete task

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 18859fb05 - bd10c49bd
  refs/heads/master 06db3cd24 - 47c64ec9c


CAMEL-9055: camel-aws - SQS should not allow handover the delete task


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

Branch: refs/heads/master
Commit: 47c64ec9c6b9609a71113ad82b15d2c66463c4cd
Parents: 06db3cd
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:33:43 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:36:39 2015 +0200

--
 .../camel/component/aws/sqs/SqsConsumer.java| 40 
 .../camel/component/aws/sqs/SqsProducer.java|  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/47c64ec9/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 0a8d024..d3e0a25 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -34,13 +34,13 @@ import 
com.amazonaws.services.sqs.model.QueueDoesNotExistException;
 import com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
-
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
 import org.apache.camel.NoFactoryAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ScheduledBatchPollingConsumer;
 import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.SynchronizationAdapter;
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
@@ -141,17 +141,20 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 
 // schedule task to extend visibility if enabled
 Integer visibilityTimeout = 
getConfiguration().getVisibilityTimeout();
-if (this.scheduledExecutor != null  visibilityTimeout != null  
(visibilityTimeout.intValue() / 2)  0) {
-int delay = visibilityTimeout.intValue() / 2;
-int period = visibilityTimeout.intValue();
+if (this.scheduledExecutor != null  visibilityTimeout != null  
(visibilityTimeout / 2)  0) {
+int delay = visibilityTimeout / 2;
+int period = visibilityTimeout;
 int repeatSeconds = new Double(visibilityTimeout.doubleValue() 
* 1.5).intValue();
 if (LOG.isDebugEnabled()) {
 LOG.debug(Scheduled TimeoutExtender task to start after 
{} delay, and run with {}/{} period/repeat (seconds), to extend exchangeId: {},
 new Object[]{delay, period, repeatSeconds, 
exchange.getExchangeId()});
 }
+
 final ScheduledFuture? scheduledFuture = 
this.scheduledExecutor.scheduleAtFixedRate(
 new TimeoutExtender(exchange, repeatSeconds), delay, 
period, TimeUnit.SECONDS);
-exchange.addOnCompletion(new Synchronization() {
+
+// as the AWS client is not thread-safe we cannot handover the 
task
+exchange.addOnCompletion(new SynchronizationAdapter() {
 @Override
 public void onComplete(Exchange exchange) {
 cancelExtender(exchange);
@@ -162,6 +165,11 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 cancelExtender(exchange);
 }
 
+@Override
+public boolean allowHandover() {
+return false;
+}
+
 private void cancelExtender(Exchange exchange) {
 // cancel task as we are done
 LOG.trace(Processing done so cancelling 
TimeoutExtender task for exchangeId: {}, exchange.getExchangeId());
@@ -170,24 +178,30 @@ public class SqsConsumer extends 
ScheduledBatchPollingConsumer {
 });
 }
 
-
 // add on completion to handle after work when the exchange is done
-exchange.addOnCompletion(new Synchronization() {
+// as the AWS client is not 

camel git commit: CAMEL-9056: Aggregator - Allow to clear closed correlation key cache

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/master 47c64ec9c - 7eef37262


CAMEL-9056: Aggregator - Allow to clear closed correlation key cache


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

Branch: refs/heads/master
Commit: 7eef37262ada1824adaa647bc3c2aadf139e66e3
Parents: 47c64ec
Author: Claus Ibsen davscl...@apache.org
Authored: Wed Aug 5 15:51:58 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Wed Aug 5 15:51:58 2015 +0200

--
 .../mbean/ManagedAggregateProcessorMBean.java   |  8 +++-
 .../mbean/ManagedAggregateProcessor.java|  9 -
 .../processor/aggregate/AggregateProcessor.java | 20 
 3 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7eef3726/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedAggregateProcessorMBean.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedAggregateProcessorMBean.java
 
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedAggregateProcessorMBean.java
index 845d6c7..07c1d21 100644
--- 
a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedAggregateProcessorMBean.java
+++ 
b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedAggregateProcessorMBean.java
@@ -54,7 +54,7 @@ public interface ManagedAggregateProcessorMBean extends 
ManagedProcessorMBean {
 @ManagedAttribute(description = Ignore invalid correlation keys)
 boolean isIgnoreInvalidCorrelationKeys();
 
-@ManagedAttribute(description = Whether to close the correlation group on 
completion)
+@ManagedAttribute(description = Whether to close the correlation group on 
completion if this value is  0.)
 Integer getCloseCorrelationKeyOnCompletion();
 
 @ManagedAttribute(description = Parallel mode)
@@ -90,6 +90,12 @@ public interface ManagedAggregateProcessorMBean extends 
ManagedProcessorMBean {
 @ManagedOperation(description = To force complete of all groups)
 int forceCompletionOfAllGroups();
 
+@ManagedAttribute(description = Current number of closed correlation keys 
in the memory cache)
+int getClosedCorrelationKeysCacheSize();
+
+@ManagedOperation(description = Clear all the closed correlation keys 
stored in the cache)
+void clearClosedCorrelationKeysCache();
+
 @ManagedAttribute(description = Total number of exchanges arrived into 
the aggregator)
 long getTotalIn();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7eef3726/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
index 2531332..a00c63e 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedAggregateProcessor.java
@@ -22,7 +22,6 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.ManagedAggregateProcessorMBean;
 import org.apache.camel.model.AggregateDefinition;
-import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.processor.aggregate.AggregateProcessor;
 import org.apache.camel.spi.ManagementStrategy;
 
@@ -189,6 +188,14 @@ public class ManagedAggregateProcessor extends 
ManagedProcessor implements Manag
 }
 }
 
+public int getClosedCorrelationKeysCacheSize() {
+return processor.getClosedCorrelationKeysCacheSize();
+}
+
+public void clearClosedCorrelationKeysCache() {
+processor.clearClosedCorrelationKeysCache();
+}
+
 public long getTotalIn() {
 return processor.getStatistics().getTotalIn();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7eef3726/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index d08cfd9..4e0dbca 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 

camel git commit: CAMEL-8663: activating the disabled tests as we have a new cxf

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 7eef37262 - 51c55dea2


CAMEL-8663: activating the disabled tests as we have a new cxf


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

Branch: refs/heads/master
Commit: 51c55dea27d97894d13f5f98773b23530224e7e4
Parents: 7eef372
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Aug 5 16:52:12 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Aug 5 16:52:19 2015 +0200

--
 .../component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java | 4 ++--
 .../component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/51c55dea/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java
index 9f9ed95..65e2cf0 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadConsumerNamespaceOnEnvelopeTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -93,8 +94,7 @@ public class CxfPayloadConsumerNamespaceOnEnvelopeTest 
extends CamelTestSupport
 };
 }
 
-// need cxf-3.0.6
-//@Test
+@Test
 public void testInvokeRouter() {
 Object returnValue = template.requestBody(direct:router, 
REQUEST_MESSAGE);
 assertNotNull(returnValue);

http://git-wip-us.apache.org/repos/asf/camel/blob/51c55dea/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java
index 2d514a1..0dedbf8 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadProducerNamespaceOnEnvelopeTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -94,8 +95,7 @@ public class CxfPayloadProducerNamespaceOnEnvelopeTest 
extends CamelTestSupport
 };
 }
 
-// need cxf-3.0.6
-//@Test
+@Test
 public void testInvokeRouter() {
 Object returnValue = template.requestBody(direct:router, 
REQUEST_PAYLOAD);
 assertNotNull(returnValue);

camel git commit: fix checkstyle error

[ay]

Repository: camel
Updated Branches:
  refs/heads/master 51c55dea2 - 4b55c629c


fix checkstyle error


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

Branch: refs/heads/master
Commit: 4b55c629cfa295d5a6f168431b0bd81512b98768
Parents: 51c55de
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Aug 5 17:03:51 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Aug 5 17:03:51 2015 +0200

--
 .../camel/component/cxf/CxfConsumerTest.java| 21 ++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4b55c629/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
index 5d7201e..28cee98 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
@@ -85,16 +85,17 @@ public class CxfConsumerTest extends CamelTestSupport {
 MapString, Object map = new HashMapString, 
Object();
 map.put(org.apache.cxf.stax.force-start-document, 
Boolean.TRUE);
 exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, 
map);
-}})
-
.when(header(CxfConstants.OPERATION_NAME).isEqualTo(ECHO_BOOLEAN_OPERATION)).process(new
 Processor() {
-public void process(final Exchange exchange) {
-Message in = exchange.getIn();
-// Get the parameter list
-List? parameter = in.getBody(List.class);
-// Put the result back
-exchange.getOut().setBody(parameter.get(0));
-}
-});
+}
+})
+
.when(header(CxfConstants.OPERATION_NAME).isEqualTo(ECHO_BOOLEAN_OPERATION)).process(new
 Processor() {
+public void process(final Exchange exchange) {
+Message in = exchange.getIn();
+// Get the parameter list
+List? parameter = in.getBody(List.class);
+// Put the result back
+exchange.getOut().setBody(parameter.get(0));
+}
+});
 }
 };
 }

camel git commit: Upgrade Weld to version 2.2.15.Final

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 4b55c629c - a00fbe19a


Upgrade Weld to version 2.2.15.Final


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

Branch: refs/heads/master
Commit: a00fbe19a9a942b3083e20f1645079ad40706818
Parents: 4b55c62
Author: Andrea Cosentino anco...@gmail.com
Authored: Wed Aug 5 08:43:02 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Wed Aug 5 17:33:01 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a00fbe19/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 891076b..58f996a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -498,7 +498,7 @@
 velocity-version1.7/velocity-version
 vertx-version3.0.0/vertx-version
 vysper-version0.7/vysper-version
-weld2-version2.2.14.Final/weld2-version
+weld2-version2.2.15.Final/weld2-version
 werken-xpath-bundle-version0.9.4_5/werken-xpath-bundle-version
 woodstox-version4.4.1/woodstox-version
 ws-commons-util-bundle-version1.0.2_2/ws-commons-util-bundle-version

camel git commit: Upgrade Mvel to version 2.2.6.Final

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master a00fbe19a - 97bf45b28


Upgrade Mvel to version 2.2.6.Final


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

Branch: refs/heads/master
Commit: 97bf45b28ec57200af59e448fcb54f59941a4eac
Parents: a00fbe1
Author: Andrea Cosentino anco...@gmail.com
Authored: Wed Aug 5 17:34:31 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Wed Aug 5 17:48:23 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/97bf45b2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 58f996a..9b61420 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -365,7 +365,7 @@
 mustache-java-version0.8.16/mustache-java-version
 mustache-guava-version16.0/mustache-guava-version
 mustache-bundle-version0.8.16_1/mustache-bundle-version
-mvel-version2.2.5.Final/mvel-version
+mvel-version2.2.6.Final/mvel-version
 mybatis-version3.3.0/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.10.4.Final/netty3-version

[1/2] camel git commit: [CAMEL-9048] Import correct range for wiring package

[cschneider]

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x bd10c49bd - cfb6cd629


[CAMEL-9048] Import correct range for wiring package


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

Branch: refs/heads/camel-2.15.x
Commit: 529d590a7713f5da2d49a25718415b4d38710aee
Parents: bd10c49
Author: Christian Schneider ch...@die-schneider.net
Authored: Wed Aug 5 17:45:41 2015 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Wed Aug 5 17:45:41 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/529d590a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f08493b..b2e8f9d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -523,6 +523,7 @@
 
camel.osgi.import.default.version[$(version;==;$(@)),$(version;+;$(@)))/camel.osgi.import.default.version
 camel.osgi.import.defaults
   org.osgi.framework*;version=[1.5,2),
+  org.osgi.framework.wiring;version=[1.0,2),
   org.springframework.ws.*;version=[2,3),
   org.springframework.xml.*;version=[2,3),
   org.springframework.*;version=${spring-version-range},

[2/2] camel git commit: [CAMEL-9048] Special handling for camel-core

[cschneider]

[CAMEL-9048] Special handling for camel-core


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

Branch: refs/heads/camel-2.15.x
Commit: cfb6cd629c6e38c6e93e810ec9a38e32685705b2
Parents: 529d590
Author: Christian Schneider ch...@die-schneider.net
Authored: Wed Aug 5 17:52:50 2015 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Wed Aug 5 17:52:50 2015 +0200

--
 .../src/main/java/org/apache/camel/impl/osgi/Activator.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cfb6cd62/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 853dcf8..63380a4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -92,6 +92,7 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
 
 public void start(BundleContext context) throws Exception {
 LOG.info(Camel activator starting);
+bundleId = context.getBundle().getBundleId();
 tracker = new BundleTracker(context, Bundle.ACTIVE, this);
 cachePackageCapabilities(context);
 tracker.open();
@@ -210,6 +211,10 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
  * Check if bundle can see the given class
  */
 protected boolean canSee(Bundle bundle, Class? clazz) {
+if (bundle.getBundleId() == bundleId) {
+// Need extra handling of camel core as it does not import the api
+return true;
+}
 BundleCapability packageCap = 
packageCapabilities.get(clazz.getPackage().getName());
 BundleWiring wiring = bundle.adapt(BundleWiring.class);
 ListBundleWire imports = wiring.getRequiredWires(PACKAGE_NAMESPACE);

camel git commit: [CAMEL-9048] Special handling for camel-core

[cschneider]

Repository: camel
Updated Branches:
  refs/heads/master 97bf45b28 - 90121e537


[CAMEL-9048] Special handling for camel-core


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

Branch: refs/heads/master
Commit: 90121e5377106348b61a6ddab9d2b3050454ea5e
Parents: 97bf45b
Author: Christian Schneider ch...@die-schneider.net
Authored: Wed Aug 5 17:47:29 2015 +0200
Committer: Christian Schneider ch...@die-schneider.net
Committed: Wed Aug 5 17:53:25 2015 +0200

--
 .../src/main/java/org/apache/camel/impl/osgi/Activator.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/90121e53/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java 
b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
index 354232b..6457747 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/osgi/Activator.java
@@ -237,6 +237,10 @@ public class Activator implements BundleActivator, 
BundleTrackerCustomizer {
  * Check if bundle can see the given class
  */
 protected boolean canSee(Bundle bundle, Class? clazz) {
+if (bundle.getBundleId() == bundleId) {
+// Need extra handling of camel core as it does not import the api
+return true;
+}
 BundleCapability packageCap = 
packageCapabilities.get(clazz.getPackage().getName());
 BundleWiring wiring = bundle.adapt(BundleWiring.class);
 ListBundleWire imports = wiring.getRequiredWires(PACKAGE_NAMESPACE);

camel git commit: CAMEL-9050 Camel-cassandraql: Add loadbalancingpolicy as uri option

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 90121e537 - aa0bb9277


CAMEL-9050 Camel-cassandraql: Add loadbalancingpolicy as uri option


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

Branch: refs/heads/master
Commit: aa0bb927747d2215273482775f1aa348eb0f2e5b
Parents: 90121e5
Author: Andrea Cosentino anco...@gmail.com
Authored: Wed Aug 5 17:50:06 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Wed Aug 5 17:55:53 2015 +0200

--
 .../component/cassandra/CassandraEndpoint.java  | 22 +
 .../CassandraLoadBalancingPolicies.java | 48 
 .../CassandraComponentProducerTest.java | 21 +
 3 files changed, 91 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/aa0bb927/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
--
diff --git 
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
 
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
index 0e28d9f..95ab660 100644
--- 
a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
+++ 
b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/CassandraEndpoint.java
@@ -21,6 +21,8 @@ import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
+import com.datastax.driver.core.policies.LoadBalancingPolicy;
+
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Message;
@@ -31,6 +33,7 @@ import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.utils.cassandra.CassandraLoadBalancingPolicies;
 import org.apache.camel.utils.cassandra.CassandraSessionHolder;
 
 /**
@@ -65,6 +68,8 @@ public class CassandraEndpoint extends DefaultEndpoint {
 private Session session;
 @UriParam
 private ConsistencyLevel consistencyLevel;
+@UriParam
+private String loadBalancingPolicy;
 
 /**
  * How many rows should be retrieved in message body
@@ -140,6 +145,7 @@ public class CassandraEndpoint extends DefaultEndpoint {
 }
 
 protected Cluster.Builder createClusterBuilder() throws Exception {
+CassandraLoadBalancingPolicies cassLoadBalancingPolicies = new 
CassandraLoadBalancingPolicies();
 Cluster.Builder clusterBuilder = Cluster.builder();
 for (String host : hosts.split(,)) {
 clusterBuilder = clusterBuilder.addContactPoint(host);
@@ -153,6 +159,9 @@ public class CassandraEndpoint extends DefaultEndpoint {
 if (username != null  !username.isEmpty()  password != null) {
 clusterBuilder.withCredentials(username, password);
 }
+if (loadBalancingPolicy != null  !loadBalancingPolicy.isEmpty()) {
+
clusterBuilder.withLoadBalancingPolicy(cassLoadBalancingPolicies.getLoadBalancingPolicy(loadBalancingPolicy));
+}
 return clusterBuilder;
 }
 
@@ -337,4 +346,17 @@ public class CassandraEndpoint extends DefaultEndpoint {
 public void setPrepareStatements(boolean prepareStatements) {
 this.prepareStatements = prepareStatements;
 }
+
+/**
+ * To use a specific LoadBalancingPolicy
+ */
+public String getLoadBalancingPolicy() {
+return loadBalancingPolicy;
+}
+
+public void setLoadBalancingPolicy(String loadBalancingPolicy) {
+this.loadBalancingPolicy = loadBalancingPolicy;
+}
+
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/aa0bb927/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
--
diff --git 
a/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
 
b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
new file mode 100644
index 000..30b735c
--- /dev/null
+++ 
b/components/camel-cassandraql/src/main/java/org/apache/camel/utils/cassandra/CassandraLoadBalancingPolicies.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE 

camel git commit: CAMEL-8598 Set default timeouts on workflows registered by the camel-aws / aws-swf component, changed default values in accordance with AWS docs

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master aa0bb9277 - bc7312202


CAMEL-8598 Set default timeouts on workflows registered by the camel-aws / 
aws-swf component, changed default values in accordance with AWS docs


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

Branch: refs/heads/master
Commit: bc7312202dd4d6c3e976094b3e0c41593b70919e
Parents: aa0bb92
Author: Andrea Cosentino anco...@gmail.com
Authored: Wed Aug 5 17:59:31 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Wed Aug 5 17:59:58 2015 +0200

--
 .../org/apache/camel/component/aws/swf/SWFConfiguration.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bc731220/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
--
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
index d6a40fa..88e1596 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java
@@ -66,10 +66,10 @@ public class SWFConfiguration {
 private String stateResultType;
 @UriParam(label = producer,workflow)
 private String terminationDetails;
-@UriParam(label = producer,workflow, defaultValue = 300)
-private String executionStartToCloseTimeout = 300;
-@UriParam(label = producer,workflow, defaultValue = 300)
-private String taskStartToCloseTimeout = 300;
+@UriParam(label = producer,workflow, defaultValue = 3600)
+private String executionStartToCloseTimeout = 3600;
+@UriParam(label = producer,workflow, defaultValue = 600)
+private String taskStartToCloseTimeout = 600;
 @UriParam
 private DataConverter dataConverter;
 @UriParam(label = producer,activity)

camel git commit: CAMEL-9057. Add missing scala deps to resolve the issue

[cmoulliard]

Repository: camel
Updated Branches:
  refs/heads/master bc7312202 - 3f8df7fca


CAMEL-9057. Add missing scala deps to resolve the issue


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

Branch: refs/heads/master
Commit: 3f8df7fcae229a038b773cf5e72e27ea7e8aa0f3
Parents: bc73122
Author: Charles Moulliard cmoulli...@apache.org
Authored: Wed Aug 5 18:28:37 2015 +0200
Committer: Charles Moulliard cmoulli...@apache.org
Committed: Wed Aug 5 18:28:37 2015 +0200

--
 examples/camel-example-servlet-rest-tomcat/pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3f8df7fc/examples/camel-example-servlet-rest-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-tomcat/pom.xml 
b/examples/camel-example-servlet-rest-tomcat/pom.xml
index 0ca773b..aea9ab9 100755
--- a/examples/camel-example-servlet-rest-tomcat/pom.xml
+++ b/examples/camel-example-servlet-rest-tomcat/pom.xml
@@ -32,6 +32,7 @@
 
 properties
 swagger-ui.version2.0.24/swagger-ui.version
+scala.version2.11.7/scala.version
 logback-version1.1.3/logback-version
 
swagger.urlhttps://github.com/swagger-api/swagger-ui/archive/v${swagger-ui.version}/swagger.url
 destDirtarget/swagger-ui/destDir
@@ -62,6 +63,22 @@
 groupIdorg.apache.camel/groupId
 artifactIdcamel-swagger/artifactId
 /dependency
+!-- Add scala deps to resolve issue 
https://issues.apache.org/jira/browse/CAMEL-9057  --
+dependency
+groupIdorg.scala-lang/groupId
+artifactIdscala-library/artifactId
+version${scala.version}/version
+/dependency
+dependency
+groupIdorg.scala-lang/groupId
+artifactIdscala-compiler/artifactId
+version${scala.version}/version
+/dependency
+dependency
+groupIdorg.scala-lang/groupId
+artifactIdscala-reflect/artifactId
+version${scala.version}/version
+/dependency
 
 !-- use for json binding --
 dependency