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 2015/11/11 19:43:37 UTC

knox git commit: KNOX-621 - Simplify KnoxSSO API Resource Path

Repository: knox
Updated Branches:
  refs/heads/master 9632b6970 -> eda2fa5e7


KNOX-621 - Simplify KnoxSSO API Resource Path

Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/eda2fa5e
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/eda2fa5e
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/eda2fa5e

Branch: refs/heads/master
Commit: eda2fa5e74f06357d9387d7b672f13418e10cf66
Parents: 9632b69
Author: Larry McCay <lm...@hortonworks.com>
Authored: Wed Nov 11 13:43:12 2015 -0500
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Wed Nov 11 13:43:12 2015 -0500

----------------------------------------------------------------------
 .../org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java  | 2 +-
 .../knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/eda2fa5e/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java b/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java
index 475e39b..4bab18c 100644
--- a/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java
+++ b/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/WebSSOResource.java
@@ -53,7 +53,7 @@ public class WebSSOResource {
   private static final String ORIGINAL_URL_REQUEST_PARAM = "originalUrl";
   private static final String ORIGINAL_URL_COOKIE_NAME = "original-url";
   private static final String JWT_COOKIE_NAME = "hadoop-jwt";
-  static final String RESOURCE_PATH = "/knoxsso/api/v1/websso";
+  static final String RESOURCE_PATH = "/api/v1/websso";
   private static KnoxSSOMessages log = MessagesFactory.get( KnoxSSOMessages.class );
   private boolean secureOnly = true;
   private int maxAge = -1;

http://git-wip-us.apache.org/repos/asf/knox/blob/eda2fa5e/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java b/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java
index 70abeaf..3e37a57 100644
--- a/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java
+++ b/gateway-service-knoxsso/src/main/java/org/apache/hadoop/gateway/service/knoxsso/deploy/KnoxSSOServiceDeploymentContributor.java
@@ -50,7 +50,7 @@ public class KnoxSSOServiceDeploymentContributor extends JerseyServiceDeployment
    */
   @Override
   protected String[] getPatterns() {
-    return new String[]{ "knoxsso/api/**?**" };
+    return new String[]{ "api/**?**" };
   }
 
 }