[java-idp-testbed COMMIT] in /trunk/src/main: java/Main.java resources/conf/ resources/conf/web-override.xml resource...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Sep  3 01:09:36 2015
New Revision: 320

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=320&view=rev
Log:
IDP-806 - Move testbed web-override.xml

Move testbed web-override.xml from system/conf to conf.

Added:
    trunk/src/main/resources/conf/
    trunk/src/main/resources/conf/web-override.xml
      - copied unchanged from r319, trunk/src/main/resources/system/conf/web-override.xml
Modified:
    trunk/src/main/java/Main.java
    trunk/src/main/resources/system/conf/web-override.xml

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=320&r1=319&r2=320&view=diff
==============================================================================
--- trunk/src/main/java/Main.java	(original)
+++ trunk/src/main/java/Main.java	Thu Sep  3 01:09:36 2015
@@ -108,7 +108,7 @@
             idpWebapp.setContextPath("/idp");
             idpWebapp.setWar(idpWebappPath.toString());
             
-            final Path override = Paths.get("src", "main", "resources", "system", "conf", "web-override.xml");
+            final Path override = Paths.get("src", "main", "resources", "conf", "web-override.xml");
             idpWebapp.setOverrideDescriptor(override.toString());
             
             final String idpJaasConfigPath = configuration.getProperties().get("jetty.jaas.path");
@@ -130,7 +130,7 @@
             contexts.addHandler(testbedWebapp);
             contexts.addHandler(idpWebapp);
 
-            // Uncomment to emable TeeFilter.
+            // Uncomment to enable TeeFilter.
             // final RequestLogImpl requestLog = new RequestLogImpl();
             // requestLog.setResource("/system/conf/logback-access.xml");
             // final RequestLogHandler requestLogHandler = new RequestLogHandler();