[java-identity-provider COMMIT] in /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session: AuthenticationEvent...

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Aug 12 18:22:21 2011
New Revision: 4012

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4012&view=rev
Log:
More work on the session APIs

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionCreationStrategy.java   (with props)
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/SessionCreationStrategy.java   (with props)
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/SessionStore.java   (contents, props changed)
      - copied, changed from r4011, trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
Removed:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/BasicSessionManager.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/ServiceSession.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java?rev=4012&r1=4011&r2=4012&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java Fri Aug 12 18:22:21 2011
@@ -29,7 +29,7 @@
  * Describes an authentication event that took place within the scope of an {@link IdPSession}.
  * 
  * Properties of this object <strong>must not</strong> be modifiable directly. Instead, use the modification methods
- * available via the {@link SessionManager} that created the associate {@link IdPSession}.
+ * available via the {@link SessionStore} that created the associate {@link IdPSession}.
  */
 public class AuthenticationEvent extends AbstractSubcontextContainer {
 

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java?rev=4012&r1=4011&r2=4012&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java Fri Aug 12 18:22:21 2011
@@ -22,20 +22,16 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.security.auth.Subject;
-
 import org.opensaml.messaging.context.AbstractSubcontextContainer;
 import org.opensaml.util.Assert;
 import org.opensaml.util.ObjectSupport;
 import org.opensaml.util.StringSupport;
 
-//TODO implement hashCode/equals - need to implement this for AbstractSubcontextContainer as well
-
 /**
  * An identity provider session.
  * 
  * Properties of this object <strong>must not</strong> be modifiable directly. Instead, use the modification methods
- * available via the {@link SessionManager} that created this session.
+ * available via the {@link SessionStore} that created this session.
  */
 public class IdPSession extends AbstractSubcontextContainer {
 
@@ -45,23 +41,11 @@
     /** Secret associated with this session. */
     private byte[] secret;
 
-    /**
-     * Time, in milliseconds since the epoch, when this session expires, regardless of activity. A value of 0 or less
-     * indicates the session does not have an absolute expiration instant.
-     */
-    private long expirationInstant;
-
-    /**
-     * Amount of time, in milliseconds, a session may be inactive before it is considered expired. A value of 0 or less
-     * indicates the session never expires due to inactivity.
-     */
-    private long inactivityTimeout;
+    /** Time, in milliseconds since the epoch, when this session was created. */
+    private long creationInstant;
 
     /** Last activity instant, in milliseconds since the epoch, for this session. */
     private long lastActivityInstant;
-
-    /** Gets the subject associated with this session. */
-    private Subject subject;
 
     /** Gets the authentication events that have occurred within the scope of this session. */
     private Collection<AuthenticationEvent> authnEvents;
@@ -108,23 +92,22 @@
     }
 
     /**
-     * Gets the time, in milliseconds since the epoch, when this session expires regardless of activity. A value of 0 or
-     * less indicates the session does not have an absolute expiration instant.
-     * 
-     * @return time, in milliseconds since the epoch, when this session expires regardless of activity
-     */
-    public long getExpirationInstant() {
-        return expirationInstant;
-    }
-
-    /**

[... 346 lines stripped ...]