knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmc...@apache.org
Subject knox git commit: KNOX-689 - Revert - Applications Deployment Contributor can't find service.xml
Date Tue, 08 Mar 2016 21:28:05 GMT
Repository: knox
Updated Branches:
  refs/heads/master 7861f20e5 -> 8706baa1d


KNOX-689 - Revert - 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/8706baa1
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8706baa1
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8706baa1

Branch: refs/heads/master
Commit: 8706baa1d5da3adc578f237e183605278e0b6552
Parents: 7861f20
Author: Larry McCay <lmccay@hortonworks.com>
Authored: Tue Mar 8 16:27:55 2016 -0500
Committer: Larry McCay <lmccay@hortonworks.com>
Committed: Tue Mar 8 16:27:55 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/8706baa1/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 aac5dff..3f68ede 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() + ".war" );
+      File appDir = new File( appsDir, application.getName() );
       File serviceFile = new File( appDir, SERVICE_DEFINITION_FILE_NAME );
       File rewriteFile = new File( appDir, REWRITE_RULES_FILE_NAME );
       serviceDefinition = loadServiceDefinition( application, serviceFile );


Mime
View raw message