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

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 15:11:38 2014
New Revision: 5985

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5985&view=rev
Log:
- Rewire "Direct" SAML decoders into empty Transforming decoders.
- Fix default config and override config in tests to allow test SP to run Direct flows.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/BaseTransformingDecoder.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransformingNameIDDecoder.java
      - copied, changed from r5980, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/DirectNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/TransformingNameIdentifierDecoder.java
      - copied, changed from r5980, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/DirectNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/TransformingDecoderTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
    trunk/idp-conf/src/main/resources/conf/subject-c14n-user.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/DirectNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/DirectNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrincipalConnectorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/DirectDecoderTest.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java?rev=5985&r1=5984&r2=5985&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java Wed May 28 15:11:38 2014
@@ -20,8 +20,8 @@
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.idp.saml.nameid.impl.DirectNameIDDecoder;
-import net.shibboleth.idp.saml.nameid.impl.DirectNameIdentifierDecoder;
+import net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder;
+import net.shibboleth.idp.saml.nameid.impl.TransformingNameIdentifierDecoder;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -40,7 +40,7 @@
     @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
 
-        BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(DirectNameIDDecoder.class);
+        BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransformingNameIDDecoder.class);
         subBuilder.setInitMethodName("initialize");
         subBuilder.setDestroyMethodName("destroy");
         
@@ -49,7 +49,7 @@
         builder.addConstructorArgValue(subBuilder.getBeanDefinition());
         
 
-        subBuilder = BeanDefinitionBuilder.genericBeanDefinition(DirectNameIdentifierDecoder.class);
+        subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransformingNameIdentifierDecoder.class);
         subBuilder.setInitMethodName("initialize");
         subBuilder.setDestroyMethodName("destroy");
         

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java?rev=5985&r1=5984&r2=5985&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java Wed May 28 15:11:38 2014
@@ -21,8 +21,8 @@
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
 import net.shibboleth.idp.saml.nameid.NameDecoderException;
-import net.shibboleth.idp.saml.nameid.impl.DirectNameIDDecoder;

[... 186 lines stripped ...]