knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject [3/3] knox git commit: KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. Renabled GatewayBasicFuncTest.
Date Mon, 09 Nov 2015 20:45:46 GMT
KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. Renabled
GatewayBasicFuncTest.


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

Branch: refs/heads/master
Commit: 2bb8d1e0d3f1a0c39f456701fef2e9011d94b568
Parents: a4ab854
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Mon Nov 9 15:45:39 2015 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Mon Nov 9 15:45:39 2015 -0500

----------------------------------------------------------------------
 .../filter/rewrite/impl/UrlRewriteRequest.java  |    9 +-
 gateway-shell/pom.xml                           |    2 +-
 .../org/apache/hadoop/gateway/shell/Shell.java  |    2 +-
 gateway-test/pom.xml                            |    5 -
 .../hadoop/gateway/GatewayBasicFuncTest.java    | 7233 +++++++++---------
 .../src/test/resources/log4j.properties         |    8 +-
 pom.xml                                         |    6 +-
 7 files changed, 3633 insertions(+), 3632 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/2bb8d1e0/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRequest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRequest.java
b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRequest.java
index 3865d25..4197d65 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRequest.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteRequest.java
@@ -50,6 +50,7 @@ import static org.apache.hadoop.gateway.filter.rewrite.impl.UrlRewriteUtil.pickF
 public class UrlRewriteRequest extends GatewayRequestWrapper implements Resolver {
 
   private static final UrlRewriteMessages LOG = MessagesFactory.get( UrlRewriteMessages.class
);
+  private static final String[] EMPTY_STRING_ARRAY = new String[]{};
 
   private UrlRewriter rewriter;
   private String urlRuleName;
@@ -120,8 +121,12 @@ public class UrlRewriteRequest extends GatewayRequestWrapper implements
Resolver
   }
 
   private String[] splitTargetUrl( Template url ) {
-    String s = url.toString();
-    return s.split( "\\?" );
+    if( url == null ) {
+      return EMPTY_STRING_ARRAY;
+    } else {
+      String s = url.toString();
+      return s.split( "\\?" );
+    }
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/knox/blob/2bb8d1e0/gateway-shell/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml
index 616bcfd..c97067f 100644
--- a/gateway-shell/pom.xml
+++ b/gateway-shell/pom.xml
@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>

http://git-wip-us.apache.org/repos/asf/knox/blob/2bb8d1e0/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java
index 145d22a..23227ab 100644
--- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java
+++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java
@@ -53,7 +53,7 @@ public class Shell {
       //setup.println( "set show-last-result false;" );
       Groovysh shell = new Groovysh();
       shell.execute( buffer.toString() );
-      //shell.run("");
+      shell.run();
     }
   }
 

http://git-wip-us.apache.org/repos/asf/knox/blob/2bb8d1e0/gateway-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index 844118e..c143a6d 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -83,11 +83,6 @@
 
 
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>com.jayway.restassured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>


Mime
View raw message