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 2014/07/01 22:40:45 UTC
[14/24] git commit: merge apache-storm master
merge apache-storm master
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/22a6ca9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/22a6ca9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/22a6ca9b
Branch: refs/heads/master
Commit: 22a6ca9b94cf68709c16436acc7ad4ac6c7c9d7a
Parents: 4d6a27f 2a60e99
Author: JuDasheng <ju...@meituan.com>
Authored: Thu Jun 12 18:08:02 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Thu Jun 12 18:08:02 2014 +0800
----------------------------------------------------------------------
CHANGELOG.md | 2 +-
LICENSE | 124 ++++++-
examples/storm-starter/pom.xml | 5 +-
external/storm-kafka/README.md | 33 +-
external/storm-kafka/pom.xml | 27 +-
.../storm/kafka/DynamicBrokersReaderTest.java | 17 +
.../src/test/storm/kafka/KafkaErrorTest.java | 17 +
.../src/test/storm/kafka/KafkaTestBroker.java | 17 +
.../src/test/storm/kafka/KafkaUtilsTest.java | 17 +
.../storm/kafka/StringKeyValueSchemeTest.java | 17 +
.../src/test/storm/kafka/TestUtils.java | 17 +
.../src/test/storm/kafka/ZkCoordinatorTest.java | 17 +
.../test/storm/kafka/bolt/KafkaBoltTest.java | 17 +
pom.xml | 40 ++-
storm-core/dependency-reduced-pom.xml | 359 +++++++++++++++++++
storm-core/pom.xml | 4 +
.../netty/NettyRenameThreadFactory.java | 17 +
.../jvm/backtype/storm/multilang/BoltMsg.java | 17 +
.../backtype/storm/multilang/ISerializer.java | 17 +
.../storm/multilang/JsonSerializer.java | 17 +
.../storm/multilang/NoOutputException.java | 17 +
.../jvm/backtype/storm/multilang/ShellMsg.java | 17 +
.../jvm/backtype/storm/multilang/SpoutMsg.java | 17 +
.../trident/state/map/RemovableMapState.java | 17 +
storm-core/src/ui/public/component.html | 16 +
storm-core/src/ui/public/index.html | 16 +
storm-core/src/ui/public/js/visualization.js | 20 +-
.../templates/component-page-template.html | 17 +
.../public/templates/index-page-template.html | 16 +
.../public/templates/json-error-template.html | 16 +
.../templates/topology-page-template.html | 16 +
storm-core/src/ui/public/topology.html | 17 +
storm-dist/binary/LICENSE | 154 +++++++-
storm-dist/binary/NOTICE | 2 +-
storm-dist/binary/pom.xml | 4 +
storm-dist/source/pom.xml | 2 +-
36 files changed, 1122 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/examples/storm-starter/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/external/storm-kafka/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-core/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --cc storm-core/dependency-reduced-pom.xml
index 0000000,0000000..9dacd73
new file mode 100644
--- /dev/null
+++ b/storm-core/dependency-reduced-pom.xml
@@@ -1,0 -1,0 +1,359 @@@
++<?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.9.2-incubating-mt0000</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>
++ <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>${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>true</keepDependenciesWithProvidedScope>
++ <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
++ <createDependencyReducedPom>true</createDependencyReducedPom>
++ <minimizeJar>false</minimizeJar>
++ <artifactSet>
++ <includes>
++ <include>org.apache.thrift:*</include>
++ <include>org.apache.storm:*</include>
++ </includes>
++ </artifactSet>
++ <relocations>
++ <relocation>
++ <pattern>org.apache.thrift</pattern>
++ <shadedPattern>org.apache.thrift7</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>
++ </filters>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++ <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.4.1</version>
++ <scope>compile</scope>
++ </dependency>
++ <dependency>
++ <groupId>compojure</groupId>
++ <artifactId>compojure</artifactId>
++ <version>1.1.3</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>0.3.11</version>
++ <scope>compile</scope>
++ </dependency>
++ <dependency>
++ <groupId>ring</groupId>
++ <artifactId>ring-jetty-adapter</artifactId>
++ <version>0.3.11</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>org.clojure</groupId>
++ <artifactId>tools.nrepl</artifactId>
++ <version>0.2.3</version>
++ <scope>test</scope>
++ <exclusions>
++ <exclusion>
++ <artifactId>clojure</artifactId>
++ <groupId>org.clojure</groupId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
++ <groupId>clojure-complete</groupId>
++ <artifactId>clojure-complete</artifactId>
++ <version>0.2.3</version>
++ <scope>test</scope>
++ <exclusions>
++ <exclusion>
++ <artifactId>clojure</artifactId>
++ <groupId>org.clojure</groupId>
++ </exclusion>
++ </exclusions>
++ </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>org.apache.thrift</groupId>
++ <artifactId>libthrift</artifactId>
++ <version>0.7.0</version>
++ <scope>provided</scope>
++ <exclusions>
++ <exclusion>
++ <artifactId>slf4j-api</artifactId>
++ <groupId>org.slf4j</groupId>
++ </exclusion>
++ <exclusion>
++ <artifactId>servlet-api</artifactId>
++ <groupId>javax.servlet</groupId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.curator</groupId>
++ <artifactId>curator-framework</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>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>org.yaml</groupId>
++ <artifactId>snakeyaml</artifactId>
++ <version>1.11</version>
++ <scope>compile</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.httpcomponents</groupId>
++ <artifactId>httpclient</artifactId>
++ <version>4.3.3</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>com.google.guava</groupId>
++ <artifactId>guava</artifactId>
++ <version>13.0</version>
++ <scope>compile</scope>
++ </dependency>
++ <dependency>
++ <groupId>ch.qos.logback</groupId>
++ <artifactId>logback-classic</artifactId>
++ <version>1.0.6</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>io.netty</groupId>
++ <artifactId>netty</artifactId>
++ <version>3.6.3.Final</version>
++ <scope>compile</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.mockito</groupId>
++ <artifactId>mockito-all</artifactId>
++ <version>1.9.5</version>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.clojars.runa</groupId>
++ <artifactId>conjure</artifactId>
++ <version>2.1.3</version>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>reply</groupId>
++ <artifactId>reply</artifactId>
++ <version>0.3.0</version>
++ <scope>provided</scope>
++ <exclusions>
++ <exclusion>
++ <artifactId>cd-client</artifactId>
++ <groupId>org.thnetos</groupId>
++ </exclusion>
++ <exclusion>
++ <artifactId>drawbridge</artifactId>
++ <groupId>com.cemerick</groupId>
++ </exclusion>
++ <exclusion>
++ <artifactId>versioneer</artifactId>
++ <groupId>trptcolin</groupId>
++ </exclusion>
++ <exclusion>
++ <artifactId>sjacket</artifactId>
++ <groupId>org.clojars.trptcolin</groupId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++ </dependencies>
++</project>
++
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-core/pom.xml
----------------------------------------------------------------------
diff --cc storm-core/pom.xml
index 440214d,134eeb8..91cd370
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@@ -20,7 -20,7 +20,11 @@@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
++<<<<<<< HEAD
+ <version>0.9.2-incubating-mt0000</version>
++=======
+ <version>0.9.3-incubating-SNAPSHOT</version>
++>>>>>>> upstream/master
</parent>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/22a6ca9b/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --cc storm-dist/binary/pom.xml
index bb1b876,0d97c0b..464ecd7
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@@ -21,7 -21,7 +21,11 @@@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
++<<<<<<< HEAD
+ <version>0.9.2-incubating-mt0000</version>
++=======
+ <version>0.9.3-incubating-SNAPSHOT</version>
++>>>>>>> upstream/master
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.storm</groupId>