[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/intercept/consent-intercept-config.xml sy...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Dec  3 11:26:08 2014
New Revision: 7038

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7038&view=rev
Log:
Try to be consistent with 'shibboleth.consent' prefix in bean IDs.

Modified:
    trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml?rev=7038&r1=7037&r2=7038&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml Wed Dec  3 11:26:08 2014
@@ -48,20 +48,20 @@
     whether consent should be obtained for an attribute based on the attribute ID.
     -->
     
-    <util:list id="shibboleth.attribute-release.WhitelistedAttributeIDs">
+    <util:list id="shibboleth.consent.attribute-release.WhitelistedAttributeIDs">
         <!--
         <value>email</value>
         -->
     </util:list>
 
-    <util:list id="shibboleth.attribute-release.BlacklistedAttributeIDs">
+    <util:list id="shibboleth.consent.attribute-release.BlacklistedAttributeIDs">
         <value>transientId</value>
         <value>persistentId</value>
         <value>eduPersonTargetedID</value>
     </util:list>
 
     <!-- 
-    <bean id="shibboleth.attribute-release.MatchExpression" class="java.util.regex.Pattern" factory-method="compile" 
+    <bean id="shibboleth.consent.attribute-release.MatchExpression" class="java.util.regex.Pattern" factory-method="compile" 
         c:regex="^exampleAttribute.*$" />
     -->
 
@@ -110,14 +110,14 @@
     If you write your own function to extract a new piece of data for auditing, you can install it into one or more
     of the maps below to add it to the auditing framework, keyed by an audit field label to be used in formatting.
     -->
-    <bean id="shibboleth.PreConsentAuditExtractors" parent="shibboleth.DefaultPreConsentAuditExtractors" lazy-init="true">
+    <bean id="shibboleth.consent.PreConsentAuditExtractors" parent="shibboleth.consent.DefaultPreConsentAuditExtractors" lazy-init="true">
         <property name="sourceMap">
             <map merge="true">
             </map>
         </property>
     </bean>
 
-    <bean id="shibboleth.ConsentAuditExtractors" parent="shibboleth.DefaultConsentAuditExtractors" lazy-init="true">
+    <bean id="shibboleth.consent.ConsentAuditExtractors" parent="shibboleth.consent.DefaultConsentAuditExtractors" lazy-init="true">
         <property name="sourceMap">
             <map merge="true">
             </map>

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml?rev=7038&r1=7037&r2=7038&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml Wed Dec  3 11:26:08 2014
@@ -54,20 +54,23 @@
         scope="prototype" />
 
     <!-- Function to lookup consent-specific audit context as a child of the consent context. -->
-    <bean id="shibboleth.ChildLookup.ConsentAuditContext" class="com.google.common.base.Functions" factory-method="compose">
+    <bean id="shibboleth.consent.ChildLookup.ConsentAuditContext"
+        class="com.google.common.base.Functions" factory-method="compose">
         <constructor-arg name="g">
-            <bean id="shibboleth.ChildLookup.AuditContext" class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+            <bean id="shibboleth.ChildLookup.AuditContext"
+                class="org.opensaml.messaging.context.navigate.ChildContextLookup"
                 c:type="#{ T(net.shibboleth.idp.profile.context.AuditContext) }"
                 c:createContext="true" />
         </constructor-arg>
         <constructor-arg name="f">
-            <bean id="shibboleth.ChildLookup.ConsentContext" class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+            <bean id="shibboleth.ChildLookup.ConsentContext"
+                class="org.opensaml.messaging.context.navigate.ChildContextLookup"
                 c:type="#{ T(net.shibboleth.idp.consent.context.ConsentContext) }" />
         </constructor-arg>
     </bean>
 
     <!-- Default pre-consent audit extractors. -->
-    <bean id="shibboleth.DefaultPreConsentAuditExtractors"
+    <bean id="shibboleth.consent.DefaultPreConsentAuditExtractors"

[... 106 lines stripped ...]