[java-idp-testbed COMMIT] /trunk/src/main/java/Main.java

[noreply at shibboleth.net]

Author: tzeller
Date: Thu May 21 22:17:15 2015
New Revision: 307

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=307&view=rev
Log:
Comment out last change adding logback-access and TeeFilter, building from command line fails otherwise.

Modified:
    trunk/src/main/java/Main.java

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=307&r1=306&r2=307&view=diff
==============================================================================
--- trunk/src/main/java/Main.java	(original)
+++ trunk/src/main/java/Main.java	Thu May 21 22:17:15 2015
@@ -28,12 +28,9 @@
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.handler.RequestLogHandler;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.xml.XmlConfiguration;
-
-import ch.qos.logback.access.jetty.RequestLogImpl;
 
 /** Start Jetty */
 public class Main {
@@ -109,14 +106,9 @@
             idpWebapp.setContextPath("/idp");
             idpWebapp.setWar(idpWebappPath.toString());
             
-            // Optionally enable logback-access logging as well as the TeeFilter.
-            boolean enableLogging = false;
-            
-            if (enableLogging) {
-                // TeeFilter.
-                final Path override = Paths.get("src", "main", "resources", "system", "conf", "web-override.xml");
-                idpWebapp.setOverrideDescriptor(override.toString());
-            }
+            // Uncomment along with request log handler to enable TeeFilter.
+            // final Path override = Paths.get("src", "main", "resources", "system", "conf", "web-override.xml");
+            // idpWebapp.setOverrideDescriptor(override.toString());
             
             final String idpJaasConfigPath = configuration.getProperties().get("jetty.jaas.path");
             final String testbedJaasConfigPath = pathToIdPConfTestResources.toAbsolutePath().toString()
@@ -137,13 +129,12 @@
             contexts.addHandler(testbedWebapp);
             contexts.addHandler(idpWebapp);
 
-            if (enableLogging) {
-                final RequestLogImpl requestLog = new RequestLogImpl();
-                requestLog.setResource("/system/conf/logback-access.xml");
-                final RequestLogHandler requestLogHandler = new RequestLogHandler();
-                requestLogHandler.setRequestLog(requestLog);
-                handlers.addHandler(requestLogHandler);
-            }
+            // Uncomment to emable TeeFilter.
+            // final RequestLogImpl requestLog = new RequestLogImpl();
+            // requestLog.setResource("/system/conf/logback-access.xml");
+            // final RequestLogHandler requestLogHandler = new RequestLogHandler();
+            // requestLogHandler.setRequestLog(requestLog);
+            // handlers.addHandler(requestLogHandler);
 
             server.setHandler(handlers);