You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/10/18 06:24:39 UTC
[1/3] camel git commit: CAMEL-11920: camel-hdfs2 not working in osgi
using documented HdfsOsgiHelper
Repository: camel
Updated Branches:
refs/heads/master 52fbc6b5d -> f3688e041
CAMEL-11920: camel-hdfs2 not working in osgi using documented HdfsOsgiHelper
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/818d5485
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/818d5485
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/818d5485
Branch: refs/heads/master
Commit: 818d54854dc54b7a8ca8cc0b2531d9893aac5c7b
Parents: 52fbc6b
Author: Andrea Tarocchi <at...@redhat.com>
Authored: Tue Oct 17 19:11:40 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 18 08:14:37 2017 +0200
----------------------------------------------------------------------
components/camel-hdfs2/pom.xml | 4 +++-
.../java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/818d5485/components/camel-hdfs2/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index cd19368..f78769c 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -44,7 +44,9 @@
org.apache.hadoop.hdfs.security.token.delegation,
org.apache.hadoop.hdfs.protocol,
org.apache.hadoop.hdfs.protocol.proto,
- org.apache.hadoop.hdfs.protocol.datatransfer
+ org.apache.hadoop.hdfs.protocol.datatransfer,
+ org.apache.hadoop.net,
+ org.apache.hadoop.ipc
</camel.osgi.import.additional>
<camel.osgi.activator>
org.apache.camel.component.hdfs2.osgi.HdfsActivator
http://git-wip-us.apache.org/repos/asf/camel/blob/818d5485/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
index 5077fbd..d63a592 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
@@ -41,13 +41,17 @@ public class HdfsOsgiHelper {
// get bundle classloader for camel-hdfs2 bundle
ClassLoader cl = getClass().getClassLoader();
Configuration conf = new Configuration();
+ // set that as the hdfs configuration's classloader
+ conf.setClassLoader(cl);
for (String key : fileSystems.keySet()) {
URI uri = URI.create(key);
conf.setClass(String.format("fs.%s.impl", uri.getScheme()), cl.loadClass(fileSystems.get(key)), FileSystem.class);
+ LOG.debug("Successfully loaded class: {}", fileSystems.get(key) );
FileSystem.get(uri, conf);
+ LOG.debug("Successfully got uri: {} from FileSystem Object", uri );
}
} catch (Exception e) {
- LOG.debug(e.getMessage());
+ LOG.debug(e.getMessage(), e);
}
}
[3/3] camel git commit: This closes #2037
Posted by ac...@apache.org.
This closes #2037
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f3688e04
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f3688e04
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f3688e04
Branch: refs/heads/master
Commit: f3688e041e59c03762233b24f837814ef789ca19
Parents: dd23610
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 18 08:24:17 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 18 08:24:17 2017 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] camel git commit: Fixed CS
Posted by ac...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd23610b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd23610b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd23610b
Branch: refs/heads/master
Commit: dd23610b2ddbed8baf2d757bc568f047e00a06a6
Parents: 818d548
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Oct 18 08:18:04 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Oct 18 08:18:04 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dd23610b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
index d63a592..2373408 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsOsgiHelper.java
@@ -46,9 +46,9 @@ public class HdfsOsgiHelper {
for (String key : fileSystems.keySet()) {
URI uri = URI.create(key);
conf.setClass(String.format("fs.%s.impl", uri.getScheme()), cl.loadClass(fileSystems.get(key)), FileSystem.class);
- LOG.debug("Successfully loaded class: {}", fileSystems.get(key) );
+ LOG.debug("Successfully loaded class: {}", fileSystems.get(key));
FileSystem.get(uri, conf);
- LOG.debug("Successfully got uri: {} from FileSystem Object", uri );
+ LOG.debug("Successfully got uri: {} from FileSystem Object", uri);
}
} catch (Exception e) {
LOG.debug(e.getMessage(), e);