knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject [knox] branch master updated: KNOX-1703 - Cleanup old System.out debugging lines
Date Thu, 20 Dec 2018 17:45:43 GMT
This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f65b6b  KNOX-1703 - Cleanup old System.out debugging lines
3f65b6b is described below

commit 3f65b6bc81d4d088137a7d267a5d1d9132898132
Author: Kevin Risden <krisden@apache.org>
AuthorDate: Thu Dec 20 11:31:34 2018 -0500

    KNOX-1703 - Cleanup old System.out debugging lines
    
    Signed-off-by: Kevin Risden <krisden@apache.org>
---
 .../ambari/AmbariConfigurationMonitorTest.java     |  5 --
 .../hostmap/impl/HostmapFunctionProcessor.java     |  1 -
 .../hostmap/impl/HostmapFunctionProcessorTest.java |  8 ---
 .../filter/rewrite/impl/json/JsonFilterReader.java |  6 ---
 .../impl/html/HtmlFilterReaderBaseTest.java        |  8 ---
 .../rewrite/impl/json/JsonFilterReaderTest.java    | 59 ----------------------
 .../rewrite/impl/xml/XmlFilterReaderTest.java      | 56 --------------------
 .../gateway/filter/AclsAuthorizationFilter.java    |  1 -
 .../knox/gateway/shirorealm/KnoxLdapRealm.java     |  2 -
 .../gateway/dispatch/UrlConnectionDispatch.java    |  7 ---
 .../knox/gateway/filter/JaasLoginFilter.java       |  1 -
 .../knox/gateway/util/CredentialsProvider.java     |  2 -
 .../org/apache/knox/gateway/TempletonDemo.java     |  5 --
 .../xml/XmlGatewayDescriptorExporterTest.java      |  1 -
 .../org/apache/knox/gateway/util/KnoxCLITest.java  |  2 -
 .../apache/knox/gateway/websockets/BadUrlTest.java |  1 -
 .../knox/gateway/websockets/WebsocketEchoTest.java |  1 -
 .../WebsocketMultipleConnectionTest.java           | 28 +---------
 ...moteConfigurationRegistryClientServiceTest.java |  6 ---
 .../security/impl/CMFMasterServiceTest.java        |  6 +--
 .../java/org/apache/knox/gateway/ShellTest.java    |  3 --
 .../apache/knox/test/mock/MockRequestMatcher.java  |  2 -
 .../apache/knox/gateway/GatewayAdminFuncTest.java  |  8 ---
 .../knox/gateway/GatewayAdminTopologyFuncTest.java |  3 --
 .../apache/knox/gateway/GatewayBasicFuncTest.java  | 25 +--------
 .../gateway/GatewayLdapDynamicGroupFuncTest.java   |  1 -
 .../knox/gateway/GatewayLdapGroupFuncTest.java     |  1 -
 .../knox/gateway/GatewayLocalServiceFuncTest.java  |  1 -
 .../org/apache/knox/gateway/Knox242FuncTest.java   |  1 -
 .../knox/gateway/KnoxCliLdapFuncTestNegative.java  |  1 -
 .../org/apache/knox/gateway/WebHdfsHaFuncTest.java |  1 -
 .../org/apache/knox/gateway/launcher/Command.java  |  5 --
 .../org/apache/knox/gateway/launcher/Launcher.java |  8 +--
 33 files changed, 5 insertions(+), 261 deletions(-)

diff --git a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java
index 0da5a67..c0026ac 100644
--- a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java
+++ b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java
@@ -145,7 +145,6 @@ public class AmbariConfigurationMonitorTest {
 
         final Map<String, Map<String, Integer>> changeNotifications = new HashMap<>();
         monitor.addListener((src, cname) -> {
-//            System.out.println("Cluster config changed: " + cname + " @ " + src);
             // Record the notification
             Integer notificationCount  = changeNotifications.computeIfAbsent(src, s -> new HashMap<>())
                                                             .computeIfAbsent(cname, c -> 0);
@@ -156,16 +155,12 @@ public class AmbariConfigurationMonitorTest {
             if (changeIndex < updateConfigurations.get(src).get(cname).size()) {
                 List<AmbariCluster.ServiceConfiguration> changes = updateConfigurations.get(src).get(cname).get(changeIndex);
 
-//                System.out.println("Applying config update " + changeIndex + " to " + cname + " @ " + src + " ...");
                 for (AmbariCluster.ServiceConfiguration change : changes) {
                     monitor.updateConfigState(src, cname, change.getType(), change.getVersion());
-//                    System.out.println("    Updated " + change.getType() + " to version " + change.getVersion());
                 }
 
                 // Increment the change index
                 configChangeIndex.get(src).replace(cname, changeIndex + 1);
-
-//                System.out.println("Monitor config updated for " + cname + " @ " + src + " : " + changeIndex );
             }
         });
 
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
index 885eecc..2992433 100644
--- a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
@@ -82,7 +82,6 @@ public class HostmapFunctionProcessor
         }
         result.add( parameter );
       }
