Author: rdw
Date: Fri Feb 21 10:11:49 2014
New Revision: 154
URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=154&view=rev
Log:
IDP-371 give the SAML2 actions SAML2 names
Added:
trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java
- copied, changed from r153, trunk/src/test/java/idp/c14n/actions/SetupForC14N.java
Modified:
trunk/src/test/java/idp/c14n/actions/SetupForC14N.java
trunk/src/test/resources/c14n/webflows/beans.xml
trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
trunk/src/test/resources/c14n/webflows/transientNameID-flow.xml
Copied: trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java (from r153, trunk/src/test/java/idp/c14n/actions/SetupForC14N.java)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java?p2=trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java&p1=trunk/src/test/java/idp/c14n/actions/SetupForC14N.java&r1=153&r2=154&rev=154&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/actions/SetupForC14N.java (original)
+++ trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java Fri Feb 21 10:11:49 2014
@@ -34,7 +34,7 @@
/**
*
*/
-public class SetupForC14N extends AbstractProfileAction {
+public class SetupForSAML2C14N extends AbstractProfileAction {
private String attributeName;
Modified: trunk/src/test/resources/c14n/webflows/beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/beans.xml?rev=154&r1=153&r2=154&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/beans.xml (original)
+++ trunk/src/test/resources/c14n/webflows/beans.xml Fri Feb 21 10:11:49 2014
@@ -14,9 +14,9 @@
<bean id="PopulateResolution" class = "idp.c14n.actions.SetupForResolver" scope="prototype" p:id="resThing" />
<bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" p:id="Resolver" c:resolverService-ref="shibboleth.AttributeResolverService" scope="prototype" />
- <bean id="PopulateC14N" class = "idp.c14n.actions.SetupForC14N" scope="prototype" p:id="c14nThing" p:attributeName="transientId" />
- <bean id="PopulateC14NCrypto" class = "idp.c14n.actions.SetupForC14N" scope="prototype" p:id="c14ncryptoThing" p:attributeName="cryptoTransientId" />
- <bean id="PopulateC14NDirect" class = "idp.c14n.actions.SetupForC14N" scope="prototype" p:id="c14nThing" p:attributeName="Principal" />
+ <bean id="PopulateSAML2C14N" class = "idp.c14n.actions.SetupForSAML2C14N" scope="prototype" p:id="c14nThing" p:attributeName="transientId" />
+ <bean id="PopulateSAML2C14NCrypto" class = "idp.c14n.actions.SetupForSAML2C14N" scope="prototype" p:id="c14ncryptoThing" p:attributeName="cryptoTransientId" />
+ <bean id="PopulateSAML2C14NDirect" class = "idp.c14n.actions.SetupForSAML2C14N" scope="prototype" p:id="c14nThing" p:attributeName="Principal" />
<bean id="TestAfterC14N" class = "idp.c14n.actions.TestAfterC14N" scope="prototype" p:id="c14nTest" />
</beans>
Modified: trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml?rev=154&r1=153&r2=154&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml Fri Feb 21 10:11:49 2014
@@ -13,11 +13,11 @@
<action-state id="ResolveAttributes">
<evaluate expression="ResolveAttributes" />
- <transition on="proceed" to="PopulateC14NCrypto" />
+ <transition on="proceed" to="PopulateSAML2C14NCrypto" />
</action-state>
- <action-state id="PopulateC14NCrypto">
- <evaluate expression="PopulateC14NCrypto" />
+ <action-state id="PopulateSAML2C14NCrypto">
+ <evaluate expression="PopulateSAML2C14NCrypto" />
<transition on="proceed" to="thing" />
</action-state>
Modified: trunk/src/test/resources/c14n/webflows/directNameID-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/resources/c14n/webflows/directNameID-flow.xml?rev=154&r1=153&r2=154&view=diff
==============================================================================
--- trunk/src/test/resources/c14n/webflows/directNameID-flow.xml (original)
+++ trunk/src/test/resources/c14n/webflows/directNameID-flow.xml Fri Feb 21 10:11:49 2014
@@ -13,11 +13,11 @@
<action-state id="ResolveAttributes">
<evaluate expression="ResolveAttributes" />
- <transition on="proceed" to="PopulateC14NDirect" />
+ <transition on="proceed" to="PopulateSAML2C14NDirect" />
[... 31 lines stripped ...]