diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
| commit | e54fabf198f50546b093753900d3a41fa7535181 (patch) | |
| tree | bcd4952415c938101ae168efc2dcb2b550369e23 /src/installer/resources/build.xml | |
| parent | 6c67f4c3050fa01d1b8e04f334cb8dd2293b39d0 (diff) | |
| parent | bd0c52acfb796b5a8cd85c2f535e7e874f558f3a (diff) | |
Merge branch 'trunk' into idp.nordu.net
Conflicts:
src/main/webapp/wayf.jsp
Diffstat (limited to 'src/installer/resources/build.xml')
| -rwxr-xr-x[-rw-r--r--] | src/installer/resources/build.xml | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml index b4201d8..ae85dfa 100644..100755 --- a/src/installer/resources/build.xml +++ b/src/installer/resources/build.xml @@ -10,37 +10,23 @@ <!-- Load ant-contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" /> - - <!-- Load Internet2 ant extensions --> - <taskdef resource="edu/internet2/middleware/ant/antlib.xml" /> <!-- install - for deployment --> <target name="install" description="Creates the discovery service home directory, install configuration files, and create the service's WAR."> - <input message="Where should the Shibboleth Discovery Service software be installed?" - addproperty="ds.home.input" - defaultvalue="${ds.home}" /> - <var name="ds.home" value="${ds.home.input}" /> - - <pathToAbsolutePath path="${ds.home}" addproperty="ds.home.path" /> - <pathToUrl path="${ds.home}" addproperty="ds.home.url" /> - - <if> - <available file="${ds.home.path}" property="ds.home.exists"/> - <then> - <input message="The directory '${ds.home.path}' already exists. Would you like to overwrite your existing configuration?" - addproperty="install.config" - validargs="yes,no" - defaultvalue="no" /> - </then> - <else> - <var name="install.config" value="yes"/> - </else> - </if> + <input message="Is this a new installation? Answering 'yes' will overwrite your current configuration." + addproperty="new.install" + validargs="yes,no" + defaultvalue="no" /> <if> - <equals arg1="${install.config}" arg2="yes" /> + <equals arg1="${new.install}" arg2="yes" /> <then> + <input message="Where should the Shibboleth Discovert Service software be installed?" + addproperty="ds.home.input" + defaultvalue="${ds.home}" /> + <var name="ds.home" value="${ds.home.input}" /> + <propertyfile file="${resources.dir}/install.properties"> <entry key="ds.home" value="${ds.home}" /> </propertyfile> |