[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 22 19:37:24 2013
New Revision: 4791

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4791&view=rev
Log:
Update with session API changes.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TestContextContainer.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractActiveAuthenticationResults.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TestContextContainer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TestContextContainer.java?rev=4791&r1=4790&r2=4791&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TestContextContainer.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TestContextContainer.java Sun Sep 22 19:37:24 2013
@@ -1,10 +1,4 @@
 package net.shibboleth.idp.attribute.resolver.impl.ad;
-
-import java.security.Principal;
-
-import net.shibboleth.idp.authn.AuthenticationResult;
-import net.shibboleth.idp.session.IdPSession;
-import net.shibboleth.idp.session.ServiceSession;
 
 import org.joda.time.DateTime;
 import org.opensaml.messaging.context.BasicMessageMetadataContext;
@@ -23,18 +17,7 @@
         inbound = new MyMessageContext();
         
         final BasicMessageMetadataContext basic = new BasicMessageMetadataContext();
-        basic.setMessageIssuer(relyingParty);
-        
-        AuthenticationResult event = new AuthenticationResult(authnMethod, new Principal() {   
-            public String getName() {
-                return principalName;
-            }
-        });
-        
-        final IdPSession idpSession = new IdPSession("sessionId", principalName);
-        idpSession.addAuthenticationResult(event);
-        final ServiceSession serviceSession = new ServiceSession("serviceSession", authnMethod);
-        idpSession.addServiceSession(serviceSession);
+        basic.setMessageIssuer(relyingParty);        
     }
 
     public TestContextContainer() {

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractActiveAuthenticationResults.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractActiveAuthenticationResults.java?rev=4791&r1=4790&r2=4791&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractActiveAuthenticationResults.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractActiveAuthenticationResults.java Sun Sep 22 19:37:24 2013
@@ -27,7 +27,7 @@
 import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
 import net.shibboleth.idp.authn.AuthenticationResult;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
-import net.shibboleth.idp.session.IdPSession;
+import net.shibboleth.idp.session.BaseIdPSession;
 import net.shibboleth.idp.session.context.SessionContext;
 
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -50,7 +50,7 @@
     private final Logger log = LoggerFactory.getLogger(ExtractActiveAuthenticationResults.class);
 
     /** Session to copy results from. */
-    private IdPSession session;
+    private BaseIdPSession session;
     
     /** {@inheritDoc} */
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java?rev=4791&r1=4790&r2=4791&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/UpdateSessionWithAuthenticationResult.java Sun Sep 22 19:37:24 2013
@@ -29,8 +29,8 @@
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
 
-import net.shibboleth.idp.session.IdPSession;
-import net.shibboleth.idp.session.ServiceSession;
+import net.shibboleth.idp.session.BaseIdPSession;
+import net.shibboleth.idp.session.BasicServiceSession;
 
 import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
@@ -90,8 +90,8 @@
     /**
      * Updates the session associated with the authenticated user. The following steps are performed:
      * <ul>

[... 8 lines stripped ...]