[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/profile-defaults.xml system/conf/global-s...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May  2 05:07:18 2014
New Revision: 5825

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5825&view=rev
Log:
IDP-390 Make the Rp fonig resolver which loads from relying-party.xml "live.  Remove old configurations.  Fix default inboundFlowId for the flow artifact retrieval.  Fix some bean capitalization en passant.

Modified:
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5825&r1=5824&r2=5825&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Fri May  2 05:07:18 2014
@@ -19,7 +19,7 @@
 
     <!--  SAML2 -->
     <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2ArtifactQuery" /><!-- TODO -->
+        c:_0="SecurityPolicy.SAML2ArtifactResolution" /><!-- TODO -->
         
     <bean id="shibboleth.SAML2.Logout.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/Logout" />
@@ -43,13 +43,13 @@
         c:_0="SecurityPolicy.SAML2SSO" />
         
     <bean id="shibboleth.SAML2.ECP.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML2ECP" />
+        c:_0="SecurityPolicy.SAML2ECP" /><!-- TODO -->
 
     <!--  SAML2 - Liberty -->
 
     <!--  SAML1 -->
     <bean id="shibboleth.SAML1.Artifact.InboundFlowId" class="java.lang.String"
-        c:_0="SecurityPolicy.SAML1ArtifactQuery" /><!-- TODO -->
+        c:_0="SecurityPolicy.SAML1ArtifactResolution" />
         
     <bean id="shibboleth.SAML1.AttributeQuery.ArtifactServiceURL" class="java.lang.String"
         c:_0="https://idp.example.org/AttributeQuery/SAML1" />

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5825&r1=5824&r2=5825&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Fri May  2 05:07:18 2014
@@ -181,11 +181,11 @@
         p:reloadCheckDelay="${idp.service.metadata.checkInterval}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
     
-    <bean id="shibboleth.RelyingPartyResolver"
+    <bean id="Shibboleth.RelyingPartyResolver"
         class="net.shibboleth.idp.relyingparty.impl.ReloadingRelyingPartyConfigurationResolver"
         c:resolverService-ref="rpResolverService" />
         
-    <bean id="shibboleth.MetadataResolver"
+    <bean id="Shibboleth.MetadataResolver"
         class="net.shibboleth.idp.saml.metadata.impl.ReloadingRelyingPartyMetadataProvider"
         c:resolverService-ref="metadataResolverService" />
 
@@ -194,7 +194,7 @@
     <bean id="shibboleth.MetadataCredentialResolver" class="org.opensaml.saml.security.impl.MetadataCredentialResolver">
         <constructor-arg>
             <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
-                c:mdResolver-ref="shibboleth.MetadataResolver" />
+                c:mdResolver-ref="Shibboleth.MetadataResolver" />
         </constructor-arg>
     </bean>
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5825&r1=5824&r2=5825&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Fri May  2 05:07:18 2014
@@ -58,7 +58,7 @@
             <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype">
                 <property name="roleDescriptorResolver">
                     <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
-                        c:mdResolver-ref="shibboleth.MetadataResolver" />
+                        c:mdResolver-ref="Shibboleth.MetadataResolver" />
                 </property>
             </bean>
         </constructor-arg>
@@ -71,9 +71,7 @@

[... 134 lines stripped ...]