[java-idp-testbed COMMIT] in /trunk/src/test: java/idp/c14n/TestLegacyC14N.java resources/c14n/attribute-resolver-leg...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 27 05:36:59 2014
New Revision: 163

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=163&view=rev
Log:
IDP-358 Force the legacy principal connector by use distinguished NameID and NameIdentifier formats

Modified:
    trunk/src/test/java/idp/c14n/TestLegacyC14N.java
    trunk/src/test/resources/c14n/attribute-resolver-legacy.xml

Modified: trunk/src/test/java/idp/c14n/TestLegacyC14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/TestLegacyC14N.java?rev=163&r1=162&r2=163&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/TestLegacyC14N.java (original)
+++ trunk/src/test/java/idp/c14n/TestLegacyC14N.java Thu Feb 27 05:36:59 2014
@@ -38,11 +38,11 @@
 public class TestLegacyC14N extends AbstractFlowTest {
     
     @BeforeClass public void setPerClassProperties() {
-        System.setProperty("idp.c14n.flows", "Simple|Legacy.*");
+        //System.setProperty("idp.c14n.flows", "Simple|Legacy.*");
     }
     
     @AfterClass public void resetPerClassProperties() {
-        System.setProperty("idp.c14n.flows", "Simple");
+        //System.setProperty("idp.c14n.flows", "Simple");
     }
 
     /** Class logger. */

Modified: trunk/src/test/resources/c14n/attribute-resolver-legacy.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/attribute-resolver-legacy.xml?rev=163&r1=162&r2=163&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/attribute-resolver-legacy.xml (original)
+++ trunk/src/test/resources/c14n/attribute-resolver-legacy.xml Thu Feb 27 05:36:59 2014
@@ -13,10 +13,10 @@
     <!--      Attribute Definitions for webflow testing  -->
 
     <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId">
-        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
-        <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
+        <resolver:AttributeEncoder xsi:type="enc:SAML1StringNameIdentifier" nameFormat="http://example.org/SAML1"/>
+        <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="http://example.org/SAML2"/>
     </resolver:AttributeDefinition>
     
-     <resolver:PrincipalConnector xsi:type="pc:Transient" nameIDFormat="urn:mace:shibboleth:1.0:nameIdentifier" id="Transient"/>
-     <resolver:PrincipalConnector xsi:type="pc:Transient" nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" id="Transient"/>
+     <resolver:PrincipalConnector xsi:type="pc:Transient" nameIDFormat="http://example.org/SAML1" id="Transient"/>
+     <resolver:PrincipalConnector xsi:type="pc:Transient" nameIDFormat="http://example.org/SAML2" id="Transient"/>
 </resolver:AttributeResolver>