You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/21 17:18:01 UTC
[1/2] storm git commit: STORM-1026: Expand external classpaths to
include any jars
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 5fbaf78cf -> 8c3d69560
STORM-1026: Expand external classpaths to include any jars
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9293981a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9293981a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9293981a
Branch: refs/heads/0.10.x-branch
Commit: 9293981a17ef6ba1c2bb1eb21162b33e49559c80
Parents: 5fbaf78
Author: Bryan Shell <br...@orbitz.com>
Authored: Wed Sep 2 14:45:04 2015 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Sep 22 00:16:49 2015 +0900
----------------------------------------------------------------------
bin/storm.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9293981a/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 7a25ead..0dddcdb 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -101,7 +101,12 @@ if not os.path.exists(STORM_LIB_DIR):
sys.exit(1)
def get_jars_full(adir):
- files = os.listdir(adir)
+ files = []
+ if os.path.isdir(adir):
+ files = os.listdir(adir)
+ elif os.path.exists(adir):
+ files = [aidr]
+
ret = []
for f in files:
if f.endswith(".jar"):
@@ -115,9 +120,11 @@ def get_classpath(extrajars, daemon=True):
if daemon:
ret.extend(get_jars_full(STORM_DIR + "/extlib-daemon"))
if STORM_EXT_CLASSPATH != None:
- ret.extend(STORM_EXT_CLASSPATH)
+ for path in STORM_EXT_CLASSPATH.split(os.pathsep):
+ ret.extend(get_jars_full(path))
if daemon and STORM_EXT_CLASSPATH_DAEMON != None:
- ret.extend(STORM_EXT_CLASSPATH_DAEMON)
+ for path in STORM_EXT_CLASSPATH_DAEMON.split(os.pathsep):
+ ret.extend(get_jars_full(path))
ret.extend(extrajars)
return normclasspath(os.pathsep.join(ret))
[2/2] storm git commit: add STORM-1026 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1026 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c3d6956
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c3d6956
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c3d6956
Branch: refs/heads/0.10.x-branch
Commit: 8c3d69560ad565a50aff7cb9a06d539beb6e957b
Parents: 9293981
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Sep 22 00:17:42 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Sep 22 00:17:42 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c3d6956/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8287f50..5cf99ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-1026: Adding external classpath elements does not work
* STORM-1056: allow supervisor log filename to be configurable via ENV variable
* STORM-1055: storm-jdbc README needs fixes and context
* STORM-1044: Setting dop to zero does not raise an error