From d0269f479999ebc08f8c89e541e269c451d4f1ce Mon Sep 17 00:00:00 2001 From: srasmusson Date: Sat, 23 Apr 2016 21:48:54 +0200 Subject: [PATCH] changes dependecny, imports and started to fix redirectencoder --- .idea/.name | 1 + .idea/compiler.xml | 32 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 6 + ..._ch_qos_logback_logback_classic_1_0_13.xml | 13 + ...en__ch_qos_logback_logback_core_1_0_13.xml | 13 + ..._com_google_code_findbugs_jsr305_3_0_0.xml | 13 + .../Maven__com_google_guava_guava_18_0.xml | 13 + ...aven__commons_codec_commons_codec_1_10.xml | 13 + ..._collections_commons_collections_3_2_1.xml | 13 + .../Maven__commons_lang_commons_lang_2_4.xml | 13 + .../Maven__javax_servlet_servlet_api_2_5.xml | 13 + ...Maven__javax_xml_stream_stax_api_1_0_2.xml | 13 + .../Maven__joda_time_joda_time_2_7.xml | 13 + ...hibboleth_utilities_java_support_7_1_1.xml | 13 + ...apache_httpcomponents_httpclient_4_3_6.xml | 13 + ...g_apache_httpcomponents_httpcore_4_3_3.xml | 13 + ...ven__org_apache_santuario_xmlsec_2_0_3.xml | 13 + ...aven__org_apache_velocity_velocity_1_7.xml | 13 + ...__org_bouncycastle_bcprov_jdk15on_1_51.xml | 13 + ..._org_codehaus_woodstox_stax2_api_3_1_4.xml | 13 + ...ehaus_woodstox_woodstox_core_asl_4_4_1.xml | 13 + ...Maven__org_cryptacular_cryptacular_1_0.xml | 13 + ...aven__org_opensaml_opensaml_core_3_1_1.xml | 13 + ..._opensaml_opensaml_messaging_api_3_1_1.xml | 13 + ...rg_opensaml_opensaml_profile_api_3_1_1.xml | 13 + ...__org_opensaml_opensaml_saml_api_3_1_1.xml | 13 + ..._org_opensaml_opensaml_saml_impl_3_1_1.xml | 13 + ...g_opensaml_opensaml_security_api_3_1_1.xml | 13 + ..._opensaml_opensaml_security_impl_3_1_1.xml | 13 + ...__org_opensaml_opensaml_soap_api_3_1_1.xml | 13 + ..._org_opensaml_opensaml_soap_impl_3_1_1.xml | 13 + ...rg_opensaml_opensaml_storage_api_3_1_1.xml | 13 + ...org_opensaml_opensaml_xmlsec_api_3_1_1.xml | 13 + ...rg_opensaml_opensaml_xmlsec_impl_3_1_1.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_10.xml | 13 + .../Maven__xerces_xercesImpl_2_10_0.xml | 13 + .../Maven__xml_apis_xml_apis_1_4_01.xml | 13 + .idea/misc.xml | 42 ++ .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 437 ++++++++++++++++++ pom.xml | 23 +- .../steras/opensamlbook/sp/AccessFilter.java | 37 +- webprofile-ref-project.iml | 70 ++- 45 files changed, 1039 insertions(+), 68 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml create mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_0.xml create mode 100644 .idea/libraries/Maven__com_google_guava_guava_18_0.xml create mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml create mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_4.xml create mode 100644 .idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml create mode 100644 .idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml create mode 100644 .idea/libraries/Maven__joda_time_joda_time_2_7.xml create mode 100644 .idea/libraries/Maven__net_shibboleth_utilities_java_support_7_1_1.xml create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml create mode 100644 .idea/libraries/Maven__org_apache_santuario_xmlsec_2_0_3.xml create mode 100644 .idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml create mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml create mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml create mode 100644 .idea/libraries/Maven__org_cryptacular_cryptacular_1_0.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_core_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_messaging_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_profile_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_saml_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_saml_impl_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_security_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_security_impl_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_soap_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_soap_impl_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_storage_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_xmlsec_api_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_opensaml_opensaml_xmlsec_impl_3_1_1.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml create mode 100644 .idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml create mode 100644 .idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..6ed6363 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +webprofile-ref-project \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..ca09352 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml new file mode 100644 index 0000000..3d4778e --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml new file mode 100644 index 0000000..45d3320 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_0.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_0.xml new file mode 100644 index 0000000..6644d12 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml new file mode 100644 index 0000000..bbd71d7 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml new file mode 100644 index 0000000..27424a1 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml new file mode 100644 index 0000000..5e8b8d3 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml new file mode 100644 index 0000000..679e09a --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml new file mode 100644 index 0000000..2a4dd7a --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_7.xml b/.idea/libraries/Maven__joda_time_joda_time_2_7.xml new file mode 100644 index 0000000..1259eca --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_shibboleth_utilities_java_support_7_1_1.xml b/.idea/libraries/Maven__net_shibboleth_utilities_java_support_7_1_1.xml new file mode 100644 index 0000000..bcabb72 --- /dev/null +++ b/.idea/libraries/Maven__net_shibboleth_utilities_java_support_7_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml new file mode 100644 index 0000000..04cad1e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml new file mode 100644 index 0000000..a821fc2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_santuario_xmlsec_2_0_3.xml b/.idea/libraries/Maven__org_apache_santuario_xmlsec_2_0_3.xml new file mode 100644 index 0000000..ed63443 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_santuario_xmlsec_2_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml new file mode 100644 index 0000000..7a2914a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml new file mode 100644 index 0000000..e98695e --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_51.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml new file mode 100644 index 0000000..b510642 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml new file mode 100644 index 0000000..2997967 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_cryptacular_cryptacular_1_0.xml b/.idea/libraries/Maven__org_cryptacular_cryptacular_1_0.xml new file mode 100644 index 0000000..78cf9a6 --- /dev/null +++ b/.idea/libraries/Maven__org_cryptacular_cryptacular_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_core_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_core_3_1_1.xml new file mode 100644 index 0000000..2f33506 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_core_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_messaging_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_messaging_api_3_1_1.xml new file mode 100644 index 0000000..df3da52 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_messaging_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_profile_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_profile_api_3_1_1.xml new file mode 100644 index 0000000..8c5ed0a --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_profile_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_saml_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_saml_api_3_1_1.xml new file mode 100644 index 0000000..61d981d --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_saml_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_saml_impl_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_saml_impl_3_1_1.xml new file mode 100644 index 0000000..b1b6cb8 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_saml_impl_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_security_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_security_api_3_1_1.xml new file mode 100644 index 0000000..f7ede7e --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_security_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_security_impl_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_security_impl_3_1_1.xml new file mode 100644 index 0000000..bc0e7c1 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_security_impl_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_soap_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_soap_api_3_1_1.xml new file mode 100644 index 0000000..750fd67 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_soap_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_soap_impl_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_soap_impl_3_1_1.xml new file mode 100644 index 0000000..4140daf --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_soap_impl_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_storage_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_storage_api_3_1_1.xml new file mode 100644 index 0000000..2466090 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_storage_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_api_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_api_3_1_1.xml new file mode 100644 index 0000000..666ead1 --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_impl_3_1_1.xml b/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_impl_3_1_1.xml new file mode 100644 index 0000000..bcb5f6f --- /dev/null +++ b/.idea/libraries/Maven__org_opensaml_opensaml_xmlsec_impl_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml new file mode 100644 index 0000000..2b13f0f --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml new file mode 100644 index 0000000..133d4d6 --- /dev/null +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml new file mode 100644 index 0000000..9aadd29 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..dfca8c4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..db5c687 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..06ef216 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1461435607141 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6b3a20c..9ed0839 100644 --- a/pom.xml +++ b/pom.xml @@ -12,16 +12,21 @@ org.opensaml - opensaml - 2.6.0 - - - org.apache.xerces - xercesImpl - - + opensaml-core + 3.1.1 - + + org.opensaml + opensaml-saml-api + 3.1.1 + + + org.opensaml + opensaml-saml-impl + 3.1.1 + + + xerces xercesImpl 2.10.0 diff --git a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java index 1575e40..bb6c024 100644 --- a/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java +++ b/src/main/java/no/steras/opensamlbook/sp/AccessFilter.java @@ -3,18 +3,16 @@ package no.steras.opensamlbook.sp; import no.steras.opensamlbook.OpenSAMLUtils; import no.steras.opensamlbook.idp.IDPConstants; import org.joda.time.DateTime; -import org.opensaml.Configuration; -import org.opensaml.DefaultBootstrap; -import org.opensaml.common.SAMLObject; -import org.opensaml.common.binding.BasicSAMLMessageContext; -import org.opensaml.common.xml.SAMLConstants; -import org.opensaml.saml2.binding.encoding.HTTPRedirectDeflateEncoder; -import org.opensaml.saml2.core.*; -import org.opensaml.saml2.metadata.Endpoint; -import org.opensaml.saml2.metadata.SingleSignOnService; -import org.opensaml.ws.message.encoder.MessageEncodingException; -import org.opensaml.ws.transport.http.HttpServletResponseAdapter; -import org.opensaml.xml.ConfigurationException; +import org.opensaml.core.config.InitializationException; +import org.opensaml.core.config.InitializationService; +import org.opensaml.messaging.context.MessageContext; +import org.opensaml.messaging.encoder.MessageEncodingException; +import org.opensaml.saml.common.SAMLObject; +import org.opensaml.saml.common.xml.SAMLConstants; +import org.opensaml.saml.saml2.binding.encoding.impl.HTTPRedirectDeflateEncoder; +import org.opensaml.saml.saml2.core.*; +import org.opensaml.saml.saml2.metadata.Endpoint; +import org.opensaml.saml.saml2.metadata.SingleSignOnService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,18 +31,15 @@ public class AccessFilter implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { - Configuration.validateJCEProviders(); - Configuration.validateNonSunJAXP(); - for (Provider jceProvider : Security.getProviders()) { logger.info(jceProvider.getInfo()); } try { logger.info("Bootstrapping"); - DefaultBootstrap.bootstrap(); - } catch (ConfigurationException e) { - throw new RuntimeException("Bootstrapping failed"); + InitializationService.initialize(); + } catch (InitializationException e) { + throw new RuntimeException("Initialization failed"); } } @@ -80,12 +75,16 @@ public class AccessFilter implements Filter { context.setOutboundSAMLMessageSigningCredential(SPCredentials.getCredential()); HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder(); + MessageContext s = new MessageContext(); + + s.addSubcontext(); + encoder.setMessageContext(); logger.info("AuthnRequest: "); OpenSAMLUtils.logSAMLObject(authnRequest); logger.info("Redirecting to IDP"); try { - encoder.encode(context); + encoder.encode(); } catch (MessageEncodingException e) { throw new RuntimeException(e); } diff --git a/webprofile-ref-project.iml b/webprofile-ref-project.iml index 327259f..e27de12 100644 --- a/webprofile-ref-project.iml +++ b/webprofile-ref-project.iml @@ -1,58 +1,48 @@ - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - + \ No newline at end of file