[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Apr 12 11:49:33 2014
New Revision: 5713

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5713&view=rev
Log:
IDP-390 Parsers and test for X509Inline Credentials

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineCredentialFactoryBean.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineCredentialParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineParserTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java?rev=5713&r1=5712&r2=5713&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java Sat Apr 12 11:49:33 2014
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.profile.spring.relyingparty.security;
 
 import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509FilesystemCredentialParser;
+import net.shibboleth.idp.profile.spring.relyingparty.security.credential.X509InlineCredentialParser;
 import net.shibboleth.idp.spring.BaseSpringNamespaceHandler;
 
 
@@ -30,5 +31,6 @@
     /** {@inheritDoc} */
     @Override public void init() {
         registerBeanDefinitionParser(X509FilesystemCredentialParser.ELEMENT_NAME, new X509FilesystemCredentialParser());
+        registerBeanDefinitionParser(X509InlineCredentialParser.ELEMENT_NAME, new X509InlineCredentialParser());
     }
 }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java?rev=5713&r1=5712&r2=5713&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java Sat Apr 12 11:49:33 2014
@@ -81,7 +81,7 @@
         if (null == value) {
             throw new BeanCreationException("<PrivateKey> Must contain text.");
         }
-        log.debug("Found a private key {}", value);
+        log.debug("Found a private key <Supressed>");
         builder.addPropertyValue("privateKey", value);
         builder.addPropertyValue("privateKeyPassword", key.getAttributeNS(null, "password"));
     }