summaryrefslogtreecommitdiff
path: root/src/installer
diff options
context:
space:
mode:
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/resources/build.xml34
-rw-r--r--src/installer/resources/install.properties3
-rw-r--r--src/installer/resources/wayfconfig.xml24
3 files changed, 45 insertions, 16 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>
diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
index c37d1c1..6de85c4 100644
--- a/src/installer/resources/install.properties
+++ b/src/installer/resources/install.properties
@@ -1 +1,2 @@
-ds.home = /etc/DiscoveryService \ No newline at end of file
+#Mon Jun 28 14:25:15 CEST 2010
+ds.home=/opt/shibboleth-ds
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 1cd22d7..a797b54 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -18,11 +18,12 @@
The jspFile & errorJspFile attributes control the display
The provideList attribute controls whether a single list of all
- possible IdPs is presented. The default wayf.jsp works best
- if this is true when provideListofList is true.
+ possible IdPs is presented. This also controls whether the
+ Quick search dialog is presented.
The provideListOfList attribute controls whether multiple lists
- are presented (one for each MetadataProvider).
+ are presented (one for each MetadataProvider). Rather than all
+ the entities as one.
The showUsableIdPs attribute controls the contents of the above
lists. The single list (provideList=true) is trimmed by
@@ -43,8 +44,8 @@
<Default
jspFile="wayf.jsp"
errorJspFile="wayferror.jsp"
- provideList="false"
- provideListOfList="true"
+ provideList="true"
+ provideListOfList="false"
warnOnBadBinding="false"
showUnusableIdPs="false">
<SearchIgnore>
@@ -156,4 +157,17 @@
</DiscoveryServiceHandler>
-->
+<!-- The Javascript handler downloads javascript arrays with the IdPs and the cookies -->
+ <DiscoveryServiceHandler
+ location=".+/js.wayf"
+ provideList="true"
+ provideListOfList="false"
+ default="false"
+ jspFile="/javascript.jsp">
+ <Federation identifier="FirstSite"/>
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+
+
</WayfConfig>