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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Sep 27 00:14:46 2014
New Revision: 6596

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6596&view=rev
Log:
IDP-244 - Working resolvertest flow with JSON output.

Added:
    trunk/idp-conf/src/main/resources/views/resolvertest.vm   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateSubjectContext.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolverTestPrincipalLookup.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolverTestRequest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolverTestRequestDecoder.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java?rev=6596&r1=6595&r2=6596&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectContext.java Sat Sep 27 00:14:46 2014
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.authn.context;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +32,7 @@
 import org.opensaml.messaging.context.BaseContext;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
 
 /**
  * A {@link BaseContext} that holds information about the subject of a transaction.
@@ -51,7 +51,7 @@
     
     /** Constructor. */
     public SubjectContext() {
-        authenticationResults = new HashMap(5);
+        authenticationResults = Maps.newHashMapWithExpectedSize(2);
     }
 
     /**
@@ -67,9 +67,13 @@
      * Set the canonical principal name of the subject.
      * 
      * @param name the canonical principal name
+     * 
+     * @return this context
      */
-    public void setPrincipalName(@Nullable final String name) {
+    @Nonnull public SubjectContext setPrincipalName(@Nullable final String name) {
         principalName = name;
+        
+        return this;
     }
 
     /**

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6596&r1=6595&r2=6596&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Sat Sep 27 00:14:46 2014
@@ -78,6 +78,9 @@
     <bean id="shibboleth.ChildLookup.SAMLBindingContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLBindingContext) }" />
+    <bean id="shibboleth.ChildLookup.SAMLProtocolContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLProtocolContext) }" />
     <bean id="shibboleth.ChildLookup.SAMLPeerEntityContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext) }" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=6596&r1=6595&r2=6596&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml Sat Sep 27 00:14:46 2014
@@ -23,7 +23,8 @@
     
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
-        p:profileId="http://shibboleth.net/ns/profiles/resolvertest" />
+        p:profileId="http://shibboleth.net/ns/profiles/resolvertest"
+        p:loggingId="%{idp.service.logging.resolvertest:ResolverTest}" />
 
     <bean id="CheckAccess"
         class="org.opensaml.profile.action.impl.CheckAccess" scope="prototype"
@@ -33,7 +34,7 @@
         
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>

[... 200 lines stripped ...]