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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 17 23:51:43 2013
New Revision: 5053

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5053&view=rev
Log:
De-springify a couple of actions.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContext.java
      - copied, changed from r5048, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContextBasedOnInboundMessageIssuer.java
Modified:
    trunk/idp-saml-impl/pom.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContextBasedOnInboundMessageIssuer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/SelectProfileConfiguration.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/package-info.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/SelectProfileConfigurationTest.java

Modified: trunk/idp-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/pom.xml?rev=5053&r1=5052&r2=5053&view=diff
==============================================================================
--- trunk/idp-saml-impl/pom.xml (original)
+++ trunk/idp-saml-impl/pom.xml Tue Dec 17 23:51:43 2013
@@ -114,16 +114,23 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-saml-api</artifactId>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-api</artifactId>
+            <version>${opensaml.version}</version>
             <type>test-jar</type>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-saml-impl</artifactId>
             <version>${opensaml.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-api</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>

Copied: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContext.java (from r5048, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContextBasedOnInboundMessageIssuer.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContext.java?p2=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContext.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContextBasedOnInboundMessageIssuer.java&r1=5048&r2=5053&rev=5053&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContextBasedOnInboundMessageIssuer.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeRelyingPartyContext.java Tue Dec 17 23:51:43 2013
@@ -19,10 +19,10 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.ActionSupport;
 import org.opensaml.profile.ProfileException;
+import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.context.ProfileRequestContext;
+
 import net.shibboleth.idp.relyingparty.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -32,74 +32,61 @@
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
 
 import com.google.common.base.Function;
 
 /**
- * Adds a {@link RelyingPartyContext} to the current {@link ProfileRequestContext}. The relying party ID is assumed to
- * be the inbound message issuer as determined by the {@link BasicMessageMetadataContext#getMessageIssuer()} located on
- * the {@link ProfileRequestContext#getInboundMessageContext()}.
+ * Action that adds a {@link RelyingPartyContext} to the current {@link ProfileRequestContext}.
+ * The relying party ID is set to the inbound message issuer as determined by
+ * {@link BasicMessageMetadataContext#getMessageIssuer()} via {@link ProfileRequestContext#getInboundMessageContext()}.
+ * 
+ * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
+ * @post ProfileRequestContext.getSubcontext(RelyingPartyContext.class, false) != null

[... 323 lines stripped ...]