Joshfischer/consistent eco examples (#3220)
* renaming eco topolgies for consistency
* updating eco docs to be consistent with change of example yaml files
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/heron-stateful-windowing.yaml b/eco-heron-examples/src/java/org/apache/heron/examples/eco/heron_stateful_windowing.yaml
similarity index 100%
rename from eco-heron-examples/src/java/org/apache/heron/examples/eco/heron-stateful-windowing.yaml
rename to eco-heron-examples/src/java/org/apache/heron/examples/eco/heron_stateful_windowing.yaml
diff --git a/eco-heron-examples/src/java/org/apache/heron/examples/eco/heron-stateful-word-count.yaml b/eco-heron-examples/src/java/org/apache/heron/examples/eco/heron_stateful_word_count.yaml
similarity index 100%
rename from eco-heron-examples/src/java/org/apache/heron/examples/eco/heron-stateful-word-count.yaml
rename to eco-heron-examples/src/java/org/apache/heron/examples/eco/heron_stateful_word_count.yaml
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/fibonacci.yaml b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_fibonacci.yaml
similarity index 98%
rename from eco-storm-examples/src/java/org/apache/heron/examples/eco/fibonacci.yaml
rename to eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_fibonacci.yaml
index ffcc7aa..b541db0 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/fibonacci.yaml
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_fibonacci.yaml
@@ -17,7 +17,7 @@
---
-name: "fibonacci-topology"
+name: "storm-fibonacci-topology"
config:
topology.workers: 1
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_windowing.yaml b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_windowing.yaml
similarity index 97%
rename from eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_windowing.yaml
rename to eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_windowing.yaml
index 08c0b44..8f21a85 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_windowing.yaml
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_windowing.yaml
@@ -17,7 +17,7 @@
---
-name: "sliding-window-topology"
+name: "storm-sliding-window-topology"
components:
- id: "windowLength"
diff --git a/eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_wordcount.yaml b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_wordcount.yaml
similarity index 98%
rename from eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_wordcount.yaml
rename to eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_wordcount.yaml
index 93f9d0f..2f318f9 100644
--- a/eco-storm-examples/src/java/org/apache/heron/examples/eco/simple_wordcount.yaml
+++ b/eco-storm-examples/src/java/org/apache/heron/examples/eco/storm_wordcount.yaml
@@ -19,7 +19,7 @@
# topology definition
# name to be used when submitting
-name: "simple-wordcount-topology"
+name: "storm-wordcount-topology"
# topology configuration
# this will be passed to the submitter as a map of config options
diff --git a/website/content/docs/developers/java/eco-api.mmark b/website/content/docs/developers/java/eco-api.mmark
index e109d07..c25c21e 100644
--- a/website/content/docs/developers/java/eco-api.mmark
+++ b/website/content/docs/developers/java/eco-api.mmark
@@ -10,7 +10,7 @@
## What about Storm Flux? Is it compatible with Eco?
-ECO is an extension Flux. Most Storm Flux topologies should be able to deployed in Heron with minimal changes.
+ECO is an extension of Flux. Most Storm Flux topologies should be able to deployed in Heron with minimal changes.
Start reading [Migrate Storm Topologies To Heron] (../../../migrate-storm-to-heron) to learn how to migrate your Storm Flux topology then come back.
## Getting started
@@ -189,7 +189,7 @@
$ heron submit local \
~/.heron/examples/heron-eco-examples.jar \
org.apache.heron.eco.Eco \
- --eco-config-file ~/.heron/examples/fibonacci.yaml
+ --eco-config-file ~/.heron/examples/storm_fibonacci.yaml
```
This ECO topology does not do anything spectacular, but it's a good starting point to go through some of ECO's concepts.
@@ -530,7 +530,7 @@
$ heron submit local \
~/.heron/examples/heron-eco-examples.jar \
org.apache.heron.eco.Eco \
- --eco-config-file ~/.heron/examples/simple_wordcount.yaml
+ --eco-config-file ~/.heron/examples/storm_wordcount.yaml
```
Run the simple windowing example
@@ -539,5 +539,5 @@
$ heron submit local \
~/.heron/examples/heron-eco-examples.jar \
org.apache.heron.eco.Eco \
- --eco-config-file ~/.heron/examples/simple_windowing.yaml
+ --eco-config-file ~/.heron/examples/storm_windowing.yaml
```