You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/11/24 20:42:21 UTC
[1/5] storm git commit: Update ObjectDef.java
Repository: storm
Updated Branches:
refs/heads/master 74cd04215 -> dc05a00e5
Update ObjectDef.java
update:let constructorArgs support map type.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a019d504
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a019d504
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a019d504
Branch: refs/heads/master
Commit: a019d504dff6492e4b5a18387b7281a918dca0e9
Parents: 0a5426e
Author: lispking <li...@qq.com>
Authored: Mon Sep 14 22:03:30 2015 +0800
Committer: lispking <li...@qq.com>
Committed: Mon Sep 14 22:03:30 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/flux/model/ObjectDef.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a019d504/external/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java b/external/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java
index 7386900..dc9e6cb 100644
--- a/external/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java
+++ b/external/flux/flux-core/src/main/java/org/apache/storm/flux/model/ObjectDef.java
@@ -56,6 +56,8 @@ public class ObjectDef {
if(map.containsKey("ref") && map.size() == 1){
newVal.add(new BeanReference((String)map.get("ref")));
this.hasReferences = true;
+ } else {
+ newVal.add(obj);
}
} else {
newVal.add(obj);
[3/5] storm git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/storm
Posted by pt...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd75ca72
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd75ca72
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd75ca72
Branch: refs/heads/master
Commit: fd75ca72016bfb8d20c996bb3d7514f8c2a20740
Parents: e03b28c 74cd042
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Nov 24 13:56:43 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Nov 24 13:56:43 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 10 +
LICENSE | 38 +-
bin/storm.py | 43 +-
conf/defaults.yaml | 12 +
docs/documentation/Pacemaker.md | 108 +
docs/documentation/Windowing.md | 144 ++
docs/documentation/ui-rest-api.md | 16 +-
.../storm/starter/SlidingWindowTopology.java | 185 ++
external/storm-metrics/pom.xml | 53 +-
.../resources/libsigar-amd64-freebsd-6.so | Bin 210641 -> 0 bytes
.../resources/resources/libsigar-amd64-linux.so | Bin 246605 -> 0 bytes
.../resources/libsigar-amd64-solaris.so | Bin 251360 -> 0 bytes
.../resources/libsigar-ia64-hpux-11.sl | Bin 577452 -> 0 bytes
.../resources/resources/libsigar-ia64-linux.so | Bin 494929 -> 0 bytes
.../resources/resources/libsigar-pa-hpux-11.sl | Bin 516096 -> 0 bytes
.../resources/resources/libsigar-ppc-aix-5.so | Bin 400925 -> 0 bytes
.../resources/resources/libsigar-ppc-linux.so | Bin 258547 -> 0 bytes
.../resources/resources/libsigar-ppc64-aix-5.so | Bin 425077 -> 0 bytes
.../resources/resources/libsigar-ppc64-linux.so | Bin 330767 -> 0 bytes
.../resources/resources/libsigar-s390x-linux.so | Bin 269932 -> 0 bytes
.../resources/libsigar-sparc-solaris.so | Bin 285004 -> 0 bytes
.../resources/libsigar-sparc64-solaris.so | Bin 261896 -> 0 bytes
.../resources/libsigar-universal-macosx.dylib | Bin 377668 -> 0 bytes
.../resources/libsigar-universal64-macosx.dylib | Bin 397440 -> 0 bytes
.../resources/libsigar-x86-freebsd-5.so | Bin 179751 -> 0 bytes
.../resources/libsigar-x86-freebsd-6.so | Bin 179379 -> 0 bytes
.../resources/resources/libsigar-x86-linux.so | Bin 233385 -> 0 bytes
.../resources/resources/libsigar-x86-solaris.so | Bin 242880 -> 0 bytes
.../resources/resources/sigar-amd64-winnt.dll | Bin 402432 -> 0 bytes
.../resources/resources/sigar-x86-winnt.dll | Bin 266240 -> 0 bytes
.../resources/resources/sigar-x86-winnt.lib | Bin 99584 -> 0 bytes
log4j2/cluster.xml | 12 +-
log4j2/worker.xml | 10 +-
pom.xml | 1 +
storm-core/pom.xml | 7 +-
storm-core/src/clj/backtype/storm/cluster.clj | 279 +--
.../cluster_state/zookeeper_state_factory.clj | 157 ++
.../clj/backtype/storm/command/heartbeats.clj | 52 +
storm-core/src/clj/backtype/storm/config.clj | 6 +
.../src/clj/backtype/storm/daemon/common.clj | 30 +-
.../src/clj/backtype/storm/daemon/executor.clj | 4 +
.../src/clj/backtype/storm/daemon/logviewer.clj | 60 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 11 +-
.../src/clj/backtype/storm/daemon/worker.clj | 32 +-
storm-core/src/clj/backtype/storm/stats.clj | 88 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 21 +-
storm-core/src/clj/backtype/storm/util.clj | 16 +
.../org/apache/storm/pacemaker/pacemaker.clj | 237 +++
.../storm/pacemaker/pacemaker_state_factory.clj | 124 ++
storm-core/src/jvm/backtype/storm/Config.java | 105 +
.../backtype/storm/cluster/ClusterState.java | 208 ++
.../storm/cluster/ClusterStateContext.java | 41 +
.../storm/cluster/ClusterStateFactory.java | 28 +
.../storm/cluster/ClusterStateListener.java | 22 +
.../backtype/storm/cluster/ConnectionState.java | 24 +
.../jvm/backtype/storm/cluster/DaemonType.java | 27 +
.../backtype/storm/generated/Assignment.java | 244 +--
.../jvm/backtype/storm/generated/BoltStats.java | 340 ++--
.../storm/generated/ClusterSummary.java | 108 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 52 +-
.../storm/generated/ComponentPageInfo.java | 220 +-
.../backtype/storm/generated/Credentials.java | 44 +-
.../backtype/storm/generated/ExecutorStats.java | 160 +-
.../generated/HBAuthorizationException.java | 406 ++++
.../storm/generated/HBExecutionException.java | 406 ++++
.../jvm/backtype/storm/generated/HBMessage.java | 636 ++++++
.../backtype/storm/generated/HBMessageData.java | 640 ++++++
.../jvm/backtype/storm/generated/HBNodes.java | 461 +++++
.../jvm/backtype/storm/generated/HBPulse.java | 522 +++++
.../jvm/backtype/storm/generated/HBRecords.java | 466 +++++
.../storm/generated/HBServerMessageType.java | 113 +
.../storm/generated/LSApprovedWorkers.java | 44 +-
.../generated/LSSupervisorAssignments.java | 48 +-
.../backtype/storm/generated/LSTopoHistory.java | 64 +-
.../storm/generated/LSTopoHistoryList.java | 36 +-
.../storm/generated/LSWorkerHeartbeat.java | 36 +-
.../storm/generated/LocalAssignment.java | 36 +-
.../storm/generated/LocalStateData.java | 48 +-
.../jvm/backtype/storm/generated/LogConfig.java | 48 +-
.../jvm/backtype/storm/generated/Nimbus.java | 36 +-
.../jvm/backtype/storm/generated/NodeInfo.java | 32 +-
.../storm/generated/RebalanceOptions.java | 44 +-
.../backtype/storm/generated/SpoutStats.java | 224 +-
.../jvm/backtype/storm/generated/StormBase.java | 92 +-
.../backtype/storm/generated/StormTopology.java | 251 ++-
.../storm/generated/SupervisorInfo.java | 152 +-
.../storm/generated/SupervisorSummary.java | 250 ++-
.../storm/generated/TopologyHistoryInfo.java | 32 +-
.../backtype/storm/generated/TopologyInfo.java | 164 +-
.../storm/generated/TopologyPageInfo.java | 96 +-
.../backtype/storm/generated/TopologyStats.java | 220 +-
.../backtype/storm/hooks/BaseWorkerHook.java | 51 +
.../jvm/backtype/storm/hooks/IWorkerHook.java | 44 +
.../storm/messaging/netty/ControlMessage.java | 17 +-
.../messaging/netty/INettySerializable.java | 26 +
.../netty/KerberosSaslClientHandler.java | 152 ++
.../netty/KerberosSaslNettyClient.java | 203 ++
.../netty/KerberosSaslNettyClientState.java | 31 +
.../netty/KerberosSaslNettyServer.java | 210 ++
.../netty/KerberosSaslNettyServerState.java | 30 +
.../netty/KerberosSaslServerHandler.java | 133 ++
.../storm/messaging/netty/MessageDecoder.java | 4 +-
.../netty/NettyRenameThreadFactory.java | 10 +-
.../netty/NettyUncaughtExceptionHandler.java | 35 +
.../storm/messaging/netty/SaslMessageToken.java | 37 +-
.../storm/messaging/netty/SaslNettyClient.java | 22 +-
.../storm/messaging/netty/SaslNettyServer.java | 244 ++-
.../messaging/netty/SaslNettyServerState.java | 13 +-
.../messaging/netty/SaslStormServerHandler.java | 21 +-
.../storm/messaging/netty/SaslUtils.java | 1 +
.../backtype/storm/messaging/netty/Server.java | 50 +-
.../messaging/netty/StormServerHandler.java | 24 +-
.../metric/internal/LatencyStatAndMetric.java | 13 +-
.../jvm/backtype/storm/scheduler/Cluster.java | 115 +-
.../resource/ResourceAwareScheduler.java | 18 +-
.../backtype/storm/security/auth/AuthUtils.java | 69 +
.../backtype/storm/task/OutputCollector.java | 2 +-
.../backtype/storm/topology/IWindowedBolt.java | 40 +
.../storm/topology/TopologyBuilder.java | 62 +-
.../storm/topology/WindowedBoltExecutor.java | 224 ++
.../storm/topology/base/BaseWindowedBolt.java | 179 ++
.../storm/utils/ThriftTopologyUtils.java | 36 +-
.../src/jvm/backtype/storm/utils/Utils.java | 102 +
.../storm/validation/ConfigValidation.java | 20 +-
.../storm/windowing/CountEvictionPolicy.java | 68 +
.../storm/windowing/CountTriggerPolicy.java | 63 +
.../src/jvm/backtype/storm/windowing/Event.java | 41 +
.../jvm/backtype/storm/windowing/EventImpl.java | 38 +
.../storm/windowing/EvictionPolicy.java | 42 +
.../storm/windowing/TimeEvictionPolicy.java | 52 +
.../storm/windowing/TimeTriggerPolicy.java | 115 ++
.../storm/windowing/TriggerHandler.java | 29 +
.../backtype/storm/windowing/TriggerPolicy.java | 42 +
.../backtype/storm/windowing/TupleWindow.java | 26 +
.../storm/windowing/TupleWindowImpl.java | 61 +
.../jvm/backtype/storm/windowing/Window.java | 48 +
.../windowing/WindowLifecycleListener.java | 42 +
.../backtype/storm/windowing/WindowManager.java | 212 ++
.../storm/pacemaker/IServerMessageHandler.java | 25 +
.../apache/storm/pacemaker/PacemakerClient.java | 255 +++
.../storm/pacemaker/PacemakerClientHandler.java | 75 +
.../apache/storm/pacemaker/PacemakerServer.java | 163 ++
.../storm/pacemaker/codec/ThriftDecoder.java | 76 +
.../storm/pacemaker/codec/ThriftEncoder.java | 110 +
.../pacemaker/codec/ThriftNettyClientCodec.java | 94 +
.../pacemaker/codec/ThriftNettyServerCodec.java | 99 +
.../src/jvm/storm/trident/TridentTopology.java | 17 +-
.../jvm/storm/trident/spout/IBatchSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 3 +-
.../trident/spout/IPartitionedTridentSpout.java | 2 +-
.../storm/trident/spout/ITridentDataSource.java | 26 +
.../jvm/storm/trident/spout/ITridentSpout.java | 2 +-
.../jvm/storm/trident/util/TridentUtils.java | 33 +-
storm-core/src/py/storm/Nimbus.py | 14 +-
storm-core/src/py/storm/ttypes.py | 1925 ++++++++++++------
storm-core/src/storm.thrift | 72 +-
storm-core/src/ui/public/css/style.css | 8 +
storm-core/src/ui/public/images/bug.png | Bin 0 -> 4045 bytes
storm-core/src/ui/public/images/statistic.png | Bin 0 -> 488 bytes
storm-core/src/ui/public/index.html | 4 +-
.../public/templates/index-page-template.html | 36 +
.../templates/topology-page-template.html | 6 +
.../src/ui/public/templates/user-template.html | 22 +-
storm-core/src/ui/public/topology.html | 7 +-
.../test/clj/backtype/storm/cluster_test.clj | 7 +-
.../storm/pacemaker_state_factory_test.clj | 150 ++
.../clj/org/apache/storm/pacemaker_test.clj | 242 +++
.../jvm/backtype/storm/TestConfigValidate.java | 18 +
.../storm/topology/TopologyBuilderTest.java | 5 +
.../storm/utils/ThriftTopologyUtilsTest.java | 94 +
.../storm/windowing/WindowManagerTest.java | 250 +++
storm-dist/binary/LICENSE | 29 +
172 files changed, 13348 insertions(+), 2622 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fd75ca72/pom.xml
----------------------------------------------------------------------
[2/5] storm git commit: enable markdown in javadoc
Posted by pt...@apache.org.
enable markdown in javadoc
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e03b28ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e03b28ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e03b28ca
Branch: refs/heads/master
Commit: e03b28ca6222f61471b4acb1a6086aab9b597b8a
Parents: 1afa5a2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Nov 18 20:16:47 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Nov 18 20:16:47 2015 -0500
----------------------------------------------------------------------
pom.xml | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e03b28ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd2818b..61a0110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -861,6 +861,19 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>ch.raffael.doclets.pegdown.PegdownDoclet</doclet>
+ <docletArtifact>
+ <groupId>ch.raffael.pegdown-doclet</groupId>
+ <artifactId>pegdown-doclet</artifactId>
+ <version>1.1</version>
+ </docletArtifact>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -885,10 +898,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<reportsDirectories>
[5/5] storm git commit: add STORM-1349 to changelog
Posted by pt...@apache.org.
add STORM-1349 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dc05a00e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc05a00e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc05a00e
Branch: refs/heads/master
Commit: dc05a00e5c0f956f4511fec789ea7c037f811723
Parents: 609b11c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Nov 24 14:42:05 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Nov 24 14:42:05 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dc05a00e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f0d482..11aa0f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-## 0.11.0
++## 0.11.0
+ * STORM-1349: [Flux] Allow constructorArgs to take Maps as arguments
* STORM-126: Add Lifecycle support API for worker nodes
* STORM-1213: Remove sigar binaries from source tree
* STORM-885: Heartbeat Server (Pacemaker)
[4/5] storm git commit: Merge branch 'master' of
github.com:lispking/storm
Posted by pt...@apache.org.
Merge branch 'master' of github.com:lispking/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/609b11c5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/609b11c5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/609b11c5
Branch: refs/heads/master
Commit: 609b11c54d41795c423d9a33bfa552b4fd89bc05
Parents: fd75ca7 a019d50
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Nov 24 14:24:56 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Nov 24 14:24:56 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/flux/model/ObjectDef.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------