You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2016/03/08 20:42:28 UTC

knox git commit: KNOX-689 - Applications Deployment Contributor can't find service.xml

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 <lm...@hortonworks.com>
Authored: Tue Mar 8 14:42:03 2016 -0500
Committer: Larry McCay <lm...@hortonworks.com>
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 );