[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribu...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 29 16:38:57 2014
New Revision: 6357

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6357&view=rev
Log:
Fix failing tests.

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.kver
Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks?rev=6357&r1=6356&r2=6357&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml?rev=6357&r1=6356&r2=6357&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml Tue Jul 29 16:38:57 2014
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xmlns:util="http://www.springframework.org/schema/util" 
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-<bean  id="shibboleth.TransientIDDataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
-        init-method="initialize">
-    <property name="keystoreResource" value="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks" />
-    <property name="keystorePassword" value="password" />
-    <property name="cipherKeyAlias" value="secret" />
-    <property name="cipherKeyPassword" value="kpassword" />
-</bean>
+    <bean id="shibboleth.TransientIDDataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer">
+        <property name="keyStrategy">
+            <bean class="net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy"
+                p:keystoreResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks"
+                p:keyVersionResource="/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.kver"
+                p:keystorePassword="kpassword"
+                p:keyPassword="password"
+                p:updateInterval="0" />
+        </property>
+    </bean>
 </beans>