-//    System.out.println( "HOSTMAP: " + parameter + "->" + value );
     }
     return result;
   }
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
index 6eee0b3..90d7efd 100644
--- a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
+++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java
@@ -92,7 +92,6 @@ public class HostmapFunctionProcessorTest {
 
     Template input = Parser.parseLiteral( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-rewritten-host" ) );
   }
@@ -119,7 +118,6 @@ public class HostmapFunctionProcessorTest {
     Template input = Parser.parseLiteral(
         "test-scheme://test-external-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
     assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
@@ -153,7 +151,6 @@ public class HostmapFunctionProcessorTest {
     Template input = Parser.parseLiteral(
         "test-scheme://test-external-host:42/test-path/test-file?qp1=qp1-val&qp2=qp2-val&test-name-1=test-value-1&test-name-2=test-value-2" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.OUT, "test-rule" );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "test-static-host" ) );
     assertThat( output.getQuery().get( "server" ).getFirstValue().getPattern(), is( "test-external-host" ) );
@@ -187,7 +184,6 @@ public class HostmapFunctionProcessorTest {
     Template input = Parser.parseLiteral(
         "test-scheme://test-inbound-unmapped-host:42/test-path/test-file?test-name-1=test-value-1&test-name-2=test-value-2" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-unmapped-host" ) );
   }
@@ -213,7 +209,6 @@ public class HostmapFunctionProcessorTest {
 
     Template input = Parser.parseLiteral( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "$invalid-function(host)" ) );
   }
@@ -239,7 +234,6 @@ public class HostmapFunctionProcessorTest {
 
     Template input = Parser.parseLiteral( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "$invalid-function(host)" ) );
   }
@@ -265,9 +259,7 @@ public class HostmapFunctionProcessorTest {
 
     Template input = Parser.parseLiteral( "test-scheme://test-inbound-host:42/test-path/test-file?test-name=test-value" );
     Template output = rewriter.rewrite( resolver, input, UrlRewriter.Direction.IN, null );
-    //System.out.println( output );
     assertThat( output, notNullValue() );
     assertThat( output.getHost().getFirstValue().getPattern(), is( "test-inbound-host" ) );
   }
-
 }
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
index 2c205dd..3c32604 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
@@ -649,11 +649,5 @@ class JsonFilterReader extends Reader {
       }
     }
   }
-
-//  private void dump() throws IOException {
-//    mapper.writeTree( factory.createGenerator( System.out ), stack.get( 0 ).node );
-//    System.out.println();
-//  }
-
 }
 
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
index 2cb1000..515812f 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBaseTest.java
@@ -171,7 +171,6 @@ public class HtmlFilterReaderBaseTest {
     HtmlFilterReaderBase filterReader = new NoopXmlFilterReader( inputReader );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
 
-    //System.out.println( outputHtml );
     SimpleNamespaceContext ns = new SimpleNamespaceContext();
     ns.bind( "ns", "http://hortonworks.com/xml/ns" );
     assertThat( the( outputHtml ), hasXPath( "/ns:root", ns ) );
@@ -183,7 +182,6 @@ public class HtmlFilterReaderBaseTest {
     StringReader inputReader = new StringReader( inputXml );
     HtmlFilterReaderBase filterReader = new NoopXmlFilterReader( inputReader );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/text()", equalTo( "text" ) ) );
   }
 
@@ -193,7 +191,6 @@ public class HtmlFilterReaderBaseTest {
     StringReader inputReader = new StringReader( inputXml );
     HtmlFilterReaderBase filterReader = new NoopXmlFilterReader( inputReader );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/@name", equalTo( "value" ) ) );
   }
 
@@ -223,7 +220,6 @@ public class HtmlFilterReaderBaseTest {
     StringReader inputReader = new StringReader( inputXml );
     HtmlFilterReaderBase filterReader = new MapXmlFilterReader( inputReader, map );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/text()", equalTo( "output-text" ) ) );
   }
 
@@ -235,7 +231,6 @@ public class HtmlFilterReaderBaseTest {
     StringReader inputReader = new StringReader( inputXml );
     HtmlFilterReaderBase filterReader = new MapXmlFilterReader( inputReader, map );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/@attribute", equalTo( "output-text" ) ) );
   }
 
@@ -269,13 +264,10 @@ public class HtmlFilterReaderBaseTest {
             "  </ns2:child2>\n" +
             "  root-input3\n" +
             "</ns1:root>";
-    //System.out.println( inputXml );
 
     StringReader inputReader = new StringReader( inputXml );
     HtmlFilterReaderBase filterReader = new MapXmlFilterReader( inputReader, map );
     String outputXml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputXml );
-    //System.out.flush();
 
     SimpleNamespaceContext ns = new SimpleNamespaceContext();
     ns.bind( "n1", "http://hortonworks.com/xml/ns1" );
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
index 3a022e0..9f4eb14 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java
@@ -107,7 +107,6 @@ public class JsonFilterReaderTest {
     StringReader inputReader = new StringReader( inputJson );
     JsonFilterReader filterReader = new TestJsonFilterReader( inputReader, null );
     String outputJson = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "JSON=" + outputJson );
 
     JsonAssert.with( outputJson ).assertThat( "name<test-name>", is( "value:null<test-value>" ) );
   }
@@ -118,7 +117,6 @@ public class JsonFilterReaderTest {
     StringReader inputReader = new StringReader( inputJson );
     JsonFilterReader filterReader = new TestJsonFilterReader( inputReader, null );
     String outputJson = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "JSON=" + outputJson );
     JsonAssert.with( outputJson ).assertThat( "$.[0]", is( "value:null<test-value-1>" ) );
     JsonAssert.with( outputJson ).assertThat( "$.[1]", is( "value:null<test-value-2>" ) );
     JsonAssert.with( outputJson ).assertThat( "$.[2]", is( "value:null<test-value-3>" ) );
