From b5c41b83249677bf1dec46de4a7ce97fee55729e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 3 Nov 2011 10:53:40 +0100 Subject: import 1.1.3 --- LICENSE.txt | 346 +++---- cpappend.bat | 0 doc/CREDITS.txt | 0 doc/INSTALL.txt | 14 +- doc/README.txt | 0 doc/RELEASE-NOTES.txt | 34 +- doc/api/allclasses-frame.html | 75 -- doc/api/allclasses-noframe.html | 75 -- doc/api/constant-values.html | 207 ---- doc/api/deprecated-list.html | 143 --- .../common/ShibbolethConfigurationException.html | 267 ----- .../ShibbolethConfigurationException.html | 193 ---- .../shibboleth/common/package-frame.html | 33 - .../shibboleth/common/package-summary.html | 155 --- .../middleware/shibboleth/common/package-tree.html | 155 --- .../middleware/shibboleth/common/package-use.html | 167 ---- .../shibboleth/wayf/DiscoveryResponseBuilder.html | 312 ------ .../shibboleth/wayf/DiscoveryResponseImpl.html | 420 -------- .../wayf/DiscoveryResponseUnmarshaller.html | 298 ------ .../shibboleth/wayf/DiscoveryServiceHandler.html | 343 ------- .../middleware/shibboleth/wayf/HandlerConfig.html | 414 -------- .../shibboleth/wayf/IdPSite.Compare.html | 270 ------ .../middleware/shibboleth/wayf/IdPSite.html | 396 -------- .../middleware/shibboleth/wayf/IdPSiteSet.html | 514 ---------- .../shibboleth/wayf/IdPSiteSetEntry.html | 286 ------ .../wayf/LogbackConfigurationChangeListener.html | 353 ------- .../shibboleth/wayf/LogbackLoggingService.html | 232 ----- .../middleware/shibboleth/wayf/Version.html | 256 ----- .../middleware/shibboleth/wayf/WayfException.html | 266 ----- .../middleware/shibboleth/wayf/WayfService.html | 316 ------ .../middleware/shibboleth/wayf/XMLConstants.html | 304 ------ .../wayf/class-use/DiscoveryResponseBuilder.html | 141 --- .../wayf/class-use/DiscoveryResponseImpl.html | 187 ---- .../class-use/DiscoveryResponseUnmarshaller.html | 141 --- .../wayf/class-use/DiscoveryServiceHandler.html | 141 --- .../shibboleth/wayf/class-use/HandlerConfig.html | 203 ---- .../shibboleth/wayf/class-use/IdPSite.Compare.html | 141 --- .../shibboleth/wayf/class-use/IdPSite.html | 447 --------- .../shibboleth/wayf/class-use/IdPSiteSet.html | 193 ---- .../shibboleth/wayf/class-use/IdPSiteSetEntry.html | 141 --- .../LogbackConfigurationChangeListener.html | 141 --- .../wayf/class-use/LogbackLoggingService.html | 141 --- .../shibboleth/wayf/class-use/Version.html | 141 --- .../shibboleth/wayf/class-use/WayfException.html | 195 ---- .../shibboleth/wayf/class-use/WayfService.html | 141 --- .../shibboleth/wayf/class-use/XMLConstants.html | 141 --- .../middleware/shibboleth/wayf/package-frame.html | 70 -- .../shibboleth/wayf/package-summary.html | 223 ----- .../middleware/shibboleth/wayf/package-tree.html | 194 ---- .../middleware/shibboleth/wayf/package-use.html | 230 ----- .../middleware/shibboleth/wayf/plugins/Plugin.html | 381 -------- .../shibboleth/wayf/plugins/PluginContext.html | 179 ---- .../wayf/plugins/PluginMetadataParameter.html | 177 ---- .../wayf/plugins/WayfRequestHandled.html | 243 ----- .../shibboleth/wayf/plugins/class-use/Plugin.html | 232 ----- .../wayf/plugins/class-use/PluginContext.html | 318 ------ .../plugins/class-use/PluginMetadataParameter.html | 329 ------- .../wayf/plugins/class-use/WayfRequestHandled.html | 257 ----- .../shibboleth/wayf/plugins/package-frame.html | 48 - .../shibboleth/wayf/plugins/package-summary.html | 179 ---- .../shibboleth/wayf/plugins/package-tree.html | 160 --- .../shibboleth/wayf/plugins/package-use.html | 246 ----- .../wayf/plugins/provider/BindingFilter.html | 270 ------ .../wayf/plugins/provider/ListFilter.html | 278 ------ .../provider/SamlCookiePlugin.SamlIdPCookie.html | 250 ----- .../wayf/plugins/provider/SamlCookiePlugin.html | 408 -------- .../plugins/provider/class-use/BindingFilter.html | 141 --- .../plugins/provider/class-use/ListFilter.html | 141 --- .../class-use/SamlCookiePlugin.SamlIdPCookie.html | 141 --- .../provider/class-use/SamlCookiePlugin.html | 141 --- .../wayf/plugins/provider/package-frame.html | 37 - .../wayf/plugins/provider/package-summary.html | 164 ---- .../wayf/plugins/provider/package-tree.html | 153 --- .../wayf/plugins/provider/package-use.html | 141 --- doc/api/help-doc.html | 220 ----- doc/api/index-all.html | 472 --------- doc/api/index.html | 40 - doc/api/options | 23 - doc/api/overview-frame.html | 49 - doc/api/overview-summary.html | 188 ---- doc/api/overview-tree.html | 201 ---- doc/api/package-list | 4 - doc/api/packages | 4 - doc/api/resources/inherit.gif | Bin 57 -> 0 bytes doc/api/serialized-form.html | 261 ----- doc/api/stylesheet.css | 29 - doc/src-xref/allclasses-frame.html | 92 -- .../common/ShibbolethConfigurationException.html | 64 -- .../shibboleth/common/package-frame.html | 24 - .../shibboleth/common/package-summary.html | 67 -- .../shibboleth/wayf/DiscoveryResponseBuilder.html | 61 -- .../shibboleth/wayf/DiscoveryResponseImpl.html | 63 -- .../wayf/DiscoveryResponseUnmarshaller.html | 51 - .../shibboleth/wayf/DiscoveryServiceHandler.html | 1016 -------------------- .../middleware/shibboleth/wayf/HandlerConfig.html | 236 ----- .../middleware/shibboleth/wayf/IdPSite.html | 231 ----- .../middleware/shibboleth/wayf/IdPSiteSet.html | 577 ----------- .../shibboleth/wayf/IdPSiteSetEntry.html | 71 -- .../wayf/LogbackConfigurationChangeListener.html | 86 -- .../shibboleth/wayf/LogbackLoggingService.html | 78 -- .../middleware/shibboleth/wayf/Version.html | 45 - .../middleware/shibboleth/wayf/WayfException.html | 61 -- .../middleware/shibboleth/wayf/WayfService.html | 332 ------- .../middleware/shibboleth/wayf/XMLConstants.html | 47 - .../middleware/shibboleth/wayf/package-frame.html | 66 -- .../shibboleth/wayf/package-summary.html | 137 --- .../middleware/shibboleth/wayf/plugins/Plugin.html | 173 ---- .../shibboleth/wayf/plugins/PluginContext.html | 45 - .../wayf/plugins/PluginMetadataParameter.html | 44 - .../wayf/plugins/WayfRequestHandled.html | 31 - .../shibboleth/wayf/plugins/package-frame.html | 33 - .../shibboleth/wayf/plugins/package-summary.html | 82 -- .../wayf/plugins/provider/BindingFilter.html | 190 ---- .../wayf/plugins/provider/ListFilter.html | 198 ---- .../wayf/plugins/provider/SamlCookiePlugin.html | 558 ----------- .../wayf/plugins/provider/package-frame.html | 36 - .../wayf/plugins/provider/package-summary.html | 87 -- doc/src-xref/index.html | 24 - doc/src-xref/overview-frame.html | 34 - doc/src-xref/overview-summary.html | 79 -- doc/src-xref/stylesheet.css | 116 --- doc/style/checkstyle.html | 55 -- doc/style/css/maven-base.css | 140 --- doc/style/css/maven-theme.css | 110 --- doc/style/css/print.css | 7 - doc/style/images/add.gif | Bin 207 -> 0 bytes doc/style/images/collapsed.gif | Bin 53 -> 0 bytes doc/style/images/expanded.gif | Bin 52 -> 0 bytes doc/style/images/external-classic.png | Bin 956 -> 0 bytes doc/style/images/external.png | Bin 230 -> 0 bytes doc/style/images/file.gif | Bin 152 -> 0 bytes doc/style/images/fix.gif | Bin 181 -> 0 bytes doc/style/images/folder-closed.gif | Bin 220 -> 0 bytes doc/style/images/folder-open.gif | Bin 229 -> 0 bytes doc/style/images/help_logo.gif | Bin 2113 -> 0 bytes doc/style/images/icon_alert.gif | Bin 1120 -> 0 bytes doc/style/images/icon_alertsml.gif | Bin 154 -> 0 bytes doc/style/images/icon_arrowfolder1_sml.gif | Bin 1082 -> 0 bytes doc/style/images/icon_arrowfolder2_sml.gif | Bin 1080 -> 0 bytes doc/style/images/icon_arrowfolderclosed1_sml.gif | Bin 441 -> 0 bytes doc/style/images/icon_arrowfolderopen2_sml.gif | Bin 664 -> 0 bytes doc/style/images/icon_arrowmembers1_sml.gif | Bin 1073 -> 0 bytes doc/style/images/icon_arrowmembers2_sml.gif | Bin 1072 -> 0 bytes doc/style/images/icon_arrowusergroups1_sml.gif | Bin 1072 -> 0 bytes doc/style/images/icon_arrowusergroups2_sml.gif | Bin 1076 -> 0 bytes doc/style/images/icon_arrowwaste1_sml.gif | Bin 606 -> 0 bytes doc/style/images/icon_arrowwaste2_sml.gif | Bin 609 -> 0 bytes doc/style/images/icon_confirmsml.gif | Bin 94 -> 0 bytes doc/style/images/icon_doc_lrg.gif | Bin 1335 -> 0 bytes doc/style/images/icon_doc_sml.gif | Bin 355 -> 0 bytes doc/style/images/icon_error_lrg.gif | Bin 1531 -> 0 bytes doc/style/images/icon_error_sml.gif | Bin 1010 -> 0 bytes doc/style/images/icon_folder_lrg.gif | Bin 1548 -> 0 bytes doc/style/images/icon_folder_sml.gif | Bin 634 -> 0 bytes doc/style/images/icon_help_lrg.gif | Bin 1418 -> 0 bytes doc/style/images/icon_help_sml.gif | Bin 1019 -> 0 bytes doc/style/images/icon_info_lrg.gif | Bin 1383 -> 0 bytes doc/style/images/icon_info_sml.gif | Bin 606 -> 0 bytes doc/style/images/icon_infosml.gif | Bin 77 -> 0 bytes doc/style/images/icon_members_lrg.gif | Bin 1570 -> 0 bytes doc/style/images/icon_members_sml.gif | Bin 1023 -> 0 bytes doc/style/images/icon_sortdown.gif | Bin 117 -> 0 bytes doc/style/images/icon_sortleft.gif | Bin 121 -> 0 bytes doc/style/images/icon_sortright.gif | Bin 122 -> 0 bytes doc/style/images/icon_sortup.gif | Bin 117 -> 0 bytes doc/style/images/icon_success_lrg.gif | Bin 1492 -> 0 bytes doc/style/images/icon_success_sml.gif | Bin 990 -> 0 bytes doc/style/images/icon_usergroups_lrg.gif | Bin 1520 -> 0 bytes doc/style/images/icon_usergroups_sml.gif | Bin 1026 -> 0 bytes doc/style/images/icon_warning_lrg.gif | Bin 1491 -> 0 bytes doc/style/images/icon_warning_sml.gif | Bin 576 -> 0 bytes doc/style/images/icon_waste_lrg.gif | Bin 780 -> 0 bytes doc/style/images/icon_waste_sml.gif | Bin 562 -> 0 bytes doc/style/images/logos/maven-feather.png | Bin 2907 -> 0 bytes doc/style/images/newwindow-classic.png | Bin 951 -> 0 bytes doc/style/images/newwindow.png | Bin 220 -> 0 bytes doc/style/images/none.png | Bin 946 -> 0 bytes doc/style/images/nw_maj.gif | Bin 49 -> 0 bytes doc/style/images/nw_maj_hi.gif | Bin 51 -> 0 bytes doc/style/images/nw_maj_rond.gif | Bin 51 -> 0 bytes doc/style/images/nw_med.gif | Bin 48 -> 0 bytes doc/style/images/nw_med_hi.gif | Bin 47 -> 0 bytes doc/style/images/nw_med_rond.gif | Bin 46 -> 0 bytes doc/style/images/nw_min.gif | Bin 51 -> 0 bytes doc/style/images/nw_min_036.gif | Bin 45 -> 0 bytes doc/style/images/nw_min_hi.gif | Bin 46 -> 0 bytes doc/style/images/pdf.gif | Bin 950 -> 0 bytes doc/style/images/poweredby_036.gif | Bin 808 -> 0 bytes doc/style/images/product_logo.gif | Bin 680 -> 0 bytes doc/style/images/remove.gif | Bin 227 -> 0 bytes doc/style/images/rss.png | Bin 360 -> 0 bytes doc/style/images/se_maj_rond.gif | Bin 50 -> 0 bytes doc/style/images/strich.gif | Bin 43 -> 0 bytes doc/style/images/sw_maj_rond.gif | Bin 51 -> 0 bytes doc/style/images/sw_med_rond.gif | Bin 46 -> 0 bytes doc/style/images/sw_min.gif | Bin 45 -> 0 bytes doc/style/images/update.gif | Bin 192 -> 0 bytes doc/unitTest/css/maven-base.css | 140 --- doc/unitTest/css/maven-theme.css | 110 --- doc/unitTest/css/print.css | 7 - doc/unitTest/images/add.gif | Bin 207 -> 0 bytes doc/unitTest/images/collapsed.gif | Bin 53 -> 0 bytes doc/unitTest/images/expanded.gif | Bin 52 -> 0 bytes doc/unitTest/images/external-classic.png | Bin 956 -> 0 bytes doc/unitTest/images/external.png | Bin 230 -> 0 bytes doc/unitTest/images/file.gif | Bin 152 -> 0 bytes doc/unitTest/images/fix.gif | Bin 181 -> 0 bytes doc/unitTest/images/folder-closed.gif | Bin 220 -> 0 bytes doc/unitTest/images/folder-open.gif | Bin 229 -> 0 bytes doc/unitTest/images/help_logo.gif | Bin 2113 -> 0 bytes doc/unitTest/images/icon_alert.gif | Bin 1120 -> 0 bytes doc/unitTest/images/icon_alertsml.gif | Bin 154 -> 0 bytes doc/unitTest/images/icon_arrowfolder1_sml.gif | Bin 1082 -> 0 bytes doc/unitTest/images/icon_arrowfolder2_sml.gif | Bin 1080 -> 0 bytes .../images/icon_arrowfolderclosed1_sml.gif | Bin 441 -> 0 bytes doc/unitTest/images/icon_arrowfolderopen2_sml.gif | Bin 664 -> 0 bytes doc/unitTest/images/icon_arrowmembers1_sml.gif | Bin 1073 -> 0 bytes doc/unitTest/images/icon_arrowmembers2_sml.gif | Bin 1072 -> 0 bytes doc/unitTest/images/icon_arrowusergroups1_sml.gif | Bin 1072 -> 0 bytes doc/unitTest/images/icon_arrowusergroups2_sml.gif | Bin 1076 -> 0 bytes doc/unitTest/images/icon_arrowwaste1_sml.gif | Bin 606 -> 0 bytes doc/unitTest/images/icon_arrowwaste2_sml.gif | Bin 609 -> 0 bytes doc/unitTest/images/icon_confirmsml.gif | Bin 94 -> 0 bytes doc/unitTest/images/icon_doc_lrg.gif | Bin 1335 -> 0 bytes doc/unitTest/images/icon_doc_sml.gif | Bin 355 -> 0 bytes doc/unitTest/images/icon_error_lrg.gif | Bin 1531 -> 0 bytes doc/unitTest/images/icon_error_sml.gif | Bin 1010 -> 0 bytes doc/unitTest/images/icon_folder_lrg.gif | Bin 1548 -> 0 bytes doc/unitTest/images/icon_folder_sml.gif | Bin 634 -> 0 bytes doc/unitTest/images/icon_help_lrg.gif | Bin 1418 -> 0 bytes doc/unitTest/images/icon_help_sml.gif | Bin 1019 -> 0 bytes doc/unitTest/images/icon_info_lrg.gif | Bin 1383 -> 0 bytes doc/unitTest/images/icon_info_sml.gif | Bin 606 -> 0 bytes doc/unitTest/images/icon_infosml.gif | Bin 77 -> 0 bytes doc/unitTest/images/icon_members_lrg.gif | Bin 1570 -> 0 bytes doc/unitTest/images/icon_members_sml.gif | Bin 1023 -> 0 bytes doc/unitTest/images/icon_sortdown.gif | Bin 117 -> 0 bytes doc/unitTest/images/icon_sortleft.gif | Bin 121 -> 0 bytes doc/unitTest/images/icon_sortright.gif | Bin 122 -> 0 bytes doc/unitTest/images/icon_sortup.gif | Bin 117 -> 0 bytes doc/unitTest/images/icon_success_lrg.gif | Bin 1492 -> 0 bytes doc/unitTest/images/icon_success_sml.gif | Bin 990 -> 0 bytes doc/unitTest/images/icon_usergroups_lrg.gif | Bin 1520 -> 0 bytes doc/unitTest/images/icon_usergroups_sml.gif | Bin 1026 -> 0 bytes doc/unitTest/images/icon_warning_lrg.gif | Bin 1491 -> 0 bytes doc/unitTest/images/icon_warning_sml.gif | Bin 576 -> 0 bytes doc/unitTest/images/icon_waste_lrg.gif | Bin 780 -> 0 bytes doc/unitTest/images/icon_waste_sml.gif | Bin 562 -> 0 bytes doc/unitTest/images/logos/maven-feather.png | Bin 2907 -> 0 bytes doc/unitTest/images/newwindow-classic.png | Bin 951 -> 0 bytes doc/unitTest/images/newwindow.png | Bin 220 -> 0 bytes doc/unitTest/images/none.png | Bin 946 -> 0 bytes doc/unitTest/images/nw_maj.gif | Bin 49 -> 0 bytes doc/unitTest/images/nw_maj_hi.gif | Bin 51 -> 0 bytes doc/unitTest/images/nw_maj_rond.gif | Bin 51 -> 0 bytes doc/unitTest/images/nw_med.gif | Bin 48 -> 0 bytes doc/unitTest/images/nw_med_hi.gif | Bin 47 -> 0 bytes doc/unitTest/images/nw_med_rond.gif | Bin 46 -> 0 bytes doc/unitTest/images/nw_min.gif | Bin 51 -> 0 bytes doc/unitTest/images/nw_min_036.gif | Bin 45 -> 0 bytes doc/unitTest/images/nw_min_hi.gif | Bin 46 -> 0 bytes doc/unitTest/images/pdf.gif | Bin 950 -> 0 bytes doc/unitTest/images/poweredby_036.gif | Bin 808 -> 0 bytes doc/unitTest/images/product_logo.gif | Bin 680 -> 0 bytes doc/unitTest/images/remove.gif | Bin 227 -> 0 bytes doc/unitTest/images/se_maj_rond.gif | Bin 50 -> 0 bytes doc/unitTest/images/strich.gif | Bin 43 -> 0 bytes doc/unitTest/images/sw_maj_rond.gif | Bin 51 -> 0 bytes doc/unitTest/images/sw_med_rond.gif | Bin 46 -> 0 bytes doc/unitTest/images/sw_min.gif | Bin 45 -> 0 bytes doc/unitTest/images/update.gif | Bin 192 -> 0 bytes doc/unitTest/surefire-report.html | 69 -- endorsed/resolver-2.9.1.jar | Bin 84091 -> 0 bytes endorsed/serializer-2.9.1.jar | Bin 278286 -> 0 bytes endorsed/xalan-2.7.1.jar | Bin 3176148 -> 0 bytes endorsed/xercesImpl-2.9.1.jar | Bin 1229289 -> 0 bytes endorsed/xml-apis-2.9.1.jar | Bin 194354 -> 0 bytes install.bat | 0 install.sh | 0 lib/bcprov-ext-jdk15-1.40.jar | Bin 1603682 -> 0 bytes lib/bcprov-jdk15-1.45.jar | Bin 0 -> 1663318 bytes lib/endorsed/serializer-2.10.0.jar | Bin 0 -> 278286 bytes lib/endorsed/xalan-2.7.1.jar | Bin 0 -> 3176148 bytes lib/endorsed/xercesImpl-2.10.0.jar | Bin 0 -> 1363159 bytes lib/endorsed/xml-apis-2.10.0.jar | Bin 0 -> 220536 bytes lib/endorsed/xml-resolver-1.2.jar | Bin 0 -> 84091 bytes lib/esapi-2.0GA.jar | Bin 0 -> 367204 bytes lib/jargs-1.0.jar | Bin 11406 -> 0 bytes lib/jcl-over-slf4j-1.5.5.jar | Bin 16746 -> 0 bytes lib/jcl-over-slf4j-1.6.1.jar | Bin 0 -> 17308 bytes lib/joda-time-1.5.2.jar | Bin 531326 -> 0 bytes lib/joda-time-1.6.2.jar | Bin 0 -> 543044 bytes lib/jul-to-slf4j-1.6.1.jar | Bin 0 -> 4463 bytes lib/log4j-over-slf4j-1.5.5.jar | Bin 9665 -> 0 bytes lib/log4j-over-slf4j-1.6.1.jar | Bin 0 -> 12359 bytes lib/logback-classic-0.9.13.jar | Bin 146846 -> 0 bytes lib/logback-classic-0.9.29.jar | Bin 0 -> 243718 bytes lib/logback-core-0.9.13.jar | Bin 219456 -> 0 bytes lib/logback-core-0.9.29.jar | Bin 0 -> 315256 bytes lib/not-yet-commons-ssl-0.3.9.jar | Bin 260555 -> 258278 bytes lib/opensaml-2.2.3.jar | Bin 1249375 -> 0 bytes lib/opensaml-2.5.1.jar | Bin 0 -> 1352932 bytes lib/openws-1.2.2.jar | Bin 119232 -> 0 bytes lib/openws-1.4.2.jar | Bin 0 -> 569051 bytes lib/shibboleth-discovery-service-1.1.0.jar | Bin 56599 -> 0 bytes lib/shibboleth-discovery-service-1.1.3.jar | Bin 0 -> 56721 bytes lib/slf4j-api-1.5.6.jar | Bin 22338 -> 0 bytes lib/slf4j-api-1.6.1.jar | Bin 0 -> 25496 bytes lib/xmlsec-1.4.2.jar | Bin 444503 -> 0 bytes lib/xmlsec-1.4.5.jar | Bin 0 -> 450950 bytes lib/xmltooling-1.2.0.jar | Bin 577978 -> 0 bytes lib/xmltooling-1.3.2.jar | Bin 0 -> 614120 bytes src/installer/lib/ant-extensions-13Apr2008.jar | Bin 0 -> 21017 bytes src/installer/lib/bcprov-jdk15-1.45.jar | Bin 0 -> 1663318 bytes src/installer/resources/build.xml | 70 +- src/installer/resources/install.properties | 2 +- src/installer/resources/logging.xml | 25 +- src/installer/resources/wayfconfig.xml | 90 +- src/main/webapp/Suggest.js | 362 +++++++ src/main/webapp/WEB-INF/tlds/struts-bean.tld | 0 src/main/webapp/WEB-INF/tlds/struts-logic.tld | 0 src/main/webapp/WEB-INF/web.xml | 97 +- src/main/webapp/images/incommon.gif | Bin src/main/webapp/images/internet2.gif | Bin src/main/webapp/images/logo.jpg | Bin src/main/webapp/index.htm | 0 src/main/webapp/static.html | 163 ++++ src/main/webapp/static2.html | 160 +++ src/main/webapp/wayf.css | 18 + src/main/webapp/wayf.jsp | 125 ++- src/main/webapp/wayferror.jsp | 4 +- 331 files changed, 1156 insertions(+), 22434 deletions(-) mode change 100644 => 100755 LICENSE.txt mode change 100644 => 100755 cpappend.bat mode change 100644 => 100755 doc/CREDITS.txt mode change 100644 => 100755 doc/INSTALL.txt mode change 100644 => 100755 doc/README.txt mode change 100644 => 100755 doc/RELEASE-NOTES.txt delete mode 100644 doc/api/allclasses-frame.html delete mode 100644 doc/api/allclasses-noframe.html delete mode 100644 doc/api/constant-values.html delete mode 100644 doc/api/deprecated-list.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/class-use/ShibbolethConfigurationException.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/package-frame.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/package-summary.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/package-tree.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/common/package-use.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.Compare.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSite.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/Version.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/WayfException.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/WayfService.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryResponseBuilder.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryResponseImpl.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryResponseUnmarshaller.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/DiscoveryServiceHandler.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/HandlerConfig.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.Compare.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSite.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSet.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/IdPSiteSetEntry.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackConfigurationChangeListener.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/LogbackLoggingService.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/Version.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfException.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/WayfService.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/class-use/XMLConstants.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/package-frame.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/package-summary.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/package-tree.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/package-use.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/Plugin.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginContext.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/PluginMetadataParameter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/class-use/WayfRequestHandled.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-tree.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/package-use.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.SamlIdPCookie.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/BindingFilter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/ListFilter.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.SamlIdPCookie.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/class-use/SamlCookiePlugin.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-tree.html delete mode 100644 doc/api/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-use.html delete mode 100644 doc/api/help-doc.html delete mode 100644 doc/api/index-all.html delete mode 100644 doc/api/index.html delete mode 100644 doc/api/options delete mode 100644 doc/api/overview-frame.html delete mode 100644 doc/api/overview-summary.html delete mode 100644 doc/api/overview-tree.html delete mode 100644 doc/api/package-list delete mode 100644 doc/api/packages delete mode 100644 doc/api/resources/inherit.gif delete mode 100644 doc/api/serialized-form.html delete mode 100644 doc/api/stylesheet.css delete mode 100644 doc/src-xref/allclasses-frame.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/common/ShibbolethConfigurationException.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/common/package-frame.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/common/package-summary.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseBuilder.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseImpl.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryResponseUnmarshaller.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/HandlerConfig.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSite.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/IdPSiteSetEntry.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/LogbackConfigurationChangeListener.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/LogbackLoggingService.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/Version.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfException.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/WayfService.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/XMLConstants.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-frame.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/package-summary.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/Plugin.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/PluginContext.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/PluginMetadataParameter.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/WayfRequestHandled.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-frame.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/package-summary.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/BindingFilter.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/ListFilter.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/SamlCookiePlugin.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-frame.html delete mode 100644 doc/src-xref/edu/internet2/middleware/shibboleth/wayf/plugins/provider/package-summary.html delete mode 100644 doc/src-xref/index.html delete mode 100644 doc/src-xref/overview-frame.html delete mode 100644 doc/src-xref/overview-summary.html delete mode 100644 doc/src-xref/stylesheet.css delete mode 100644 doc/style/checkstyle.html delete mode 100644 doc/style/css/maven-base.css delete mode 100644 doc/style/css/maven-theme.css delete mode 100644 doc/style/css/print.css delete mode 100644 doc/style/images/add.gif delete mode 100644 doc/style/images/collapsed.gif delete mode 100644 doc/style/images/expanded.gif delete mode 100644 doc/style/images/external-classic.png delete mode 100644 doc/style/images/external.png delete mode 100644 doc/style/images/file.gif delete mode 100644 doc/style/images/fix.gif delete mode 100644 doc/style/images/folder-closed.gif delete mode 100644 doc/style/images/folder-open.gif delete mode 100644 doc/style/images/help_logo.gif delete mode 100644 doc/style/images/icon_alert.gif delete mode 100644 doc/style/images/icon_alertsml.gif delete mode 100644 doc/style/images/icon_arrowfolder1_sml.gif delete mode 100644 doc/style/images/icon_arrowfolder2_sml.gif delete mode 100644 doc/style/images/icon_arrowfolderclosed1_sml.gif delete mode 100644 doc/style/images/icon_arrowfolderopen2_sml.gif delete mode 100644 doc/style/images/icon_arrowmembers1_sml.gif delete mode 100644 doc/style/images/icon_arrowmembers2_sml.gif delete mode 100644 doc/style/images/icon_arrowusergroups1_sml.gif delete mode 100644 doc/style/images/icon_arrowusergroups2_sml.gif delete mode 100644 doc/style/images/icon_arrowwaste1_sml.gif delete mode 100644 doc/style/images/icon_arrowwaste2_sml.gif delete mode 100644 doc/style/images/icon_confirmsml.gif delete mode 100644 doc/style/images/icon_doc_lrg.gif delete mode 100644 doc/style/images/icon_doc_sml.gif delete mode 100644 doc/style/images/icon_error_lrg.gif delete mode 100644 doc/style/images/icon_error_sml.gif delete mode 100644 doc/style/images/icon_folder_lrg.gif delete mode 100644 doc/style/images/icon_folder_sml.gif delete mode 100644 doc/style/images/icon_help_lrg.gif delete mode 100644 doc/style/images/icon_help_sml.gif delete mode 100644 doc/style/images/icon_info_lrg.gif delete mode 100644 doc/style/images/icon_info_sml.gif delete mode 100644 doc/style/images/icon_infosml.gif delete mode 100644 doc/style/images/icon_members_lrg.gif delete mode 100644 doc/style/images/icon_members_sml.gif delete mode 100644 doc/style/images/icon_sortdown.gif delete mode 100644 doc/style/images/icon_sortleft.gif delete mode 100644 doc/style/images/icon_sortright.gif delete mode 100644 doc/style/images/icon_sortup.gif delete mode 100644 doc/style/images/icon_success_lrg.gif delete mode 100644 doc/style/images/icon_success_sml.gif delete mode 100644 doc/style/images/icon_usergroups_lrg.gif delete mode 100644 doc/style/images/icon_usergroups_sml.gif delete mode 100644 doc/style/images/icon_warning_lrg.gif delete mode 100644 doc/style/images/icon_warning_sml.gif delete mode 100644 doc/style/images/icon_waste_lrg.gif delete mode 100644 doc/style/images/icon_waste_sml.gif delete mode 100644 doc/style/images/logos/maven-feather.png delete mode 100644 doc/style/images/newwindow-classic.png delete mode 100644 doc/style/images/newwindow.png delete mode 100644 doc/style/images/none.png delete mode 100644 doc/style/images/nw_maj.gif delete mode 100644 doc/style/images/nw_maj_hi.gif delete mode 100644 doc/style/images/nw_maj_rond.gif delete mode 100644 doc/style/images/nw_med.gif delete mode 100644 doc/style/images/nw_med_hi.gif delete mode 100644 doc/style/images/nw_med_rond.gif delete mode 100644 doc/style/images/nw_min.gif delete mode 100644 doc/style/images/nw_min_036.gif delete mode 100644 doc/style/images/nw_min_hi.gif delete mode 100644 doc/style/images/pdf.gif delete mode 100644 doc/style/images/poweredby_036.gif delete mode 100644 doc/style/images/product_logo.gif delete mode 100644 doc/style/images/remove.gif delete mode 100644 doc/style/images/rss.png delete mode 100644 doc/style/images/se_maj_rond.gif delete mode 100644 doc/style/images/strich.gif delete mode 100644 doc/style/images/sw_maj_rond.gif delete mode 100644 doc/style/images/sw_med_rond.gif delete mode 100644 doc/style/images/sw_min.gif delete mode 100644 doc/style/images/update.gif delete mode 100644 doc/unitTest/css/maven-base.css delete mode 100644 doc/unitTest/css/maven-theme.css delete mode 100644 doc/unitTest/css/print.css delete mode 100644 doc/unitTest/images/add.gif delete mode 100644 doc/unitTest/images/collapsed.gif delete mode 100644 doc/unitTest/images/expanded.gif delete mode 100644 doc/unitTest/images/external-classic.png delete mode 100644 doc/unitTest/images/external.png delete mode 100644 doc/unitTest/images/file.gif delete mode 100644 doc/unitTest/images/fix.gif delete mode 100644 doc/unitTest/images/folder-closed.gif delete mode 100644 doc/unitTest/images/folder-open.gif delete mode 100644 doc/unitTest/images/help_logo.gif delete mode 100644 doc/unitTest/images/icon_alert.gif delete mode 100644 doc/unitTest/images/icon_alertsml.gif delete mode 100644 doc/unitTest/images/icon_arrowfolder1_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowfolder2_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowfolderclosed1_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowfolderopen2_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowmembers1_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowmembers2_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowusergroups1_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowusergroups2_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowwaste1_sml.gif delete mode 100644 doc/unitTest/images/icon_arrowwaste2_sml.gif delete mode 100644 doc/unitTest/images/icon_confirmsml.gif delete mode 100644 doc/unitTest/images/icon_doc_lrg.gif delete mode 100644 doc/unitTest/images/icon_doc_sml.gif delete mode 100644 doc/unitTest/images/icon_error_lrg.gif delete mode 100644 doc/unitTest/images/icon_error_sml.gif delete mode 100644 doc/unitTest/images/icon_folder_lrg.gif delete mode 100644 doc/unitTest/images/icon_folder_sml.gif delete mode 100644 doc/unitTest/images/icon_help_lrg.gif delete mode 100644 doc/unitTest/images/icon_help_sml.gif delete mode 100644 doc/unitTest/images/icon_info_lrg.gif delete mode 100644 doc/unitTest/images/icon_info_sml.gif delete mode 100644 doc/unitTest/images/icon_infosml.gif delete mode 100644 doc/unitTest/images/icon_members_lrg.gif delete mode 100644 doc/unitTest/images/icon_members_sml.gif delete mode 100644 doc/unitTest/images/icon_sortdown.gif delete mode 100644 doc/unitTest/images/icon_sortleft.gif delete mode 100644 doc/unitTest/images/icon_sortright.gif delete mode 100644 doc/unitTest/images/icon_sortup.gif delete mode 100644 doc/unitTest/images/icon_success_lrg.gif delete mode 100644 doc/unitTest/images/icon_success_sml.gif delete mode 100644 doc/unitTest/images/icon_usergroups_lrg.gif delete mode 100644 doc/unitTest/images/icon_usergroups_sml.gif delete mode 100644 doc/unitTest/images/icon_warning_lrg.gif delete mode 100644 doc/unitTest/images/icon_warning_sml.gif delete mode 100644 doc/unitTest/images/icon_waste_lrg.gif delete mode 100644 doc/unitTest/images/icon_waste_sml.gif delete mode 100644 doc/unitTest/images/logos/maven-feather.png delete mode 100644 doc/unitTest/images/newwindow-classic.png delete mode 100644 doc/unitTest/images/newwindow.png delete mode 100644 doc/unitTest/images/none.png delete mode 100644 doc/unitTest/images/nw_maj.gif delete mode 100644 doc/unitTest/images/nw_maj_hi.gif delete mode 100644 doc/unitTest/images/nw_maj_rond.gif delete mode 100644 doc/unitTest/images/nw_med.gif delete mode 100644 doc/unitTest/images/nw_med_hi.gif delete mode 100644 doc/unitTest/images/nw_med_rond.gif delete mode 100644 doc/unitTest/images/nw_min.gif delete mode 100644 doc/unitTest/images/nw_min_036.gif delete mode 100644 doc/unitTest/images/nw_min_hi.gif delete mode 100644 doc/unitTest/images/pdf.gif delete mode 100644 doc/unitTest/images/poweredby_036.gif delete mode 100644 doc/unitTest/images/product_logo.gif delete mode 100644 doc/unitTest/images/remove.gif delete mode 100644 doc/unitTest/images/se_maj_rond.gif delete mode 100644 doc/unitTest/images/strich.gif delete mode 100644 doc/unitTest/images/sw_maj_rond.gif delete mode 100644 doc/unitTest/images/sw_med_rond.gif delete mode 100644 doc/unitTest/images/sw_min.gif delete mode 100644 doc/unitTest/images/update.gif delete mode 100644 doc/unitTest/surefire-report.html delete mode 100644 endorsed/resolver-2.9.1.jar delete mode 100644 endorsed/serializer-2.9.1.jar delete mode 100644 endorsed/xalan-2.7.1.jar delete mode 100644 endorsed/xercesImpl-2.9.1.jar delete mode 100644 endorsed/xml-apis-2.9.1.jar mode change 100644 => 100755 install.bat mode change 100644 => 100755 install.sh delete mode 100644 lib/bcprov-ext-jdk15-1.40.jar create mode 100644 lib/bcprov-jdk15-1.45.jar create mode 100644 lib/endorsed/serializer-2.10.0.jar create mode 100644 lib/endorsed/xalan-2.7.1.jar create mode 100644 lib/endorsed/xercesImpl-2.10.0.jar create mode 100644 lib/endorsed/xml-apis-2.10.0.jar create mode 100644 lib/endorsed/xml-resolver-1.2.jar create mode 100644 lib/esapi-2.0GA.jar delete mode 100644 lib/jargs-1.0.jar delete mode 100644 lib/jcl-over-slf4j-1.5.5.jar create mode 100644 lib/jcl-over-slf4j-1.6.1.jar delete mode 100644 lib/joda-time-1.5.2.jar create mode 100644 lib/joda-time-1.6.2.jar create mode 100644 lib/jul-to-slf4j-1.6.1.jar delete mode 100644 lib/log4j-over-slf4j-1.5.5.jar create mode 100644 lib/log4j-over-slf4j-1.6.1.jar delete mode 100644 lib/logback-classic-0.9.13.jar create mode 100644 lib/logback-classic-0.9.29.jar delete mode 100644 lib/logback-core-0.9.13.jar create mode 100644 lib/logback-core-0.9.29.jar delete mode 100644 lib/opensaml-2.2.3.jar create mode 100644 lib/opensaml-2.5.1.jar delete mode 100644 lib/openws-1.2.2.jar create mode 100644 lib/openws-1.4.2.jar delete mode 100644 lib/shibboleth-discovery-service-1.1.0.jar create mode 100644 lib/shibboleth-discovery-service-1.1.3.jar delete mode 100644 lib/slf4j-api-1.5.6.jar create mode 100644 lib/slf4j-api-1.6.1.jar delete mode 100644 lib/xmlsec-1.4.2.jar create mode 100644 lib/xmlsec-1.4.5.jar delete mode 100644 lib/xmltooling-1.2.0.jar create mode 100644 lib/xmltooling-1.3.2.jar create mode 100644 src/installer/lib/ant-extensions-13Apr2008.jar create mode 100644 src/installer/lib/bcprov-jdk15-1.45.jar mode change 100644 => 100755 src/installer/resources/build.xml mode change 100644 => 100755 src/installer/resources/install.properties mode change 100644 => 100755 src/installer/resources/logging.xml mode change 100644 => 100755 src/installer/resources/wayfconfig.xml create mode 100755 src/main/webapp/Suggest.js mode change 100644 => 100755 src/main/webapp/WEB-INF/tlds/struts-bean.tld mode change 100644 => 100755 src/main/webapp/WEB-INF/tlds/struts-logic.tld mode change 100644 => 100755 src/main/webapp/WEB-INF/web.xml mode change 100644 => 100755 src/main/webapp/images/incommon.gif mode change 100644 => 100755 src/main/webapp/images/internet2.gif mode change 100644 => 100755 src/main/webapp/images/logo.jpg mode change 100644 => 100755 src/main/webapp/index.htm create mode 100755 src/main/webapp/static.html create mode 100755 src/main/webapp/static2.html mode change 100644 => 100755 src/main/webapp/wayf.css mode change 100644 => 100755 src/main/webapp/wayf.jsp mode change 100644 => 100755 src/main/webapp/wayferror.jsp diff --git a/LICENSE.txt b/LICENSE.txt old mode 100644 new mode 100755 index 338979d..895657b --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,174 +1,174 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. \ No newline at end of file diff --git a/cpappend.bat b/cpappend.bat old mode 100644 new mode 100755 diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt old mode 100644 new mode 100755 diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt old mode 100644 new mode 100755 index 8ca3ae0..a9fd0a1 --- 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/README.txt b/doc/README.txt old mode 100644 new mode 100755 diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt old mode 100644 new mode 100755 index 07aa43f..e76023c --- a/doc/RELEASE-NOTES.txt +++ b/doc/RELEASE-NOTES.txt @@ -1,20 +1,16 @@ -Changes in Release 1.1.0 +Changes in Release 1.1.3 ============================================= -[SDSJ-22] - wayf.jsp: Invalid loaction of tag and - + + + + + + - + - - + + + + + + + + + - + - - - - - + + + + + - + - + @@ -49,20 +59,20 @@ - + - - - + + + - + - \ No newline at end of file + diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties old mode 100644 new mode 100755 index c37d1c1..4b9d0de --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1 +1 @@ -ds.home = /etc/DiscoveryService \ No newline at end of file +ds.home = /opt/shibboleth-ds \ No newline at end of file diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml old mode 100644 new mode 100755 index 77fefd6..eff4799 --- a/src/installer/resources/logging.xml +++ b/src/installer/resources/logging.xml @@ -1,5 +1,4 @@ - $DS_HOME$/logs/discoveryService.log - true $DS_HOME$/logs/discovery-%d{yyyy-MM-dd}.log - - %date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n - + + UTF-8 + %date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n + - true - - %date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n - + + UTF-8 + %date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n + - + - + - - + + diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml old mode 100644 new mode 100755 index 1cd22d7..664cd0d --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -1,7 +1,5 @@ - - + + - + Institution University @@ -69,14 +67,11 @@ NOTE - for windows installation with an explicit DOS device ("C:\etc\discoveryservice") The url below should be "file://C:\program files/metadata/sites.xml - --> +--> - + - + - + - + - + + with the DS refers to this handler --> - + diff --git a/src/main/webapp/Suggest.js b/src/main/webapp/Suggest.js new file mode 100755 index 0000000..537064b --- /dev/null +++ b/src/main/webapp/Suggest.js @@ -0,0 +1,362 @@ +function TypeAheadControl(list, box, orig, submit, optype, ie6hack) +{ + // + // Squirrel away the parameters we were given + // + this.elementList = list; + this.textBox = box; + this.origin = orig; + this.submit = submit; + this.optype = optype; + this.results = 0; + // + // Change these as needed + // + this.maxResults = 10; // How many to show + this.alwaysShowResult = true; // Show dropdown even if there are more that ,axResult results + this.ie6hack = ie6hack; + var myThis = this; + + // + // Setup the lowercase names + // + var i = 0; + while (i < list.length) { + if (null == list[i]) { + list.length = i; + break; + } + list[i][2] = list[i][0].toLowerCase(); + i++; + } + // + // Set up the 'dropDown' + // + this.dropDown = document.createElement('div'); + this.dropDown.className = 'dropdown'; + this.dropDown.style.visibility = 'hidden'; + this.dropDown.style.width = box.offsetWidth; + this.dropDown.current = -1; + document.body.appendChild(this.dropDown); + + // + // mouse listeners for the dropdown box + // + this.dropDown.onmouseover = function(event) { + if (!event) { + event = window.event; + } + target = event.target; + if (!target) { + target = event.srcElement; + } + myThis.select(target); + } + + this.dropDown.onmousedown = function(event) { + if (-1 != myThis.dropDown.current) { + myThis.textBox.value = myThis.results[myThis.dropDown.current][0]; + } + } + + // + // Add the listeners to the text box + // + this.textBox.onkeyup = function(event) { + // + // get window even if needed (because of browser oddities) + // + if (!event) { + event = window.event; + } + myThis.handleKeyUp(event); + }; + + this.textBox.onkeydown = function(event) { + if (!event) { + event = window.event; + } + + myThis.handleKeyDown(event); + }; + + this.textBox.onblur = function() { + myThis.hideDrop(); + }; + + this.textBox.onfocus = function() { + myThis.handleChange(); + }; + +}; +// +// Given a name return the first maxresults, or all possibles +// +TypeAheadControl.prototype.getPossible = function(name) { + var possibles = []; + var inIndex = 0; + var outIndex = 0; + name = name.toLowerCase(); + var strIndex = 0; + var str; + var ostr; + + while (outIndex <= this.maxResults && inIndex < this.elementList.length) { + strIndex = this.elementList[inIndex][2].indexOf(name); + if (-1 != strIndex) { + // + // a hit + // + str = this.elementList[inIndex][0]; + possibles[outIndex] = new Array(str, this.elementList[inIndex][1]); + outIndex ++; + } else { + // + // Check entityId + strIndex = this.elementList[inIndex][1].indexOf(name); + if (-1 != strIndex) { + // + // a hit + // + str = this.elementList[inIndex][0]; + possibles[outIndex] = new Array(str, this.elementList[inIndex][1]); + outIndex ++; + } + } + inIndex ++; + } + // + // reset the cursor to the top + // + this.dropDown.current = -1; + + return possibles; +}; + +TypeAheadControl.prototype.handleKeyUp = function(event) { + var key = event.keyCode; + + if (27 == key) { + // + // Escape - clear + // + this.textBox.value = ''; + this.handleChange(); + } else if (8 == key || 32 == key || (key >= 46 && key < 112) || key > 123) { + // + // Backspace, Space and >=Del to F12 + // + this.handleChange(); + } +}; + +TypeAheadControl.prototype.handleKeyDown = function(event) { + + var key = event.keyCode; + + if (38 == key) { + // + // up arrow + // + this.upSelect(); + + } else if (40 == key) { + // + // down arrow + // + this.downSelect(); + } +}; + +TypeAheadControl.prototype.hideDrop = function() { + var i = 0; + if (null != this.ie6hack) { + while (i < this.ie6hack.length) { + this.ie6hack[i].style.visibility = 'visible'; + i++; + } + } + this.dropDown.style.visibility = 'hidden'; + if (-1 == this.dropDown.current) { + this.doUnselected(); + } +}; + +TypeAheadControl.prototype.showDrop = function() { + var i = 0; + if (null != this.ie6hack) { + while (i < this.ie6hack.length) { + this.ie6hack[i].style.visibility = 'hidden'; + i++; + } + } + this.dropDown.style.visibility = 'visible'; +}; + + +TypeAheadControl.prototype.doSelected = function() { + this.submit.value='Select'; + this.optype.value = 'selection'; +}; + +TypeAheadControl.prototype.doUnselected = function() { + this.submit.value='Search'; + + this.optype.value = 'search'; +}; + +TypeAheadControl.prototype.handleChange = function() { + + var val = this.textBox.value; + var res = this.getPossible(val); + + if (0 == val.length || + 0 == res.length || + (!this.alwaysShowResult && this.maxResults < res.length)) { + this.hideDrop(); + this.doUnselected(); + this.results = []; + this.dropDown.current = -1; + } else { + this.results = res; + this.populateDropDown(res); + if (1 == res.length) { + this.select(this.dropDown.childNodes[0]); + this.doSelected(); + } else { + this.doUnselected(); + } + } +}; + +// +// A lot of the stuff below comes from +// http://www.webreference.com/programming/javascript/ncz/column2 +// +// With thanks to Nicholas C Zakas +// +TypeAheadControl.prototype.populateDropDown = function(list) { + this.dropDown.innerHTML = ''; + var i = 0; + var div; + while (i < list.length) { + div = document.createElement('div'); + div.appendChild(document.createTextNode(list[i][0])); +// div.style.zIndex = '1000'; + this.dropDown.appendChild(div); + i++; + } + var off = this.getXY(); + this.dropDown.style.left = off[0] + 'px'; + this.dropDown.style.top = off[1] + 'px'; + this.showDrop(); +}; + +TypeAheadControl.prototype.getXY = function() { + + var node = this.textBox; + var sumX = 0; + var sumY = node.offsetHeight; + + while(node.tagName != 'BODY') { + sumX += node.offsetLeft; + sumY += node.offsetTop; + node = node.offsetParent; + } + // + // And add in the offset for the Body + // + sumX += node.offsetLeft; + sumY += node.offsetTop; + + return [sumX, sumY]; +}; + +TypeAheadControl.prototype.select = function(selected) { + var i = 0; + var node; + this.dropDown.current = -1; + this.doUnselected(); + while (i < this.dropDown.childNodes.length) { + node = this.dropDown.childNodes[i]; + if (node == selected) { + // + // Highlight it + // + node.className = 'current'; + // + // turn on the button + // + this.doSelected(); + // + // setup the cursor + // + this.dropDown.current = i; + // + // and the value for the Server + // + this.origin.value = this.results[i][1]; + this.origin.textValue = this.results[i][0]; + } else { + node.className = ''; + } + i++; + } + this.textBox.focus(); +}; + +TypeAheadControl.prototype.downSelect = function() { + if (this.results.length > 0) { + + if (-1 == this.dropDown.current) { + // + // mimic a select() + // + this.dropDown.current = 0; + this.dropDown.childNodes[0].className = 'current'; + this.doSelected(); + this.origin.value = this.results[0][1]; + this.origin.textValue = this.results[0][0]; + + } else if (this.dropDown.current < (this.results.length-1)) { + // + // turn off highlight + // + this.dropDown.childNodes[this.dropDown.current].className = ''; + // + // move cursor + // + this.dropDown.current++; + // + // and 'select' + // + this.dropDown.childNodes[this.dropDown.current].className = 'current'; + this.doSelected(); + this.origin.value = this.results[this.dropDown.current][1]; + this.origin.textValue = this.results[this.dropDown.current][0]; + } + } +}; + + +TypeAheadControl.prototype.upSelect = function() { + if ((this.results.length > 0) && + (this.dropDown.current > 0)) { + + // + // turn off highlight + // + this.dropDown.childNodes[this.dropDown.current].className = ''; + // + // move cursor + // + this.dropDown.current--; + // + // and 'select' + // + this.dropDown.childNodes[this.dropDown.current].className = 'current'; + this.doSelected(); + this.origin.value = this.results[this.dropDown.current][1]; + this.origin.textValue = this.results[this.dropDown.current][0]; + } +}; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tlds/struts-bean.tld b/src/main/webapp/WEB-INF/tlds/struts-bean.tld old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/tlds/struts-logic.tld b/src/main/webapp/WEB-INF/tlds/struts-logic.tld old mode 100644 new mode 100755 diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml old mode 100644 new mode 100755 index c938b16..ef5f00e --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,55 +1,50 @@ - - - - - - - - WAYF - Shibboleth WAYF Service - edu.internet2.middleware.shibboleth.wayf.WayfService - - WAYFConfigFileLocation - $DS_HOME$/conf/wayfconfig.xml - - - WAYFLogConfig - $DS_HOME$/conf/logging.xml + + + + + WAYF + Shibboleth WAYF Service + edu.internet2.middleware.shibboleth.wayf.WayfService + + WAYFConfigFileLocation + $DS_HOME$/conf/wayfconfig.xml + + + WAYFLogConfig + $DS_HOME$/conf/logging.xml WAYFLogConfigPollFrequency 300000 - - - - - - - WAYF - /WAYF - - - - WAYF - *.wayf - - - - WAYF - /DS - - - - WAYF - *.ds - - - - css - text/css - - + + + + + + + WAYF + /WAYF + + + + WAYF + *.wayf + + + + WAYF + /DS + + + + WAYF + *.ds + + + + css + text/css + + diff --git a/src/main/webapp/images/incommon.gif b/src/main/webapp/images/incommon.gif old mode 100644 new mode 100755 diff --git a/src/main/webapp/images/internet2.gif b/src/main/webapp/images/internet2.gif old mode 100644 new mode 100755 diff --git a/src/main/webapp/images/logo.jpg b/src/main/webapp/images/logo.jpg old mode 100644 new mode 100755 diff --git a/src/main/webapp/index.htm b/src/main/webapp/index.htm old mode 100644 new mode 100755 diff --git a/src/main/webapp/static.html b/src/main/webapp/static.html new file mode 100755 index 0000000..c35b8a3 --- /dev/null +++ b/src/main/webapp/static.html @@ -0,0 +1,163 @@ + + + +Static Discovery Service with centralised hinting + +

