[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/relying-party-native.xml conf/subject-c14...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 29 12:09:32 2014
New Revision: 5996

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5996&view=rev
Log:
Utility bean for common predicate, testing RP override

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5996&r1=5995&r2=5996&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Thu May 29 12:09:32 2014
@@ -48,6 +48,27 @@
     </bean>
 
     <util:list id="RelyingPartyOverrides">
+    
+        <!--
+        <bean id="" parent="RelyingParty" p:detailedErrors="true">
+            <property name="activationCondition">
+                <bean parent="shibboleth.Conditions.RelyingPartyId" c:candidates="https://sp.example.org" />
+            </property>
+            <property name="profileConfigurations">
+                <util:list>
+                    <ref bean="Shibboleth.SSO" />
+                    <ref bean="SAML1.AttributeQuery" />
+                    <ref bean="SAML1.ArtifactResolution" />
+                    <ref bean="SAML2.SSO" />
+                    <ref bean="SAML2.ECP" />
+                    <ref bean="SAML2.AttributeQuery" />
+                    <ref bean="SAML2.ArtifactResolution" />
+                    <ref bean="Liberty.SSOS" />
+                </util:list>
+            </property>
+        </bean>
+        -->
+        
     </util:list>
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-c14n.xml?rev=5996&r1=5995&r2=5996&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-c14n.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-c14n.xml Thu May 29 12:09:32 2014
@@ -78,7 +78,7 @@
     Under what conditions should direct NameID mapping be allowed? By default, never.
     Any predicate can be used here; the example is suitable for enumerating a number of SPs to allow.
     -->
-    <bean id="shibboleth.NameTransformPredicate" class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate">
+    <bean id="shibboleth.NameTransformPredicate" parent="shibboleth.Conditions.RelyingPartyId">
         <constructor-arg>
             <util:list>
                 <!-- <value>https://sp.example.org</value> -->

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=5996&r1=5995&r2=5996&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Thu May 29 12:09:32 2014
@@ -12,8 +12,11 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean id="shibboleth.Predicates.True" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
-    <bean id="shibboleth.Predicates.False" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+    <bean id="shibboleth.Conditions.True" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
+    <bean id="shibboleth.Conditions.False" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+    
+    <bean id="shibboleth.Conditions.RelyingPartyId"
+        class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />
 
     <bean id="shibboleth.MessageContextLookup.Inbound"
         class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />