Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit 9e0c782

Browse files
huijunwuhuijunw
huijunwu
and
huijunw
authored
mkdir for storm api 2.2.0 (#3566)
* mkdirstormapi2 * fixjavalicenseheader * fixstyle Co-authored-by: Huijun Wu <[email protected]>
1 parent b760eab commit 9e0c782

File tree

382 files changed

+11017
-1487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+11017
-1487
lines changed

‎contrib/bolts/kafka/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_doc(
1414
)
1515

1616
kafka_bolt_deps = [
17-
"//storm-compatibility/src/java:storm-compatibility-java-neverlink",
17+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java-neverlink",
1818
"//heron/api/src/java:api-java-low-level",
1919
"//heron/common/src/java:basics-java",
2020
"//heron/common/src/java:config-java",

‎contrib/spouts/kafka/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_doc(
1414
)
1515

1616
kafka_spout_deps = [
17-
"//storm-compatibility/src/java:storm-compatibility-java-neverlink",
17+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java-neverlink",
1818
"//heron/api/src/java:api-java-low-level",
1919
"//heron/common/src/java:basics-java",
2020
"//heron/common/src/java:config-java",

‎docker/scripts/test-platform.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ bazel test -c opt --jobs 25 \
6969
heron/... \
7070
heronpy/... \
7171
examples/... \
72-
storm-compatibility-examples/... \
72+
storm-compatibility-examples/v0.10.2/... \
7373
eco-storm-examples/... \
7474
eco-heron-examples/... \
7575
contrib/...

‎eco-heron-examples/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ java_binary(
1515
"//heron/api/src/java:api-java",
1616
"//heron/api/src/java:api-java-low-level",
1717
"//heron/common/src/java:basics-java",
18-
"//storm-compatibility/src/java:storm-compatibility-java",
18+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
1919
],
2020
)
2121

‎eco-storm-examples/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ java_binary(
1818
"//heron/api/src/java:api-java",
1919
"//heron/api/src/java:api-java-low-level",
2020
"//heron/common/src/java:basics-java",
21-
"//storm-compatibility/src/java:storm-compatibility-java",
21+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
2222
],
2323
)
2424

‎eco/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ eco_deps = [
88
"@maven//:commons_cli_commons_cli",
99
"@maven//:org_yaml_snakeyaml",
1010
"//third_party/java:logging",
11-
"//storm-compatibility/src/java:storm-compatibility-java-neverlink",
11+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java-neverlink",
1212
"//heron/api/src/java:api-java-low-level",
1313
"//heron/common/src/java:basics-java",
1414
]

‎eco/tests/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ heron_local_deps = [
1616
"//eco/src/java:eco-storm-builder-java",
1717
"//eco/src/java:eco-heron-builder-java",
1818
"//heron/api/src/java:api-java-low-level",
19-
"//storm-compatibility/src/java:storm-compatibility-java",
19+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
2020
]
2121

2222
eco_test_deps = heron_local_deps + test_deps_files

‎examples/src/scala/compile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ rm -f heron-storm.jar
3535
(cd $root && bazel build --config=darwin scripts/packages:tarpkgs)
3636

3737
# Verify storm and heron bolts compile with heron-storm.jar
38-
scalac -cp bazel-bin/./storm-compatibility/src/java/heron-storm.jar \
38+
scalac -cp bazel-bin/./storm-compatibility/v0.10.2/src/java/heron-storm.jar \
3939
$dir/org/apache/heron/examples/*.scala

‎integration_test/src/java/BUILD

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ java_library(
2323
"//heron/api/src/java:api-java",
2424
"//heron/api/src/java:api-java-low-level",
2525
"//heron/proto:proto_topology_java",
26-
"//storm-compatibility/src/java:storm-compatibility-java",
26+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
2727
"//third_party/java:jackson",
2828
"@com_google_protobuf//:protobuf_java",
2929
"@maven//:commons_logging_commons_logging",
@@ -41,7 +41,7 @@ java_library(
4141
":core",
4242
"//heron/api/src/java:api-java",
4343
"//heron/api/src/java:api-java-low-level",
44-
"//storm-compatibility/src/java:storm-compatibility-java",
44+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
4545
"//third_party/java:hadoop-core",
4646
"//third_party/java:jackson",
4747
"@maven//:commons_cli_commons_cli",
@@ -58,7 +58,7 @@ java_library(
5858
":core",
5959
"//heron/api/src/java:api-java",
6060
"//heron/api/src/java:api-java-low-level",
61-
"//storm-compatibility/src/java:storm-compatibility-java",
61+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
6262
"@maven//:com_googlecode_json_simple_json_simple",
6363
"@maven//:commons_cli_commons_cli",
6464
],
@@ -74,7 +74,7 @@ java_library(
7474
":core",
7575
"//heron/api/src/java:api-java",
7676
"//heron/api/src/java:api-java-low-level",
77-
"//storm-compatibility/src/java:storm-compatibility-java",
77+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
7878
],
7979
)
8080

@@ -88,7 +88,7 @@ java_binary(
8888
":core",
8989
"//heron/api/src/java:api-java",
9090
"//heron/api/src/java:api-java-low-level",
91-
"//storm-compatibility/src/java:storm-compatibility-java",
91+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
9292
"@maven//:com_googlecode_json_simple_json_simple",
9393
"@maven//:commons_cli_commons_cli",
9494
],
@@ -111,7 +111,7 @@ java_binary(
111111
":core",
112112
"//heron/api/src/java:api-java",
113113
"//heron/api/src/java:api-java-low-level",
114-
"//storm-compatibility/src/java:storm-compatibility-java",
114+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
115115
],
116116
)
117117

@@ -131,7 +131,7 @@ java_library(
131131
"//heron/api/src/java:api-java",
132132
"//heron/api/src/java:api-java-low-level",
133133
"//heron/proto:proto_topology_java",
134-
"//storm-compatibility/src/java:storm-compatibility-java",
134+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
135135
"//third_party/java:jackson",
136136
"@com_google_protobuf//:protobuf_java",
137137
"@maven//:commons_logging_commons_logging",
@@ -150,7 +150,7 @@ java_library(
150150
":core-topology",
151151
"//heron/api/src/java:api-java",
152152
"//heron/api/src/java:api-java-low-level",
153-
"//storm-compatibility/src/java:storm-compatibility-java",
153+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
154154
"//third_party/java:hadoop-core",
155155
"//third_party/java:jackson",
156156
"@maven//:commons_cli_commons_cli",
@@ -169,7 +169,7 @@ java_library(
169169
":core-topology",
170170
"//heron/api/src/java:api-java",
171171
"//heron/api/src/java:api-java-low-level",
172-
"//storm-compatibility/src/java:storm-compatibility-java",
172+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
173173
"@maven//:com_googlecode_json_simple_json_simple",
174174
"@maven//:commons_cli_commons_cli",
175175
],
@@ -187,7 +187,7 @@ java_binary(
187187
":core-topology",
188188
"//heron/api/src/java:api-java",
189189
"//heron/api/src/java:api-java-low-level",
190-
"//storm-compatibility/src/java:storm-compatibility-java",
190+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
191191
"@maven//:com_googlecode_json_simple_json_simple",
192192
"@maven//:commons_cli_commons_cli",
193193
],

‎scripts/ci/build_maven_artifacts.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ echo "Make jar components"
4242
$HOME/bin/bazel build heron/api/src/java:all
4343
$HOME/bin/bazel build heron/spi/src/java:all
4444
$HOME/bin/bazel build heron/simulator/src/java:all
45-
$HOME/bin/bazel build storm-compatibility/src/java:all
45+
$HOME/bin/bazel build storm-compatibility/v0.10.2/src/java:all
4646
$HOME/bin/bazel build contrib/spouts/kafka/src/java:all
4747
$HOME/bin/bazel build contrib/bolts/kafka/src/java:all
4848

@@ -87,9 +87,9 @@ cp -p -f ./bazel-bin/heron/simulator/src/java/libsimulator-java-src.jar $OUTPUT_
8787

8888
echo "Copy heron-storm artifacts ... "
8989
cp -p -f ./release/heron-storm-$VERSION_TAG.pom $OUTPUT_DIR/$VERSION_TAG/heron-storm/
90-
cp -p -f ./bazel-bin/storm-compatibility/src/java/heron-storm.jar $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG.jar
91-
cp -p -f ./bazel-bin/storm-compatibility/src/java/heron-storm-javadoc.zip $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG-javadoc.jar
92-
cp -p -f ./bazel-bin/storm-compatibility/src/java/libstorm-compatibility-java-src.jar $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG-sources.jar
90+
cp -p -f ./bazel-bin/storm-compatibility/v0.10.2/src/java/heron-storm.jar $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG.jar
91+
cp -p -f ./bazel-bin/storm-compatibility/v0.10.2/src/java/heron-storm-javadoc.zip $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG-javadoc.jar
92+
cp -p -f ./bazel-bin/storm-compatibility/v0.10.2/src/java/libstorm-compatibility-java-src.jar $OUTPUT_DIR/$VERSION_TAG/heron-storm/heron-storm-$VERSION_TAG-sources.jar
9393

9494
echo "Copy heron-kafka-spout artifacts ... "
9595
cp -p -f ./release/heron-kafka-spout-$VERSION_TAG.pom $OUTPUT_DIR/$VERSION_TAG/heron-kafka-spout/

‎scripts/travis/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ T="heron build"
7878
start_timer "$T"
7979
${UTILS}/save-logs.py "heron_build.txt" bazel\
8080
--bazelrc=tools/travis/bazel.rc build --config=$PLATFORM heron/... \
81-
heronpy/... examples/... storm-compatibility-examples/... \
81+
heronpy/... examples/... storm-compatibility-examples/v0.10.2/... \
8282
eco-storm-examples/... eco-heron-examples/... contrib/...
8383
end_timer "$T"
8484

@@ -89,7 +89,7 @@ ${UTILS}/save-logs.py "heron_test_non_flaky.txt" bazel\
8989
--bazelrc=tools/travis/bazel.rc test\
9090
--test_summary=detailed --test_output=errors\
9191
--config=$PLATFORM --test_tag_filters=-flaky heron/... \
92-
heronpy/... examples/... storm-compatibility-examples/... \
92+
heronpy/... examples/... storm-compatibility-examples/v0.10.2/... \
9393
eco-storm-examples/... eco-heron-examples/... contrib/...
9494
end_timer "$T"
9595

@@ -101,7 +101,7 @@ ${UTILS}/save-logs.py "heron_test_flaky.txt" bazel\
101101
--bazelrc=tools/travis/bazel.rc test\
102102
--test_summary=detailed --test_output=errors\
103103
--config=$PLATFORM --test_tag_filters=flaky --jobs=1 heron/... \
104-
heronpy/... examples/... storm-compatibility-examples/... \
104+
heronpy/... examples/... storm-compatibility-examples/v0.10.2/... \
105105
eco-storm-examples/... eco-heron-examples/...
106106
end_timer "$T"
107107

‎storm-compatibility-examples/src/java/BUILD ‎storm-compatibility-examples/v0.10.2/src/java/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ java_binary(
99
deps = [
1010
"//heron/api/src/java:api-java-low-level",
1111
"//heron/common/src/java:basics-java",
12-
"//storm-compatibility/src/java:storm-compatibility-java",
12+
"//storm-compatibility/v0.10.2/src/java:storm-compatibility-java",
1313
],
1414
)
1515

‎storm-compatibility-examples/src/java/org/apache/storm/examples/AckingTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/AckingTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/CustomGroupingTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/CustomGroupingTopology.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
19+
1820
package org.apache.storm.examples;
1921

2022
import java.util.ArrayList;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/ExclamationTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/ExclamationTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/MultiSpoutExclamationTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/MultiSpoutExclamationTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/MultiStageAckingTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/MultiStageAckingTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/SentenceWordCountTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/SentenceWordCountTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/SlidingWindowTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/SlidingWindowTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

‎storm-compatibility-examples/src/java/org/apache/storm/examples/TaskHookTopology.java ‎storm-compatibility-examples/v0.10.2/src/java/org/apache/storm/examples/TaskHookTopology.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
99
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
1718
*/
1819

1920
package org.apache.storm.examples;

0 commit comments

Comments
 (0)