From 07e9574edfa5735e79087058aa027cc7b1c0458c Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Sat, 4 May 2013 11:04:16 +1000
Subject: [PATCH] 407214 Reduce build logging of OSGi modules

---
 jetty-osgi/test-jetty-osgi/pom.xml            |  2 ++
 .../TestJettyOSGiBootContextAsService.java    | 28 +++++++++++--------
 .../osgi/test/TestJettyOSGiBootCore.java      |  1 -
 .../osgi/test/TestJettyOSGiBootSpdy.java      | 23 ++++++++++++++-
 .../TestJettyOSGiBootWebAppAsService.java     | 24 ++++++++--------
 .../osgi/test/TestJettyOSGiBootWithJsp.java   | 19 ++++++-------
 6 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 8b2fde43c60..58184f8b2cd 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -141,12 +141,14 @@
         <scope>test</scope>
     </dependency>
     <!-- For sane logging -->
+<!--
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.6.1</version>
       <scope>test</scope>
     </dependency>
+-->
     <!-- Orbit Servlet Deps -->
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java
index dc850f2cac1..b15e002f0c7 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java
@@ -78,17 +78,21 @@ public class TestJettyOSGiBootContextAsService
         // to pick up and deploy
         options.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("test-jetty-osgi-context").versionAsInProject().start());
 
+        String logLevel = "WARN";
         // Enable Logging
         if (LOGGING_ENABLED)
