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:40 UTC
[1/2] storm git commit: Merge branch 'STORM-2450' of
https://github.com/revans2/incubator-storm into STORM-2450
Repository: storm
Updated Branches:
refs/heads/1.x-branch 8ab85bfc7 -> ca66b1a3a
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/e2768bb7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2768bb7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2768bb7
Branch: refs/heads/1.x-branch
Commit: e2768bb7e9a9e7d942e240c22c7a0babd2ddf8bf
Parents: 8ab85bf
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 12:43:09 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/e2768bb7/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 a2f9857..ae5103f 100644
--- a/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
+++ b/storm-core/src/jvm/org/apache/storm/localizer/AsyncLocalizer.java
@@ -191,18 +191,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/2] 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/ca66b1a3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca66b1a3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca66b1a3
Branch: refs/heads/1.x-branch
Commit: ca66b1a3a0bed693d1796e6374cdfd79ec5b78f3
Parents: e2768bb
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Apr 3 12:56:09 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Apr 3 12:56:09 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ca66b1a3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1daa538..32e1a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -199,6 +199,7 @@
* STORM-1720: Support GEO in storm-redis
## 1.0.4
+ * STORM-2450: Write resources into correct local director
* STORM-2038: No symlinks for local cluster
## 1.0.3