Merge branch 'master' into feature/METRON-1416-upgrade-solr
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/67d6c0ed Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/67d6c0ed Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/67d6c0ed Branch: refs/heads/master Commit: 67d6c0edd731f528af759ca11de875cbf77f6b2c Parents: f525dcf 38b7d5e Author: cstella <ceste...@gmail.com> Authored: Wed Feb 7 11:43:34 2018 -0500 Committer: cstella <ceste...@gmail.com> Committed: Wed Feb 7 11:43:34 2018 -0500 ---------------------------------------------------------------------- .../roles/java_jdk/tasks/install_jdk_ubuntu.yml | 2 +- .../packaging/ambari/metron-mpack/README.md | 14 + metron-deployment/scripts/platform-info.sh | 4 +- .../advanced-config-form.component.html | 2 +- .../advanced-config-form.component.spec.ts | 34 +++ .../advanced-config-form.component.ts | 20 +- .../src/main/config/rest_application.yml | 3 +- .../apache/metron/rest/MetronRestConstants.java | 6 +- .../metron/rest/controller/StormController.java | 81 +++-- .../metron/rest/service/StormAdminService.java | 4 +- .../service/impl/StormAdminServiceImpl.java | 8 +- .../rest/service/impl/StormCLIWrapper.java | 16 +- .../src/main/resources/application-test.yml | 3 +- .../src/main/resources/application-vagrant.yml | 4 +- .../StormControllerIntegrationTest.java | 102 ++++--- .../rest/mock/MockStormCLIClientWrapper.java | 93 ++++-- .../metron/rest/mock/MockStormRestTemplate.java | 22 +- .../service/impl/StormAdminServiceImplTest.java | 8 +- .../rest/service/impl/StormCLIWrapperTest.java | 17 +- metron-platform/metron-management/README.md | 32 +- .../metron/management/ShellFunctions.java | 302 ------------------- .../metron/management/ShellFunctionsTest.java | 171 ----------- metron-stellar/stellar-common/NOTICE | 6 + metron-stellar/stellar-common/README.md | 74 +++++ metron-stellar/stellar-common/pom.xml | 6 + .../src/main/assembly/assembly.xml | 2 +- .../src/main/assembly/stand-alone-assembly.xml | 57 ++++ .../stellar/common/shell/cli/PausableInput.java | 23 +- .../stellar/dsl/functions/ShellFunctions.java | 301 ++++++++++++++++++ .../src/main/scripts/deployed/stellar | 36 +++ .../src/main/scripts/stand-alone/stellar | 21 ++ .../stellar-common/src/main/scripts/stellar | 36 --- .../dsl/functions/ShellFunctionsTest.java | 176 +++++++++++ 33 files changed, 998 insertions(+), 688 deletions(-) ----------------------------------------------------------------------
