From ca19e1aeccc299295d581aab6e9f409f85c248c2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Jun 2010 23:47:21 +0200 Subject: import 1.1. --- doc/INSTALL.txt | 14 +- doc/RELEASE-NOTES.txt | 37 +- doc/api/allclasses-frame.html | 12 +- doc/api/allclasses-noframe.html | 12 +- doc/api/constant-values.html | 32 +- doc/api/deprecated-list.html | 8 +- .../common/ShibbolethConfigurationException.html | 8 +- .../ShibbolethConfigurationException.html | 8 +- .../shibboleth/common/package-frame.html | 6 +- .../shibboleth/common/package-summary.html | 8 +- .../middleware/shibboleth/common/package-tree.html | 8 +- .../middleware/shibboleth/common/package-use.html | 8 +- .../shibboleth/wayf/DiscoveryServiceHandler.html | 12 +- .../middleware/shibboleth/wayf/HandlerConfig.html | 8 +- .../shibboleth/wayf/IdPSite.Compare.html | 8 +- .../middleware/shibboleth/wayf/IdPSite.html | 8 +- .../middleware/shibboleth/wayf/IdPSiteSet.html | 8 +- .../shibboleth/wayf/IdPSiteSetEntry.html | 8 +- .../wayf/LogbackConfigurationChangeListener.html | 8 +- .../shibboleth/wayf/LogbackLoggingService.html | 8 +- .../middleware/shibboleth/wayf/Version.html | 8 +- .../middleware/shibboleth/wayf/WayfException.html | 8 +- .../middleware/shibboleth/wayf/WayfService.html | 8 +- .../middleware/shibboleth/wayf/XMLConstants.html | 8 +- .../wayf/class-use/DiscoveryServiceHandler.html | 8 +- .../shibboleth/wayf/class-use/HandlerConfig.html | 8 +- .../shibboleth/wayf/class-use/IdPSite.Compare.html | 8 +- .../shibboleth/wayf/class-use/IdPSite.html | 8 +- .../shibboleth/wayf/class-use/IdPSiteSet.html | 8 +- .../shibboleth/wayf/class-use/IdPSiteSetEntry.html | 8 +- .../LogbackConfigurationChangeListener.html | 8 +- .../wayf/class-use/LogbackLoggingService.html | 8 +- .../shibboleth/wayf/class-use/Version.html | 8 +- .../shibboleth/wayf/class-use/WayfException.html | 8 +- .../shibboleth/wayf/class-use/WayfService.html | 8 +- .../shibboleth/wayf/class-use/XMLConstants.html | 8 +- .../middleware/shibboleth/wayf/package-frame.html | 12 +- .../shibboleth/wayf/package-summary.html | 21 +- .../middleware/shibboleth/wayf/package-tree.html | 38 +- .../middleware/shibboleth/wayf/package-use.html | 15 +- .../middleware/shibboleth/wayf/plugins/Plugin.html | 8 +- .../shibboleth/wayf/plugins/PluginContext.html | 8 +- .../wayf/plugins/PluginMetadataParameter.html | 8 +- .../wayf/plugins/WayfRequestHandled.html | 8 +- .../shibboleth/wayf/plugins/class-use/Plugin.html | 8 +- .../wayf/plugins/class-use/PluginContext.html | 8 +- .../plugins/class-use/PluginMetadataParameter.html | 8 +- .../wayf/plugins/class-use/WayfRequestHandled.html | 8 +- .../shibboleth/wayf/plugins/package-frame.html | 6 +- .../shibboleth/wayf/plugins/package-summary.html | 8 +- .../shibboleth/wayf/plugins/package-tree.html | 8 +- .../shibboleth/wayf/plugins/package-use.html | 8 +- .../wayf/plugins/provider/BindingFilter.html | 8 +- .../wayf/plugins/provider/ListFilter.html | 8 +- .../provider/SamlCookiePlugin.SamlIdPCookie.html | 8 +- .../wayf/plugins/provider/SamlCookiePlugin.html | 8 +- .../plugins/provider/class-use/BindingFilter.html | 8 +- .../plugins/provider/class-use/ListFilter.html | 8 +- .../class-use/SamlCookiePlugin.SamlIdPCookie.html | 8 +- .../provider/class-use/SamlCookiePlugin.html | 8 +- .../wayf/plugins/provider/package-frame.html | 6 +- .../wayf/plugins/provider/package-summary.html | 8 +- .../wayf/plugins/provider/package-tree.html | 8 +- .../wayf/plugins/provider/package-use.html | 8 +- doc/api/help-doc.html | 8 +- doc/api/index-all.html | 35 +- doc/api/index.html | 6 +- doc/api/options | 21 +- doc/api/overview-frame.html | 8 +- doc/api/overview-summary.html | 12 +- doc/api/overview-tree.html | 38 +- doc/api/serialized-form.html | 8 +- doc/src-xref/allclasses-frame.html | 9 - .../shibboleth/common/package-frame.html | 2 +- .../shibboleth/common/package-summary.html | 2 +- .../shibboleth/wayf/DiscoveryServiceHandler.html | 1909 ++++++++++---------- .../middleware/shibboleth/wayf/IdPSiteSet.html | 6 +- .../middleware/shibboleth/wayf/WayfService.html | 557 +++--- .../middleware/shibboleth/wayf/package-frame.html | 11 +- .../shibboleth/wayf/package-summary.html | 17 +- .../shibboleth/wayf/plugins/package-frame.html | 2 +- .../shibboleth/wayf/plugins/package-summary.html | 2 +- .../wayf/plugins/provider/BindingFilter.html | 284 ++- .../wayf/plugins/provider/ListFilter.html | 301 ++- .../wayf/plugins/provider/package-frame.html | 2 +- .../wayf/plugins/provider/package-summary.html | 2 +- doc/src-xref/index.html | 2 +- doc/src-xref/overview-frame.html | 2 +- doc/src-xref/overview-summary.html | 4 +- doc/style/checkstyle.html | 4 +- doc/unitTest/surefire-report.html | 2 +- install.sh | 0 src/installer/resources/build.xml | 34 +- src/installer/resources/install.properties | 3 +- src/installer/resources/wayfconfig.xml | 24 +- src/main/webapp/wayf.css | 18 + src/main/webapp/wayf.jsp | 117 +- 97 files changed, 2014 insertions(+), 2069 deletions(-) mode change 100644 => 100755 install.sh diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index 8ca3ae0..a9fd0a1 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -1,18 +1,6 @@ -3-Mar-08 -Version 1.0 Release Candidate 3 - Shibboleth Discovery Service Installation Prior to installation you may need to configure the system as described in deployment guide. This is currently available at: -https://spaces.internet2.edu/display/SHIB/DiscoveryService - -Specifically you may need to edit webpages\wayf.jsp and -src/conf/wayfconfig.xml. With no configuration the DiscoveryService -deploys an internet2 branded GUI and looks for metadata in the file -"/usr/local/sites.xml" (unix) and "%systemdrive%:\usr\local\sites.xml" -(Windows) - -Then run ant in the top level directory to build the war file suitable -for deploying into your container. \ No newline at end of file +https://spaces.internet2.edu/display/SHIB/DiscoveryService \ No newline at end of file diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt index 07aa43f..da2cc9a 100644 --- a/doc/RELEASE-NOTES.txt +++ b/doc/RELEASE-NOTES.txt @@ -1,20 +1,19 @@ -Changes in Release 1.1.0 +Changes in Release 1.1.1 ============================================= -[SDSJ-22] - wayf.jsp: Invalid loaction of tag and - + + + + + + - + - - + + + + + + + + + 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 @@ @@ -156,4 +157,17 @@ --> + + + + + + + + diff --git a/src/main/webapp/wayf.css b/src/main/webapp/wayf.css index 4056aa3..0eeb26c 100644 --- a/src/main/webapp/wayf.css +++ b/src/main/webapp/wayf.css @@ -102,3 +102,21 @@ span.warning { text-align: center; margin-top: 1.5em; } + +div.dropdown { + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid black; + position: absolute; +} + +div.dropdown div { + background-color: white; + cursor: default; + padding: 0px 3px; +} + +div.dropdown div.current { + background-color: #3366cc; + color: white; +} diff --git a/src/main/webapp/wayf.jsp b/src/main/webapp/wayf.jsp index 74ba11d..3a9e258 100644 --- a/src/main/webapp/wayf.jsp +++ b/src/main/webapp/wayf.jsp @@ -123,6 +123,7 @@ 10 - Recently used sites hyperlinks 20 - + 25 - AutoSuggestion 30 Federation selection 40 IdP within Selection 50 Select button @@ -158,15 +159,14 @@ Select an identity provider The Service you are trying to reach requires that you -authenticate with your home institution, please select it from the -list below. +authenticate with your home organization, enter the name below.

-Recently used institutions: +Recently used organizations:

@@ -178,6 +178,7 @@ Recently used institutions: simulating the user having specified a permanent cookie --> +

@@ -230,13 +231,54 @@ Recently used institutions: - + -

+ + + + or

@@ -412,6 +461,9 @@ Search by keyword:

+ - + + + + + + + + + + -- cgit v1.1