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:15 UTC
[01/25] storm git commit: Revert "prepare for next development
iteration"
Repository: storm
Updated Branches:
refs/heads/master 90561baf4 -> 01e75ec9e
Revert "prepare for next development iteration"
This reverts commit cfe7e6313acc35a5c346480b4ac4e0d863d09410.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d2249973
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d2249973
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d2249973
Branch: refs/heads/master
Commit: d22499734d74609ee2fb2bf4b16f2def932006b3
Parents: cfe7e63
Author: caofangkun <ca...@gmail.com>
Authored: Wed Oct 15 16:50:57 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Oct 15 16:50:57 2014 +0800
----------------------------------------------------------------------
examples/storm-starter/pom.xml | 2 +-
external/storm-hbase/pom.xml | 2 +-
external/storm-hdfs/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
pom.xml | 2 +-
storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 68fb962..27ea5b7 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index b4bdd6d..da52429 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 7afb4a8..a2137b5 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 16e994d..65a207e 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b63d332..e3e4b7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.storm</groupId>
<artifactId>storm</artifactId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<packaging>pom</packaging>
<name>Storm</name>
<description>Distributed and fault-tolerant realtime computation</description>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/storm-buildtools/maven-shade-clojure-transformer/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 9e9f524..beea82f 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d2938e3..1b12b7d 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
</parent>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index f6dd6d5..31c0bf5 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d2249973/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index 91de1ac..deb7bdf 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc2-SNAPSHOT</version>
+ <version>0.9.3-rc1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
[08/25] storm git commit: STORM-243:resolved merge conflicts
Posted by bo...@apache.org.
STORM-243:resolved merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/61870151
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/61870151
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/61870151
Branch: refs/heads/master
Commit: 61870151db95b1a8dd029d903352474374a51180
Parents: 7c665c7 0b9bc2e
Author: caokun <caokun@caokun-VirtualBox.(none)>
Authored: Thu Jan 8 16:25:09 2015 +0800
Committer: caokun <caokun@caokun-VirtualBox.(none)>
Committed: Thu Jan 8 16:25:09 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 14 +
DEVELOPER.md | 5 +-
README.markdown | 18 +-
SECURITY.md | 25 +-
bin/storm | 59 ++--
conf/defaults.yaml | 1 +
docs/about/integrates.md | 2 +-
docs/about/multi-language.md | 6 +-
docs/about/simple-api.md | 2 +-
.../Acking-framework-implementation.md | 8 +-
docs/documentation/Clojure-DSL.md | 6 +-
docs/documentation/Common-patterns.md | 2 +-
docs/documentation/Configuration.md | 4 +-
.../Creating-a-new-Storm-project.md | 6 +-
.../DSLs-and-multilang-adapters.md | 3 +-
...Defining-a-non-jvm-language-dsl-for-storm.md | 2 +-
docs/documentation/Distributed-RPC.md | 2 +-
docs/documentation/FAQ.md | 4 +-
docs/documentation/Kestrel-and-Storm.md | 2 +-
docs/documentation/Lifecycle-of-a-topology.md | 70 ++---
docs/documentation/Maven.md | 50 +---
docs/documentation/Multilang-protocol.md | 30 +-
.../Serialization-(prior-to-0.6.0).md | 2 +-
.../documentation/Setting-up-a-Storm-cluster.md | 4 +-
.../Setting-up-development-environment.md | 2 +-
docs/documentation/Structure-of-the-codebase.md | 88 +++---
docs/documentation/Transactional-topologies.md | 12 +-
docs/documentation/Trident-API-Overview.md | 4 +-
docs/documentation/Trident-spouts.md | 8 +-
docs/documentation/Trident-state.md | 12 +-
docs/documentation/Tutorial.md | 4 +-
docs/downloads.html | 2 +-
external/storm-hbase/README.md | 49 +++-
external/storm-hbase/pom.xml | 17 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 9 +-
.../apache/storm/hbase/security/AutoHBase.java | 243 ++++++++++++++++
.../storm/hbase/security/HBaseSecurityUtil.java | 32 ++-
.../storm/hbase/trident/state/HBaseState.java | 9 +-
external/storm-hdfs/README.md | 45 +++
.../storm/hdfs/bolt/format/SequenceFormat.java | 5 +-
.../storm/hdfs/common/security/AutoHDFS.java | 281 +++++++++++++++++++
.../hdfs/common/security/HdfsSecurityUtil.java | 30 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 12 +-
.../src/jvm/storm/kafka/PartitionManager.java | 6 +-
.../kafka/TopicOffsetOutOfRangeException.java | 25 ++
.../jvm/storm/kafka/UpdateOffsetException.java | 22 --
.../FieldNameBasedTupleToKafkaMapper.java | 2 +-
.../kafka/trident/TridentKafkaEmitter.java | 43 ++-
.../src/test/storm/kafka/KafkaUtilsTest.java | 2 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 36 ++-
.../src/clj/backtype/storm/daemon/nimbus.clj | 7 +-
.../clj/backtype/storm/daemon/supervisor.clj | 22 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 1 +
storm-core/src/jvm/backtype/storm/Config.java | 34 +--
.../storm/security/auth/hadoop/AutoHDFS.java | 262 -----------------
.../jvm/backtype/storm/utils/ShellProcess.java | 11 +-
.../src/native/worker-launcher/configure.ac | 2 +-
.../worker-launcher/impl/worker-launcher.c | 7 +-
.../test/clj/backtype/storm/logviewer_test.clj | 47 +++-
.../backtype/storm/security/auth/auth_test.clj | 8 +-
.../test/clj/backtype/storm/supervisor_test.clj | 6 +-
61 files changed, 1107 insertions(+), 627 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/61870151/bin/storm
----------------------------------------------------------------------
diff --cc bin/storm
index 38161a0,83f5a9f..f041b5f
--- a/bin/storm
+++ b/bin/storm
@@@ -417,14 -429,14 +422,14 @@@ def dev_zookeeper()
def version():
"""Syntax: [storm version]
-
- Prints the version number of this Storm release.
+
+ Prints the version number of this Storm release.
"""
- releasefile = STORM_RELEASE_DIR
- if os.path.exists(releasefile):
- print(open(releasefile).readline().strip())
- else:
- print("Unknown")
+ cppaths = [CLUSTER_CONF_DIR]
+ exec_storm_class(
+ "backtype.storm.utils.VersionInfo",
- jvmtype=" ",
++ jvmtype="-client",
+ extrajars=[CLUSTER_CONF_DIR])
def print_classpath():
"""Syntax: [storm classpath]
http://git-wip-us.apache.org/repos/asf/storm/blob/61870151/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
[09/25] storm git commit: STORM-243:check if STORM_DIR/lib/ folder
exists in bin/storm
Posted by bo...@apache.org.
STORM-243:check if STORM_DIR/lib/ folder exists in bin/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/63562966
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/63562966
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/63562966
Branch: refs/heads/master
Commit: 63562966db6ef3a07d3e65a417303efc7827d3c3
Parents: 6187015
Author: caofangkun <ca...@gmail.com>
Authored: Thu Jan 8 17:09:03 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Jan 8 17:09:03 2015 +0800
----------------------------------------------------------------------
bin/storm | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/63562966/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index f041b5f..0d8f970 100755
--- a/bin/storm
+++ b/bin/storm
@@ -88,6 +88,13 @@ def get_config_opts():
global CONFIG_OPTS
return "-Dstorm.options=" + ','.join(map(quote_plus,CONFIG_OPTS))
+if not os.path.exists(STORM_DIR + "/lib/"):
+ print("******************************************")
+ print("The storm client can only be run from within a release. You appear to be trying to run the client from a checkout of Storm's source code.")
+ print("\nYou can download a Storm release at http://storm-project.net/downloads.html")
+ print("******************************************")
+ sys.exit(1)
+
def get_jars_full(adir):
files = os.listdir(adir)
ret = []
[02/25] storm git commit: Revert "Revert "prepare for next
development iteration""
Posted by bo...@apache.org.
Revert "Revert "prepare for next development iteration""
This reverts commit d22499734d74609ee2fb2bf4b16f2def932006b3.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fa383351
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fa383351
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fa383351
Branch: refs/heads/master
Commit: fa3833516e1855a9053ba13089089c09755b28bb
Parents: d224997
Author: caofangkun <ca...@gmail.com>
Authored: Wed Oct 15 17:08:39 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Oct 15 17:08:39 2014 +0800
----------------------------------------------------------------------
examples/storm-starter/pom.xml | 2 +-
external/storm-hbase/pom.xml | 2 +-
external/storm-hdfs/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
pom.xml | 2 +-
storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
storm-dist/binary/pom.xml | 2 +-
storm-dist/source/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 27ea5b7..68fb962 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index da52429..b4bdd6d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index a2137b5..7afb4a8 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 65a207e..16e994d 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3e4b7f..b63d332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.storm</groupId>
<artifactId>storm</artifactId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Storm</name>
<description>Distributed and fault-tolerant realtime computation</description>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/storm-buildtools/maven-shade-clojure-transformer/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index beea82f..9e9f524 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 1b12b7d..d2938e3 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
</parent>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 31c0bf5..f6dd6d5 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/fa383351/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index deb7bdf..91de1ac 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>0.9.3-rc1</version>
+ <version>0.9.3-rc2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>
[19/25] storm git commit: STORM-243:add module
storm-buildtools/storm-maven-plugins to generate version info
Posted by bo...@apache.org.
STORM-243:add module storm-buildtools/storm-maven-plugins to generate version info
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/272749cd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/272749cd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/272749cd
Branch: refs/heads/master
Commit: 272749cdbfd4195a2652932998d523a209de6d3d
Parents: 802272a
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 12:42:39 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 12:42:39 2015 +0800
----------------------------------------------------------------------
pom.xml | 2 +-
pom.xml.rej | 24 ++
storm-buildtools/storm-maven-plugins/pom.xml | 64 ++++
.../storm/maven/plugin/util/CommandExec.java | 89 ++++++
.../plugin/versioninfo/VersionInfoMojo.java | 304 +++++++++++++++++++
.../src/test/java/org/apache/storm/AppTest.java | 38 +++
storm-core/pom.xml | 58 ++--
.../jvm/backtype/storm/utils/VersionInfo.java | 119 ++++++--
.../resources/common-version-info.properties | 26 ++
.../src/resources/core-version-info.properties | 25 ++
storm-core/src/saveVersion.sh | 41 ---
11 files changed, 701 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5645b9a..875031c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,7 @@
<modules>
<module>storm-buildtools/maven-shade-clojure-transformer</module>
+ <module>storm-buildtools/storm-maven-plugins</module>
<module>storm-core</module>
<module>examples/storm-starter</module>
<module>external/storm-kafka</module>
@@ -209,7 +210,6 @@
<reply.version>0.3.0</reply.version>
<conjure.version>2.1.3</conjure.version>
<zookeeper.version>3.4.6</zookeeper.version>
- <conjure.version>2.1.3</conjure.version>
<clojure-data-codec.version>0.1.0</clojure-data-codec.version>
<clojure-contrib.version>1.2.0</clojure-contrib.version>
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/pom.xml.rej
----------------------------------------------------------------------
diff --git a/pom.xml.rej b/pom.xml.rej
new file mode 100644
index 0000000..e5ba6ec
--- /dev/null
+++ b/pom.xml.rej
@@ -0,0 +1,24 @@
+--- pom.xml
++++ pom.xml
+@@ -305,6 +305,21 @@
+ <include>NOTICE</include>
+ </includes>
+ </resource>
++ <resource>
++ <directory>${basedir}/src/main/resources</directory>
++ <excludes>
++ <exclude>common-version-info.properties</exclude>
++ </excludes>
++ <filtering>false</filtering>
++ </resource>
++ <resource>
++ <directory>${basedir}/src/main/resources</directory>
++ <includes>
++ <include>common-version-info.properties</include>
++ </includes>
++ <filtering>true</filtering>
++ </resource>
++
+
+ </resources>
+ <testResources>
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-buildtools/storm-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml
new file mode 100644
index 0000000..9b932d9
--- /dev/null
+++ b/storm-buildtools/storm-maven-plugins/pom.xml
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>storm</artifactId>
+ <groupId>org.apache.storm</groupId>
+ <version>0.10.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.storm</groupId>
+ <artifactId>storm-maven-plugins</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>storm-maven-plugins</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.dependency.version>3.0</maven.dependency.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.dependency.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.dependency.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven.dependency.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven.dependency.version}</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
new file mode 100644
index 0000000..c289f51
--- /dev/null
+++ b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/util/CommandExec.java
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.storm.maven.plugin.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.plugin.Mojo;
+
+public class CommandExec {
+ private Mojo mojo;
+
+ public CommandExec(Mojo mojo) {
+ this.mojo = mojo;
+ }
+
+ public int run(List<String> command, List<String> output) {
+ int retCode = 1;
+ ProcessBuilder pb = new ProcessBuilder(command);
+ try {
+ Process p = pb.start();
+ OutputBufferThread stdOut = new OutputBufferThread(p.getInputStream());
+ OutputBufferThread stdErr = new OutputBufferThread(p.getErrorStream());
+ stdOut.start();
+ stdErr.start();
+ retCode = p.waitFor();
+ if (retCode != 0) {
+ mojo.getLog().warn(command + " failed with error code " + retCode);
+ for (String s : stdErr.getOutput()) {
+ mojo.getLog().debug(s);
+ }
+ }
+ stdOut.join();
+ stdErr.join();
+ output.addAll(stdOut.getOutput());
+ } catch (Exception ex) {
+ mojo.getLog().warn(command + " failed: " + ex.toString());
+ }
+ return retCode;
+ }
+
+ private static class OutputBufferThread extends Thread {
+ private List<String> output;
+ private BufferedReader reader;
+
+ public OutputBufferThread(InputStream is) {
+ this.setDaemon(true);
+ output = new ArrayList<String>();
+ reader = new BufferedReader(new InputStreamReader(is));
+ }
+
+ @Override
+ public void run() {
+ try {
+ String line = reader.readLine();
+ while (line != null) {
+ output.add(line);
+ line = reader.readLine();
+ }
+ } catch (IOException ex) {
+ throw new RuntimeException("make failed with error code "
+ + ex.toString());
+ }
+ }
+
+ public List<String> getOutput() {
+ return output;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/versioninfo/VersionInfoMojo.java
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/versioninfo/VersionInfoMojo.java b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/versioninfo/VersionInfoMojo.java
new file mode 100644
index 0000000..31354e3
--- /dev/null
+++ b/storm-buildtools/storm-maven-plugins/src/main/java/org/apache/storm/maven/plugin/versioninfo/VersionInfoMojo.java
@@ -0,0 +1,304 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.storm.maven.plugin.versioninfo;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.apache.maven.model.FileSet;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.storm.maven.plugin.util.CommandExec;
+import org.codehaus.plexus.util.FileUtils;
+
+@Mojo(name = "version-info")
+public class VersionInfoMojo extends AbstractMojo {
+
+ @Parameter(defaultValue = "${project}")
+ private MavenProject project;
+
+ @Parameter(required = true)
+ private FileSet source;
+
+ @Parameter(defaultValue = "version-info.build.time")
+ private String buildTimeProperty;
+
+ @Parameter(defaultValue = "version-info.source.md5")
+ private String md5Property;
+
+ @Parameter(defaultValue = "version-info.scm.uri")
+ private String scmUriProperty;
+
+ @Parameter(defaultValue = "version-info.scm.branch")
+ private String scmBranchProperty;
+
+ @Parameter(defaultValue = "version-info.scm.commit")
+ private String scmCommitProperty;
+
+ @Parameter(defaultValue = "git")
+ private String gitCommand;
+
+ @Parameter(defaultValue = "svn")
+ private String svnCommand;
+
+ private enum SCM {
+ NONE, SVN, GIT
+ }
+
+ @Override
+ public void execute() throws MojoExecutionException {
+ try {
+ SCM scm = determineSCM();
+ project.getProperties().setProperty(buildTimeProperty, getBuildTime());
+ project.getProperties().setProperty(scmUriProperty, getSCMUri(scm));
+ project.getProperties().setProperty(scmBranchProperty, getSCMBranch(scm));
+ project.getProperties().setProperty(scmCommitProperty, getSCMCommit(scm));
+ project.getProperties().setProperty(md5Property, computeMD5());
+ } catch (Throwable ex) {
+ throw new MojoExecutionException(ex.toString(), ex);
+ }
+ }
+
+ private String getBuildTime() {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
+ dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ return dateFormat.format(new Date());
+ }
+
+ private List<String> scmOut;
+
+ /**
+ * Determines which SCM is in use (Subversion, git, or none) and captures
+ * output of the SCM command for later parsing.
+ *
+ * @return SCM in use for this build
+ * @throws Exception if any error occurs attempting to determine SCM
+ */
+ private SCM determineSCM() throws Exception {
+ CommandExec exec = new CommandExec(this);
+ SCM scm = SCM.NONE;
+ scmOut = new ArrayList<String>();
+ int ret = exec.run(Arrays.asList(svnCommand, "info"), scmOut);
+ if (ret == 0) {
+ scm = SCM.SVN;
+ } else {
+ ret = exec.run(Arrays.asList(gitCommand, "branch"), scmOut);
+ if (ret == 0) {
+ ret = exec.run(Arrays.asList(gitCommand, "remote", "-v"), scmOut);
+ if (ret != 0) {
+ scm = SCM.NONE;
+ scmOut = null;
+ } else {
+ ret = exec.run(Arrays.asList(gitCommand, "log", "-n", "1"), scmOut);
+ if (ret != 0) {
+ scm = SCM.NONE;
+ scmOut = null;
+ } else {
+ scm = SCM.GIT;
+ }
+ }
+ }
+ }
+ if (scmOut != null) {
+ getLog().debug(scmOut.toString());
+ }
+ getLog().info("SCM: " + scm);
+ return scm;
+ }
+
+ private String[] getSvnUriInfo(String str) {
+ String[] res = new String[] { "Unknown", "Unknown" };
+ try {
+ String path = str;
+ int index = path.indexOf("trunk");
+ if (index > -1) {
+ res[0] = path.substring(0, index - 1);
+ res[1] = "trunk";
+ } else {
+ index = path.indexOf("branches");
+ if (index > -1) {
+ res[0] = path.substring(0, index - 1);
+ int branchIndex = index + "branches".length() + 1;
+ index = path.indexOf("/", branchIndex);
+ if (index > -1) {
+ res[1] = path.substring(branchIndex, index);
+ } else {
+ res[1] = path.substring(branchIndex);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ getLog().warn("Could not determine URI & branch from SVN URI: " + str);
+ }
+ return res;
+ }
+
+ private String getSCMUri(SCM scm) {
+ String uri = "Unknown";
+ switch (scm) {
+ case SVN:
+ for (String s : scmOut) {
+ if (s.startsWith("URL:")) {
+ uri = s.substring(4).trim();
+ uri = getSvnUriInfo(uri)[0];
+ break;
+ }
+ }
+ break;
+ case GIT:
+ for (String s : scmOut) {
+ if (s.startsWith("origin") && s.endsWith("(fetch)")) {
+ uri = s.substring("origin".length());
+ uri = uri.substring(0, uri.length() - "(fetch)".length());
+ break;
+ }
+ }
+ break;
+ }
+ return uri.trim();
+ }
+
+ private String getSCMCommit(SCM scm) {
+ String commit = "Unknown";
+ switch (scm) {
+ case SVN:
+ for (String s : scmOut) {
+ if (s.startsWith("Revision:")) {
+ commit = s.substring("Revision:".length());
+ break;
+ }
+ }
+ break;
+ case GIT:
+ for (String s : scmOut) {
+ if (s.startsWith("commit")) {
+ commit = s.substring("commit".length());
+ break;
+ }
+ }
+ break;
+ }
+ return commit.trim();
+ }
+
+ private String getSCMBranch(SCM scm) {
+ String branch = "Unknown";
+ switch (scm) {
+ case SVN:
+ for (String s : scmOut) {
+ if (s.startsWith("URL:")) {
+ branch = s.substring(4).trim();
+ branch = getSvnUriInfo(branch)[1];
+ break;
+ }
+ }
+ break;
+ case GIT:
+ for (String s : scmOut) {
+ if (s.startsWith("*")) {
+ branch = s.substring("*".length());
+ break;
+ }
+ }
+ break;
+ }
+ return branch.trim();
+ }
+
+ private byte[] readFile(File file) throws IOException {
+ RandomAccessFile raf = new RandomAccessFile(file, "r");
+ byte[] buffer = new byte[(int) raf.length()];
+ raf.readFully(buffer);
+ raf.close();
+ return buffer;
+ }
+
+ private byte[] computeMD5(List<File> files) throws IOException,
+ NoSuchAlgorithmException {
+ MessageDigest md5 = MessageDigest.getInstance("MD5");
+ for (File file : files) {
+ getLog().debug("Computing MD5 for: " + file);
+ md5.update(readFile(file));
+ }
+ return md5.digest();
+ }
+
+ private String byteArrayToString(byte[] array) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : array) {
+ sb.append(Integer.toHexString(0xff & b));
+ }
+ return sb.toString();
+ }
+
+ private String computeMD5() throws Exception {
+ List<File> files = convertFileSetToFiles(source);
+ // File order of MD5 calculation is significant. Sorting is done on
+ // unix-format names, case-folded, in order to get a platform-independent
+ // sort and calculate the same MD5 on all platforms.
+ Collections.sort(files, new Comparator<File>() {
+ @Override
+ public int compare(File lhs, File rhs) {
+ return normalizePath(lhs).compareTo(normalizePath(rhs));
+ }
+
+ private String normalizePath(File file) {
+ return file.getPath().toUpperCase().replaceAll("\\\\", "/");
+ }
+ });
+ byte[] md5 = computeMD5(files);
+ String md5str = byteArrayToString(md5);
+ getLog().info("Computed MD5: " + md5str);
+ return md5str;
+ }
+
+ @SuppressWarnings("rawtypes")
+ private static String getCommaSeparatedList(List list) {
+ StringBuilder buffer = new StringBuilder();
+ String separator = "";
+ for (Object e : list) {
+ buffer.append(separator).append(e);
+ separator = ",";
+ }
+ return buffer.toString();
+ }
+
+ @SuppressWarnings("unchecked")
+ public static List<File> convertFileSetToFiles(FileSet source)
+ throws IOException {
+ String includes = getCommaSeparatedList(source.getIncludes());
+ String excludes = getCommaSeparatedList(source.getExcludes());
+ return FileUtils.getFiles(new File(source.getDirectory()), includes,
+ excludes);
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java b/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
new file mode 100644
index 0000000..56ecd53
--- /dev/null
+++ b/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
@@ -0,0 +1,38 @@
+package org.apache.storm;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 42111ee..75e24de 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -305,7 +305,20 @@
<include>NOTICE</include>
</includes>
</resource>
-
+ <resource>
+ <directory>${basedir}/src/resources</directory>
+ <excludes>
+ <exclude>core-version-info.properties</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/resources</directory>
+ <includes>
+ <include>core-version-info.properties</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
</resources>
<testResources>
<testResource>
@@ -464,29 +477,27 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>Version Calculation</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>sh</executable>
- <arguments>
- <argument>${basedir}/src/saveVersion.sh</argument>
- <argument>${project.version}</argument>
- <argument>${project.build.directory}/build</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.storm</groupId>
+ <artifactId>storm-maven-plugins</artifactId>
+ <executions>
+ <execution>
+ <id>version-info</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>version-info</goal>
+ </goals>
+ <configuration>
+ <source>
+ <directory>${basedir}/src/</directory>
+ <includes>
+ <include>jvm/**/*.java</include>
+ <include>clj/**/*.clj</include>
+ </includes>
+ </source>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
@@ -543,7 +554,6 @@
<configuration>
<sources><!-- Allows JaCoCo to find the clojure source code -->
<source>src/clj</source>
- <source>${project.build.directory}/build</source>
</sources>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
index e4e71ae..d9b437c 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -1,52 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package backtype.storm.utils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
public class VersionInfo {
- private static Package myPackage;
- private static VersionAnnotation version;
- static {
- myPackage = VersionAnnotation.class.getPackage();
- version = myPackage.getAnnotation(VersionAnnotation.class);
+ private Properties info;
+
+ protected VersionInfo(String component) {
+ info = new Properties();
+ String versionInfoFile = component + "-version-info.properties";
+ InputStream is = null;
+ try {
+ is = Thread.currentThread().getContextClassLoader()
+ .getResourceAsStream(versionInfoFile);
+ if (is == null) {
+ throw new IOException("Resource not found");
+ }
+ info.load(is);
+ } catch (IOException ex) {
+ } finally {
+ if (is != null) {
+ try {
+
+ is.close();
+ } catch (IOException ioex) {
+ }
+
+ }
+ }
}
-
- static Package getPackage() {
- return myPackage;
+
+ protected String _getVersion() {
+ return info.getProperty("version", "Unknown");
}
- public static String getVersion() {
- return version != null ? version.version() : "Unknown";
+ protected String _getRevision() {
+ return info.getProperty("revision", "Unknown");
+ }
+
+ protected String _getBranch() {
+ return info.getProperty("branch", "Unknown");
+ }
+
+ protected String _getDate() {
+ return info.getProperty("date", "Unknown");
+ }
+
+ protected String _getUser() {
+ return info.getProperty("user", "Unknown");
+ }
+
+ protected String _getUrl() {
+ return info.getProperty("url", "Unknown");
}
+ protected String _getSrcChecksum() {
+ return info.getProperty("srcChecksum", "Unknown");
+ }
+
+ protected String _getBuildVersion(){
+ return getVersion() +
+ " from " + _getRevision() +
+ " by " + _getUser() +
+ " source checksum " + _getSrcChecksum();
+ }
+
+
+ private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("core");
+
+ public static String getVersion() {
+ return COMMON_VERSION_INFO._getVersion();
+ }
+
public static String getRevision() {
- return version != null ? version.revision() : "Unknown";
+ return COMMON_VERSION_INFO._getRevision();
}
public static String getBranch() {
- return version != null ? version.branch() : "Unknown";
+ return COMMON_VERSION_INFO._getBranch();
}
public static String getDate() {
- return version != null ? version.date() : "Unknown";
+ return COMMON_VERSION_INFO._getDate();
}
-
+
public static String getUser() {
- return version != null ? version.user() : "Unknown";
+ return COMMON_VERSION_INFO._getUser();
}
-
+
public static String getUrl() {
- return version != null ? version.url() : "Unknown";
+ return COMMON_VERSION_INFO._getUrl();
}
public static String getSrcChecksum() {
- return version != null ? version.srcChecksum() : "Unknown";
+ return COMMON_VERSION_INFO._getSrcChecksum();
}
- public static String getBuildVersion() {
- return VersionInfo.getVersion() + " from " + VersionInfo.getRevision()
- + " by " + VersionInfo.getUser() + " source checksum "
- + VersionInfo.getSrcChecksum();
+ public static String getBuildVersion(){
+ return COMMON_VERSION_INFO._getBuildVersion();
}
+
public static void main(String[] args) {
System.out.println("Storm " + getVersion());
System.out.println("URL " + getUrl() + " -r " + getRevision());
@@ -54,5 +128,4 @@ public class VersionInfo {
System.out.println("Compiled by " + getUser() + " on " + getDate());
System.out.println("From source with checksum " + getSrcChecksum());
}
-
}
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-core/src/resources/common-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/common-version-info.properties b/storm-core/src/resources/common-version-info.properties
new file mode 100644
index 0000000..ad9a24d
--- /dev/null
+++ b/storm-core/src/resources/common-version-info.properties
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+version=${pom.version}
+revision=${version-info.scm.commit}
+branch=${version-info.scm.branch}
+user=${user.name}
+date=${version-info.build.time}
+url=${version-info.scm.uri}
+srcChecksum=${version-info.source.md5}
+protocVersion=${protobuf.version}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-core/src/resources/core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/core-version-info.properties b/storm-core/src/resources/core-version-info.properties
new file mode 100644
index 0000000..8b04e2d
--- /dev/null
+++ b/storm-core/src/resources/core-version-info.properties
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+version=${pom.version}
+revision=${version-info.scm.commit}
+branch=${version-info.scm.branch}
+user=${user.name}
+date=${version-info.build.time}
+url=${version-info.scm.uri}
+srcChecksum=${version-info.source.md5}
+protocVersion=${protobuf.version}
http://git-wip-us.apache.org/repos/asf/storm/blob/272749cd/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
deleted file mode 100755
index 4ef6da0..0000000
--- a/storm-core/src/saveVersion.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#this file is used to generate the package-info.java class that
-# records the version, revision, branch, user, timestamp, and url
-unset LANG
-unset LC_CTYPE
-unset LC_TIME
-version=$1
-build_dir=$2
-user=`whoami`
-date=`date`
-cwd=`pwd`
-if [ -d ../.git ]; then
- revision=`git rev-parse HEAD`
- branch=`git branch | sed -n -e 's/^* //p'`
- url=`git remote -v | sed -n -e 's/^origin[[:space:]]\(.*\)(fetch)/\1/p'`
-elif [ -d .svn ]; then
- revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
- url=`svn info | sed -n -e 's/^URL: \(.*\)/\1/p'`
- # Get canonical branch (branches/X, tags/X, or trunk)
- branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
- -e 's,.*\(tags/.*\)$,\1,p' \
- -e 's,.*trunk$,trunk,p'`
-else
- revision="Unknown"
- branch="Unknown"
- url="file://$cwd"
-fi
-srcChecksum=`find src -name '*.*' -type f | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
-
-mkdir -p $build_dir/backtype/storm/utils
-cat << EOF | \
- sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
- -e "s|URL|$url|" -e "s/REV/$revision/" \
- -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
- > $build_dir/backtype/storm/package-info.java
-/*
- * Generated by saveVersion.sh
- */
-@VersionAnnotation(version="VERSION", revision="REV", branch="BRANCH",
- user="USER", date="DATE", url="URL",
- srcChecksum="SRCCHECKSUM")
-package backtype.storm.utils;
[11/25] storm git commit: STORM-243: add
storm-core/dependency-reduced-pom.xml to .gitignore file
Posted by bo...@apache.org.
STORM-243: add storm-core/dependency-reduced-pom.xml to .gitignore file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a3d5c4e3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a3d5c4e3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a3d5c4e3
Branch: refs/heads/master
Commit: a3d5c4e390add10fdf3873d301db5a42ea434578
Parents: 7784131
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 09:54:21 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 09:54:21 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a3d5c4e3/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5626872..6d9fad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ target
.*
!/.gitignore
_site
+/storm-core/dependency-reduced-pom.xml
[04/25] storm git commit: STORM-243,
modify storm.cmd for running on windows
Posted by bo...@apache.org.
STORM-243,modify storm.cmd for running on windows
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/766e9cfa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/766e9cfa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/766e9cfa
Branch: refs/heads/master
Commit: 766e9cfa1b67884b692b5e92f9afe8eb228c0df7
Parents: fd03e16
Author: caofangkun <ca...@gmail.com>
Authored: Thu Oct 16 10:29:42 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Oct 16 10:29:42 2014 +0800
----------------------------------------------------------------------
bin/storm.cmd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/766e9cfa/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 359acb6..46d77e0 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -199,7 +199,8 @@
goto :eof
:version
- type %STORM_HOME%\RELEASE
+ set CLASS=backtype.storm.utils.VersionInfo
+ set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
goto :eof
:make_command_arguments
[05/25] storm git commit: STORM-243:Merge from master to
caofangkun/storm-243
Posted by bo...@apache.org.
STORM-243:Merge from master to caofangkun/storm-243
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ffba148c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ffba148c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ffba148c
Branch: refs/heads/master
Commit: ffba148cc47a92185fa1a5db11f72982de10f106
Parents: 766e9cf 97ae36e
Author: caofangkun <ca...@gmail.com>
Authored: Wed Jan 7 19:02:00 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Jan 7 19:02:00 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
CHANGELOG.md | 26 +-
DEVELOPER.md | 4 +
LICENSE | 14 +-
README.markdown | 4 +
SECURITY.md | 356 +-
STORM-UI-REST-API.md | 179 +-
bin/storm | 15 +-
bin/storm.cmd | 11 +-
conf/defaults.yaml | 46 +-
conf/jaas_digest.conf | 8 +-
conf/jaas_kerberos.conf | 15 +
doap_Storm.rdf | 57 +
docs/README.md | 38 +
docs/_config.yml | 11 +
docs/_includes/footer.html | 16 +
docs/_includes/head.html | 31 +
docs/_includes/header.html | 25 +
docs/_layouts/about.html | 40 +
docs/_layouts/default.html | 19 +
docs/_layouts/documentation.html | 16 +
docs/_layouts/page.html | 14 +
docs/_layouts/post.html | 15 +
docs/_posts/2012-08-02-storm080-released.md | 120 +
docs/_posts/2012-09-06-storm081-released.md | 47 +
docs/_posts/2013-01-11-storm082-released.md | 82 +
docs/_posts/2013-12-08-storm090-released.md | 127 +
docs/_posts/2014-04-10-storm-logo-contest.md | 66 +
docs/_posts/2014-04-17-logo-pforrest.md | 10 +
docs/_posts/2014-04-17-logo-squinones.md | 9 +
docs/_posts/2014-04-19-logo-ssuleman.md | 8 +
docs/_posts/2014-04-21-logo-rmarshall.md | 12 +
docs/_posts/2014-04-22-logo-zsayari.md | 9 +
docs/_posts/2014-04-23-logo-abartos.md | 15 +
docs/_posts/2014-04-27-logo-cboustead.md | 12 +
docs/_posts/2014-04-27-logo-sasili.md | 10 +
docs/_posts/2014-04-29-logo-jlee1.md | 10 +
docs/_posts/2014-04-29-logo-jlee2.md | 10 +
docs/_posts/2014-04-29-logo-jlee3.md | 10 +
docs/_posts/2014-05-27-round1-results.md | 38 +
docs/_posts/2014-06-17-contest-results.md | 24 +
docs/_posts/2014-06-25-storm092-released.md | 137 +
.../2014-10-20-storm093-release-candidate.md | 11 +
docs/_posts/2014-11-25-storm093-released.md | 164 +
docs/_sass/_syntax-highlighting.scss | 70 +
docs/about.md | 7 +
docs/about/deployment.md | 9 +
docs/about/fault-tolerant.md | 9 +
docs/about/free-and-open-source.md | 15 +
docs/about/guarantees-data-processing.md | 10 +
docs/about/integrates.md | 13 +
docs/about/multi-language.md | 9 +
docs/about/scalable.md | 10 +
docs/about/simple-api.md | 15 +
docs/assets/css/bootstrap-theme.css | 470 ++
docs/assets/css/bootstrap-theme.css.map | 1 +
docs/assets/css/bootstrap-theme.min.css | 5 +
docs/assets/css/bootstrap.css | 6332 ++++++++++++++++++
docs/assets/css/bootstrap.css.map | 1 +
docs/assets/css/bootstrap.min.css | 5 +
docs/assets/css/theme.css | 18 +
docs/assets/favicon.ico | Bin 0 -> 1150 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes
docs/assets/js/bootstrap.js | 2320 +++++++
docs/assets/js/bootstrap.min.js | 7 +
docs/assets/js/npm.js | 13 +
docs/css/main.scss | 47 +
docs/doc-index.html | 11 +
.../Acking-framework-implementation.md | 38 +
docs/documentation/Clojure-DSL.md | 266 +
docs/documentation/Command-line-client.md | 102 +
docs/documentation/Common-patterns.md | 88 +
docs/documentation/Concepts.md | 117 +
docs/documentation/Configuration.md | 31 +
docs/documentation/Contributing-to-Storm.md | 33 +
.../Creating-a-new-Storm-project.md | 27 +
.../DSLs-and-multilang-adapters.md | 11 +
...Defining-a-non-jvm-language-dsl-for-storm.md | 38 +
docs/documentation/Distributed-RPC.md | 199 +
docs/documentation/Documentation.md | 52 +
docs/documentation/FAQ.md | 123 +
docs/documentation/Fault-tolerance.md | 30 +
.../Guaranteeing-message-processing.md | 181 +
docs/documentation/Home.md | 69 +
docs/documentation/Hooks.md | 9 +
docs/documentation/Implementation-docs.md | 20 +
.../Installing-native-dependencies.md | 38 +
docs/documentation/Kestrel-and-Storm.md | 200 +
docs/documentation/Lifecycle-of-a-topology.md | 82 +
docs/documentation/Local-mode.md | 29 +
docs/documentation/Maven.md | 56 +
.../Message-passing-implementation.md | 30 +
docs/documentation/Metrics.md | 36 +
docs/documentation/Multilang-protocol.md | 223 +
docs/documentation/Powered-By.md | 925 +++
docs/documentation/Project-ideas.md | 6 +
docs/documentation/Rationale.md | 33 +
...unning-topologies-on-a-production-cluster.md | 77 +
.../Serialization-(prior-to-0.6.0).md | 52 +
docs/documentation/Serialization.md | 62 +
docs/documentation/Serializers.md | 4 +
.../documentation/Setting-up-a-Storm-cluster.md | 85 +
.../Setting-up-a-Storm-project-in-Eclipse.md | 1 +
.../Setting-up-development-environment.md | 41 +
docs/documentation/Spout-implementations.md | 10 +
...guage-protocol-(versions-0.7.0-and-below).md | 124 +
docs/documentation/Structure-of-the-codebase.md | 142 +
.../Support-for-non-java-languages.md | 9 +
docs/documentation/Transactional-topologies.md | 361 +
docs/documentation/Trident-API-Overview.md | 312 +
docs/documentation/Trident-spouts.md | 44 +
docs/documentation/Trident-state.md | 331 +
docs/documentation/Trident-tutorial.md | 254 +
docs/documentation/Troubleshooting.md | 145 +
docs/documentation/Tutorial.md | 312 +
...nding-the-parallelism-of-a-Storm-topology.md | 123 +
.../Using-non-JVM-languages-with-Storm.md | 52 +
docs/documentation/images/ack_tree.png | Bin 0 -> 31463 bytes
docs/documentation/images/batched-stream.png | Bin 0 -> 66336 bytes
docs/documentation/images/drpc-workflow.png | Bin 0 -> 66199 bytes
.../images/eclipse-project-properties.png | Bin 0 -> 80810 bytes
.../images/example-of-a-running-topology.png | Bin 0 -> 81430 bytes
docs/documentation/images/grouping.png | Bin 0 -> 39701 bytes
.../images/ld-library-path-eclipse-linux.png | Bin 0 -> 114597 bytes
...onships-worker-processes-executors-tasks.png | Bin 0 -> 54804 bytes
docs/documentation/images/spout-vs-state.png | Bin 0 -> 24804 bytes
docs/documentation/images/storm-cluster.png | Bin 0 -> 34604 bytes
docs/documentation/images/topology-tasks.png | Bin 0 -> 45960 bytes
docs/documentation/images/topology.png | Bin 0 -> 23147 bytes
.../images/transactional-batches.png | Bin 0 -> 23293 bytes
.../images/transactional-commit-flow.png | Bin 0 -> 17725 bytes
.../images/transactional-design-2.png | Bin 0 -> 13537 bytes
.../images/transactional-spout-structure.png | Bin 0 -> 25067 bytes
docs/documentation/images/trident-to-storm1.png | Bin 0 -> 67173 bytes
docs/documentation/images/trident-to-storm2.png | Bin 0 -> 68943 bytes
docs/documentation/images/tuple-dag.png | Bin 0 -> 18849 bytes
docs/documentation/images/tuple_tree.png | Bin 0 -> 58186 bytes
docs/downloads.html | 155 +
docs/feed.xml | 30 +
docs/images/bullet.gif | Bin 0 -> 82 bytes
docs/images/download.png | Bin 0 -> 16272 bytes
docs/images/incubator-logo.png | Bin 0 -> 11651 bytes
.../logocontest/abartos/stationery_mockup.jpg | Bin 0 -> 146498 bytes
docs/images/logocontest/abartos/storm_logo.png | Bin 0 -> 153974 bytes
docs/images/logocontest/abartos/storm_logo2.png | Bin 0 -> 115425 bytes
docs/images/logocontest/abartos/storm_logo3.png | Bin 0 -> 94950 bytes
.../images/logocontest/cboustead/storm_logo.png | Bin 0 -> 67149 bytes
.../logocontest/cboustead/storm_logo1.png | Bin 0 -> 16327 bytes
docs/images/logocontest/jlee1/storm_logo.jpg | Bin 0 -> 189382 bytes
docs/images/logocontest/jlee2/storm_logo.jpg | Bin 0 -> 155666 bytes
docs/images/logocontest/jlee3/storm_logo.jpg | Bin 0 -> 158134 bytes
docs/images/logocontest/pforrest/storm1.png | Bin 0 -> 84569 bytes
.../pforrest/storm_logo_composite.png | Bin 0 -> 139223 bytes
.../rmarshall/StormLogo_Horizontal.png | Bin 0 -> 16481 bytes
.../rmarshall/StormLogo_Horizontal_NoColour.png | Bin 0 -> 14358 bytes
.../logocontest/rmarshall/StormLogo_Square.png | Bin 0 -> 14392 bytes
docs/images/logocontest/sasili/storm_logo.png | Bin 0 -> 92196 bytes
.../images/logocontest/squinones/storm_logo.png | Bin 0 -> 203263 bytes
.../logocontest/squinones/storm_logo1.png | Bin 0 -> 53325 bytes
docs/images/logocontest/ssuleman/storm_logo.png | Bin 0 -> 95509 bytes
docs/images/logocontest/storm_logo_winner.png | Bin 0 -> 34490 bytes
docs/images/logocontest/zsayari/storm_logo.png | Bin 0 -> 120794 bytes
docs/images/logos/8digits.png | Bin 0 -> 19557 bytes
docs/images/logos/Yahoo_Japan_logo.png | Bin 0 -> 3707 bytes
docs/images/logos/aeris.png | Bin 0 -> 6268 bytes
docs/images/logos/alibaba.jpg | Bin 0 -> 43703 bytes
docs/images/logos/baidu.jpeg | Bin 0 -> 3413 bytes
docs/images/logos/cerner.gif | Bin 0 -> 2591 bytes
docs/images/logos/flipboard.jpeg | Bin 0 -> 2909 bytes
docs/images/logos/fullcontact.png | Bin 0 -> 24567 bytes
docs/images/logos/groupon.jpg | Bin 0 -> 41413 bytes
docs/images/logos/holidaycheck.png | Bin 0 -> 3129 bytes
docs/images/logos/idexx.gif | Bin 0 -> 38689 bytes
docs/images/logos/mercadolibre.png | Bin 0 -> 73388 bytes
docs/images/logos/navisite.jpg | Bin 0 -> 9358 bytes
docs/images/logos/ooyala.gif | Bin 0 -> 7830 bytes
docs/images/logos/parc.png | Bin 0 -> 7256 bytes
docs/images/logos/quicklizard.png | Bin 0 -> 5667 bytes
docs/images/logos/rocketfuel.png | Bin 0 -> 9719 bytes
docs/images/logos/rubicon.png | Bin 0 -> 10663 bytes
docs/images/logos/spiderio.png | Bin 0 -> 46790 bytes
docs/images/logos/spotify.jpeg | Bin 0 -> 3282 bytes
docs/images/logos/taobao.gif | Bin 0 -> 3262 bytes
docs/images/logos/twitter.png | Bin 0 -> 4392 bytes
docs/images/logos/weatherchannel.gif | Bin 0 -> 3425 bytes
docs/images/logos/webmd.jpg | Bin 0 -> 6193 bytes
docs/images/logos/yelp.png | Bin 0 -> 98431 bytes
docs/images/mailinglist.png | Bin 0 -> 4245 bytes
docs/images/storm_header.png | Bin 0 -> 17291 bytes
docs/images/storm_logo_tagline_color copy.png | Bin 0 -> 67928 bytes
docs/images/storm_logo_tagline_color.png | Bin 0 -> 33568 bytes
docs/images/top_bg.gif | Bin 0 -> 113 bytes
docs/images/topology.png | Bin 0 -> 59837 bytes
docs/images/ui_topology_viz.png | Bin 0 -> 112831 bytes
docs/index.html | 104 +
docs/news.html | 12 +
.../multilang/resources/asyncSplitsentence.js | 18 +
.../multilang/resources/randomsentence.js | 18 +
.../multilang/resources/splitsentence.js | 18 +
.../storm-starter/multilang/resources/storm.js | 38 +-
.../storm-starter/multilang/resources/storm.py | 87 +-
.../storm-starter/multilang/resources/storm.rb | 90 +-
examples/storm-starter/pom.xml | 2 +-
.../src/jvm/storm/starter/util/StormRunner.java | 3 +-
external/storm-hbase/pom.xml | 5 +-
.../trident/mapper/TridentHBaseMapper.java | 18 +
.../hbase/trident/state/HBaseMapState.java | 17 +
external/storm-hdfs/pom.xml | 4 +-
.../hdfs/bolt/format/DefaultSequenceFormat.java | 17 +
.../storm/hdfs/bolt/format/SequenceFormat.java | 17 +
.../hdfs/bolt/rotation/TimedRotationPolicy.java | 17 +
.../hdfs/common/rotation/MoveFileAction.java | 17 +
.../hdfs/common/rotation/RotationAction.java | 17 +
.../apache/storm/hdfs/trident/HdfsState.java | 17 +
.../storm/hdfs/trident/HdfsStateFactory.java | 17 +
.../apache/storm/hdfs/trident/HdfsUpdater.java | 17 +
.../trident/format/DefaultSequenceFormat.java | 17 +
.../hdfs/trident/format/SequenceFormat.java | 17 +
.../trident/rotation/TimedRotationPolicy.java | 17 +
.../storm/hdfs/trident/FixedBatchSpout.java | 17 +
.../storm/hdfs/trident/TridentFileTopology.java | 17 +
.../hdfs/trident/TridentSequenceTopology.java | 17 +
external/storm-kafka/README.md | 13 +-
external/storm-kafka/pom.xml | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 63 +-
.../src/jvm/storm/kafka/PartitionManager.java | 11 +-
.../jvm/storm/kafka/UpdateOffsetException.java | 22 +
.../src/test/storm/kafka/KafkaUtilsTest.java | 7 +-
logback/cluster.xml | 6 +-
logback/worker.xml | 41 +
pom.xml | 50 +-
.../maven-shade-clojure-transformer/pom.xml | 4 +-
storm-core/pom.xml | 306 +-
.../src/clj/backtype/storm/LocalCluster.clj | 4 +
storm-core/src/clj/backtype/storm/LocalDRPC.clj | 4 +-
.../src/clj/backtype/storm/MockAutoCred.clj | 58 +
storm-core/src/clj/backtype/storm/bootstrap.clj | 5 +-
storm-core/src/clj/backtype/storm/cluster.clj | 167 +-
.../storm/command/upload_credentials.clj | 35 +
storm-core/src/clj/backtype/storm/config.clj | 40 +-
.../backtype/storm/daemon/builtin_metrics.clj | 21 +-
.../src/clj/backtype/storm/daemon/common.clj | 18 +-
.../src/clj/backtype/storm/daemon/drpc.clj | 174 +-
.../src/clj/backtype/storm/daemon/executor.clj | 139 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 271 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 245 +-
.../clj/backtype/storm/daemon/supervisor.clj | 185 +-
.../src/clj/backtype/storm/daemon/task.clj | 7 +-
.../src/clj/backtype/storm/daemon/worker.clj | 109 +-
storm-core/src/clj/backtype/storm/disruptor.clj | 11 +-
.../src/clj/backtype/storm/messaging/loader.clj | 16 +-
storm-core/src/clj/backtype/storm/testing.clj | 56 +-
storm-core/src/clj/backtype/storm/testing4j.clj | 28 +-
storm-core/src/clj/backtype/storm/thrift.clj | 28 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 173 +-
.../src/clj/backtype/storm/ui/helpers.clj | 69 +-
storm-core/src/clj/backtype/storm/util.clj | 95 +-
storm-core/src/clj/backtype/storm/zookeeper.clj | 19 +-
storm-core/src/clj/storm/trident/testing.clj | 1 +
.../src/dev/drpc-simple-acl-test-scenario.yaml | 11 +
storm-core/src/dev/resources/storm.js | 24 +
storm-core/src/dev/resources/storm.py | 25 +-
storm-core/src/dev/resources/storm.rb | 55 +-
storm-core/src/dev/resources/tester_bolt.js | 17 +
storm-core/src/dev/resources/tester_spout.js | 17 +
storm-core/src/jvm/backtype/storm/Config.java | 547 +-
.../jvm/backtype/storm/ConfigValidation.java | 156 +-
.../src/jvm/backtype/storm/Constants.java | 3 +-
.../backtype/storm/ICredentialsListener.java | 32 +
.../src/jvm/backtype/storm/ILocalCluster.java | 2 +
.../src/jvm/backtype/storm/StormSubmitter.java | 164 +-
.../storm/drpc/DRPCInvocationsClient.java | 91 +-
.../src/jvm/backtype/storm/drpc/DRPCSpout.java | 100 +-
.../jvm/backtype/storm/drpc/ReturnResults.java | 35 +-
.../storm/generated/AuthorizationException.java | 345 +
.../backtype/storm/generated/Credentials.java | 390 ++
.../storm/generated/DistributedRPC.java | 110 +-
.../generated/DistributedRPCInvocations.java | 352 +-
.../jvm/backtype/storm/generated/Nimbus.java | 3006 ++++++++-
.../backtype/storm/generated/SubmitOptions.java | 98 +-
.../backtype/storm/generated/TopologyInfo.java | 192 +-
.../storm/generated/TopologySummary.java | 192 +-
.../backtype/storm/messaging/netty/Client.java | 73 +-
.../storm/messaging/netty/ControlMessage.java | 4 +-
.../storm/messaging/netty/MessageDecoder.java | 32 +-
.../storm/messaging/netty/MessageEncoder.java | 4 +
.../storm/messaging/netty/SaslMessageToken.java | 99 +
.../storm/messaging/netty/SaslNettyClient.java | 166 +
.../messaging/netty/SaslNettyClientState.java | 31 +
.../storm/messaging/netty/SaslNettyServer.java | 165 +
.../messaging/netty/SaslNettyServerState.java | 31 +
.../messaging/netty/SaslStormClientHandler.java | 158 +
.../netty/SaslStormServerAuthorizeHandler.java | 83 +
.../messaging/netty/SaslStormServerHandler.java | 155 +
.../storm/messaging/netty/SaslUtils.java | 74 +
.../backtype/storm/messaging/netty/Server.java | 104 +-
.../netty/StormClientPipelineFactory.java | 12 +-
.../messaging/netty/StormServerHandler.java | 2 +-
.../netty/StormServerPipelineFactory.java | 20 +-
.../jvm/backtype/storm/scheduler/Cluster.java | 13 +
.../scheduler/multitenant/DefaultPool.java | 219 +
.../storm/scheduler/multitenant/FreePool.java | 125 +
.../scheduler/multitenant/IsolatedPool.java | 346 +
.../multitenant/MultitenantScheduler.java | 98 +
.../storm/scheduler/multitenant/Node.java | 343 +
.../storm/scheduler/multitenant/NodePool.java | 296 +
.../storm/security/INimbusCredentialPlugin.java | 47 +
.../backtype/storm/security/auth/AuthUtils.java | 228 +-
.../auth/DefaultHttpCredentialsPlugin.java | 87 +
.../security/auth/DefaultPrincipalToLocal.java | 43 +
.../storm/security/auth/IAutoCredentials.java | 55 +
.../security/auth/ICredentialsRenewer.java | 41 +
.../auth/IGroupMappingServiceProvider.java | 42 +
.../security/auth/IHttpCredentialsPlugin.java | 50 +
.../storm/security/auth/IPrincipalToLocal.java | 41 +
.../storm/security/auth/ITransportPlugin.java | 14 +-
.../security/auth/KerberosPrincipalToLocal.java | 45 +
.../storm/security/auth/ReqContext.java | 10 +-
.../security/auth/SaslTransportPlugin.java | 44 +-
.../security/auth/ShellBasedGroupsMapping.java | 94 +
.../security/auth/SimpleTransportPlugin.java | 61 +-
.../security/auth/SingleUserPrincipal.java | 56 +
.../storm/security/auth/TBackoffConnect.java | 77 +
.../storm/security/auth/ThriftClient.java | 85 +-
.../security/auth/ThriftConnectionType.java | 77 +
.../storm/security/auth/ThriftServer.java | 19 +-
.../auth/authorizer/DRPCAuthorizerBase.java | 46 +
.../authorizer/DRPCSimpleACLAuthorizer.java | 157 +
.../auth/authorizer/DenyAuthorizer.java | 4 +-
.../auth/authorizer/NoopAuthorizer.java | 6 +-
.../auth/authorizer/SimpleACLAuthorizer.java | 131 +
.../authorizer/SimpleWhitelistAuthorizer.java | 70 +
.../auth/digest/DigestSaslTransportPlugin.java | 1 +
.../storm/security/auth/hadoop/AutoHDFS.java | 262 +
.../storm/security/auth/kerberos/AutoTGT.java | 281 +
.../auth/kerberos/AutoTGTKrb5LoginModule.java | 108 +
.../kerberos/AutoTGTKrb5LoginModuleTest.java | 44 +
.../auth/kerberos/ClientCallbackHandler.java | 104 +
.../kerberos/KerberosSaslTransportPlugin.java | 206 +
.../auth/kerberos/ServerCallbackHandler.java | 86 +
.../auth/kerberos/jaas_kerberos_cluster.conf | 31 +
.../auth/kerberos/jaas_kerberos_launcher.conf | 12 +
.../jvm/backtype/storm/spout/ShellSpout.java | 65 +-
.../src/jvm/backtype/storm/task/ShellBolt.java | 211 +-
.../storm/testing/CompleteTopologyParam.java | 22 +-
.../testing/ForwardingMetricsConsumer.java | 95 +
.../storm/testing/PythonShellMetricsBolt.java | 17 +
.../storm/testing/PythonShellMetricsSpout.java | 17 +
.../testing/SingleUserSimpleTransport.java | 37 +
.../state/TestTransactionalState.java | 47 +
.../transactional/state/TransactionalState.java | 56 +-
.../storm/ui/InvalidRequestException.java | 17 +
.../jvm/backtype/storm/utils/DRPCClient.java | 63 +-
.../backtype/storm/utils/DisruptorQueue.java | 56 +-
.../jvm/backtype/storm/utils/LocalState.java | 44 +-
.../jvm/backtype/storm/utils/NimbusClient.java | 11 +-
.../jvm/backtype/storm/utils/ShellUtils.java | 498 ++
.../src/jvm/backtype/storm/utils/TestUtils.java | 34 +
.../src/jvm/backtype/storm/utils/Utils.java | 130 +-
.../backtype/storm/utils/ZookeeperAuthInfo.java | 9 +-
.../storm/utils/ZookeeperServerCnxnFactory.java | 84 +
.../trident/drpc/ReturnResultsReducer.java | 13 +-
.../topology/state/TestTransactionalState.java | 47 +
.../topology/state/TransactionalState.java | 58 +-
storm-core/src/multilang/js/storm.js | 19 +-
storm-core/src/multilang/py/storm.py | 25 +-
storm-core/src/multilang/rb/storm.rb | 55 +-
.../src/native/worker-launcher/.autom4te.cfg | 42 +
.../worker-launcher/.deps/worker-launcher.Po | 1 +
.../src/native/worker-launcher/Makefile.am | 32 +
.../src/native/worker-launcher/configure.ac | 50 +
.../native/worker-launcher/impl/configuration.c | 340 +
.../native/worker-launcher/impl/configuration.h | 45 +
.../src/native/worker-launcher/impl/main.c | 210 +
.../worker-launcher/impl/worker-launcher.c | 779 +++
.../worker-launcher/impl/worker-launcher.h | 129 +
.../worker-launcher/test/test-worker-launcher.c | 340 +
storm-core/src/py/__init__.py | 16 +
storm-core/src/py/storm/DistributedRPC-remote | 18 +
storm-core/src/py/storm/DistributedRPC.py | 37 +-
.../py/storm/DistributedRPCInvocations-remote | 18 +
.../src/py/storm/DistributedRPCInvocations.py | 96 +-
storm-core/src/py/storm/Nimbus-remote | 25 +
storm-core/src/py/storm/Nimbus.py | 652 +-
storm-core/src/py/storm/__init__.py | 16 +
storm-core/src/py/storm/constants.py | 16 +
storm-core/src/py/storm/ttypes.py | 1243 +++-
storm-core/src/storm.thrift | 58 +-
storm-core/src/ui/public/component.html | 23 +-
storm-core/src/ui/public/css/style.css | 9 +
storm-core/src/ui/public/favicon.ico | Bin 0 -> 18280 bytes
storm-core/src/ui/public/index.html | 12 +-
storm-core/src/ui/public/js/script.js | 3 +-
.../public/templates/anti-forgery-template.html | 19 +
.../public/templates/index-page-template.html | 12 +
.../templates/topology-page-template.html | 23 +-
.../src/ui/public/templates/user-template.html | 25 +
storm-core/src/ui/public/topology.html | 21 +-
.../test/clj/backtype/storm/cluster_test.clj | 93 +-
.../test/clj/backtype/storm/config_test.clj | 11 +
.../test/clj/backtype/storm/drpc_test.clj | 14 +-
.../clj/backtype/storm/local_state_test.clj | 14 +-
.../test/clj/backtype/storm/logviewer_test.clj | 187 +
.../storm/messaging/netty_integration_test.clj | 4 +-
.../storm/messaging/netty_unit_test.clj | 32 +-
.../test/clj/backtype/storm/nimbus_test.clj | 377 +-
.../scheduler/multitenant_scheduler_test.clj | 831 +++
.../storm/security/auth/AuthUtils_test.clj | 16 +-
.../auth/DefaultHttpCredentialsPlugin_test.clj | 40 +
.../storm/security/auth/ThriftClient_test.clj | 28 +-
.../storm/security/auth/ThriftServer_test.clj | 8 +-
.../backtype/storm/security/auth/auth_test.clj | 374 +-
.../authorizer/DRPCSimpleACLAuthorizer_test.clj | 226 +
.../security/auth/auto_login_module_test.clj | 91 +
.../storm/security/auth/drpc-auth-alice.jaas | 5 +
.../storm/security/auth/drpc-auth-bob.jaas | 5 +
.../storm/security/auth/drpc-auth-charlie.jaas | 5 +
.../storm/security/auth/drpc-auth-server.jaas | 6 +
.../storm/security/auth/drpc_auth_test.clj | 315 +
.../storm/security/auth/nimbus_auth_test.clj | 181 +
.../test/clj/backtype/storm/submitter_test.clj | 75 +
.../test/clj/backtype/storm/supervisor_test.clj | 180 +-
.../test/clj/backtype/storm/testing4j_test.clj | 32 +
.../clj/backtype/storm/transactional_test.clj | 27 +-
.../utils/ZookeeperServerCnxnFactory_test.clj | 35 +
.../test/clj/backtype/storm/utils_test.clj | 58 +-
.../test/clj/storm/trident/state_test.clj | 25 +-
.../storm/utils/DisruptorQueueTest.java | 25 +-
storm-dist/binary/LICENSE | 15 +-
storm-dist/binary/pom.xml | 2 +-
storm-dist/binary/src/main/assembly/binary.xml | 4 +
storm-dist/source/pom.xml | 2 +-
435 files changed, 39558 insertions(+), 1718 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ffba148c/bin/storm
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ffba148c/bin/storm.cmd
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ffba148c/storm-core/pom.xml
----------------------------------------------------------------------
diff --cc storm-core/pom.xml
index 514f39d,7b4cd75..d6a39b6
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@@ -362,29 -464,203 +464,227 @@@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>Version Calculation</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>${basedir}/src/saveVersion.sh</argument>
+ <argument>${project.version}</argument>
+ <argument>${basedir}/src/jvm</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
++ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <!-- avoid warning about recursion -->
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>coverage</id>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources><!-- Allows JaCoCo to find the clojure source code -->
+ <source>src/clj</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>pre-test-jacoco-clean</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <delete file="target\jacoco.exec" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.6.1.201212231917</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <append>true</append>
+ <excludes>
+ <exclude>backtype/storm/metric/api/IMetricsConsumer$DataPointFieldAccess</exclude>
+ <exclude>backtype/storm/metric/api/IMetricsConsumer$TaskInfoFieldAccess</exclude>
+ <exclude>backtype/storm/testing/TestSerObjectFieldAccess</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>backtype/storm/generated/*</exclude> <!--Thrift generated code-->
+ </excludes>
+ <includes>
+ <include>backtype/*/*/*/*</include>
+ <include>backtype/*/*/*</include>
+ <include>backtype/*/*</include>
+ <include>backtype/*</include>
+ <include>zilch/*</include>
+ <include>storm/*/*/*/*</include>
+ <include>storm/*/*/*</include>
+ <include>storm/*/*</include>
+ <include>storm/*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>native</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals><goal>exec</goal></goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>-c</argument>
+ <argument>mkdir -p ${project.build.directory}/; cp -rufv ${basedir}/src/native/ ${project.build.directory}/</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>make-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>autoreconf</goal>
+ <goal>configure</goal>
+ <goal>make-install</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- autoreconf settings -->
+ <workDir>${project.build.directory}/native/worker-launcher</workDir>
+ <arguments>
+ <argument>-i</argument>
+ </arguments>
+
+ <!-- configure settings -->
+ <configureEnvironment>
+ <property>
+ <name>CFLAGS</name>
+ <value>-DEXEC_CONF_DIR=${worker-launcher.conf.dir} ${worker-launcher.additional_cflags}</value>
+ </property>
+ </configureEnvironment>
+ <configureWorkDir>${project.build.directory}/native/worker-launcher</configureWorkDir>
+ <prefix>/usr/local</prefix>
+
+ <!-- configure & make settings -->
+ <destDir>${project.build.directory}/native/target</destDir>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/storm/blob/ffba148c/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ffba148c/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
[25/25] storm git commit: Added STORM-243 to changelog and added
Apache Header to pom.xml
Posted by bo...@apache.org.
Added STORM-243 to changelog and added Apache Header to pom.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/01e75ec9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/01e75ec9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/01e75ec9
Branch: refs/heads/master
Commit: 01e75ec9e4e0429640e9fd9b8aad7aa7091d433b
Parents: 45f20be
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jan 22 11:38:02 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jan 22 11:38:02 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-buildtools/storm-maven-plugins/pom.xml | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/01e75ec9/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e0c26..975948a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
* STORM-620: Duplicate maven plugin declaration
* STORM-599: Use nimbus's cached heartbeats rather than fetching again from ZK
* STORM-559: ZkHosts in README should use 2181 as port.
+ * STORM-243: Record version and revision information in builds
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
http://git-wip-us.apache.org/repos/asf/storm/blob/01e75ec9/storm-buildtools/storm-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml
index 9b932d9..5579d03 100644
--- a/storm-buildtools/storm-maven-plugins/pom.xml
+++ b/storm-buildtools/storm-maven-plugins/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
[07/25] storm git commit: Merge pull request #3 from apache/master
Posted by bo...@apache.org.
Merge pull request #3 from apache/master
Merge from apache/storm master to caofangkun/apache-storm master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0b9bc2e0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0b9bc2e0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0b9bc2e0
Branch: refs/heads/master
Commit: 0b9bc2e0df417bf3faa4ff5be9f1c0a565cab9ca
Parents: 97ae36e e71e2a3
Author: caofangkun <ca...@gmail.com>
Authored: Thu Jan 8 16:20:10 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Jan 8 16:20:10 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 14 +
DEVELOPER.md | 5 +-
README.markdown | 18 +-
SECURITY.md | 25 +-
bin/storm | 59 ++--
conf/defaults.yaml | 1 +
docs/about/integrates.md | 2 +-
docs/about/multi-language.md | 6 +-
docs/about/simple-api.md | 2 +-
.../Acking-framework-implementation.md | 8 +-
docs/documentation/Clojure-DSL.md | 6 +-
docs/documentation/Common-patterns.md | 2 +-
docs/documentation/Configuration.md | 4 +-
.../Creating-a-new-Storm-project.md | 6 +-
.../DSLs-and-multilang-adapters.md | 3 +-
...Defining-a-non-jvm-language-dsl-for-storm.md | 2 +-
docs/documentation/Distributed-RPC.md | 2 +-
docs/documentation/FAQ.md | 4 +-
docs/documentation/Kestrel-and-Storm.md | 2 +-
docs/documentation/Lifecycle-of-a-topology.md | 70 ++---
docs/documentation/Maven.md | 50 +---
docs/documentation/Multilang-protocol.md | 30 +-
.../Serialization-(prior-to-0.6.0).md | 2 +-
.../documentation/Setting-up-a-Storm-cluster.md | 4 +-
.../Setting-up-development-environment.md | 2 +-
docs/documentation/Structure-of-the-codebase.md | 88 +++---
docs/documentation/Transactional-topologies.md | 12 +-
docs/documentation/Trident-API-Overview.md | 4 +-
docs/documentation/Trident-spouts.md | 8 +-
docs/documentation/Trident-state.md | 12 +-
docs/documentation/Tutorial.md | 4 +-
docs/downloads.html | 2 +-
external/storm-hbase/README.md | 49 +++-
external/storm-hbase/pom.xml | 17 +-
.../storm/hbase/bolt/AbstractHBaseBolt.java | 9 +-
.../apache/storm/hbase/security/AutoHBase.java | 243 ++++++++++++++++
.../storm/hbase/security/HBaseSecurityUtil.java | 32 ++-
.../storm/hbase/trident/state/HBaseState.java | 9 +-
external/storm-hdfs/README.md | 45 +++
.../storm/hdfs/bolt/format/SequenceFormat.java | 5 +-
.../storm/hdfs/common/security/AutoHDFS.java | 281 +++++++++++++++++++
.../hdfs/common/security/HdfsSecurityUtil.java | 30 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 12 +-
.../src/jvm/storm/kafka/PartitionManager.java | 6 +-
.../kafka/TopicOffsetOutOfRangeException.java | 25 ++
.../jvm/storm/kafka/UpdateOffsetException.java | 22 --
.../FieldNameBasedTupleToKafkaMapper.java | 2 +-
.../kafka/trident/TridentKafkaEmitter.java | 43 ++-
.../src/test/storm/kafka/KafkaUtilsTest.java | 2 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 36 ++-
.../src/clj/backtype/storm/daemon/nimbus.clj | 7 +-
.../clj/backtype/storm/daemon/supervisor.clj | 22 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 1 +
storm-core/src/jvm/backtype/storm/Config.java | 34 +--
.../storm/security/auth/hadoop/AutoHDFS.java | 262 -----------------
.../jvm/backtype/storm/utils/ShellProcess.java | 11 +-
.../src/native/worker-launcher/configure.ac | 2 +-
.../worker-launcher/impl/worker-launcher.c | 7 +-
.../test/clj/backtype/storm/logviewer_test.clj | 47 +++-
.../backtype/storm/security/auth/auth_test.clj | 8 +-
.../test/clj/backtype/storm/supervisor_test.clj | 6 +-
61 files changed, 1107 insertions(+), 627 deletions(-)
----------------------------------------------------------------------
[16/25] storm git commit: STORM-243:delete package-info.java path
from .gitignore file
Posted by bo...@apache.org.
STORM-243:delete package-info.java path from .gitignore file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/77d96f11
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/77d96f11
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/77d96f11
Branch: refs/heads/master
Commit: 77d96f116e62957c1c5b3b33776de5292bcd5e36
Parents: ec2db75
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 15:07:51 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 15:07:51 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/77d96f11/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ffdd9f4..ef159e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,3 @@ target
!/.gitignore
_site
storm-core/dependency-reduced-pom.xml
-storm-core/src/jvm/backtype/storm/package-info.java
[06/25] storm git commit: STORM-243:Record version and revision
information in builds
Posted by bo...@apache.org.
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/7c665c77
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c665c77
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c665c77
Branch: refs/heads/master
Commit: 7c665c77b948f129b4b44d677aa7b5a697a02836
Parents: ffba148
Author: caofangkun <ca...@gmail.com>
Authored: Thu Jan 8 10:56:17 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Jan 8 10:56:17 2015 +0800
----------------------------------------------------------------------
bin/storm | 7 -
storm-core/dependency-reduced-pom.xml | 743 +++++++++++++++++++
storm-core/src/clj/backtype/storm/ui/core.clj | 7 +-
.../src/jvm/backtype/storm/package-info.java | 7 +
.../jvm/backtype/storm/utils/VersionInfo.java | 1 +
storm-core/src/saveVersion.sh | 8 +-
6 files changed, 757 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 5c7b4e3..38161a0 100755
--- a/bin/storm
+++ b/bin/storm
@@ -83,13 +83,6 @@ def get_config_opts():
global CONFIG_OPTS
return "-Dstorm.options=" + ','.join(map(quote_plus,CONFIG_OPTS))
-if not os.path.exists(STORM_DIR + "/RELEASE"):
- print("******************************************")
- print("The storm client can only be run from within a release. You appear to be trying to run the client from a checkout of Storm's source code.")
- print("\nYou can download a Storm release at http://storm-project.net/downloads.html")
- print("******************************************")
- sys.exit(1)
-
def get_jars_full(adir):
files = os.listdir(adir)
ret = []
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/storm-core/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/dependency-reduced-pom.xml b/storm-core/dependency-reduced-pom.xml
new file mode 100644
index 0000000..95e5542
--- /dev/null
+++ b/storm-core/dependency-reduced-pom.xml
@@ -0,0 +1,743 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>storm</artifactId>
+ <groupId>org.apache.storm</groupId>
+ <version>0.10.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.storm</groupId>
+ <artifactId>storm-core</artifactId>
+ <name>Storm Core</name>
+ <description>Storm Core Java API and Clojure implementation.</description>
+ <build>
+ <sourceDirectory>src/jvm</sourceDirectory>
+ <testSourceDirectory>test/jvm</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>../conf</directory>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>../</directory>
+ <includes>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/dev</directory>
+ </testResource>
+ <testResource>
+ <directory>test/resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>clojure-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>compile-clojure</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-clojure</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test-with-junit</goal>
+ </goals>
+ <configuration>
+ <vmargs>${argLine} ${test.extra.args}</vmargs>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectories>
+ <sourceDirectory>src/clj</sourceDirectory>
+ </sourceDirectories>
+ <testSourceDirectories>
+ <testSourceDirectory>test/clj</testSourceDirectory>
+ </testSourceDirectories>
+ <warnOnReflection>false</warnOnReflection>
+ <copyDeclaredNamespaceOnly>true</copyDeclaredNamespaceOnly>
+ <copiedNamespaces>
+ <copiedNamespace>none</copiedNamespace>
+ </copiedNamespaces>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectories>
+ <file>${project.build.directory}/test-reports</file>
+ </reportsDirectories>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.storm</groupId>
+ <artifactId>maven-shade-clojure-transformer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ <minimizeJar>false</minimizeJar>
+ <artifactSet>
+ <includes>
+ <include>org.apache.thrift:*</include>
+ <include>io.netty:netty</include>
+ <include>com.google.guava:guava</include>
+ <include>org.apache.httpcomponents:http*</include>
+ <include>org.apache.zookeeper:zookeeper</include>
+ <include>org.apache.curator:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.thrift</pattern>
+ <shadedPattern>org.apache.thrift7</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.jboss.netty</pattern>
+ <shadedPattern>org.apache.storm.netty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.common</pattern>
+ <shadedPattern>org.apache.storm.guava</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.thirdparty</pattern>
+ <shadedPattern>org.apache.storm.guava.thirdparty</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.http</pattern>
+ <shadedPattern>org.apache.storm.http</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.zookeeper</pattern>
+ <shadedPattern>org.apache.storm.zookeeper</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.curator</pattern>
+ <shadedPattern>org.apache.storm.curator</shadedPattern>
+ </relocation>
+ </relocations>
+ <transformers>
+ <transformer />
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>org.apache.thrift:*</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>io.netty:netty</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>commons-httpclient:commons-httpclient</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/README.txt</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.apache.zookeeper:zookeeper</artifact>
+ <excludes>
+ <exclude>LICENSE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>Version Calculation</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>${basedir}/src/saveVersion.sh</argument>
+ <argument>${project.version}</argument>
+ <argument>${basedir}/src/jvm</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>false</inherited>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>coverage</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/clj</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>pre-test-jacoco-clean</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.6.1.201212231917</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <append>true</append>
+ <excludes>
+ <exclude>backtype/storm/metric/api/IMetricsConsumer$DataPointFieldAccess</exclude>
+ <exclude>backtype/storm/metric/api/IMetricsConsumer$TaskInfoFieldAccess</exclude>
+ <exclude>backtype/storm/testing/TestSerObjectFieldAccess</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>backtype/storm/generated/*</exclude>
+ </excludes>
+ <includes>
+ <include>backtype/*/*/*/*</include>
+ <include>backtype/*/*/*</include>
+ <include>backtype/*/*</include>
+ <include>backtype/*</include>
+ <include>zilch/*</include>
+ <include>storm/*/*/*/*</include>
+ <include>storm/*/*/*</include>
+ <include>storm/*/*</include>
+ <include>storm/*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>native</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>-c</argument>
+ <argument>mkdir -p ${project.build.directory}/; cp -rufv ${basedir}/src/native/ ${project.build.directory}/</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>make-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>autoreconf</goal>
+ <goal>configure</goal>
+ <goal>make-install</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <workDir>${project.build.directory}/native/worker-launcher</workDir>
+ <arguments>
+ <argument>-i</argument>
+ </arguments>
+ <configureEnvironment>
+ <property>
+ <name>CFLAGS</name>
+ <value>-DEXEC_CONF_DIR=${worker-launcher.conf.dir} ${worker-launcher.additional_cflags}</value>
+ </property>
+ </configureEnvironment>
+ <configureWorkDir>${project.build.directory}/native/worker-launcher</configureWorkDir>
+ <prefix>/usr/local</prefix>
+ <destDir>${project.build.directory}/native/target</destDir>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>clojure</artifactId>
+ <version>1.5.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>clj-time</groupId>
+ <artifactId>clj-time</artifactId>
+ <version>0.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>compojure</groupId>
+ <artifactId>compojure</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>core.incubator</artifactId>
+ <version>0.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>tools.macro</artifactId>
+ <version>0.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>clout</groupId>
+ <artifactId>clout</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ring</groupId>
+ <artifactId>ring-core</artifactId>
+ <version>1.1.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>hiccup</groupId>
+ <artifactId>hiccup</artifactId>
+ <version>0.3.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ring</groupId>
+ <artifactId>ring-devel</artifactId>
+ <version>1.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>clj-stacktrace</groupId>
+ <artifactId>clj-stacktrace</artifactId>
+ <version>0.2.7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ns-tracker</groupId>
+ <artifactId>ns-tracker</artifactId>
+ <version>0.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>tools.namespace</artifactId>
+ <version>0.2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>java.classpath</artifactId>
+ <version>0.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ring</groupId>
+ <artifactId>ring-jetty-adapter</artifactId>
+ <version>1.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ring</groupId>
+ <artifactId>ring-servlet</artifactId>
+ <version>1.3.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>2.5.0.v201103041518</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ring</groupId>
+ <artifactId>ring-anti-forgery</artifactId>
+ <version>1.0.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>crypto-random</groupId>
+ <artifactId>crypto-random</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>crypto-equality</groupId>
+ <artifactId>crypto-equality</artifactId>
+ <version>1.0.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>7.6.13.v20130916</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>tools.logging</artifactId>
+ <version>0.2.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>math.numeric-tower</artifactId>
+ <version>0.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>tools.cli</artifactId>
+ <version>0.2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-exec</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>carbonite</artifactId>
+ <version>1.4.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware.kryo</groupId>
+ <artifactId>kryo</artifactId>
+ <version>2.21</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware.reflectasm</groupId>
+ <artifactId>reflectasm</artifactId>
+ <version>1.07</version>
+ <classifier>shaded</classifier>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>4.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware.minlog</groupId>
+ <artifactId>minlog</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-java</artifactId>
+ <version>0.3.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.11</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.disruptor</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>2.10.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jgrapht</groupId>
+ <artifactId>jgrapht-core</artifactId>
+ <version>0.9.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.13</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.0.13</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.6.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>2.4.0</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>2.11</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <worker-launcher.conf.dir>/etc/storm</worker-launcher.conf.dir>
+ </properties>
+</project>
+
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 86bd711..dc80e71 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -33,6 +33,7 @@
(:import [backtype.storm.security.auth AuthUtils ReqContext])
(:import [backtype.storm.generated AuthorizationException])
(:import [backtype.storm.security.auth AuthUtils])
+ (:import [backtype.storm.utils VersionInfo])
(:import [java.io File])
(:require [compojure.route :as route]
[compojure.handler :as handler]
@@ -72,10 +73,6 @@
(map #(.get_stats ^ExecutorSummary %))
(filter not-nil?)))
-(def read-storm-version
- "Returns a string containing the Storm version or 'Unknown'."
- (str VersionInfo/getVersion))
-
(defn component-type
"Returns the component type (either :bolt or :spout) for a given
topology and component id. Returns nil if not found."
@@ -504,7 +501,7 @@
(map #(.get_num_executors ^TopologySummary %))
(reduce +))]
{"user" user
- "stormVersion" (read-storm-version)
+ "stormVersion" (str (VersionInfo/getVersion))
"nimbusUptime" (pretty-uptime-sec (.get_nimbus_uptime_secs summ))
"supervisors" (count sups)
"slotsTotal" total-slots
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/storm-core/src/jvm/backtype/storm/package-info.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/package-info.java b/storm-core/src/jvm/backtype/storm/package-info.java
new file mode 100644
index 0000000..675c920
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/package-info.java
@@ -0,0 +1,7 @@
+/*
+ * Generated by saveVersion.sh
+ */
+@VersionAnnotation(version="0.10.0-SNAPSHOT", revision="ffba148cc47a92185fa1a5db11f72982de10f106", branch="storm-243",
+ user="caokun", date="Thu Jan 8 10:47:48 CST 2015", url="https://github.com/caofangkun/apache-storm.git ",
+ srcChecksum="97e7c942939e3e82dcb854b497991a51")
+package backtype.storm.utils;
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
index d19a5d1..8a731de 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -50,6 +50,7 @@ public class VersionInfo {
public static void main(String[] args) {
System.out.println("Storm " + getVersion());
System.out.println("Subversion " + getUrl() + " -r " + getRevision());
+ System.out.println("Branch " + getBranch());
System.out.println("Compiled by " + getUser() + " on " + getDate());
System.out.println("From source with checksum " + getSrcChecksum());
}
http://git-wip-us.apache.org/repos/asf/storm/blob/7c665c77/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
index 6475418..f9da090 100755
--- a/storm-core/src/saveVersion.sh
+++ b/storm-core/src/saveVersion.sh
@@ -1,4 +1,4 @@
-s file is used to generate the package-info.java class that
+#this file is used to generate the package-info.java class that
# records the version, revision, branch, user, timestamp, and url
unset LANG
unset LC_CTYPE
@@ -8,14 +8,14 @@ build_dir=$2
user=`whoami`
date=`date`
cwd=`pwd`
-if [ -d .git ]; then
+if [ -d ../.git ]; then
revision=`git log -1 --pretty=format:"%H"`
hostname=`hostname`
branch=`git branch | sed -n -e 's/^* //p'`
- url="git://${hostname}${cwd}"
+ url=`git remote -v | sed -n -e 's/^origin\t\(.*\)(fetch)/\1/p'`
elif [ -d .svn ]; then
revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
- url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
+ url=`svn info | sed -n -e 's/^URL: \(.*\)/\1/p'`
# Get canonical branch (branches/X, tags/X, or trunk)
branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
-e 's,.*\(tags/.*\)$,\1,p' \
[03/25] storm git commit: STORM-243,
Record version and revision information in builds
Posted by bo...@apache.org.
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/fd03e16f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd03e16f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd03e16f
Branch: refs/heads/master
Commit: fd03e16f1a11bafb352dbda74f4b179ddf569bef
Parents: fa38335
Author: caofangkun <ca...@gmail.com>
Authored: Thu Oct 16 09:57:48 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Thu Oct 16 09:57:48 2014 +0800
----------------------------------------------------------------------
bin/storm | 10 ++--
storm-core/pom.xml | 23 ++++++++
storm-core/src/clj/backtype/storm/ui/core.clj | 10 +---
.../backtype/storm/utils/VersionAnnotation.java | 20 +++++++
.../jvm/backtype/storm/utils/VersionInfo.java | 57 ++++++++++++++++++++
storm-core/src/saveVersion.sh | 42 +++++++++++++++
storm-dist/binary/src/main/assembly/binary.xml | 7 ---
7 files changed, 149 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index fee548a..5eadb89 100755
--- a/bin/storm
+++ b/bin/storm
@@ -415,11 +415,11 @@ def version():
Prints the version number of this Storm release.
"""
- releasefile = STORM_DIR + "/RELEASE"
- if os.path.exists(releasefile):
- print(open(releasefile).readline().strip())
- else:
- print("Unknown")
+ cppaths = [CLUSTER_CONF_DIR]
+ exec_storm_class(
+ "backtype.storm.utils.VersionInfo",
+ jvmtype=" ",
+ extrajars=[CLUSTER_CONF_DIR])
def print_classpath():
"""Syntax: [storm classpath]
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d2938e3..514f39d 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -361,6 +361,29 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>Version Calculation</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>sh</executable>
+ <arguments>
+ <argument>${basedir}/src/saveVersion.sh</argument>
+ <argument>${project.version}</argument>
+ <argument>${basedir}/src/jvm</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 969b514..8c2541f 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -52,15 +52,9 @@
(map #(.get_stats ^ExecutorSummary %))
(filter not-nil?)))
-(defn read-storm-version
+(def read-storm-version
"Returns a string containing the Storm version or 'Unknown'."
- []
- (let [storm-home (System/getProperty "storm.home")
- release-path (format "%s/RELEASE" storm-home)
- release-file (File. release-path)]
- (if (and (.exists release-file) (.isFile release-file))
- (trim (slurp release-path))
- "Unknown")))
+ (str VersionInfo/getVersion))
(defn component-type
"Returns the component type (either :bolt or :spout) for a given
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java b/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
new file mode 100644
index 0000000..684e8ae
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
@@ -0,0 +1,20 @@
+package backtype.storm.utils;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PACKAGE)
+public @interface VersionAnnotation {
+ String version();
+
+ String user();
+
+ String date();
+
+ String url();
+
+ String revision();
+
+ String branch();
+
+ String srcChecksum();
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
new file mode 100644
index 0000000..d19a5d1
--- /dev/null
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -0,0 +1,57 @@
+package backtype.storm.utils;
+
+public class VersionInfo {
+ private static Package myPackage;
+ private static VersionAnnotation version;
+
+ static {
+ myPackage = VersionAnnotation.class.getPackage();
+ version = myPackage.getAnnotation(VersionAnnotation.class);
+ }
+
+ static Package getPackage() {
+ return myPackage;
+ }
+
+ public static String getVersion() {
+ return version != null ? version.version() : "Unknown";
+ }
+
+ public static String getRevision() {
+ return version != null ? version.revision() : "Unknown";
+ }
+
+ public static String getBranch() {
+ return version != null ? version.branch() : "Unknown";
+ }
+
+ public static String getDate() {
+ return version != null ? version.date() : "Unknown";
+ }
+
+ public static String getUser() {
+ return version != null ? version.user() : "Unknown";
+ }
+
+ public static String getUrl() {
+ return version != null ? version.url() : "Unknown";
+ }
+
+ public static String getSrcChecksum() {
+ return version != null ? version.srcChecksum() : "Unknown";
+ }
+
+ public static String getBuildVersion() {
+ return VersionInfo.getVersion() + " from " + VersionInfo.getRevision()
+ + " by " + VersionInfo.getUser() + " source checksum "
+ + VersionInfo.getSrcChecksum();
+ }
+
+ public static void main(String[] args) {
+ System.out.println("Storm " + getVersion());
+ System.out.println("Subversion " + getUrl() + " -r " + getRevision());
+ System.out.println("Compiled by " + getUser() + " on " + getDate());
+ System.out.println("From source with checksum " + getSrcChecksum());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
new file mode 100755
index 0000000..6475418
--- /dev/null
+++ b/storm-core/src/saveVersion.sh
@@ -0,0 +1,42 @@
+s file is used to generate the package-info.java class that
+# records the version, revision, branch, user, timestamp, and url
+unset LANG
+unset LC_CTYPE
+unset LC_TIME
+version=$1
+build_dir=$2
+user=`whoami`
+date=`date`
+cwd=`pwd`
+if [ -d .git ]; then
+ revision=`git log -1 --pretty=format:"%H"`
+ hostname=`hostname`
+ branch=`git branch | sed -n -e 's/^* //p'`
+ url="git://${hostname}${cwd}"
+elif [ -d .svn ]; then
+ revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
+ url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
+ # Get canonical branch (branches/X, tags/X, or trunk)
+ branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
+ -e 's,.*\(tags/.*\)$,\1,p' \
+ -e 's,.*trunk$,trunk,p'`
+else
+ revision="Unknown"
+ branch="Unknown"
+ url="file://$cwd"
+fi
+srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
+
+mkdir -p $build_dir/backtype/storm/utils
+cat << EOF | \
+ sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
+ -e "s|URL|$url|" -e "s/REV/$revision/" \
+ -e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
+ > $build_dir/backtype/storm/package-info.java
+/*
+ * Generated by saveVersion.sh
+ */
+@VersionAnnotation(version="VERSION", revision="REV", branch="BRANCH",
+ user="USER", date="DATE", url="URL",
+ srcChecksum="SRCCHECKSUM")
+package backtype.storm.utils;
http://git-wip-us.apache.org/repos/asf/storm/blob/fd03e16f/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index fdaee1d..bf87c50 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -131,13 +131,6 @@
</file>
<!-- TODO this should be a generated file from "target" -->
<file>
- <source>${project.basedir}/../../VERSION</source>
- <outputDirectory>/</outputDirectory>
- <destName>RELEASE</destName>
- <filtered>true</filtered>
- </file>
-
- <file>
<source>${project.basedir}/../../logback/cluster.xml</source>
<outputDirectory>/logback</outputDirectory>
</file>
[21/25] storm git commit: STORM-243:add module
storm-buildtools/storm-maven-plugins to generate version info
Posted by bo...@apache.org.
STORM-243:add module storm-buildtools/storm-maven-plugins to generate version info
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2cef782f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2cef782f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2cef782f
Branch: refs/heads/master
Commit: 2cef782f0d523ebb6db92f1f4e0c6a4625f69c06
Parents: 72d621c
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 12:44:21 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 12:44:21 2015 +0800
----------------------------------------------------------------------
pom.xml.rej | 24 -------------
.../src/test/java/org/apache/storm/AppTest.java | 38 --------------------
2 files changed, 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2cef782f/pom.xml.rej
----------------------------------------------------------------------
diff --git a/pom.xml.rej b/pom.xml.rej
deleted file mode 100644
index e5ba6ec..0000000
--- a/pom.xml.rej
+++ /dev/null
@@ -1,24 +0,0 @@
---- pom.xml
-+++ pom.xml
-@@ -305,6 +305,21 @@
- <include>NOTICE</include>
- </includes>
- </resource>
-+ <resource>
-+ <directory>${basedir}/src/main/resources</directory>
-+ <excludes>
-+ <exclude>common-version-info.properties</exclude>
-+ </excludes>
-+ <filtering>false</filtering>
-+ </resource>
-+ <resource>
-+ <directory>${basedir}/src/main/resources</directory>
-+ <includes>
-+ <include>common-version-info.properties</include>
-+ </includes>
-+ <filtering>true</filtering>
-+ </resource>
-+
-
- </resources>
- <testResources>
http://git-wip-us.apache.org/repos/asf/storm/blob/2cef782f/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java b/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
deleted file mode 100644
index 56ecd53..0000000
--- a/storm-buildtools/storm-maven-plugins/src/test/java/org/apache/storm/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.storm;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
[17/25] storm git commit: STORM-243: modify saveVersion.sh use 'git
rev-parse HEAD' command to ger revision id & remove unused variable
'hostname'
Posted by bo...@apache.org.
STORM-243: modify saveVersion.sh use 'git rev-parse HEAD' command to ger revision id & remove unused variable 'hostname'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8afdbbd4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8afdbbd4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8afdbbd4
Branch: refs/heads/master
Commit: 8afdbbd43ff95697ae4f8aea366e68dd097ee114
Parents: 77d96f1
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 10:00:50 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 10:00:50 2015 +0800
----------------------------------------------------------------------
storm-core/src/saveVersion.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8afdbbd4/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
index 97ade81..f9720fa 100755
--- a/storm-core/src/saveVersion.sh
+++ b/storm-core/src/saveVersion.sh
@@ -10,11 +10,10 @@ date=`date`
cwd=`pwd`
if [ -d ../.git ]; then
revision=`git log -1 --pretty=format:"%H"`
- hostname=`hostname`
branch=`git branch | sed -n -e 's/^* //p'`
url=`git remote -v | sed -n -e 's/^origin[[:space:]]\(.*\)(fetch)/\1/p'`
elif [ -d .svn ]; then
- revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
+ revision=`git rev-parse HEAD`
url=`svn info | sed -n -e 's/^URL: \(.*\)/\1/p'`
# Get canonical branch (branches/X, tags/X, or trunk)
branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
[18/25] storm git commit: STORM-243: modify saveVersion.sh use 'git
rev-parse HEAD' command to ger revision id & remove unused variable
'hostname'
Posted by bo...@apache.org.
STORM-243: modify saveVersion.sh use 'git rev-parse HEAD' command to ger revision id & remove unused variable 'hostname'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/802272ab
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/802272ab
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/802272ab
Branch: refs/heads/master
Commit: 802272ab1455763d649fdba647f167a3c8c87abd
Parents: 8afdbbd
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 10:03:49 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 10:03:49 2015 +0800
----------------------------------------------------------------------
storm-core/src/saveVersion.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/802272ab/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
index f9720fa..4ef6da0 100755
--- a/storm-core/src/saveVersion.sh
+++ b/storm-core/src/saveVersion.sh
@@ -9,11 +9,11 @@ user=`whoami`
date=`date`
cwd=`pwd`
if [ -d ../.git ]; then
- revision=`git log -1 --pretty=format:"%H"`
+ revision=`git rev-parse HEAD`
branch=`git branch | sed -n -e 's/^* //p'`
url=`git remote -v | sed -n -e 's/^origin[[:space:]]\(.*\)(fetch)/\1/p'`
elif [ -d .svn ]; then
- revision=`git rev-parse HEAD`
+ revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
url=`svn info | sed -n -e 's/^URL: \(.*\)/\1/p'`
# Get canonical branch (branches/X, tags/X, or trunk)
branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
[10/25] storm git commit: STORM-243:remove file
storm-core/dependency-reduced-pom.xml
Posted by bo...@apache.org.
STORM-243:remove file storm-core/dependency-reduced-pom.xml
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/77841313
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/77841313
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/77841313
Branch: refs/heads/master
Commit: 77841313937ffa630e30ae811d671bea24600035
Parents: 6356296
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 09:51:40 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 09:51:40 2015 +0800
----------------------------------------------------------------------
storm-core/dependency-reduced-pom.xml | 743 -----------------------------
1 file changed, 743 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/77841313/storm-core/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/dependency-reduced-pom.xml b/storm-core/dependency-reduced-pom.xml
deleted file mode 100644
index 95e5542..0000000
--- a/storm-core/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,743 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>storm</artifactId>
- <groupId>org.apache.storm</groupId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <name>Storm Core</name>
- <description>Storm Core Java API and Clojure implementation.</description>
- <build>
- <sourceDirectory>src/jvm</sourceDirectory>
- <testSourceDirectory>test/jvm</testSourceDirectory>
- <resources>
- <resource>
- <directory>../conf</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>../</directory>
- <includes>
- <include>NOTICE</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/dev</directory>
- </testResource>
- <testResource>
- <directory>test/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>com.theoryinpractise</groupId>
- <artifactId>clojure-maven-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>compile-clojure</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-clojure</id>
- <phase>test</phase>
- <goals>
- <goal>test-with-junit</goal>
- </goals>
- <configuration>
- <vmargs>${argLine} ${test.extra.args}</vmargs>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <sourceDirectories>
- <sourceDirectory>src/clj</sourceDirectory>
- </sourceDirectories>
- <testSourceDirectories>
- <testSourceDirectory>test/clj</testSourceDirectory>
- </testSourceDirectories>
- <warnOnReflection>false</warnOnReflection>
- <copyDeclaredNamespaceOnly>true</copyDeclaredNamespaceOnly>
- <copiedNamespaces>
- <copiedNamespace>none</copiedNamespace>
- </copiedNamespaces>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectories>
- <file>${project.build.directory}/test-reports</file>
- </reportsDirectories>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>maven-shade-clojure-transformer</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- <minimizeJar>false</minimizeJar>
- <artifactSet>
- <includes>
- <include>org.apache.thrift:*</include>
- <include>io.netty:netty</include>
- <include>com.google.guava:guava</include>
- <include>org.apache.httpcomponents:http*</include>
- <include>org.apache.zookeeper:zookeeper</include>
- <include>org.apache.curator:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.thrift</pattern>
- <shadedPattern>org.apache.thrift7</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.jboss.netty</pattern>
- <shadedPattern>org.apache.storm.netty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.common</pattern>
- <shadedPattern>org.apache.storm.guava</shadedPattern>
- </relocation>
- <relocation>
- <pattern>com.google.thirdparty</pattern>
- <shadedPattern>org.apache.storm.guava.thirdparty</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.storm.http</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.zookeeper</pattern>
- <shadedPattern>org.apache.storm.zookeeper</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.curator</pattern>
- <shadedPattern>org.apache.storm.curator</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer />
- </transformers>
- <filters>
- <filter>
- <artifact>org.apache.thrift:*</artifact>
- <excludes>
- <exclude>META-INF/LICENSE.txt</exclude>
- <exclude>META-INF/NOTICE.txt</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>io.netty:netty</artifact>
- <excludes>
- <exclude>META-INF/LICENSE.txt</exclude>
- <exclude>META-INF/NOTICE.txt</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>commons-httpclient:commons-httpclient</artifact>
- <excludes>
- <exclude>META-INF/LICENSE.txt</exclude>
- <exclude>META-INF/NOTICE.txt</exclude>
- <exclude>META-INF/README.txt</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.apache.zookeeper:zookeeper</artifact>
- <excludes>
- <exclude>LICENSE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>Version Calculation</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>sh</executable>
- <arguments>
- <argument>${basedir}/src/saveVersion.sh</argument>
- <argument>${project.version}</argument>
- <argument>${basedir}/src/jvm</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- <inherited>false</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>false</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <includeScope>runtime</includeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/clj</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>pre-test-jacoco-clean</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.6.1.201212231917</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <append>true</append>
- <excludes>
- <exclude>backtype/storm/metric/api/IMetricsConsumer$DataPointFieldAccess</exclude>
- <exclude>backtype/storm/metric/api/IMetricsConsumer$TaskInfoFieldAccess</exclude>
- <exclude>backtype/storm/testing/TestSerObjectFieldAccess</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>backtype/storm/generated/*</exclude>
- </excludes>
- <includes>
- <include>backtype/*/*/*/*</include>
- <include>backtype/*/*/*</include>
- <include>backtype/*/*</include>
- <include>backtype/*</include>
- <include>zilch/*</include>
- <include>storm/*/*/*/*</include>
- <include>storm/*/*/*</include>
- <include>storm/*/*</include>
- <include>storm/*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>native</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>sh</executable>
- <arguments>
- <argument>-c</argument>
- <argument>mkdir -p ${project.build.directory}/; cp -rufv ${basedir}/src/native/ ${project.build.directory}/</argument>
- </arguments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>make-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>autoreconf</goal>
- <goal>configure</goal>
- <goal>make-install</goal>
- </goals>
- </execution>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <workDir>${project.build.directory}/native/worker-launcher</workDir>
- <arguments>
- <argument>-i</argument>
- </arguments>
- <configureEnvironment>
- <property>
- <name>CFLAGS</name>
- <value>-DEXEC_CONF_DIR=${worker-launcher.conf.dir} ${worker-launcher.additional_cflags}</value>
- </property>
- </configureEnvironment>
- <configureWorkDir>${project.build.directory}/native/worker-launcher</configureWorkDir>
- <prefix>/usr/local</prefix>
- <destDir>${project.build.directory}/native/target</destDir>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>1.5.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>clj-time</groupId>
- <artifactId>clj-time</artifactId>
- <version>0.8.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>compojure</groupId>
- <artifactId>compojure</artifactId>
- <version>1.1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>core.incubator</artifactId>
- <version>0.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>tools.macro</artifactId>
- <version>0.1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>clout</groupId>
- <artifactId>clout</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-core</artifactId>
- <version>1.1.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>hiccup</groupId>
- <artifactId>hiccup</artifactId>
- <version>0.3.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-devel</artifactId>
- <version>1.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>clj-stacktrace</groupId>
- <artifactId>clj-stacktrace</artifactId>
- <version>0.2.7</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ns-tracker</groupId>
- <artifactId>ns-tracker</artifactId>
- <version>0.2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>tools.namespace</artifactId>
- <version>0.2.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>java.classpath</artifactId>
- <version>0.2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-jetty-adapter</artifactId>
- <version>1.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-servlet</artifactId>
- <version>1.3.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>2.5.0.v201103041518</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ring</groupId>
- <artifactId>ring-anti-forgery</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>crypto-random</groupId>
- <artifactId>crypto-random</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>crypto-equality</groupId>
- <artifactId>crypto-equality</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>7.6.13.v20130916</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>tools.logging</artifactId>
- <version>0.2.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>math.numeric-tower</artifactId>
- <version>0.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>tools.cli</artifactId>
- <version>0.2.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.twitter</groupId>
- <artifactId>carbonite</artifactId>
- <version>1.4.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.esotericsoftware.kryo</groupId>
- <artifactId>kryo</artifactId>
- <version>2.21</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.esotericsoftware.reflectasm</groupId>
- <artifactId>reflectasm</artifactId>
- <version>1.07</version>
- <classifier>shaded</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>4.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.esotericsoftware.minlog</groupId>
- <artifactId>minlog</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.twitter</groupId>
- <artifactId>chill-java</artifactId>
- <version>0.3.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.11</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.googlecode.disruptor</groupId>
- <artifactId>disruptor</artifactId>
- <version>2.10.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jgrapht</groupId>
- <artifactId>jgrapht-core</artifactId>
- <version>0.9.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.13</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>1.0.13</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>1.6.6</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>2.4.0</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>2.11</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <properties>
- <worker-launcher.conf.dir>/etc/storm</worker-launcher.conf.dir>
- </properties>
-</project>
-
[22/25] storm git commit: STORM-243:rename file
core-version-info.properties to storm-core-version-info.properties
Posted by bo...@apache.org.
STORM-243:rename file core-version-info.properties to storm-core-version-info.properties
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14e12aa8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14e12aa8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14e12aa8
Branch: refs/heads/master
Commit: 14e12aa8d4d733510390afe55c779af2a527a9a3
Parents: 2cef782
Author: caofangkun <ca...@gmail.com>
Authored: Wed Jan 14 09:43:49 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Jan 14 09:43:49 2015 +0800
----------------------------------------------------------------------
storm-core/pom.xml | 4 ++--
.../jvm/backtype/storm/utils/VersionInfo.java | 2 +-
.../src/resources/core-version-info.properties | 24 --------------------
.../storm-core-version-info.properties | 24 ++++++++++++++++++++
4 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 75e24de..4e1d0d7 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -308,14 +308,14 @@
<resource>
<directory>${basedir}/src/resources</directory>
<excludes>
- <exclude>core-version-info.properties</exclude>
+ <exclude>storm-core-version-info.properties</exclude>
</excludes>
<filtering>false</filtering>
</resource>
<resource>
<directory>${basedir}/src/resources</directory>
<includes>
- <include>core-version-info.properties</include>
+ <include>storm-core-version-info.properties</include>
</includes>
<filtering>true</filtering>
</resource>
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
index d9b437c..1740e18 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -86,7 +86,7 @@ public class VersionInfo {
}
- private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("core");
+ private static VersionInfo COMMON_VERSION_INFO = new VersionInfo("storm-core");
public static String getVersion() {
return COMMON_VERSION_INFO._getVersion();
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/resources/core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/core-version-info.properties b/storm-core/src/resources/core-version-info.properties
deleted file mode 100644
index 7ae3130..0000000
--- a/storm-core/src/resources/core-version-info.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-version=${pom.version}
-revision=${version-info.scm.commit}
-branch=${version-info.scm.branch}
-user=${user.name}
-date=${version-info.build.time}
-url=${version-info.scm.uri}
-srcChecksum=${version-info.source.md5}
http://git-wip-us.apache.org/repos/asf/storm/blob/14e12aa8/storm-core/src/resources/storm-core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/storm-core-version-info.properties b/storm-core/src/resources/storm-core-version-info.properties
new file mode 100644
index 0000000..7ae3130
--- /dev/null
+++ b/storm-core/src/resources/storm-core-version-info.properties
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+version=${pom.version}
+revision=${version-info.scm.commit}
+branch=${version-info.scm.branch}
+user=${user.name}
+date=${version-info.build.time}
+url=${version-info.scm.uri}
+srcChecksum=${version-info.source.md5}
[13/25] storm git commit: STORM-243: use STORM_LIB_DIR instead of
STORM_DIR + "/lib/" and deleted unused variable STORM_RELEASE_DIR
Posted by bo...@apache.org.
STORM-243: use STORM_LIB_DIR instead of STORM_DIR + "/lib/" and deleted unused variable STORM_RELEASE_DIR
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/80c84bd6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/80c84bd6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/80c84bd6
Branch: refs/heads/master
Commit: 80c84bd681e92f03b67d829d75011420830b36a0
Parents: 09bcdd1
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 10:12:00 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 10:12:00 2015 +0800
----------------------------------------------------------------------
bin/storm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/80c84bd6/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 0d8f970..ff3b3dd 100755
--- a/bin/storm
+++ b/bin/storm
@@ -71,7 +71,6 @@ 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")
@@ -88,7 +87,7 @@ def get_config_opts():
global CONFIG_OPTS
return "-Dstorm.options=" + ','.join(map(quote_plus,CONFIG_OPTS))
-if not os.path.exists(STORM_DIR + "/lib/"):
+if not os.path.exists(STORM_LIB_DIR):
print("******************************************")
print("The storm client can only be run from within a release. You appear to be trying to run the client from a checkout of Storm's source code.")
print("\nYou can download a Storm release at http://storm-project.net/downloads.html")
[12/25] storm git commit: STORM-243: remove package-info.java and add
it to .gitignore file
Posted by bo...@apache.org.
STORM-243: remove package-info.java and add it to .gitignore file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/09bcdd1b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/09bcdd1b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/09bcdd1b
Branch: refs/heads/master
Commit: 09bcdd1bc6cca976a9901140a67cacdfc6a36a17
Parents: a3d5c4e
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 09:59:25 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 09:59:25 2015 +0800
----------------------------------------------------------------------
.gitignore | 3 ++-
storm-core/src/jvm/backtype/storm/package-info.java | 7 -------
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/09bcdd1b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 6d9fad7..ffdd9f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,5 @@ target
.*
!/.gitignore
_site
-/storm-core/dependency-reduced-pom.xml
+storm-core/dependency-reduced-pom.xml
+storm-core/src/jvm/backtype/storm/package-info.java
http://git-wip-us.apache.org/repos/asf/storm/blob/09bcdd1b/storm-core/src/jvm/backtype/storm/package-info.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/package-info.java b/storm-core/src/jvm/backtype/storm/package-info.java
deleted file mode 100644
index 675c920..0000000
--- a/storm-core/src/jvm/backtype/storm/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Generated by saveVersion.sh
- */
-@VersionAnnotation(version="0.10.0-SNAPSHOT", revision="ffba148cc47a92185fa1a5db11f72982de10f106", branch="storm-243",
- user="caokun", date="Thu Jan 8 10:47:48 CST 2015", url="https://github.com/caofangkun/apache-storm.git ",
- srcChecksum="97e7c942939e3e82dcb854b497991a51")
-package backtype.storm.utils;
[15/25] storm git commit: STORM-243:move package-info.java to
$\{project.build.directory\}/build folder
Posted by bo...@apache.org.
STORM-243:move package-info.java to $\{project.build.directory\}/build folder
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec2db751
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec2db751
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec2db751
Branch: refs/heads/master
Commit: ec2db7517b388f206ec8e269b1a1370ea95747d6
Parents: 00e6331
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 15:00:53 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 15:00:53 2015 +0800
----------------------------------------------------------------------
storm-core/pom.xml | 3 ++-
storm-core/src/saveVersion.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ec2db751/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d6a39b6..42111ee 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -480,7 +480,7 @@
<arguments>
<argument>${basedir}/src/saveVersion.sh</argument>
<argument>${project.version}</argument>
- <argument>${basedir}/src/jvm</argument>
+ <argument>${project.build.directory}/build</argument>
</arguments>
</configuration>
</execution>
@@ -543,6 +543,7 @@
<configuration>
<sources><!-- Allows JaCoCo to find the clojure source code -->
<source>src/clj</source>
+ <source>${project.build.directory}/build</source>
</sources>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/storm/blob/ec2db751/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
index 5818a4a..97ade81 100755
--- a/storm-core/src/saveVersion.sh
+++ b/storm-core/src/saveVersion.sh
@@ -25,7 +25,7 @@ else
branch="Unknown"
url="file://$cwd"
fi
-srcChecksum=`find src -name '*.java' | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
+srcChecksum=`find src -name '*.*' -type f | LC_ALL=C sort | xargs md5sum | md5sum | cut -d ' ' -f 1`
mkdir -p $build_dir/backtype/storm/utils
cat << EOF | \
[14/25] storm git commit: STORM-243:modify saveVersion.sh replace the
'\t' with '[[:space:]]'
Posted by bo...@apache.org.
STORM-243:modify saveVersion.sh replace the '\t' with '[[:space:]]'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00e63317
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00e63317
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00e63317
Branch: refs/heads/master
Commit: 00e633174914276cfbe724693b11852d8e7efcea
Parents: 80c84bd
Author: caofangkun <ca...@gmail.com>
Authored: Mon Jan 12 12:31:33 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Jan 12 12:31:33 2015 +0800
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/utils/VersionInfo.java | 2 +-
storm-core/src/saveVersion.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/00e63317/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
index 8a731de..e4e71ae 100644
--- a/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
+++ b/storm-core/src/jvm/backtype/storm/utils/VersionInfo.java
@@ -49,7 +49,7 @@ public class VersionInfo {
public static void main(String[] args) {
System.out.println("Storm " + getVersion());
- System.out.println("Subversion " + getUrl() + " -r " + getRevision());
+ System.out.println("URL " + getUrl() + " -r " + getRevision());
System.out.println("Branch " + getBranch());
System.out.println("Compiled by " + getUser() + " on " + getDate());
System.out.println("From source with checksum " + getSrcChecksum());
http://git-wip-us.apache.org/repos/asf/storm/blob/00e63317/storm-core/src/saveVersion.sh
----------------------------------------------------------------------
diff --git a/storm-core/src/saveVersion.sh b/storm-core/src/saveVersion.sh
index f9da090..5818a4a 100755
--- a/storm-core/src/saveVersion.sh
+++ b/storm-core/src/saveVersion.sh
@@ -12,7 +12,7 @@ if [ -d ../.git ]; then
revision=`git log -1 --pretty=format:"%H"`
hostname=`hostname`
branch=`git branch | sed -n -e 's/^* //p'`
- url=`git remote -v | sed -n -e 's/^origin\t\(.*\)(fetch)/\1/p'`
+ url=`git remote -v | sed -n -e 's/^origin[[:space:]]\(.*\)(fetch)/\1/p'`
elif [ -d .svn ]; then
revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
url=`svn info | sed -n -e 's/^URL: \(.*\)/\1/p'`
[24/25] storm git commit: Merge branch 'storm-243' of
https://github.com/caofangkun/apache-storm into STORM-243
Posted by bo...@apache.org.
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
----------------------------------------------------------------------
[20/25] storm git commit: STORM-243:add module
storm-buildtools/storm-maven-plugins to generate version info
Posted by bo...@apache.org.
STORM-243:add module storm-buildtools/storm-maven-plugins to generate version info
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/72d621ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/72d621ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/72d621ce
Branch: refs/heads/master
Commit: 72d621ce81c98a3598f180a1ebdf419e0ad7aa6e
Parents: 272749c
Author: caofangkun <ca...@gmail.com>
Authored: Tue Jan 13 12:43:40 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Jan 13 12:43:40 2015 +0800
----------------------------------------------------------------------
.../resources/common-version-info.properties | 26 --------------------
.../src/resources/core-version-info.properties | 1 -
2 files changed, 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/72d621ce/storm-core/src/resources/common-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/common-version-info.properties b/storm-core/src/resources/common-version-info.properties
deleted file mode 100644
index ad9a24d..0000000
--- a/storm-core/src/resources/common-version-info.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-version=${pom.version}
-revision=${version-info.scm.commit}
-branch=${version-info.scm.branch}
-user=${user.name}
-date=${version-info.build.time}
-url=${version-info.scm.uri}
-srcChecksum=${version-info.source.md5}
-protocVersion=${protobuf.version}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/72d621ce/storm-core/src/resources/core-version-info.properties
----------------------------------------------------------------------
diff --git a/storm-core/src/resources/core-version-info.properties b/storm-core/src/resources/core-version-info.properties
index 8b04e2d..7ae3130 100644
--- a/storm-core/src/resources/core-version-info.properties
+++ b/storm-core/src/resources/core-version-info.properties
@@ -22,4 +22,3 @@ user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-protocVersion=${protobuf.version}
[23/25] storm git commit: STORM-243:rm unused
backtype.storm.utils.VersionAnnotation.java
Posted by bo...@apache.org.
STORM-243:rm unused backtype.storm.utils.VersionAnnotation.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f4483fed
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f4483fed
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f4483fed
Branch: refs/heads/master
Commit: f4483fed4d654192033cdb0edaa6d8356c39ac36
Parents: 14e12aa
Author: caofangkun <ca...@gmail.com>
Authored: Wed Jan 14 09:48:22 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Jan 14 09:48:22 2015 +0800
----------------------------------------------------------------------
.../backtype/storm/utils/VersionAnnotation.java | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f4483fed/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java b/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
deleted file mode 100644
index 684e8ae..0000000
--- a/storm-core/src/jvm/backtype/storm/utils/VersionAnnotation.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package backtype.storm.utils;
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PACKAGE)
-public @interface VersionAnnotation {
- String version();
-
- String user();
-
- String date();
-
- String url();
-
- String revision();
-
- String branch();
-
- String srcChecksum();
-}