+This is a boring, but static web page which shows how an signle SP can +configure their own "Discovery Service" without recouse to a Java +Container but taking full advantage of the centralised cookie server +in the Federation Discovery Service. +

+

This is not meant to be pretty - it is meant to be easy for SP's +(who understand HTML) to understand and develop. It is however +targetted at a single SP. Sites running multiple SPs and wanting a +single Discovery will still need to deploy a real DS, or deploy this +as an embedded wayf on each SP. +

+

+There is obviously plenty of room for adding all the visual sugar and +branding that we want at the three levels

+
    +
  • A World Wide "This is a Discovery" look and feel
    • +
  • A Federation branding
    • +
  • "Corporate" Branding
    • +
+ +

Just for fun, this Discovery service points to the I2Wiki, a Shib 2 +SP (and so with an easier configuration). To make things even more +fun it has access to metadata (mostly statically loaded) for 6 +Federations. (UK, InCommon, MAMS, Switch AcoNet and Renater)

+ + + +
+ +

Enter Organization Name

+ + + +
+ + + + + + + + + + + + + +
+ + + +
+
+ +

Configuring

+ +Details on how to set this up this are embedded as comments in this +web page. Currently a lot of the configuration is manual. Future +versions will be as automatic as possible and the only configuration +required will be the link which is displayed when there is not +javascript enabled. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/static2.html b/src/main/webapp/static2.html new file mode 100755 index 0000000..470b099 --- /dev/null +++ b/src/main/webapp/static2.html @@ -0,0 +1,160 @@ + + + +Static Discovery Service with centralised hinting + +

