From commits-return-1537-apmail-knox-commits-archive=knox.apache.org@knox.apache.org Tue Mar 8 19:42:28 2016 Return-Path: X-Original-To: apmail-knox-commits-archive@minotaur.apache.org Delivered-To: apmail-knox-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A1FCC182C5 for ; Tue, 8 Mar 2016 19:42:28 +0000 (UTC) Received: (qmail 96515 invoked by uid 500); 8 Mar 2016 19:42:28 -0000 Delivered-To: apmail-knox-commits-archive@knox.apache.org Received: (qmail 96490 invoked by uid 500); 8 Mar 2016 19:42:28 -0000 Mailing-List: contact commits-help@knox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@knox.apache.org Delivered-To: mailing list commits@knox.apache.org Received: (qmail 96481 invoked by uid 99); 8 Mar 2016 19:42:28 -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; Tue, 08 Mar 2016 19:42:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30BBBDFBAD; Tue, 8 Mar 2016 19:42:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lmccay@apache.org To: commits@knox.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: knox git commit: KNOX-689 - Applications Deployment Contributor can't find service.xml Date: Tue, 8 Mar 2016 19:42:28 +0000 (UTC) Repository: knox Updated Branches: refs/heads/master e341e597f -> 3a7799fbf KNOX-689 - Applications Deployment Contributor can't find service.xml Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/3a7799fb Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/3a7799fb Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/3a7799fb Branch: refs/heads/master Commit: 3a7799fbff76003b5f11ac314ae31a8b7c568c63 Parents: e341e59 Author: Larry McCay Authored: Tue Mar 8 14:42:03 2016 -0500 Committer: Larry McCay Committed: Tue Mar 8 14:42:03 2016 -0500 ---------------------------------------------------------------------- .../gateway/deploy/impl/ApplicationDeploymentContributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/3a7799fb/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ApplicationDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ApplicationDeploymentContributor.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ApplicationDeploymentContributor.java index 3f68ede..aac5dff 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ApplicationDeploymentContributor.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/impl/ApplicationDeploymentContributor.java @@ -98,7 +98,7 @@ public class ApplicationDeploymentContributor extends ServiceDeploymentContribut public ApplicationDeploymentContributor( GatewayConfig config, Application application ) throws DeploymentException { try { File appsDir = new File( config.getGatewayApplicationsDir() ); - File appDir = new File( appsDir, application.getName() ); + File appDir = new File( appsDir, application.getName() + ".war" ); File serviceFile = new File( appDir, SERVICE_DEFINITION_FILE_NAME ); File rewriteFile = new File( appDir, REWRITE_RULES_FILE_NAME ); serviceDefinition = loadServiceDefinition( application, serviceFile );