tag for release
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 25 Oct 2011 12:50:45 +0000 (12:50 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 25 Oct 2011 12:50:45 +0000 (12:50 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/tags/2.3.4@3088 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

1  2 
pom.xml
src/installer/resources/build.xml

diff --cc pom.xml
+++ b/pom.xml
  
          <!-- Runtime dependencies -->
          <dependency>
++            <groupId>org.bouncycastle</groupId>
++            <artifactId>bcprov-jdk15</artifactId>
++            <version>1.45</version>
++        </dependency>
++        <dependency>
              <groupId>ant-contrib</groupId>
              <artifactId>ant-contrib</artifactId>
              <version>1.0b2</version>
@@@ -81,7 -81,7 +81,9 @@@
                        </else>
                </if>
                        
--                <selfSignedCert hostname="${idp.hostname}" privateKeyFile="${idp.home.path}/credentials/idp.key" certificateFile="${idp.home.path}/credentials/idp.crt" keystoreFile="${idp.home.path}/credentials/idp.jks" keystorePassword="${idp.keystore.pass}" uriSubjectAltNames="${idp.entity.id}" certificateLifetime="${idp.cert.lifetime}"/>
++                <selfSignedCert hostname="${idp.hostname}" uriSubjectAltNames="${idp.entity.id}" certificateLifetime="${idp.cert.lifetime}"
++                                  privateKeyFile="${idp.home.path}/credentials/idp.key" certificateFile="${idp.home.path}/credentials/idp.crt" 
++                                  keystoreFile="${idp.home.path}/credentials/idp.jks" keystorePassword="${idp.keystore.pass}" />
  
                  <copy todir="${idp.home.path}/bin" preservelastmodified="true" overwrite="true">
                      <fileset dir="${tools.dir}/bash"/>
      </target>
  
      <target name="renew-cert" description="Create a new certificate/key pair."> 
--        <input message="This will create a new set of credentials for your IdP, overwriting existing credentials.  Do you really wish to proceed?" addproperty="renew.cert.do" validargs="yes,no" defaultvalue="no"/> 
--        <if> <equals arg1="${renew.cert.do}" arg2="yes"/> 
++        <input message="This will create a new set of credentials for your IdP.  If you ran this command previously and still have '*.new' files, they will be overwritten.  Do you wish to proceed?" 
++                 addproperty="renew.cert.do" validargs="yes,no" defaultvalue="no"/> 
++        <if> 
++              <equals arg1="${renew.cert.do}" arg2="yes"/> 
              <then> 
--
++              
                  <input message="Where is the Shibboleth Identity Provider installed?" addproperty="idp.home.input" defaultvalue="${idp.home}"/>
                  <var name="idp.home" value="${idp.home.input}"/>
                
                  <var name="idp.hostname" value="${idp.hostname.input}"/> 
                  <var name="idp.entity.id" value="https://${idp.hostname}/idp/shibboleth"/> 
  
--                <echo message="Backing up old credentials"/> 
--                <buildnumber file="${resources.dir}/credentials.buildno"/>
--                <copy todir="${idp.home.path}/credentials" overwrite="true">
--                    <fileset dir="${idp.home.path}/credentials" excludes="*bak*,buildno"/>
--                    <globmapper from="idp.*" to="idp.*.bak.${build.number}"/>
--                </copy>
--
                  <input message="A keystore is about to be generated for you. Please enter a password that will be used to protect it." addproperty="idp.keystore.pass"/> 
  
                  <if>
                      </else>
                  </if>
          
--                <echo message="Generating signing and encryption key, certificate, and keystore. "/> 
++                <echo message="Generating new signing and encryption key, certificate, and keystore. "/> 
                  <selfSignedCert hostname="${idp.hostname}" certificateLifetime="${idp.cert.lifetime}" uriSubjectAltNames="${idp.entity.id}"
                                    privateKeyFile="${idp.home.path}/credentials/idp.key.new" certificateFile="${idp.home.path}/credentials/idp.crt.new"  
                                    keystoreFile="${idp.home.path}/credentials/idp.jks.new"  keystorePassword="${idp.keystore.pass}" /> 
              </then>
--        </if> 
--    </target> 
--</project>
++        </if>
++    </target>
++</project>