[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/messages.properties s...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 18 15:12:16 2014
New Revision: 6113

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6113&view=rev
Log:
Forgot to wire up artifact config defaults.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6113&r1=6112&r2=6113&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jun 18 15:12:16 2014
@@ -134,5 +134,8 @@
 # Suppresses typical signing/encryption when artifact binding used
 idp.artifact.secureChannel = true
 
+# May differ to direct SAML 2 artifact lookups to specific server nodes
+#idp.artifact.endpointIndex = 1
+
 # Access control for status page
 idp.status.allowedAddresses = '127.0.0.1/32', '::1/128'

Modified: trunk/idp-conf/src/main/resources/conf/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/messages.properties?rev=6113&r1=6112&r2=6113&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Wed Jun 18 15:12:16 2014
@@ -66,9 +66,7 @@
                 made the same mistake.</p> \
                 <br/> \
                 <p>Left unchecked, this can cause errors on some browsers or result in you returning to \
-                the web site you tried to leave, so this page is presented instead so that you can continue \
-                with your online activities. Note that you may need to hit the Back button multiple times \
-                to skip over all of the login-related pages in your history list.</p>
+                the web site you tried to leave, so this page is presented instead.</p>
 
 unexpected.title = Unexpected Error
 unexpected.message = An unexpected error was encountered, usually reflecting a configuration or software error.

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=6113&r1=6112&r2=6113&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 Wed Jun 18 15:12:16 2014
@@ -44,6 +44,7 @@
     
     <bean id="Shibboleth.SSO"
         class="net.shibboleth.idp.saml.saml1.profile.config.BrowserSSOProfileConfiguration"
+        p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundSubflowId="security-policy/shibboleth-sso" />
 
     <bean id="SAML1.AttributeQuery"
@@ -56,6 +57,7 @@
 
     <bean id="SAML2.SSO"
         class="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration"
+        p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundSubflowId="security-policy/saml2-sso" />
 
     <bean id="SAML2.ECP"
@@ -71,6 +73,12 @@
     
     <bean id="Liberty.SSOS"
         class="net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration" />    
+    
+    <!-- Artifact Configuration Defaults -->
+    
+    <bean id="shibboleth.DefaultArtifactConfiguration"
+        class="net.shibboleth.idp.saml.profile.config.BasicSAMLArtifactConfiguration"
+        p:artifactResolutionServiceIndex="${idp.artifact.endpointIndex:1}" />
     
     <!--
     Security Configuration Defaults