diff options
| author | root <root@ds1.sunet.se> | 2010-06-29 23:47:21 +0200 |
|---|---|---|
| committer | root <root@ds1.sunet.se> | 2010-06-29 23:47:21 +0200 |
| commit | ca19e1aeccc299295d581aab6e9f409f85c248c2 (patch) | |
| tree | 5d398811083d3a0bea2a530f94f2eea9ad2345d9 /src/installer/resources/build.xml | |
| parent | 0a90384a9c7d840e88d9636271e8393a514647a0 (diff) | |
import 1.1.
Diffstat (limited to 'src/installer/resources/build.xml')
| -rw-r--r-- | src/installer/resources/build.xml | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml index ae85dfa..ba7a5cd 100644 --- a/src/installer/resources/build.xml +++ b/src/installer/resources/build.xml @@ -10,23 +10,37 @@ <!-- 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="Is this a new installation? Answering 'yes' will overwrite your current configuration." - addproperty="new.install" - validargs="yes,no" - defaultvalue="no" /> - + <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}" /> + + <pathToAbsolutePath path="${ds.home}" addproperty="ds.home.path" /> + <pathToUrl path="${ds.home}" addproperty="ds.home.url" /> + <if> - <equals arg1="${new.install}" arg2="yes" /> + <available file="${ds.home.path}" property="ds.home.exists"/> <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}" /> + <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> + <if> + <equals arg1="${install.config}" arg2="yes" /> + <then> <propertyfile file="${resources.dir}/install.properties"> <entry key="ds.home" value="${ds.home}" /> </propertyfile> |