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

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:13:34 2014
New Revision: 6143

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6143&view=rev
Log:
Make the DataSealer consume a keystore Resource rather than a String path.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java?rev=6143&r1=6142&r2=6143&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java Sun Jun 22 02:13:34 2014
@@ -21,6 +21,7 @@
 
 import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
+import net.shibboleth.ext.spring.config.StringToResourceConverter;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.idp.attribute.AttributeEncoder;
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
@@ -66,7 +67,8 @@
             boolean supressValid) {
 
         ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
-        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter()));
+        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter(),
+                new StringToResourceConverter()));
         service.afterPropertiesSet();
 
         context.getBeanFactory().setConversionService(service.getObject());
@@ -111,7 +113,8 @@
         XmlBeanDefinitionReader configReader = new XmlBeanDefinitionReader(context);
 
         ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
-        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter()));
+        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter(),
+                new StringToResourceConverter()));
         service.afterPropertiesSet();
 
         context.getBeanFactory().setConversionService(service.getObject());

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=6143&r1=6142&r2=6143&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 Sun Jun 22 02:13:34 2014
@@ -6,7 +6,7 @@
 
 <bean  id="shibboleth.TransientIDDataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
         init-method="initialize">
-    <property name="keystorePath" value="src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks" />
+    <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" />

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6143&r1=6142&r2=6143&view=diff

[... 211 lines stripped ...]