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

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Jul 17 13:21:46 2012
New Revision: 4207

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4207&view=rev
Log:
Pull up some stages that are applicable to more than just SAML

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java
      - copied, changed from r4206, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddRelyingPartyConfigurationToProfileRequestContext.java
Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/DecodeMessage.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddRelyingPartyConfigurationToProfileRequestContext.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/DecodeMessage.java

Copied: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java (from r4206, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddRelyingPartyConfigurationToProfileRequestContext.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java?p2=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddRelyingPartyConfigurationToProfileRequestContext.java&r1=4206&r2=4207&rev=4207&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddRelyingPartyConfigurationToProfileRequestContext.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java Tue Jul 17 13:21:46 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.saml.impl.profile;
+package net.shibboleth.idp.profile.impl;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/DecodeMessage.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/DecodeMessage.java?rev=4207&r1=4206&r2=4207&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/DecodeMessage.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/DecodeMessage.java Tue Jul 17 13:21:46 2012
@@ -18,128 +18,71 @@
 package net.shibboleth.idp.profile.impl;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.shibboleth.ext.spring.webflow.Event;
+import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.ActionSupport;
+import net.shibboleth.idp.profile.EventIds;
 import net.shibboleth.idp.profile.HttpServletRequestMessageDecoderFactory;
 import net.shibboleth.idp.profile.ProfileException;
 import net.shibboleth.idp.profile.ProfileRequestContext;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
+import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.decoder.MessageDecoder;
 import org.opensaml.messaging.decoder.MessageDecodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
 
-/**
- * An IdP action that decodes the incoming message and populates
- * {@link ProfileRequestContext#getInboundMessageContext()}.
- * 
- * @param <InboundMessageType> the inbound message type
- * @param <OutboundMessageType> this is meaningless for this action but needed to fill out the class decleration
- */
-public final class DecodeMessage<InboundMessageType, OutboundMessageType> extends
-        AbstractProfileAction<InboundMessageType, OutboundMessageType> implements UnmodifiableComponent {
+/** A profile stage that decodes an incoming request into a given {@link MessageContext}. */
+ at Events({@Event(id = EventIds.PROCEED_EVENT_ID),
+        @Event(id = DecodeMessage.UNABLE_TO_DECODE, description = "An error occured trying to decode the message")})
+public class DecodeMessage extends AbstractProfileAction {
+
+    /** ID of the event returned if incoming message could not be decoded. */
+    public static final String UNABLE_TO_DECODE = "UnableToDecode";
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(DecodeMessage.class);
 

[... 117 lines stripped ...]