Synch with Rel_1_3.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1770 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/resolver.ldap.xml b/src/conf/resolver.ldap.xml
index a11173a..31242e0 100644 (file)
--- a/src/conf/resolver.ldap.xml
+++ b/src/conf/resolver.ldap.xml
@@ -46,7 +46,7 @@
        <!--
        <SAML2PersistentID id="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" sourceName="guid">
                <DataConnectorDependency requires="echo"/>
-               <Salt keyStorePath="/conf/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
+               <Salt keyStorePath="file:///usr/local/shibboleth-idp/etc/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
        </SAML2PersistentID>
        -->
        

diff --git a/src/conf/resolver.xml b/src/conf/resolver.xml
index 325f685..cca3761 100644 (file)
--- a/src/conf/resolver.xml
+++ b/src/conf/resolver.xml
@@ -26,14 +26,14 @@
        <!--
        <SAML2PersistentID id="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" sourceName="guid">
                <DataConnectorDependency requires="echo"/>
-               <Salt keyStorePath="/conf/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
+               <Salt keyStorePath="file:///usr/local/shibboleth-idp/etc/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
        </SAML2PersistentID>
        -->
        <!--  Deprecated persistent id example, use only with SPs that are already relying on your values. -->
        <!--
        <PersistentIDAttributeDefinition id="urn:mace:dir:attribute-def:eduPersonTargetedID" scope="shibdev.edu" sourceName="guid">
                <DataConnectorDependency requires="echo"/>
-               <Salt keyStorePath="/conf/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
+               <Salt keyStorePath="file:///usr/local/shibboleth-idp/etc/persistent.jks" keyStoreKeyAlias="handleKey" keyStorePassword="shibhs" keyStoreKeyPassword="shibhs"/>
        </PersistentIDAttributeDefinition>
        -->