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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul  8 10:36:43 2014
New Revision: 6241

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6241&view=rev
Log:
IDP-432: missing default bean for legacy RP loading

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml?rev=6241&r1=6240&r2=6241&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml Tue Jul  8 10:36:43 2014
@@ -20,9 +20,9 @@
     <!-- ========================================== -->
     <!--      Relying Party Configurations          -->
     <!-- ========================================== -->
-    <rp:AnonymousRelyingParty provider="${idp.entityID}" defaultSigningCredentialRef="IdPCredential"/>
+    <rp:AnonymousRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential"/>
     
-    <rp:DefaultRelyingParty provider="${idp.entityID}" defaultSigningCredentialRef="IdPCredential">
+    <rp:DefaultRelyingParty provider="%{idp.entityID}" defaultSigningCredentialRef="IdPCredential">
         <!-- 
             Each attribute in these profiles configuration is set to its default value,
             that is, the values that would be in effect if those attributes were not present.
@@ -74,8 +74,8 @@
     <!--  TODO -->
     
     <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
-        <security:PrivateKey>${idp.signing.key}</security:PrivateKey>
-        <security:Certificate>${idp.signing.cert}</security:Certificate>
+        <security:PrivateKey>%{idp.signing.key}</security:PrivateKey>
+        <security:Certificate>%{idp.signing.cert}</security:Certificate>
     </security:Credential>
     
 </rp:RelyingPartyGroup>

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml?rev=6241&r1=6240&r2=6241&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-defaults.xml Tue Jul  8 10:36:43 2014
@@ -52,6 +52,8 @@
     <bean id="shibboleth.SAML1.AttributeQuery.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/soap" />
         
+    <bean id="shibboleth.SAML1.BrowserSSO.ArtifactServiceIndex" class="java.lang.String"
+        c:_0="%{idp.artifact.endpointIndex:1}" />
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/shibboleth-sso" />