[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/impl/profile/saml2/Set...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 22 11:04:15 2013
New Revision: 4604

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4604&view=rev
Log:
Start of renaming some classes.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java?rev=4604&r1=4603&r2=4604&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java Mon Jul 22 11:04:15 2013
@@ -29,7 +29,7 @@
 import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationException;
-import net.shibboleth.idp.authn.AuthenticationWorkflowDescriptor;
+import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.profile.ActionSupport;
 
@@ -70,12 +70,12 @@
         log.debug("Action {}: inbound AuthnRequest requested the following workflow IDs: {}", getId(),
                 requestedWorkflowIds);
 
-        final Map<String, AuthenticationWorkflowDescriptor> availableDescriptors =
+        final Map<String, AuthenticationFlowDescriptor> availableDescriptors =
                 authenticationContext.getPotentialWorkflows();
 
-        final HashMap<String, AuthenticationWorkflowDescriptor> requestedWorkflows =
-                new HashMap<String, AuthenticationWorkflowDescriptor>();
-        AuthenticationWorkflowDescriptor descriptor;
+        final HashMap<String, AuthenticationFlowDescriptor> requestedWorkflows =
+                new HashMap<String, AuthenticationFlowDescriptor>();
+        AuthenticationFlowDescriptor descriptor;
         for (String workflowId : requestedWorkflowIds) {
             descriptor = availableDescriptors.get(workflowId);
             if (descriptor != null) {

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java?rev=4604&r1=4603&r2=4604&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java Mon Jul 22 11:04:15 2013
@@ -17,7 +17,7 @@
 
 package net.shibboleth.idp.saml.impl.profile.saml1;
 
-import net.shibboleth.idp.authn.AuthenticationWorkflowDescriptor;
+import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.profile.ActionTestingSupport;
 
@@ -114,7 +114,7 @@
                         .buildProfileRequestContext();
 
         AuthenticationContext authCtx = new AuthenticationContext(null);
-        authCtx.setAttemptedWorkflow(new AuthenticationWorkflowDescriptor("test"));
+        authCtx.setAttemptedWorkflow(new AuthenticationFlowDescriptor("test"));
 
         long now = System.currentTimeMillis();
         // this is here to allow the event's creation time to deviate from the 'start' time