Merge branch 'STREAMS-215'
Conflicts:
streams-config/src/main/jsonschema/StreamsConfiguration.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d0b5a0a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d0b5a0a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d0b5a0a6
Branch: refs/heads/master
Commit: d0b5a0a6be93eb41ba0cd6f9a1bd96894220dfe3
Parents: 9b89c08 991b170
Author: sblackmon <[email protected]>
Authored: Mon Nov 17 14:45:33 2014 -0600
Committer: sblackmon <[email protected]>
Committed: Mon Nov 17 14:45:33 2014 -0600
----------------------------------------------------------------------
streams-config/pom.xml | 14 ++-
.../streams/config/ComponentConfigurator.java | 73 +++++++++++
.../streams/config/StreamsConfigurator.java | 41 +++++-
.../main/jsonschema/ComponentConfiguration.json | 23 ++++
.../main/jsonschema/StreamsConfiguration.json | 7 +-
.../config/test/ComponentConfiguratorTest.java | 125 +++++++++++++++++++
.../config/test/StreamsConfiguratorTest.java | 69 ++++++++++
.../src/test/resources/componentTest.conf | 11 ++
8 files changed, 354 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d0b5a0a6/streams-config/src/main/jsonschema/StreamsConfiguration.json
----------------------------------------------------------------------
diff --cc streams-config/src/main/jsonschema/StreamsConfiguration.json
index 7341ecb,fabf378..b6f30b1
--- a/streams-config/src/main/jsonschema/StreamsConfiguration.json
+++ b/streams-config/src/main/jsonschema/StreamsConfiguration.json
@@@ -6,10 -6,8 +6,11 @@@
"javaInterfaces": ["java.io.Serializable"],
"properties": {
"pipeline": {
- "type" : "string"
+ "type" : "string",
+ "default": "No-name Stream"
+ },
- "broadcastURI": {
++ "broadcastURI": {
+ "type": "string"
}
}
}
