You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/04/03 17:57:12 UTC
[1/3] storm git commit: STORM-2450: Write resources into correct
local directory
Repository: storm
Updated Branches:
refs/heads/master 21f365ea3 -> 28c8711e7
STORM-2450: Write resources into correct local directory
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/547cb108
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/547cb108
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/547cb108
Branch: refs/heads/master
Commit: 547cb108254e144bdf5a7dc0ccad95cbb7f4c4d6
Parents: 21f365e
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Sat Apr 1 10:35:39 2017 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Sat Apr 1 10:35:39 2017 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/localizer/AsyncLocalizer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/547cb108/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java b/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
index 1fb504f..506f3ad 100644
--- a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
@@ -189,18 +189,18 @@ public class AsyncLocalizer implements ILocalizer, Shutdownable {
String resourcesJar = AsyncLocalizer.resourcesJar();
URL url = classloader.getResource(ConfigUtils.RESOURCES_SUBDIR);
- String targetDir = tmproot + Utils.FILE_PATH_SEPARATOR + ConfigUtils.RESOURCES_SUBDIR;
+ String targetDir = tmproot + Utils.FILE_PATH_SEPARATOR;
if (resourcesJar != null) {
LOG.info("Extracting resources from jar at {} to {}", resourcesJar, targetDir);
Utils.extractDirFromJar(resourcesJar, ConfigUtils.RESOURCES_SUBDIR, new File(targetDir));
} else if (url != null) {
- LOG.info("Copying resources at {} to {} ", url.toString(), targetDir);
+ LOG.info("Copying resources at {} to {}", url, targetDir);
if ("jar".equals(url.getProtocol())) {
JarURLConnection urlConnection = (JarURLConnection) url.openConnection();
Utils.extractDirFromJar(urlConnection.getJarFileURL().getFile(), ConfigUtils.RESOURCES_SUBDIR, new File(targetDir));
} else {
- _fsOps.copyDirectory(new File(url.getFile()), new File(targetDir));
+ _fsOps.copyDirectory(new File(url.getFile()), new File(targetDir, ConfigUtils.RESOURCES_SUBDIR));
}
}
}
[2/3] storm git commit: Merge branch 'STORM-2450' of
https://github.com/revans2/incubator-storm into STORM-2450
Posted by bo...@apache.org.
Merge branch 'STORM-2450' of https://github.com/revans2/incubator-storm into STORM-2450
STORM-2450: Write resources into correct local directory
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/098265b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/098265b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/098265b4
Branch: refs/heads/master
Commit: 098265b42fe7d5759ce00ef55184129dfdf9049e
Parents: 21f365e 547cb10
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 3 10:49:25 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 3 10:49:25 2017 -0500
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/localizer/AsyncLocalizer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-2450 to Changelog
Posted by bo...@apache.org.
Added STORM-2450 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/28c8711e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/28c8711e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/28c8711e
Branch: refs/heads/master
Commit: 28c8711e792b03c8363bb58c34d3c7768d263cc6
Parents: 098265b
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 3 12:56:45 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 3 12:56:45 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/28c8711e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2119443..ae30ce4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -339,6 +339,7 @@
* STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
## 1.0.4
+ * STORM-2450: Write resources into correct local director
* STORM-2038: No symlinks for local cluster
## 1.0.3