@@ -127,7 +125,6 @@ public class JsonFilterReaderTest {
     inputReader = new StringReader( inputJson );
     filterReader = new TestJsonFilterReader( inputReader, null );
     outputJson = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "JSON=" + outputJson );
     JsonAssert.with( outputJson ).assertThat( "$.[0]", is( 777 ) );
     JsonAssert.with( outputJson ).assertThat( "$.[1]", is( 42 ) );
   }
@@ -157,8 +154,6 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "simple-values.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter=1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/json" );
@@ -168,8 +163,6 @@ public class JsonFilterReaderTest {
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "name<test-str>", is( "value:null<text>" ) );
   }
 
@@ -178,8 +171,6 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "dotted-field-name.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "test-filter" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "application/json" );
@@ -192,8 +183,6 @@ public class JsonFilterReaderTest {
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "$['name<testField>']", is( "value:test-rule<testField value>" ) );
     JsonAssert.with( output ).assertThat( "$['name<test_field>']", is( "value:test-rule<test_field value>" ) );
     JsonAssert.with( output ).assertThat( "$['name<test-field>']", is( "value:test-rule<test-field value>" ) );
@@ -206,25 +195,15 @@ public class JsonFilterReaderTest {
 //    String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 //
 //    Object o;
-//
 //    o = JsonPath.read( "$", input, JsonNode.class );
 //    assertThat( o, instanceOf( ObjectNode.class ) );
 //    assertThat( o.toString(), startsWith( "{" ) );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$['test-str']", input, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$['test-obj-multi']", input, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$['val']", (JsonNode)o, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    JsonPath p = JsonPath.compile( "$['test-obj-multi']['val']" );
 //    o = JsonPath.read( "$['test-obj-multi']['val']", input, JsonNode.class );
 //    JsonNode pp = ((JsonNode)o).findParent("val");
-//    System.out.println( "$['test-obj-multi']['val']=" + o.getClass() + "=" + o );
 //
 //  }
 //
@@ -234,22 +213,11 @@ public class JsonFilterReaderTest {
 //    String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 //
 //    Object o;
-//
 //    o = JsonPath.read( "$", input, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$[0]", input, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$[*]", input, JsonNode.class );
-//    System.out.println( "$[*]=" + o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$['obj1-fld1']", (JsonNode)o, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //    o = JsonPath.read( "$[0]['obj1-fld1']", input, JsonNode.class );
-//    System.out.println( o.getClass() + "=" + o );
-//
 //  }
 
   @Test
@@ -257,21 +225,16 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "simple-values.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/json" );
     UrlRewriteFilterBufferDescriptor bufferConfig = contentConfig.addBuffer( "$" );
     UrlRewriteFilterApplyDescriptor applyConfig = bufferConfig.addApply( "$['name<test-str>']", "test-rule" );
     assertNotNull(applyConfig);
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
 
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "name<test-str>", is( "value:test-rule<text>" ) );
   }
 
@@ -280,8 +243,6 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/json" );
@@ -290,13 +251,9 @@ public class JsonFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = detectConfig.addApply( "$.name<property-value>", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-name>", is( "test-name-1" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-value>", is( "test-value-1" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[1].name<property>.name<property-name>", is( "test-name-2" ) );
@@ -310,8 +267,6 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/json" );
@@ -319,13 +274,9 @@ public class JsonFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = bufferConfig.addApply( "$.name<property-value>", "test-rule" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-name>", is( "test-name-1" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-value>", is( "value:test-rule<test-value-1>" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[1].name<property>.name<property-name>", is( "test-name-2" ) );
@@ -339,8 +290,6 @@ public class JsonFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties.json" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/json" );
@@ -348,13 +297,9 @@ public class JsonFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = bufferConfig.addApply( "$.*.name<property>.name<property-value>", "test-rule" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-name>", is( "test-name-1" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[0].name<property>.name<property-value>", is( "value:test-rule<test-value-1>" ) );
     JsonAssert.with( output ).assertThat( "name<properties>[1].name<property>.name<property-name>", is( "test-name-2" ) );
@@ -367,15 +312,11 @@ public class JsonFilterReaderTest {
   public void testInvalidConfigShouldThrowException() throws Exception {
     String input = "{\"test-name\":\"test-value\"}";
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "*/json" );
     contentConfig.addApply( "/root/@url", "test-rule" );
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     try {
       JsonFilterReader filter = new TestJsonFilterReader( new StringReader( input ), contentConfig );
       IOUtils.toString( filter );
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
index d041661..2342ff9 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java
@@ -151,11 +151,9 @@ public class XmlFilterReaderTest {
     assertNotNull(scopeConfig);
 
     String input = "<root/>";
-    //System.out.println( "INPUT=" + input );
     StringReader inputReader = new StringReader( input );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, contentConfig );
     String output = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "OUTPUT=" + output );
     assertThat( the( output ), hasXPath( "/root" ) );
   }
 
@@ -181,7 +179,6 @@ public class XmlFilterReaderTest {
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, null );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
 
-    //System.out.println( outputHtml );
     SimpleNamespaceContext ns = new SimpleNamespaceContext();
     ns.bind( "ns", "http://hortonworks.com/xml/ns" );
     assertThat( the( outputHtml ), hasXPath( "/ns:root", ns ) );
@@ -193,7 +190,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, null );
     String outputXml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "OUTPUT=" + outputXml );
     assertThat( the( outputXml ), hasXPath( "/root/text()", equalTo( "text" ) ) );
   }
 
@@ -203,7 +199,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, null );
     String outputXml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputXml ), hasXPath( "/root/@name", equalTo( "value" ) ) );
   }
 
@@ -219,7 +214,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, contentConfig );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/text()", equalTo( "text" ) ) );
   }
 
