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 2015/01/22 22:00:38 UTC
[24/25] storm git commit: Merge branch 'storm-243' of
https://github.com/caofangkun/apache-storm into STORM-243
Merge branch 'storm-243' of https://github.com/caofangkun/apache-storm into STORM-243
STORM-243: Record version and revision information in builds
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/45f20be4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/45f20be4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/45f20be4
Branch: refs/heads/master
Commit: 45f20be4cd0627e5c3d451d996f68edd4cb38ca3
Parents: 90561ba f4483fe
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jan 22 11:36:04 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jan 22 11:36:04 2015 -0600
----------------------------------------------------------------------
.gitignore | 1 +
bin/storm | 15 +-
bin/storm.cmd | 3 +-
pom.xml | 2 +-
storm-buildtools/storm-maven-plugins/pom.xml | 64 ++++
.../storm/maven/plugin/util/CommandExec.java | 89 ++++++
.../plugin/versioninfo/VersionInfoMojo.java | 304 +++++++++++++++++++
storm-core/pom.xml | 37 ++-
storm-core/src/clj/backtype/storm/ui/core.clj | 13 +-
.../jvm/backtype/storm/utils/VersionInfo.java | 131 ++++++++
.../storm-core-version-info.properties | 24 ++
storm-dist/binary/src/main/assembly/binary.xml | 7 -
12 files changed, 661 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/45f20be4/bin/storm
----------------------------------------------------------------------
diff --cc bin/storm
index c5d0840,ff3b3dd..410a1b0
--- a/bin/storm
+++ b/bin/storm
@@@ -71,10 -71,9 +71,9 @@@ else
if (not os.path.isfile(os.path.join(USER_CONF_DIR, "storm.yaml"))):
USER_CONF_DIR = CLUSTER_CONF_DIR
- STORM_RELEASE_DIR = os.path.join(STORM_DIR, "RELEASE")
STORM_LIB_DIR = os.path.join(STORM_DIR, "lib")
STORM_BIN_DIR = os.path.join(STORM_DIR, "bin")
-STORM_LOGBACK_FILE_PATH = os.path.join(STORM_DIR, "logback", "cluster.xml")
+STORM_LOGBACK_CONF_DIR = os.path.join(STORM_DIR, "logback")
init_storm_env()
http://git-wip-us.apache.org/repos/asf/storm/blob/45f20be4/bin/storm.cmd
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/45f20be4/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/45f20be4/storm-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/45f20be4/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------