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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May  2 10:40:02 2014
New Revision: 5832

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5832&view=rev
Log:
Adjust bean names to match conventions.

Modified:
    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/saml2/sso-abstract-beans.xml

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=5832&r1=5831&r2=5832&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 10:40:02 2014
@@ -164,16 +164,15 @@
         p:reloadCheckDelay="${idp.service.attribute.resolver.checkInterval}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
 
-    <bean id="rpResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
+    <bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
         c:claz="net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver"
         c:servicableClaz="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
         p:serviceConfigurations-ref="shibboleth.RelyingPartyResolverResources"
         p:failFast="${idp.service.relyingparty.failFast}"
         p:reloadCheckDelay="${idp.service.relyingparty.checkInterval}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
-
-    
-    <bean id="metadataResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
+    
+    <bean id="shibboleth.MetadataResolverService" class="net.shibboleth.idp.service.ReloadableSpringService"
         c:claz="org.opensaml.saml.metadata.resolver.MetadataResolver"
         c:servicableClaz="net.shibboleth.idp.saml.metadata.impl.RelyingPartyMetadataProvider"
         p:serviceConfigurations-ref="shibboleth.MetadataResolverResources"
@@ -181,20 +180,20 @@
         p:reloadCheckDelay="${idp.service.metadata.checkInterval}"
         p:reloadTaskTimer="shibboleth.TaskTimer" />
     
-    <bean id="Shibboleth.RelyingPartyResolver"
+    <bean id="shibboleth.RelyingPartyConfigurationResolver"
         class="net.shibboleth.idp.relyingparty.impl.ReloadingRelyingPartyConfigurationResolver"
-        c:resolverService-ref="rpResolverService" />
+        c:resolverService-ref="shibboleth.RelyingPartyResolverService" />
         
-    <bean id="Shibboleth.MetadataResolver"
+    <bean id="shibboleth.MetadataResolver"
         class="net.shibboleth.idp.saml.metadata.impl.ReloadingRelyingPartyMetadataProvider"
-        c:resolverService-ref="metadataResolverService" />
+        c:resolverService-ref="shibboleth.MetadataResolverService" />
 
     <!-- TODO: all this is probably wrong, but need it to get something working -->
     
     <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=5832&r1=5831&r2=5832&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 10:40:02 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>
@@ -69,9 +69,7 @@
 
     <bean id="SelectRelyingPartyConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype"
-        p:relyingPartyConfigurationResolver-ref="RelyingPartyConfigurationResolver" />
-
-    <alias name="Shibboleth.RelyingPartyResolver" alias="RelyingPartyConfigurationResolver"/>
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
 
     <bean id="SelectProfileConfiguration"

[... 26 lines stripped ...]