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

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 29 16:48:18 2014
New Revision: 5997

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5997&view=rev
Log:
Experimenting with shorthand methods for specifying relying party rules.

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java
      - copied, changed from r5988, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/package-info.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/RelyingPartyConfigurationSupport.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/relyingparty/impl/package-info.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyParser.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/logic/EntitiesDescriptorPredicate.java

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=5997&r1=5996&r2=5997&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 16:48:18 2014
@@ -49,11 +49,8 @@
 
     <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>
+        <bean parent="RelyingPartyByName" c:relyingPartyIds="https://sp.example.org"
+                p:detailedErrors="true">
             <property name="profileConfigurations">
                 <util:list>
                     <ref bean="Shibboleth.SSO" />
@@ -67,7 +64,6 @@
                 </util:list>
             </property>
         </bean>
-        -->
         
     </util:list>
 

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=5997&r1=5996&r2=5997&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Thu May 29 16:48:18 2014
@@ -26,8 +26,18 @@
         p:relyingPartyConfigurations-ref="RelyingPartyOverrides"
         p:defaultSecurityConfiguration-ref="DefaultSecurityConfiguration" />
 
-    <!-- Parent bean for RelyingParty overrides that establishes defaults. -->
-    <bean id="RelyingParty" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration" abstract="true"
+    <!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->
+    <bean id="RelyingParty" abstract="true" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
+        p:responderId-ref="entityID" p:detailedErrors="${idp.errors.detailed}" />
+
+    <!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
+    <bean id="RelyingPartyByName" abstract="true"
+        class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byName"
+        p:responderId-ref="entityID" p:detailedErrors="${idp.errors.detailed}" />
+
+    <!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
+    <bean id="RelyingPartyByGroup" abstract="true"
+        class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byGroup"
         p:responderId-ref="entityID" p:detailedErrors="${idp.errors.detailed}" />
 
     <!-- Default Profile Configurations, also usable as parent beans in overrides. -->

Copied: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java (from r5988, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java)

[... 113 lines stripped ...]