Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D9DE8200C06 for ; Fri, 23 Dec 2016 02:46:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D86AF160B37; Fri, 23 Dec 2016 01:46:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 088E2160B43 for ; Fri, 23 Dec 2016 02:46:37 +0100 (CET) Received: (qmail 51201 invoked by uid 500); 23 Dec 2016 01:46:37 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 50871 invoked by uid 99); 23 Dec 2016 01:46:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2016 01:46:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4E1481A050A for ; Fri, 23 Dec 2016 01:46:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id bmA4lA8AxFZu for ; Fri, 23 Dec 2016 01:46:34 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id A8E9060E3B for ; Fri, 23 Dec 2016 01:46:31 +0000 (UTC) Received: (qmail 48580 invoked by uid 99); 23 Dec 2016 01:46:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2016 01:46:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C00FADFCFA; Fri, 23 Dec 2016 01:46:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@atlas.incubator.apache.org Date: Fri, 23 Dec 2016 01:47:04 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] incubator-atlas git commit: ATLAS-1133 Jetty Server start doesn't throw exception when user-credential.properties file is not found (nixonrodrigues, svimal2106 via kevalbhatt) archived-at: Fri, 23 Dec 2016 01:46:39 -0000 ATLAS-1133 Jetty Server start doesn't throw exception when user-credential.properties file is not found (nixonrodrigues,svimal2106 via kevalbhatt) (cherry picked from commit 165efca69939577f56526d7df48b07ec4509c8e0) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/ae02a2fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/ae02a2fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/ae02a2fa Branch: refs/heads/0.7-incubating Commit: ae02a2fa0f33e6185cd45f9750d7bfdd469ff030 Parents: 8404ac2 Author: kevalbhatt Authored: Tue Sep 13 11:21:45 2016 +0530 Committer: Madhan Neethiraj Committed: Thu Dec 22 15:30:26 2016 -0800 ---------------------------------------------------------------------- .../authorize/simple/SimpleAtlasAuthorizer.java | 1 + release-log.txt | 1 + webapp/pom.xml | 17 +++++++++++++++++ .../java/org/apache/atlas/web/dao/UserDao.java | 4 ++-- .../web/security/NegativeSSLAndKerberosTest.java | 9 +++++++++ 5 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ae02a2fa/authorization/src/main/java/org/apache/atlas/authorize/simple/SimpleAtlasAuthorizer.java ---------------------------------------------------------------------- diff --git a/authorization/src/main/java/org/apache/atlas/authorize/simple/SimpleAtlasAuthorizer.java b/authorization/src/main/java/org/apache/atlas/authorize/simple/SimpleAtlasAuthorizer.java index 30e2067..57156b7 100644 --- a/authorization/src/main/java/org/apache/atlas/authorize/simple/SimpleAtlasAuthorizer.java +++ b/authorization/src/main/java/org/apache/atlas/authorize/simple/SimpleAtlasAuthorizer.java @@ -113,6 +113,7 @@ public final class SimpleAtlasAuthorizer implements AtlasAuthorizer { if (LOG.isErrorEnabled()) { LOG.error("SimpleAtlasAuthorizer could not be initialized properly due to : ", e); } + throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ae02a2fa/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 65ce2aa..eaa46bb 100644 --- a/release-log.txt +++ b/release-log.txt @@ -31,6 +31,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-1133 Jetty Server start doesn't throw exception when user-credential.properties file is not found (nixonrodrigues,svimal2106 via kevalbhatt) ATLAS-1149 Changes to UI to sort the hive table schema based on "position" attribute of hive_column (Kalyanikashikar via kevalbhatt) ATLAS-1162 Register shutdown hooks with Hadoop's ShutdownHookManager, instead of directly with Java Runtime (mneethiraj via sumasai) ATLAS-1098 Atlas allows creation of tag with name "isa" which causes exceptions during search (apoorvnaik via kevalbhatt) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ae02a2fa/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 369db4d..b209d0b 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -497,6 +497,23 @@ ${project.build.directory}/../../webapp/target/test-classes/ true + + + org.eclipse.jetty + jetty-jsp + ${jetty.version} + + + javax.servlet + * + + + org.glassfish + javax.el + + + + start-jetty http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ae02a2fa/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java b/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java index 6b83c21..e746855 100644 --- a/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java +++ b/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java @@ -72,8 +72,8 @@ public class UserDao { } } catch (IOException | AtlasException e) { - LOG.error("Error while reading user.properties file, filepath=" - + PROPERTY_FILE_PATH, e); + LOG.error("Error while reading user.properties file, filepath=" + PROPERTY_FILE_PATH, e); + throw new RuntimeException(e); } finally { if(inStr != null) { try { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ae02a2fa/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java index 4ad01cf..6651b44 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java @@ -87,9 +87,18 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest { configuration.setProperty("atlas.authentication.method.kerberos.name.rules", "RULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//\nDEFAULT"); + configuration.setProperty("atlas.authentication.method.file", "true"); + configuration.setProperty("atlas.authentication.method.file.filename", persistDir + + "/users-credentials"); + configuration.setProperty("atlas.auth.policy.file",persistDir + + "/policy-store.txt" ); + TestUtils.writeConfiguration(configuration, persistDir + File.separator + ApplicationProperties.APPLICATION_PROPERTIES); + setupUserCredential(persistDir); + setUpPolicyStore(persistDir); + // save original setting originalConf = System.getProperty("atlas.conf"); System.setProperty("atlas.conf", persistDir);