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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 22:29:52 2014
New Revision: 6709

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6709&view=rev
Log:
IDP-486 - rename creds back to credentials, for sake of upgrades

Added:
    trunk/idp-conf/src/main/resources/credentials/
      - copied from r6688, trunk/idp-conf/src/main/resources/creds/
    trunk/idp-conf/src/test/resources/credentials/
      - copied from r6688, trunk/idp-conf/src/test/resources/creds/
    trunk/idp-distribution/src/main/resources/credentials/
      - copied from r6688, trunk/idp-distribution/src/main/resources/creds/
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/creds/
    trunk/idp-conf/src/test/resources/creds/
    trunk/idp-conf/src/test/resources/test/test-beans.xml
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/creds/
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

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=6709&r1=6708&r2=6709&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Oct 14 22:29:52 2014
@@ -14,20 +14,20 @@
 #idp.sealer.storeType = JCEKS
 #idp.sealer.updateInterval = PT15M
 #idp.sealer.aliasBase = secret
-idp.sealer.storeResource = %{idp.home}/creds/sealer.jks
-idp.sealer.versionResource = %{idp.home}/creds/sealer.kver
+idp.sealer.storeResource = %{idp.home}/credentials/sealer.jks
+idp.sealer.versionResource = %{idp.home}/credentials/sealer.kver
 idp.sealer.storePassword = password
 idp.sealer.keyPassword = password
 
 # Settings for public/private signing and encryption key(s)
 # During decryption key rollover, point the ".2" properties at a second
 # keypair, uncomment in credentials.xml, then publish it in your metadata.
-idp.signing.key = %{idp.home}/creds/idp-signing.key
-idp.signing.cert = %{idp.home}/creds/idp-signing.crt
-idp.encryption.key = %{idp.home}/creds/idp-encryption.key
-idp.encryption.cert = %{idp.home}/creds/idp-encryption.crt
-#idp.encryption.key.2 = %{idp.home}/creds/idp-encryption-old.key
-#idp.encryption.cert.2 = %{idp.home}/creds/idp-encryption-old.crt
+idp.signing.key = %{idp.home}/credentials/idp-signing.key
+idp.signing.cert = %{idp.home}/credentials/idp-signing.crt
+idp.encryption.key = %{idp.home}/credentials/idp-encryption.key
+idp.encryption.cert = %{idp.home}/credentials/idp-encryption.crt
+#idp.encryption.key.2 = %{idp.home}/credentials/idp-encryption-old.key
+#idp.encryption.cert.2 = %{idp.home}/credentials/idp-encryption-old.crt
 
 # Sets the bean ID to use as a default security configuration set
 #idp.security.config = shibboleth.DefaultSecurityConfiguration

Modified: trunk/idp-conf/src/test/resources/test/test-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/test/test-beans.xml?rev=6709&r1=6708&r2=6709&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/test/test-beans.xml (original)
+++ trunk/idp-conf/src/test/resources/test/test-beans.xml Tue Oct 14 22:29:52 2014
@@ -10,10 +10,10 @@
     default-init-method="initialize" default-destroy-method="destroy">
 
     <bean id="test.sp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-        p:resource="classpath:/creds/sp.crt" />
+        p:resource="classpath:/credentials/sp.crt" />
 
     <bean id="test.sp.PrivateKey" class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
-        p:resource="classpath:/creds/sp.key" />
+        p:resource="classpath:/credentials/sp.key" />
 
      <bean id="test.sp.Credential" class="org.opensaml.security.x509.BasicX509Credential"
         c:entityCertificate-ref="test.sp.X509Certificate"
@@ -21,7 +21,7 @@
         p:entityId="https://sp.example.org" />
 
     <bean id="test.idp.X509Certificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
-        p:resource="classpath:/creds/idp-encryption.crt" />
+        p:resource="classpath:/credentials/idp-encryption.crt" />
 
     <bean id="test.idp.Credential" class="org.opensaml.security.x509.BasicX509Credential"
         c:entityCertificate-ref="test.idp.X509Certificate"

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6709&r1=6708&r2=6709&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Tue Oct 14 22:29:52 2014
@@ -148,7 +148,7 @@
                                     <version>${project.version}</version>

[... 175 lines stripped ...]