-        {
-            options.addAll(Arrays.asList(options(
-                                                 // install log service using pax runners profile abstraction (there
-                                                 // are more profiles, like DS)
-                                                 // logProfile(),
-                                                 // this is how you set the default log level when using pax logging
-                                                 // (logProfile)
-                                                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"))));
-        }
+            logLevel = "INFO";
+        
+
+        options.addAll(Arrays.asList(options(
+                                             // install log service using pax runners profile abstraction (there
+                                             // are more profiles, like DS)
+                                             // logProfile(),
+                                             // this is how you set the default log level when using pax logging
+                                             // (logProfile)
+                                             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel),
+                                             systemProperty("org.eclipse.jetty.LEVEL").value(logLevel))));
+
 
         return options.toArray(new Option[options.size()]);
     }
@@ -142,12 +146,14 @@ public class TestJettyOSGiBootContextAsService
         ServiceReference[] refs = bundleContext.getServiceReferences(ContextHandler.class.getName(), null);
         Assert.assertNotNull(refs);
         Assert.assertEquals(1, refs.length);
-        String[] keys = refs[0].getPropertyKeys();
+        //uncomment for debugging
+       /*  
+       String[] keys = refs[0].getPropertyKeys();
         if (keys != null)
         {
             for (String k : keys)
                 System.err.println("service property: " + k + ", " + refs[0].getProperty(k));
-        }
+        }*/
         ContextHandler ch = (ContextHandler) bundleContext.getService(refs[0]);
         Assert.assertEquals("/acme", ch.getContextPath());
 
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
index 8ffde85925e..01eb167a451 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
@@ -53,7 +53,6 @@ public class TestJettyOSGiBootCore
     public Option[] config()
     {
         VersionResolver resolver = MavenUtils.asInProject();
-        System.err.println(resolver.getVersion("org.eclipse.jetty", "jetty-server"));
         ArrayList<Option> options = new ArrayList<Option>();
         TestOSGiUtil.addMoreOSGiContainers(options);
         options.addAll(provisionCoreJetty());
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
index 3d6b2112207..ee104b7e01d 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
@@ -19,9 +19,13 @@
 package org.eclipse.jetty.osgi.test;
 
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.options;
+
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -41,7 +45,8 @@ import org.osgi.framework.BundleContext;
 @RunWith(JUnit4TestRunner.class)
 public class TestJettyOSGiBootSpdy
 {
-
+    private static final boolean LOGGING_ENABLED = false;
+    
     private static final String JETTY_SPDY_PORT = "jetty.spdy.port";
 
     private static final int DEFAULT_JETTY_SPDY_PORT = 9877;
@@ -61,6 +66,22 @@ public class TestJettyOSGiBootSpdy
         options.add(CoreOptions.junitBundles());
         options.addAll(TestJettyOSGiBootCore.httpServiceJetty());
         options.addAll(spdyJettyDependencies());
+        
+        String logLevel = "WARN";
+        
+        // Enable Logging
+        if (LOGGING_ENABLED)
+            logLevel = "INFO";
+        
+
+        options.addAll(Arrays.asList(options(
+                                             // install log service using pax runners profile abstraction (there
+                                             // are more profiles, like DS)
+                                             // logProfile(),
+                                             // this is how you set the default log level when using pax logging
+                                             // (logProfile)
+                                             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel),
+                                             systemProperty("org.eclipse.jetty.LEVEL").value(logLevel))));
         return options.toArray(new Option[options.size()]);
     }
 
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
index 4ed58cb57df..f6e04f524c1 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java
@@ -77,18 +77,20 @@ public class TestJettyOSGiBootWebAppAsService
         options.addAll(configureJettyHomeAndPort("jetty-selector.xml"));
         options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*"));
         options.addAll(TestJettyOSGiBootCore.coreJettyDependencies());
-
-        // Enable Logging
+        
+        String logLevel = "WARN";
         if (LOGGING_ENABLED)
-        {
-            options.addAll(Arrays.asList(options(
-                                                 // install log service using pax runners profile abstraction (there
-                                                 // are more profiles, like DS)
-                                                 // logProfile(),
-                                                 // this is how you set the default log level when using pax logging
-                                                 // (logProfile)
-                                                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"))));
-        }
+            logLevel = "INFO";
+        
+
+        options.addAll(Arrays.asList(options(
+                                             // install log service using pax runners profile abstraction (there
+                                             // are more profiles, like DS)
+                                             // logProfile(),
+                                             // this is how you set the default log level when using pax logging
+                                             // (logProfile)
+                                             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel),
+                                             systemProperty("org.eclipse.jetty.LEVEL").value(logLevel))));
 
         options.addAll(jspDependencies());
         return options.toArray(new Option[options.size()]);
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
index f8521b91182..cd4b5b29458 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
@@ -52,7 +52,7 @@ import org.osgi.framework.BundleContext;
 @RunWith(JUnit4TestRunner.class)
 public class TestJettyOSGiBootWithJsp
 {
-    private static final boolean LOGGING_ENABLED = true;
+    private static final boolean LOGGING_ENABLED = false;
 
     private static final boolean REMOTE_DEBUGGING = false;
 
@@ -72,18 +72,21 @@ public class TestJettyOSGiBootWithJsp
         options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*"));
         options.addAll(TestJettyOSGiBootCore.coreJettyDependencies());
 
+        String logLevel = "WARN";
+        
         // Enable Logging
         if (LOGGING_ENABLED)
-        {
+            logLevel = "INFO";
+ 
             options.addAll(Arrays.asList(options(
                                                  // install log service using pax runners profile abstraction (there
                                                  // are more profiles, like DS)
                                                  // logProfile(),
                                                  // this is how you set the default log level when using pax logging
                                                  // (logProfile)
-                                                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"))));
-        }
-
+                                                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel),
+                                                 systemProperty("org.eclipse.jetty.LEVEL").value(logLevel))));
+     
         options.addAll(jspDependencies());
 
         // Remote JDWP Debugging, this won't work with the forked container.
@@ -119,7 +122,6 @@ public class TestJettyOSGiBootWithJsp
                 + etc
                 + "/jetty-testrealm.xml";
         options.add(systemProperty(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS).value(xmlConfigs));
-        System.err.println(OSGiServerConstants.MANAGED_JETTY_XML_CONFIG_URLS+"="+xmlConfigs);
         options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_JETTY_HTTP_PORT)));
         options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath()));
         return options;
@@ -163,10 +165,6 @@ public class TestJettyOSGiBootWithJsp
     @Test
     public void testJspDump() throws Exception
     {
-
-        // System.err.println("http://127.0.0.1:9876/jsp/dump.jsp  sleeping....");
-        // Thread.currentThread().sleep(5000000);
-        // now test the jsp/dump.jsp
         HttpClient client = new HttpClient();
         try
         {
@@ -175,7 +173,6 @@ public class TestJettyOSGiBootWithJsp
             Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
 
             String content = new String(response.getContent());
-            System.err.println("content: " + content);
             Assert.assertTrue(content.contains("<tr><th>ServletPath:</th><td>/jsp/dump.jsp</td></tr>"));
         }
         finally