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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 30 11:21:43 2014
New Revision: 6006

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6006&view=rev
Log:
Stick to shibboleth prefix for beans with fixed names.

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.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=6006&r1=6005&r2=6006&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 Fri May 30 11:21:43 2014
@@ -22,7 +22,7 @@
     to enable specific default profile settings (as below), or create new beans inline to override defaults. 
     -->
     
-    <bean id="AnonymousRelyingParty" parent="RelyingParty">
+    <bean id="shibboleth.AnonymousRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
             <util:list>
             <!-- <ref bean="SAML2.SSO" /> -->
@@ -32,7 +32,7 @@
 
     <!-- Default configuration, with default settings applied for all profiles. -->
 
-    <bean id="DefaultRelyingParty" parent="RelyingParty">
+    <bean id="shibboleth.DefaultRelyingParty" parent="RelyingParty">
         <property name="profileConfigurations">
             <util:list>
                 <ref bean="Shibboleth.SSO" />
@@ -47,7 +47,7 @@
         </property>
     </bean>
 
-    <util:list id="RelyingPartyOverrides">
+    <util:list id="shibboleth.RelyingPartyOverrides">
     
         <bean parent="RelyingPartyByName" c:relyingPartyIds="https://sp.example.org"
                 p:detailedErrors="true">

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=6006&r1=6005&r2=6006&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 Fri May 30 11:21:43 2014
@@ -21,10 +21,10 @@
 
     <!-- Pulls together the various components that feed the resolver. -->
     <bean class="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
-        p:anonymousConfiguration-ref="AnonymousRelyingParty"
-        p:defaultConfiguration-ref="DefaultRelyingParty"
-        p:relyingPartyConfigurations-ref="RelyingPartyOverrides"
-        p:defaultSecurityConfiguration-ref="DefaultSecurityConfiguration" />
+        p:anonymousConfiguration-ref="shibboleth.AnonymousRelyingParty"
+        p:defaultConfiguration-ref="shibboleth.DefaultRelyingParty"
+        p:relyingPartyConfigurations-ref="shibboleth.RelyingPartyOverrides"
+        p:defaultSecurityConfiguration-ref="shibboleth.DefaultSecurityConfiguration" />
 
     <!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->
     <bean id="RelyingParty" abstract="true" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
@@ -65,7 +65,7 @@
     and loads the default credentials used.
     -->
 
-    <bean id="DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
+    <bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
     
         <property name="signatureSigningConfiguration">
             <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"