@@ -235,7 +229,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, contentConfig );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/@name", equalTo( "value" ) ) );
   }
 
@@ -247,7 +240,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new MapXmlFilterReader( inputReader, map );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/text()", equalTo( "output-text" ) ) );
   }
 
@@ -259,7 +251,6 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new MapXmlFilterReader( inputReader, map );
     String outputHtml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputHtml );
     assertThat( the( outputHtml ), hasXPath( "/root/@attribute", equalTo( "output-text" ) ) );
   }
 
@@ -293,13 +284,10 @@ public class XmlFilterReaderTest {
             "  </ns2:child2>\n" +
             "  root-input3\n" +
             "</ns1:root>";
-    //System.out.println( inputXml );
 
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new MapXmlFilterReader( inputReader, map );
     String outputXml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( outputXml );
-    //System.out.flush();
 
     SimpleNamespaceContext ns = new SimpleNamespaceContext();
     ns.bind( "n1", "http://hortonworks.com/xml/ns1" );
@@ -716,21 +704,15 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-elements.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
     UrlRewriteFilterApplyDescriptor applyConfig = contentConfig.addApply( "/properties/property/value/text()", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/name/text()", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/value/text()", equalTo( "text:test-rule-2{test-value-1}" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/name/text()", equalTo( "test-name-2" ) ) );
@@ -744,21 +726,15 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-elements.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
     UrlRewriteFilterApplyDescriptor applyConfig = contentConfig.addApply( "/properties/property/value", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/name/text()", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/value/text()", equalTo( "text:test-rule-2{test-value-1}" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/name/text()", equalTo( "test-name-2" ) ) );
@@ -772,21 +748,15 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-attributes.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
     UrlRewriteFilterApplyDescriptor applyConfig = contentConfig.addApply( "/properties/property/@value", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/@name", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/@value", equalTo( "attr:test-rule-2{test-value-1}" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/@name", equalTo( "test-name-2" ) ) );
@@ -800,8 +770,6 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-attributes.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
@@ -809,13 +777,9 @@ public class XmlFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = bufferconfig.addApply( "@value", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/@name", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/@value", equalTo( "attr:test-rule-2{test-value-1}" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/@name", equalTo( "test-name-2" ) ) );
@@ -829,8 +793,6 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-elements.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
@@ -839,13 +801,9 @@ public class XmlFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = detectConfig.addApply( "value", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/name/text()", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/value/text()", equalTo( "test-value-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/name/text()", equalTo( "test-name-2" ) ) );
@@ -859,8 +817,6 @@ public class XmlFilterReaderTest {
     InputStream stream = TestUtils.getResourceStream( this.getClass(), "properties-attributes.xml" );
     String input = IOUtils.toString( stream, StandardCharsets.UTF_8 );
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "text/xml" );
@@ -869,13 +825,9 @@ public class XmlFilterReaderTest {
     UrlRewriteFilterApplyDescriptor applyConfig = detectConfig.addApply( "@value", "test-rule-2" );
     assertNotNull(applyConfig);
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
     String output = IOUtils.toString( filter );
 
-    //System.out.println( "OUTPUT=" + output );
-
     assertThat( the( output ), hasXPath( "/properties/property[1]/@name", equalTo( "test-name-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[1]/@value", equalTo( "test-value-1" ) ) );
     assertThat( the( output ), hasXPath( "/properties/property[2]/@name", equalTo( "test-name-2" ) ) );
@@ -888,15 +840,11 @@ public class XmlFilterReaderTest {
   public void testInvalidConfigShouldThrowException() throws Exception {
     String input = "<root url='http://mock-host:42/test-input-path-1'><url>http://mock-host:42/test-input-path-2</url></root>";
 
-    //System.out.println( "INPUT=" + input );
-
     UrlRewriteRulesDescriptor rulesConfig = UrlRewriteRulesDescriptorFactory.create();
     UrlRewriteFilterDescriptor filterConfig = rulesConfig.addFilter( "filter-1" );
     UrlRewriteFilterContentDescriptor contentConfig = filterConfig.addContent( "*/xml" );
     contentConfig.addApply( "$.url", "test-rule" );
 
-    //UrlRewriteRulesDescriptorFactory.store( rulesConfig, "xml", new PrintWriter( System.out ) );
-
     try {
       XmlFilterReader filter = new TestXmlFilterReader( new StringReader( input ), contentConfig );
       IOUtils.toString( filter );
@@ -985,11 +933,9 @@ public class XmlFilterReaderTest {
     StringReader inputReader = new StringReader( inputXml );
     XmlFilterReader filterReader = new NoopXmlFilterReader( inputReader, null );
     String outputXml = new String( IOUtils.toCharArray( filterReader ) );
-    //System.out.println( "OUTPUT=" + outputXml );
     assertThat( the( outputXml ), hasXPath( "/tag/text()", equalTo( "${oozieTemplateMarkup}" ) ) );
   }
 
-
   private class TestXmlFilterReader extends XmlFilterReader {
 
     protected TestXmlFilterReader( Reader reader, UrlRewriteFilterContentDescriptor contentConfig ) throws IOException, ParserConfigurationException, XMLStreamException {
@@ -1005,7 +951,5 @@ public class XmlFilterReaderTest {
     protected String filterText( QName elementName, String text, String ruleName ) {
       return "text:" + ruleName + "{" + text + "}";
     }
-
   }
-
 }
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
index 24ef465..f453a16 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
@@ -143,7 +143,6 @@ public class AclsAuthorizationFilter implements Filter {
     }
     Object[] groups = subject.getPrincipals(GroupPrincipal.class).toArray();
     if (groups.length > 0) {
-//      System.out.println("GroupPrincipal: " + ((Principal)groups[0]).getName());
       groupAccess = checkGroupAcls(groups);
       log.groupPrincipalHasAccess(groupAccess);
     }
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
index 7521577..8b9f78d 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
@@ -312,10 +312,8 @@ public class KnoxLdapRealm extends DefaultLdapRealm {
         } while (cookie != null);
       } catch (SizeLimitExceededException e) {
         LOG.sizeLimitExceededOnlyRetrieved(numResults);
-//        System.out.println("Only retrieved first " + numResults + " groups due to SizeLimitExceededException.");
       } catch(IOException e) {
         LOG.unableToSetupPagedResults();
-//        System.out.println("Unabled to setup paged results");
       }
 
       // save role names and group names in session so that they can be easily looked up outside of this object
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
index 3a63242..8fe46ab 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
@@ -102,13 +102,6 @@ public class UrlConnectionDispatch extends AbstractGatewayFilter {
 //    Pattern sourceRegex = UrlRewriter.compileUrlRegex( sourcePattern );
 //    Matcher matcher = sourceRegex.matcher( sourcePathInfo );
 //    String targetUrl = MessageFormat.format( targetPattern, Regex.toGroupArray( matcher ) );
-//    System.out.println( "Source URI: " + expect.getRequestURI() );
-//    System.out.println( "Source URL: " + expect.getRequestURL() );
-//    System.out.println( "Source Query: " + expect.getQueryString() );
-//    System.out.println( "Source pathInfo: " + sourcePathInfo );
-//    System.out.println( "Source pattern: " + sourcePattern );
-//    System.out.println( "Target pattern: " + targetPattern );
-//    System.out.println( "Resolved target: " + targetUrl );
 
     StringBuilder paramStr = new StringBuilder();
     Enumeration paramNames = request.getParameterNames();
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java
index e895470..d4e6b73 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java
@@ -43,7 +43,6 @@ public class JaasLoginFilter extends AbstractGatewayFilter {
 //
 //        // Adding the user principal to the public credentials because we need the username in the subject later.
 //        subject.getPublicCredentials().add( new PrincipalCredentials( credentials.getUserPrincipal() ) );
-//        //System.out.println( "Subject=" + subject );
 //
 //        PrivilegedExceptionAction<Void> action = new PrivilegedExceptionAction<>() {
 //          @Override
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java
index d39e979..ffef761 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java
@@ -40,11 +40,9 @@ public class CredentialsProvider implements CallbackHandler {
       if( callback instanceof NameCallback ) {
         String username = credentials.getUserPrincipal().getName();
         ((NameCallback)callback).setName( username );
-        //System.out.println( "Provided username: " + username );
       } else if ( callback instanceof PasswordCallback ) {
         String password = credentials.getPassword();
         ((PasswordCallback)callback).setPassword( password.toCharArray() );
-        //System.out.println( "Provided password: " + password );
       }
     }
   }
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java
index 24ec0ae..0ea0ede 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java
@@ -27,12 +27,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.apache.log4j.helpers.Loader;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,8 +45,6 @@ public class TempletonDemo {
 
   @Test
   public void demoGateway() throws IOException {
-    URL url = Loader.getResource( "log4j.properties" );
-    System.out.println( url );
     demo( "http://localhost:8888/gateway/cluster/templeton/v1/mapreduce/jar" );
   }
 
@@ -68,5 +64,4 @@ public class TempletonDemo {
     HttpResponse response = client.execute( request );
     System.out.println( EntityUtils.toString( response.getEntity() ) );
   }
-
 }
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java
index fad4fbc..98f4bea 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java
@@ -97,7 +97,6 @@ public class XmlGatewayDescriptorExporterTest {
     CharArrayWriter writer = new CharArrayWriter();
     GatewayDescriptorFactory.store( descriptor, "xml", writer );
     String xml = writer.toString();
-    //System.out.println( xml );
 
     InputSource source = new InputSource( new StringReader( xml ) );
     Document doc = XmlUtils.readXml( source );
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
index ce28245..f0cbe07 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java
@@ -493,7 +493,6 @@ public class KnoxCLITest {
     String[] args2 = { "list-alias", "--cluster", "Invalidcluster1", "--master", "master" };
     rc = cli.run(args2);
     assertEquals(0, rc);
-    System.out.println(outContent.toString(StandardCharsets.UTF_8.name()));
     assertTrue(outContent.toString(StandardCharsets.UTF_8.name()),
       outContent.toString(StandardCharsets.UTF_8.name()).contains("Invalid cluster name provided: Invalidcluster1"));
 
@@ -584,7 +583,6 @@ public class KnoxCLITest {
     String[] args2 = { "list-alias", "--cluster", "cluster1", "--master", "master" };
     rc = cli.run(args2);
     assertEquals(0, rc);
-    System.out.println(outContent.toString(StandardCharsets.UTF_8.name()));
     assertTrue(outContent.toString(StandardCharsets.UTF_8.name()), outContent.toString(StandardCharsets.UTF_8.name()).contains("alias1"));
 
     outContent.reset();
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java
index a3c5cf8..7d3a6be 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java
@@ -265,7 +265,6 @@ public class BadUrlTest {
    * Intentionally add bad URL
    */
   private static XMLTag createKnoxTopology(final String backend) {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument(true).addRoot("topology").addTag("service")
         .addTag("role").addText("WEBSOCKET").addTag("url").addText(backend)
         .gotoParent().gotoRoot();
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
index 4d1f38f..80c6458 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java
@@ -346,7 +346,6 @@ public class WebsocketEchoTest {
   }
 
   private static XMLTag createKnoxTopology(final String backend) {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument(true).addRoot("topology").addTag("service")
         .addTag("role").addText("WEBSOCKET").addTag("url").addText(backend)
         .gotoParent().gotoRoot();
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
index 1335696..ce064eb 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java
@@ -49,8 +49,6 @@ import javax.websocket.WebSocketContainer;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
@@ -137,24 +135,13 @@ public class WebsocketMultipleConnectionTest {
 
     Session[] sessions = new Session[MAX_CONNECTIONS];
 
-    MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
-
-    System.gc(); // NOPMD
-    final long heapt1 = memoryMXBean.getHeapMemoryUsage().getUsed();
-    final long nonHeapt1 = memoryMXBean.getNonHeapMemoryUsage().getUsed();
-
     for (int i = 0; i < MAX_CONNECTIONS; i++) {
-
       sessions[i] = container.connectToServer(new WebsocketClient() {
-
         @Override
         public void onMessage(String message) {
           latch.countDown();
-
         }
-
       }, new URI(serverUri.toString() + "gateway/websocket/ws"));
-
     }
 
     for (int i = 0; i < MAX_CONNECTIONS; i++) {
@@ -166,15 +153,6 @@ public class WebsocketMultipleConnectionTest {
 
     latch.await(5 * MAX_CONNECTIONS, TimeUnit.MILLISECONDS);
 
-    System.gc(); // NOPMD
-
-    final long heapUsed = memoryMXBean.getHeapMemoryUsage().getUsed() - heapt1;
-    final long nonHeapUsed = memoryMXBean.getNonHeapMemoryUsage().getUsed()
-        - nonHeapt1;
-
-    System.out.println("heapUsed = " + heapUsed);
-    System.out.println("nonHeapUsed = " + nonHeapUsed);
-
     /* 90 KB per connection */
     /*
     long expected = 90 * 1024 * MAX_CONNECTIONS;
@@ -344,7 +322,6 @@ public class WebsocketMultipleConnectionTest {
   }
 
   private static XMLTag createKnoxTopology(final String backend) {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument(true).addRoot("topology").addTag("service")
         .addTag("role").addText("WEBSOCKET").addTag("url").addText(backend)
         .gotoParent().gotoRoot();
@@ -360,11 +337,8 @@ public class WebsocketMultipleConnectionTest {
       synchronized (this) {
         for (TopologyEvent event : events) {
           if (!event.getType().equals(TopologyEvent.Type.DELETED)) {
-
             /* for this test we only care about this part */
-            DeploymentFactory.createDeployment(gatewayConfig,
-                event.getTopology());
-
+            DeploymentFactory.createDeployment(gatewayConfig, event.getTopology());
           }
         }
       }
diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java
index 72e2fa0..b4d347e 100644
--- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java
+++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java
@@ -340,15 +340,9 @@ public class RemoteConfigurationRegistryClientServiceTest {
         assertNotNull(client);
         List<String> descriptors = client.listChildEntries("/knox/config/descriptors");
         assertNotNull(descriptors);
-        for (String descriptor : descriptors) {
-            System.out.println("Descriptor: " + descriptor);
-        }
 
         List<String> providerConfigs = client.listChildEntries("/knox/config/shared-providers");
         assertNotNull(providerConfigs);
-        for (String providerConfig : providerConfigs) {
-            System.out.println("Provider config: " + providerConfig);
-        }
 
         List<String> someotherConfig = client.listChildEntries("/someotherconfig");
         if (isSecureTest) {
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
index d4142fe..3a3516d 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
@@ -30,9 +30,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-/**
-*
-*/
 @Category( { UnitTests.class, FastTests.class } )
 public class CMFMasterServiceTest {
   TestCMFMasterService ms;
@@ -46,11 +43,10 @@ public class CMFMasterServiceTest {
   public void testMasterService() {
     try {
       ms.setupMasterSecret(".", true);
-      //System.out.println("MASTER: " + new String(ms.getMasterSecret()));
       assertEquals("testmastersecret", new String(ms.getMasterSecret()));
       File file = new File("ambari-master");
       assertTrue(file.exists());
-      file.delete();
+      assertTrue(file.delete());
     } catch (ServiceLifecycleException e) {
       e.printStackTrace();
       fail();
diff --git a/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java b/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java
index fd5cdf3..05403d7 100644
--- a/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java
+++ b/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java
@@ -108,16 +108,13 @@ public class ShellTest {
     binding.setProperty("gateway", driver.getClusterUrl());
     URL readme = driver.getResourceUrl("README");
     File file = new File(readme.toURI());
-    System.out.println(file.exists());
     binding.setProperty("file", file.getAbsolutePath());
     GroovyShell shell = new GroovyShell(binding);
     shell.evaluate(driver.getResourceUrl(script).toURI());
     String status = (String) binding.getProperty("status");
     assertNotNull(status);
-    System.out.println(status);
     String fetchedFile = (String) binding.getProperty("fetchedFile");
     assertNotNull(fetchedFile);
-    System.out.println(fetchedFile);
     assertThat(fetchedFile, containsString("README"));
   }
 
diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
index 152e057..9191922 100644
--- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
+++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
@@ -299,8 +299,6 @@ public class MockRequestMatcher {
         String expect = new String( entity, ( expectEncoding == null ? StandardCharsets.UTF_8.name() : expectEncoding ) );
         String actualEncoding = request.getCharacterEncoding();
         String actual = IOUtils.toString( request.getInputStream(), actualEncoding == null ? StandardCharsets.UTF_8.name() : actualEncoding );
-//        System.out.println( "EXPECT=" + expect );
-//        System.out.println( "ACTUAL=" + actual );
         assertThat( actual, sameJSONAs( expect ) );
       } else if( characterEncoding == null || request.getCharacterEncoding() == null ) {
         byte[] bytes = IOUtils.toByteArray( request.getInputStream() );
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminFuncTest.java
index 75291f7..1f4cb9b 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminFuncTest.java
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.core.MediaType;
 import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.HashMap;
@@ -108,7 +107,6 @@ public class GatewayAdminFuncTest {
   }
 
   private static XMLTag createTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
@@ -142,12 +140,6 @@ public class GatewayAdminFuncTest {
         .gotoRoot();
   }
 
-  //@Test
-  public void waitForManualTesting() throws IOException {
-    System.out.println( clusterUrl );
-    System.in.read();
-  }
-
   @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
   public void testAdminService() throws ClassNotFoundException {
     TestUtils.LOG_ENTER();
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java
index 375ca68..b54236b 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAdminTopologyFuncTest.java
@@ -148,7 +148,6 @@ public class GatewayAdminTopologyFuncTest {
   }
 
   private static XMLTag createNormalTopology() {
-    //     System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
@@ -197,7 +196,6 @@ public class GatewayAdminTopologyFuncTest {
   }
 
   private static XMLTag createKnoxTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
@@ -238,7 +236,6 @@ public class GatewayAdminTopologyFuncTest {
   }
 
   private static XMLTag createProviderConfiguration() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
             .addRoot( "gateway" )
             .addTag( "provider" )
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
index f77cee6..c148025 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
@@ -106,15 +106,6 @@ import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
 
 @Category( { VerifyTest.class, MediumTests.class } )
 public class GatewayBasicFuncTest {
-  // Uncomment to cause the test to hang after the gateway instance is setup.
-  // This will allow the gateway instance to be hit directly via some external client.
-//  @Test
-//  public void hang() throws IOException {
-//    System.out.println( "Server on port " + driver.gateway.getAddresses()[0].getPort() );
-//    System.out.println();
-//    System.in.read();
-//  }
-
   private static Logger log = LoggerFactory.getLogger( GatewayBasicFuncTest.class );
 
   private static GatewayTestDriver driver = new GatewayTestDriver();
@@ -190,7 +181,6 @@ public class GatewayBasicFuncTest {
    * @return A populated XML structure for a topology file.
    */
   private static XMLTag createTopology() {
-    //     System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
           .addTag( "gateway" )
@@ -355,7 +345,6 @@ public class GatewayBasicFuncTest {
         .statusCode( HttpStatus.SC_TEMPORARY_REDIRECT )
         .when().put( driver.getUrl("WEBHDFS") + "/v1" + root + "/dir/file" );
     String location = response.getHeader( "Location" );
-    //System.out.println( location );
     log.debug( "Redirect location: " + response.getHeader( "Location" ) );
     if( driver.isUseGateway() ) {
       assertThat( location, anyOf(
@@ -396,7 +385,6 @@ public class GatewayBasicFuncTest {
         .when().put( driver.getUrl("WEBHDFS") + "/v1" + root + "/dir/fileレポー" );
 //        .when().put( driver.getUrl("WEBHDFS") + "/v1" + root + "/dir/file%E3%83%AC%E3%83%9D%E3%83%BC" );
     String location = response.getHeader( "Location" );
-    //System.out.println( location );
     log.debug( "Redirect location: " + response.getHeader( "Location" ) );
     if( driver.isUseGateway() ) {
       assertThat( location, containsString("/dir/file%E3%83%AC%E3%83%9D%E3%83%BC") );
@@ -1018,18 +1006,14 @@ public class GatewayBasicFuncTest {
     context.put( "inputDir", root + "/input" );
     context.put( "outputDir", root + "/output" );
 
-    //URL url = TestUtils.getResourceUrl( GatewayBasicFuncTest.class, "oozie-jobs-submit-request.xml" );
-    //String name = url.toExternalForm();
     String name = TestUtils.getResourceName( this.getClass(), "oozie-jobs-submit-request.xml" );
     Template template = velocity.getTemplate( name );
     StringWriter sw = new StringWriter();
     template.merge( context, sw );
     String request = sw.toString();
-    //System.out.println( "REQUEST=" + request );
 
     /* Submit the job via Oozie. */
     String id = oozieSubmitJob( user, pass, request, 201 );
-    //System.out.println( "ID=" + id );
 
     String success = "SUCCEEDED";
     String status = "UNKNOWN";
@@ -1038,15 +1022,12 @@ public class GatewayBasicFuncTest {
     long start = System.currentTimeMillis();
     while( System.currentTimeMillis() <= start+limit ) {
       status = oozieQueryJobStatus( user, pass, id, 200 );
-      //System.out.println( "Status=" + status );
       if( success.equalsIgnoreCase( status ) ) {
         break;
       } else {
-        //System.out.println( "Status=" + status );
         Thread.sleep( delay );
       }
     }
-    //System.out.println( "Status is " + status + " after " + ((System.currentTimeMillis()-start)/1000) + " seconds." );
     assertThat( status, is( success ) );
 
     if( CLEANUP_TEST ) {
@@ -3526,7 +3507,6 @@ public class GatewayBasicFuncTest {
         .statusCode( HttpStatus.SC_TEMPORARY_REDIRECT )
         .when().put( driver.getUrl("WEBHDFS") + "/v1" + root + "/dir/file" );
     String location = response.getHeader( "Location" );
-    //System.out.println( location );
     log.debug( "Redirect location: " + response.getHeader( "Location" ) );
     if( driver.isUseGateway() ) {
       assertThat( location, is(startsWith(scheme + "://" + host + ":" + port + "/")));
@@ -3808,7 +3788,7 @@ public class GatewayBasicFuncTest {
       setupResource("FALCON", "/api/metadata/lineage/edges/all");
 
     } catch (Exception e) {
-      System.out.println(e.getMessage());
+      e.printStackTrace();
     }
   }
 
@@ -4341,8 +4321,6 @@ public class GatewayBasicFuncTest {
         .status( HttpStatus.SC_CREATED )
         .content( driver.getResourceBytes( "oozie-jobs-submit-response.json" ) )
         .contentType( "application/json" );
-    //System.out.println( "REQUEST LENGTH = " + request.length() );
-
     URL url = new URL( driver.getUrl( "OOZIE" ) + "/v1/jobs?action=start" + ( driver.isUseGateway() ? "" : "&user.name=" + user ) );
     HttpHost targetHost = new HttpHost( url.getHost(), url.getPort(), url.getProtocol() );
     HttpClientBuilder builder = HttpClientBuilder.create();
@@ -4382,7 +4360,6 @@ public class GatewayBasicFuncTest {
 //          .log().all()
 //          .statusCode( status )
 //          .when().post( getUrl( "OOZIE" ) + "/v1/jobs" + ( isUseGateway() ? "" : "?user.name=" + user ) ).asString();
-      //System.out.println( "JSON=" + json );
     return JsonPath.from(json).getString( "id" );
   }
 
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapDynamicGroupFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapDynamicGroupFuncTest.java
index 100b977..5542104 100755
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapDynamicGroupFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapDynamicGroupFuncTest.java
@@ -90,7 +90,6 @@ public class GatewayLdapDynamicGroupFuncTest {
   }
 
   private static XMLTag createTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapGroupFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapGroupFuncTest.java
index a79067c..6e04653 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapGroupFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLdapGroupFuncTest.java
@@ -83,7 +83,6 @@ public class GatewayLdapGroupFuncTest {
   }
 
   private static XMLTag createTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLocalServiceFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLocalServiceFuncTest.java
index 4880970..cfb2235 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLocalServiceFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayLocalServiceFuncTest.java
@@ -117,7 +117,6 @@ public class GatewayLocalServiceFuncTest {
   }
 
   private static XMLTag createTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/Knox242FuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/Knox242FuncTest.java
index 9f46d99..649f37d 100755
--- a/gateway-test/src/test/java/org/apache/knox/gateway/Knox242FuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/Knox242FuncTest.java
@@ -92,7 +92,6 @@ public class Knox242FuncTest {
   }
 
   private static XMLTag createTopology() {
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument( true )
         .addRoot( "topology" )
         .addTag( "gateway" )
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/KnoxCliLdapFuncTestNegative.java b/gateway-test/src/test/java/org/apache/knox/gateway/KnoxCliLdapFuncTestNegative.java
index 9e365a0..d9ba639 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/KnoxCliLdapFuncTestNegative.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/KnoxCliLdapFuncTestNegative.java
@@ -121,7 +121,6 @@ public class KnoxCliLdapFuncTestNegative {
   }
 
   private static XMLTag createBadTopology(){
-    // System.out.println( "GATEWAY=" + xml.toString() );
     return XMLDoc.newDocument(true)
         .addRoot("topology")
         .addTag("gateway")
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java
index 8ec4664..f7bf68a 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java
@@ -96,7 +96,6 @@ public class WebHdfsHaFuncTest {
     * @return A populated XML structure for a topology file.
     */
    private static XMLTag createTopology() {
-     //     System.out.println( "GATEWAY=" + xml.toString() );
       return XMLDoc.newDocument(true)
             .addRoot("topology")
             .addTag("gateway")
diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java
index cfb3da4..9eb5775 100644
--- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java
+++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java
@@ -128,14 +128,10 @@ class Command {
         }
       }
     }
-//    for( URL url : urls ) {
-//      System.out.println( url );
-//    }
     return urls;
   }
 
   private static class WildcardFilenameFilter implements FilenameFilter {
-
     private static String SAFE = new String( new char[]{ (char)0 } );
 
     private Pattern pattern;
@@ -152,5 +148,4 @@ class Command {
       return pattern.matcher( name ).matches();
     }
   }
-
 }
diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
index 58700e2..a6d0cea 100644
--- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
+++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
@@ -75,11 +75,8 @@ public class Launcher {
     command.run();
   }
 
-  private static URL findLauncherJar() throws IOException {
-    URL jarUrl;
-    jarUrl = Launcher.class.getProtectionDomain().getCodeSource().getLocation();
-    //System.out.println( "main.lib=" + url );
-    return jarUrl;
+  private static URL findLauncherJar() {
+    return Launcher.class.getProtectionDomain().getCodeSource().getLocation();
   }
 
   static String calcLauncherName( URL launcherJarUrl ) {
@@ -105,7 +102,6 @@ public class Launcher {
     } else {
       dir = libFile.getParentFile();
     }
-    //System.out.println( "main.dir=" + dir.getAbsolutePath() );
     return dir;
   }
 


Mime
View raw message