+This is a boring, but static web page which shows how an signle SP can +configure their own "Discovery Service" without recouse to a Java +Container but taking full advantage of the centralised cookie server +in the Federation Discovery Service. +

+

+This DS points at a test SP in the UK Federation, and uses the +Shib/SAML1 protocol. It is a lot harder to configure (a lot like +setting up one a "WAYFless URLS". Consider it motivation to upgrade +from SAML1 to SAML2... +

+ + +
+
+

Enter Organization Name

+ + +
+ + + + + + + + + + + + + + + +
+ + + +
+
+ + + +

Configuring

+ +Details on how to set this up this are embedded as comments in this +web page. Currently a lot of the configuration is manual. Although +it would be feasible to automate this just as is planned for Shib2 +SPs, the duplication seems needless given that the product has a 9 +month shelf life. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/wayf.css b/src/main/webapp/wayf.css old mode 100644 new mode 100755 index 4056aa3..0eeb26c --- 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 old mode 100644 new mode 100755 index 74ba11d..12d72da --- a/src/main/webapp/wayf.jsp +++ b/src/main/webapp/wayf.jsp @@ -2,6 +2,7 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ page language="java" import="java.util.*,edu.internet2.middleware.shibboleth.wayf.*,java.lang.*" %> <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> @@ -123,6 +124,7 @@ 10 - Recently used sites hyperlinks 20 - + 25 - AutoSuggestion 30 Federation selection 40 IdP within Selection 50 Select button @@ -158,15 +160,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 +179,7 @@ Recently used institutions: simulating the user having specified a permanent cookie --> +

@@ -186,7 +188,8 @@ Recently used institutions: - ?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDxParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin="> + ?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDxParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%> +"> @@ -194,7 +197,7 @@ Recently used institutions: - ?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=&cache=perm&action=selection&origin="> + ?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=&cache=perm&action=selection&origin=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%> @@ -230,13 +233,54 @@ Recently used institutions: - + -

+ + + + or

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

+ + +

@@ -540,8 +594,55 @@ function changedFed(X, Selected) { --> - + + + + + + + + + + - \ No newline at end of file + diff --git a/src/main/webapp/wayferror.jsp b/src/main/webapp/wayferror.jsp old mode 100644 new mode 100755 index a0cb29d..1fd564a --- a/src/main/webapp/wayferror.jsp +++ b/src/main/webapp/wayferror.jsp @@ -25,12 +25,12 @@

Please email administrator's name and include the following error message:

-

WAYF failure at ()

+

Discovery Service failure at ()

 -

The DiscoveryService should not be called directly

+

The Discovery Service should not be called directly

 -- cgit v1.1