[java-idp-testbed] branch main updated: Updates for IdP refactor and Jetty.
Scott Cantor
cantor.2 at osu.edu
Thu Jul 7 19:15:23 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-testbed.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=7252a4844986d8b1fba6a048f76bb1dbd8cfb15a
The following commit(s) were added to refs/heads/main by this push:
new 7252a48 Updates for IdP refactor and Jetty.
7252a48 is described below
commit 7252a4844986d8b1fba6a048f76bb1dbd8cfb15a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 7 15:14:57 2022 -0400
Updates for IdP refactor and Jetty.
---
.classpath | 1 +
.project | 8 +
.settings/.jsdtscope | 13 ++
.settings/org.eclipse.jdt.core.prefs | 32 +++-
.settings/org.eclipse.wst.common.component | 208 +++++++++++++++++++++
.../org.eclipse.wst.common.project.facet.core.xml | 7 +
.../org.eclipse.wst.jsdt.ui.superType.container | 1 +
.settings/org.eclipse.wst.jsdt.ui.superType.name | 1 +
.settings/org.eclipse.wst.validation.prefs | 2 +
idp-testbed-jetty-11.launch | 2 +-
pom.xml | 164 +++-------------
11 files changed, 298 insertions(+), 141 deletions(-)
diff --git a/.classpath b/.classpath
index 77be441..0ef0901 100644
--- a/.classpath
+++ b/.classpath
@@ -32,6 +32,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
diff --git a/.project b/.project
index 691cd54..4aac965 100644
--- a/.project
+++ b/.project
@@ -26,10 +26,18 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 0000000..2418123
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
+ <classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index bbd5bf4..d93021a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -52,7 +52,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -78,6 +78,7 @@ org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -85,16 +86,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -157,10 +161,8 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
@@ -180,11 +182,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -214,6 +217,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -237,12 +242,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -288,6 +297,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -323,8 +334,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -350,5 +364,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..40fbbfe
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
+
+
+
+
+ <wb-module deploy-name="idp-testbed-5.0.0-SNAPSHOT">
+
+
+
+
+
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+
+
+
+
+
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+
+
+
+
+
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+
+
+
+
+
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+ <dependent-module archiveName="idp-admin-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-admin-api/idp-admin-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-admin-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-admin-impl/idp-admin-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-authn-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-authn-api/idp-authn-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-authn-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-authn-impl/idp-authn-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-consent-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-consent-api/idp-consent-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-consent-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-consent-impl/idp-consent-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-cas-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-cas-api/idp-cas-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-cas-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-cas-impl/idp-cas-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-core-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-core/idp-core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-profile-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-profile-api/idp-profile-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-profile-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-profile-impl/idp-profile-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-profile-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-profile-spring/idp-profile-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-spring/opensaml-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-saml-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-saml-api/idp-saml-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-saml-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-saml-impl/idp-saml-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-schema-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-schema/idp-schema">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-session-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-session-api/idp-session-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-session-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-session-impl/idp-session-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-ui-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-ui/idp-ui">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-api/shib-attribute-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-impl/shib-attribute-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-saml-attribute-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-saml-attribute-api/shib-saml-attribute-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-saml-attribute-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-saml-attribute-impl/shib-saml-attribute-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-filter-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-filter-api/shib-attribute-filter-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-filter-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-filter-impl/shib-attribute-filter-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-filter-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-filter-spring/shib-attribute-filter-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-resolver-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-resolver-api/shib-attribute-resolver-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-resolver-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-resolver-impl/shib-attribute-resolver-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-attribute-resolver-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-attribute-resolver-spring/shib-attribute-resolver-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-metadata-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-metadata-api/shib-metadata-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-metadata-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-metadata-impl/shib-metadata-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shib-metadata-spring-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shib-metadata-spring/shib-metadata-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="spring-extensions-7.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spring-extensions/spring-extensions">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-core-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-core/opensaml-core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-messaging-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-messaging-api/opensaml-messaging-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-messaging-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-messaging-impl/opensaml-messaging-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-profile-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-profile-api/opensaml-profile-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-profile-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-profile-impl/opensaml-profile-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-saml-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-saml-api/opensaml-saml-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-saml-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-saml-impl/opensaml-saml-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-security-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-security-api/opensaml-security-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-security-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-security-impl/opensaml-security-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-soap-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-soap-api/opensaml-soap-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-soap-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-soap-impl/opensaml-soap-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-storage-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-storage-api/opensaml-storage-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-storage-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-storage-impl/opensaml-storage-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-xmlsec-api-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-xmlsec-api/opensaml-xmlsec-api">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="opensaml-xmlsec-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/opensaml-xmlsec-impl/opensaml-xmlsec-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-conf-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-conf/idp-conf">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="idp-conf-impl-5.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/idp-conf-impl/idp-conf-impl">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="java-support-9.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/java-support/java-support">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+
+
+
+
+
+ <property name="context-root" value="idp-testbed"/>
+
+
+
+
+
+ <property name="java-output-path" value="/java-idp-testbed/target/classes"/>
+
+
+
+
+
+ </wb-module>
+
+
+
+
+
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..89fcc15
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="17"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/idp-testbed-jetty-11.launch b/idp-testbed-jetty-11.launch
index 02d06ae..e17c2ee 100644
--- a/idp-testbed-jetty-11.launch
+++ b/idp-testbed-jetty-11.launch
@@ -15,7 +15,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Main"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="java-idp-testbed"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty-home-11.0.9 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Dnet.shibboleth.idp.plugin.oidc.op.servlet.RegisterFilterServletContextInitializer=disabled -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEBU [...]
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-Djetty.home=/opt/jetty-home-11.0.11 -Djava.security.egd=file:/dev/urandom -Didp.home=classpath: -Didp.webflows=classpath*:/flows -Dlogback.configurationFile=resources/logback.xml -Didp.logfiles=${workspace_loc:java-idp-testbed/src/main/resources/logs} -Djava.io.tmpdir=tmp -Dnet.shibboleth.idp.plugin.oidc.op.servlet.RegisterFilterServletContextInitializer=disabled -Didp.loglevel.ldap=INFO -Didp.loglevel.idp=DEB [...]
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="java-idp-testbed"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:java-idp-jetty-base/src/main/resources/jetty-base}"/>
diff --git a/pom.xml b/pom.xml
index acd1c72..9513d3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,15 @@
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
<idp.version>5.0.0-SNAPSHOT</idp.version>
+ <shib-attribute.version>5.0.0-SNAPSHOT</shib-attribute.version>
+ <shib-metadata.version>5.0.0-SNAPSHOT</shib-metadata.version>
<opensaml.groupId>org.opensaml</opensaml.groupId>
<opensaml.version>5.0.0-SNAPSHOT</opensaml.version>
<spring-extensions.version>7.0.0-SNAPSHOT</spring-extensions.version>
<cas-client.version>3.6.4</cas-client.version>
- <oidc-commons.version>2.1.0-SNAPSHOT</oidc-commons.version>
+ <oidc-commons.version>2.1.1-SNAPSHOT</oidc-commons.version>
<idp-jetty-base.version>11.0.0-SNAPSHOT</idp-jetty-base.version>
- <jetty.version>11.0.9</jetty.version>
+ <jetty.version>11.0.11</jetty.version>
<jetty-jstl.version>11.0.0</jetty-jstl.version>
<logback.version>1.3.0-alpha13</logback.version>
<slf4j.version>2.0.0-alpha5</slf4j.version>
@@ -47,103 +49,33 @@
<dependencies>
<!-- Compile scope -->
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-conf</artifactId>
- <version>${idp.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-conf</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-conf-impl</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-impl</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-profile-spring</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-attribute-filter-spring</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-attribute-resolver-spring</artifactId>
- <version>${idp.version}</version>
- </dependency>
+ <!-- Addresses most IdP and lower dependencies. -->
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-authn-impl</artifactId>
+ <artifactId>idp-war</artifactId>
<version>${idp.version}</version>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-session-impl</artifactId>
- <version>${idp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-cas-api</artifactId>
+ <artifactId>idp-conf</artifactId>
<version>${idp.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-cas-impl</artifactId>
+ <artifactId>idp-conf</artifactId>
<version>${idp.version}</version>
</dependency>
<dependency>
<groupId>${idp.groupId}</groupId>
- <artifactId>idp-saml-impl</artifactId>
+ <artifactId>idp-conf-impl</artifactId>
<version>${idp.version}</version>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-impl</artifactId>
- <version>${opensaml.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
- <version>${opensaml.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-impl</artifactId>
- <version>${opensaml.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-impl</artifactId>
- <version>${opensaml.version}</version>
- </dependency>
-
<dependency>
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-saml-api</artifactId>
@@ -151,40 +83,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <version>${opensaml.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth.ext</groupId>
- <artifactId>spring-extensions</artifactId>
- <version>${spring-extensions.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${spring-webflow.groupId}</groupId>
- <artifactId>spring-webflow</artifactId>
- <version>${spring-webflow.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.ldaptive</groupId>
- <artifactId>ldaptive</artifactId>
- </dependency>
-
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
@@ -221,26 +119,6 @@
</dependency>
<!-- Runtime scope -->
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-admin-impl</artifactId>
- <version>${idp.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-consent-impl</artifactId>
- <version>${idp.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>${idp.groupId}</groupId>
- <artifactId>idp-ui</artifactId>
- <version>${idp.version}</version>
- <scope>runtime</scope>
- </dependency>
<!-- Don't know why we have to directly include this. -->
<dependency>
@@ -313,7 +191,7 @@
<dependency>
<groupId>net.shibboleth.idp.plugin.oidc</groupId>
<artifactId>idp-plugin-oidc-op-impl</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -380,6 +258,26 @@
</dependencies>
+ <profiles>
+ <!--
+ Pull in a Javascript engine for testing in Java
+ versions where the JDK doesn't provide one.
+ -->
+ <profile>
+ <id>get-nashorn</id>
+ <activation>
+ <jdk>[15,</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<!-- Build a war in addition to a jar. -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list