[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/post-authn/post-authn.xml idp-conf/src/ma...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Oct  7 16:25:48 2014
New Revision: 6648

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6648&view=rev
Log:
Checkpoint work on consent. Cleanup Spring wiring and unused flow descriptors.

Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/post-authn-system.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateAttributeConsentChoices.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/InitializeAttributeConsentContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/CreateTermsOfUseChoice.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/InitializeTermsOfUseContext.java

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml?rev=6648&r1=6647&r2=6648&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml Tue Oct  7 16:25:48 2014
@@ -12,36 +12,34 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- TODO placeholder -->
-    <!-- TODO use property replacement for storage key attribute id -->
+    <!-- TODO use property replacement for storage key attribute id ? -->
 
     <!-- Flows executed after authentication. -->
     <util:list id="shibboleth.PostAuthnFlows">
-        <!--
-        <bean id="post-authn/consent/terms-of-use" parent="TermsOfUseFlowDescriptor" />
-        <bean id="post-authn/consent/attribute-consent" parent="AttributeConsentFlowDescriptor" />
-        <bean id="post-authn/consent/per-attribute-consent" parent="AttributeConsentFlowDescriptor" />
-         -->
+        <!-- 
+        <bean id="post-authn/consent/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow"
+                p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
+                p:storageService-ref="shibboleth.ClientStorageService"
+                p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKey"
+                p:compareValues="true"
+                p:idMessageCode="idp.tou.id"
+                p:textMessageCode="idp.tou.text" />
+        
+        <bean id="post-authn/consent/attribute-consent" parent="shibboleth.consent.AttributeConsentFlow"
+                p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
+                p:storageService-ref="shibboleth.ClientStorageService"
+                p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKey"
+                p:compareValues="true" />
+        
+        <bean id="post-authn/consent/per-attribute-consent" parent="shibboleth.consent.AttributeConsentFlow"
+                p:activationCondition-ref="shibboleth.consent.RelyingPartyPredicate"
+                p:storageService-ref="shibboleth.ClientStorageService"
+                p:storageKeyLookupStrategy-ref="shibboleth.consent.StorageKey"
+                p:compareValues="true" />
+        -->
     </util:list>
 
-    <!--
-    <bean id="AttributeConsentFlowDescriptor" class="net.shibboleth.idp.consent.flow.ar.AttributeConsentFlowDescriptor"
-        p:activationCondition-ref="Consent.Conditions.RelyingPartyID"
-        p:storageService-ref="shibboleth.ClientStorageService"
-        p:storageKeyLookupStrategy-ref="StorageKeyLookupFunction"
-        p:compareValues="true"
-        scope="prototype" />
-        
-    <bean id="TermsOfUseFlowDescriptor" class="net.shibboleth.idp.consent.flow.tou.TermsOfUseFlowDescriptor"
-        p:activationCondition-ref="Consent.Conditions.RelyingPartyID"
-        p:storageService-ref="shibboleth.ClientStorageService"
-        p:storageKeyLookupStrategy-ref="StorageKeyLookupFunction"
-        p:compareValues="true"
-        p:idMessageCode="idp.tou.id"
-        p:textMessageCode="idp.tou.text"
-        scope="prototype" />
-
-    <bean id="Consent.Conditions.RelyingPartyID" parent="shibboleth.Conditions.RelyingPartyId">
+    <bean id="shibboleth.consent.RelyingPartyPredicate" parent="shibboleth.Conditions.RelyingPartyId">
         <constructor-arg>
             <util:list>
                 <value>https://sp.example.org</value>
@@ -49,8 +47,7 @@
         </constructor-arg>
     </bean>
 
-    <bean id="StorageKeyLookupFunction" class="net.shibboleth.idp.consent.logic.StorageKeyLookupFunction" scope="prototype"

[... 301 lines stripped ...]