Merge branch 'APEXCORE-536' of https://github.com/davidyan74/apex-core
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/5adcd036 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/5adcd036 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/5adcd036 Branch: refs/heads/master Commit: 5adcd0367b3a702323e629fe0a92fdbfffb2c9bd Parents: edad2a8 730b283 Author: Thomas Weise <[email protected]> Authored: Mon Oct 10 17:27:30 2016 -0700 Committer: Thomas Weise <[email protected]> Committed: Mon Oct 10 17:27:30 2016 -0700 ---------------------------------------------------------------------- engine/pom.xml | 29 +++++++++++++++----- .../java/com/datatorrent/stram/StramClient.java | 16 ++++------- .../stram/client/StramClientUtils.java | 12 ++++---- pom.xml | 2 +- 4 files changed, 35 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/5adcd036/engine/src/main/java/com/datatorrent/stram/StramClient.java ---------------------------------------------------------------------- diff --cc engine/src/main/java/com/datatorrent/stram/StramClient.java index 2009b49,fe820b1..89bca14 --- a/engine/src/main/java/com/datatorrent/stram/StramClient.java +++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java @@@ -323,12 -318,12 +319,12 @@@ public class StramClien { Class<?>[] defaultClasses; - if (applicationType.equals(YARN_APPLICATION_TYPE_DEPRECATED)) { + if (applicationType.equals(YARN_APPLICATION_TYPE)) { //TODO restrict the security check to only check if security is enabled for webservices. if (UserGroupInformation.isSecurityEnabled()) { - defaultClasses = DATATORRENT_SECURITY_CLASSES; + defaultClasses = APEX_SECURITY_CLASSES; } else { - defaultClasses = DATATORRENT_CLASSES; + defaultClasses = APEX_CLASSES; } } else { throw new IllegalStateException(applicationType + " is not a valid application type."); http://git-wip-us.apache.org/repos/asf/apex-core/blob/5adcd036/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java ----------------------------------------------------------------------
