[java-idp-testbed COMMIT] in /trunk/src/main: resources/system/conf/testbed-opensaml.xml webapp/WEB-INF/web.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:35:54 2014
New Revision: 270

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=270&view=rev
Log:
Remove the property-placeholder location attribute by customizing the web application context and adding an application context initializer.

Modified:
    trunk/src/main/resources/system/conf/testbed-opensaml.xml
    trunk/src/main/webapp/WEB-INF/web.xml

Modified: trunk/src/main/resources/system/conf/testbed-opensaml.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-opensaml.xml?rev=270&r1=269&r2=270&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-opensaml.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-opensaml.xml Sun Jun 22 02:35:54 2014
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
+    <context:property-placeholder />
 
     <bean id="shibboleth.OpenSAMLConfig" class="net.shibboleth.idp.spring.OpenSAMLConfigBean"
         depends-on="shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />

Modified: trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/web.xml?rev=270&r1=269&r2=270&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Sun Jun 22 02:35:54 2014
@@ -6,6 +6,16 @@
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>classpath:/system/conf/testbed-opensaml.xml classpath:/test/test-beans.xml</param-value>
+    </context-param>
+    
+    <context-param>
+        <param-name>contextInitializerClasses</param-name>
+        <param-value>net.shibboleth.ext.spring.context.IdPPropertiesApplicationContextInitializer</param-value>
+    </context-param>
+    
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
     </context-param>
 
     <!-- Listeners -->