[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-bea...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep  9 10:11:13 2014
New Revision: 6514

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6514&view=rev
Log:
IDP-224 - Rename ProcessLogout action to better reflect the behavior.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java
      - copied, changed from r6513, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequestTest.java
      - copied, changed from r6513, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutTest.java
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml?rev=6514&r1=6513&r2=6514&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml Tue Sep  9 10:11:13 2014
@@ -34,8 +34,8 @@
 
     <alias name="shibboleth.OutgoingSAML2SLOBindings" alias="shibboleth.OutgoingBindings"/>
 
-    <bean id="ProcessLogout"
-        class="net.shibboleth.idp.saml.saml2.profile.impl.ProcessLogout" scope="prototype"
+    <bean id="ProcessLogoutRequest"
+        class="net.shibboleth.idp.saml.saml2.profile.impl.ProcessLogoutRequest" scope="prototype"
         p:sessionManager-ref="shibboleth.SessionManager"
         p:sessionResolver-ref="shibboleth.SessionManager" />
     

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml?rev=6514&r1=6513&r2=6514&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml Tue Sep  9 10:11:13 2014
@@ -13,7 +13,7 @@
     </action-state>
 
     <action-state id="DoProfileWork">
-        <evaluate expression="ProcessLogout" />
+        <evaluate expression="ProcessLogoutRequest" />
         <evaluate expression="LogoutPopulateAuditContext" />
         <evaluate expression="PopulateMultiRPContextFromLogoutContext" />
 

Copied: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java (from r6513, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java?p2=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java&r1=6513&r2=6514&rev=6514&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutRequest.java Tue Sep  9 10:11:13 2014
@@ -71,10 +71,10 @@
  * @post If a {@link IdPSession} was found, then a {@link SubjectContext} and {@link LogoutContext} will be populated.
  * @post If a single {@link IdPSession} was found, then a {@link SessionContext} will be populated.
  */
-public class ProcessLogout extends AbstractProfileAction {
+public class ProcessLogoutRequest extends AbstractProfileAction {
     
     /** Class logger. */
-    @Nonnull private final Logger log = LoggerFactory.getLogger(ProcessLogout.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(ProcessLogoutRequest.class);
     
     /** Session resolver. */
     @NonnullAfterInit private SessionResolver sessionResolver;
@@ -101,7 +101,7 @@
     @Nullable private LogoutRequest logoutRequest;
     
     /** Constructor. */
-    public ProcessLogout() {
+    public ProcessLogoutRequest() {
         subjectContextCreationStrategy = new ChildContextLookup<>(SubjectContext.class, true);
         sessionContextCreationStrategy = new ChildContextLookup<>(SessionContext.class, true);

[... 37 lines stripped ...]