[java-idp-testbed COMMIT] in /trunk/src/main: java/Main.java java/storage/ java/storage/SimpleStorageRecordSerializer...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Aug 28 14:51:38 2015
New Revision: 318

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=318&view=rev
Log:
IDP-594 - Interact with storage via testbed.

Add a Controller which provides access via HTTP to storage services for testing purposes.

Added:
    trunk/src/main/java/storage/
    trunk/src/main/java/storage/SimpleStorageRecordSerializer.java   (with props)
    trunk/src/main/java/storage/StorageServiceWrapperController.java   (with props)
    trunk/src/main/resources/system/conf/storage-context.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=318&r1=317&r2=318&view=diff
==============================================================================
--- trunk/src/main/java/Main.java	(original)
+++ trunk/src/main/java/Main.java	Fri Aug 28 14:51:38 2015
@@ -108,9 +108,8 @@
             idpWebapp.setContextPath("/idp");
             idpWebapp.setWar(idpWebappPath.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 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()

Modified: trunk/src/main/resources/system/conf/web-override.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/web-override.xml?rev=318&r1=317&r2=318&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/web-override.xml	(original)
+++ trunk/src/main/resources/system/conf/web-override.xml	Fri Aug 28 14:51:38 2015
@@ -2,6 +2,11 @@
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
 
+    <!--
+    Uncomment to log HTTP requests and responses.
+    See http://logback.qos.ch/recipes/captureHttp.html 
+    -->
+    <!--
     <filter>
         <filter-name>TeeFilter</filter-name>
         <filter-class>ch.qos.logback.access.servlet.TeeFilter</filter-class>
@@ -11,5 +16,28 @@
         <filter-name>TeeFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
+     -->
+
+    
+    <!--
+    Uncomment to enable interacting with storage services via HTTP. 
+    -->
+    <!-- The /storage app space -->
+    <!--
+    <servlet>
+        <servlet-name>storage</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:/system/conf/storage-context.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>storage</servlet-name>
+        <url-pattern>/storage/*</url-pattern>
+    </servlet-mapping>
+    -->
 
 </web-app>