[java-identity-provider] branch dev/JSPT-98 updated (95c759275 -> 225132b95)

Rod Widdowson rdw at steadingsoftware.com
Mon Jul 11 16:23:11 UTC 2022


This is an automated email from the git hooks/post-receive script.

rdw pushed a change to branch dev/JSPT-98
in repository java-identity-provider.

 discard 95c759275 JSPT-98 Integrate lifecycle checking methods in base classes
 discard 935731812 JSPT-98 Integrate lifecycle checking methods in base classes
 discard 5f7e05b4c JSPT-98 Integrate lifecycle checking methods in base classes
 discard b5b2826b2 JSPT-98 Integrate lifecycle checking methods in base classes
 discard f3cc14693 JSPT-98 Integrate lifecycle checking methods in base classes
 discard 4d87561da JSPT-98 Integrate lifecycle checking methods in base classes
 discard c39d64537 JSPT-98 Integrate lifecycle checking methods in base classes
 discard 508a7b3b9 JSPT-98 Integrate lifecycle checking methods in base classes
 discard c79eb94fb JSPT-98 Integrate lifecycle checking methods in base classes
     add 5cbb095f8 Remove security namespace support + factory beans, start refactor.
     add a9881a3b1 Refactored IdP on top of new Java modules, tests passing.
     add 54c5daf40 Add extender to handle Subject injection into resolver/filter scripts.
     add 4c73b4032 Remove conflicting tag to fix test.
     add 23115a04c Remove stray Eclipse files.
     add 016a492a2 Latest build path files.
     add 187a4f3e6 Rename IdP Spring module.
     add fbc7514b4 Rename idp-profile-spring module.
     add 7ceb0b18f Relocate subject-sourced IdPAttribute functions and unit tests.
     new e972acb9e JSPT-98 Integrate lifecycle checking methods in base classes
     new 81154edb2 JSPT-98 Integrate lifecycle checking methods in base classes
     new cc2a32197 JSPT-98 Integrate lifecycle checking methods in base classes
     new ddec87371 JSPT-98 Integrate lifecycle checking methods in base classes
     new f97b7ef54 JSPT-98 Integrate lifecycle checking methods in base classes
     new 225132b95 JSPT-98 Integrate lifecycle checking methods in base classes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (95c759275)
            \
             N -- N -- N   refs/heads/dev/JSPT-98 (225132b95)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 idp-admin-api/.classpath                           |    1 +
 idp-admin-api/.project                             |   13 +
 idp-admin-api/.settings/org.eclipse.jdt.core.prefs |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-admin-impl/.classpath                          |    1 +
 idp-admin-impl/.project                            |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-admin-impl/pom.xml                             |    8 +
 idp-attribute-api/.checkstyle                      |   15 -
 idp-attribute-api/.project                         |   30 -
 idp-attribute-api/pom.xml                          |   98 -
 .../idp/attribute/AttributeDecodingException.java  |   62 -
 .../idp/attribute/AttributeEncodingException.java  |   62 -
 .../idp/attribute/AttributeException.java          |   62 -
 .../idp/attribute/AttributesMapContainer.java      |   84 -
 .../idp/attribute/ByteAttributeValue.java          |  131 -
 .../idp/attribute/DurablePairwiseIdStore.java      |   72 -
 .../idp/attribute/EmptyAttributeValue.java         |  110 -
 .../net/shibboleth/idp/attribute/IdPAttribute.java |  307 --
 .../idp/attribute/IdPAttributeValue.java           |   59 -
 .../idp/attribute/IdPRequestedAttribute.java       |   74 -
 .../net/shibboleth/idp/attribute/PairwiseId.java   |  217 -
 .../shibboleth/idp/attribute/PairwiseIdStore.java  |   50 -
 .../idp/attribute/ScopedStringAttributeValue.java  |  119 -
 .../idp/attribute/StringAttributeValue.java        |  108 -
 .../UnsupportedAttributeTypeException.java         |   64 -
 .../idp/attribute/XMLObjectAttributeValue.java     |  113 -
 .../idp/attribute/context/AttributeContext.java    |  149 -
 .../idp/attribute/context/package-info.java        |   22 -
 .../net/shibboleth/idp/attribute/package-info.java |   25 -
 .../transcoding/AbstractAttributeTranscoder.java   |  158 -
 .../attribute/transcoding/AttributeTranscoder.java |   98 -
 .../transcoding/AttributeTranscoderRegistry.java   |  142 -
 .../attribute/transcoding/BasicNamingFunction.java |   65 -
 .../attribute/transcoding/TranscoderSupport.java   |   55 -
 .../idp/attribute/transcoding/TranscodingRule.java |  255 --
 .../idp/attribute/transcoding/package-info.java    |   22 -
 idp-attribute-api/src/main/resources/.gitkeep      |    0
 .../idp/attribute/AttributeContextTest.java        |   60 -
 .../shibboleth/idp/attribute/AttributeTest.java    |  397 --
 .../idp/attribute/ByteAttributeValueTest.java      |   81 -
 .../idp/attribute/EmptyAttributeValueTest.java     |   60 -
 .../idp/attribute/RequestedAttributeTest.java      |   38 -
 .../attribute/ScopedStringAttributeValueTest.java  |   84 -
 .../idp/attribute/StringAttributeValueTest.java    |   78 -
 .../idp/attribute/XMLObjectAttributeValueTest.java |   86 -
 .../src/test/resources/logback-test.xml            |   17 -
 idp-attribute-filter-api/.checkstyle               |   15 -
 idp-attribute-filter-api/.classpath                |   38 -
 idp-attribute-filter-api/.gitignore                |    2 -
 idp-attribute-filter-api/.project                  |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-filter-api/pom.xml                   |   84 -
 .../idp/attribute/filter/AttributeFilter.java      |   51 -
 .../attribute/filter/AttributeFilterException.java |   64 -
 .../attribute/filter/AttributeFilterPolicy.java    |  187 -
 .../idp/attribute/filter/AttributeRule.java        |  234 --
 .../idp/attribute/filter/BaseBridgingClass.java    |   91 -
 .../shibboleth/idp/attribute/filter/Matcher.java   |   93 -
 .../idp/attribute/filter/MatcherFromPolicy.java    |   89 -
 .../idp/attribute/filter/PolicyFromMatcher.java    |   85 -
 .../idp/attribute/filter/PolicyFromMatcherId.java  |  107 -
 .../attribute/filter/PolicyRequirementRule.java    |   97 -
 .../filter/context/AttributeFilterContext.java     |  534 ---
 .../filter/context/AttributeFilterWorkContext.java |  165 -
 .../idp/attribute/filter/package-info.java         |   28 -
 .../src/main/resources/.gitkeep                    |    0
 .../filter/AttributeFilterPolicyTest.java          |  242 --
 .../idp/attribute/filter/AttributeRuleTest.java    |   56 -
 .../filter/AttributeValueFilterPolicyTest.java     |  275 --
 .../attribute/filter/BaseBridgingClassTester.java  |   76 -
 .../attribute/filter/MatcherFromPolicyTest.java    |   66 -
 .../attribute/filter/PolicyFromMatcherIdTest.java  |   62 -
 .../attribute/filter/PolicyFromMatcherTest.java    |   56 -
 .../filter/context/AttributeFilterContextTest.java |  127 -
 .../context/AttributeFilterWorkContextTest.java    |  143 -
 .../idp/attribute/filter/testing/MockMatcher.java  |  127 -
 .../filter/testing/MockPolicyRequirementRule.java  |   85 -
 .../idp/attribute/filter/testing/package-info.java |   22 -
 .../src/test/resources/logback-test.xml            |   17 -
 idp-attribute-filter-impl/.checkstyle              |   15 -
 idp-attribute-filter-impl/.classpath               |   38 -
 idp-attribute-filter-impl/.gitignore               |    2 -
 idp-attribute-filter-impl/.project                 |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-filter-impl/pom.xml                  |  238 --
 .../attribute/filter/impl/AttributeFilterImpl.java |  238 --
 .../idp/attribute/filter/impl/package-info.java    |   20 -
 .../filter/matcher/impl/AbstractMatcher.java       |  101 -
 .../matcher/impl/AbstractRegexpStringMatcher.java  |   87 -
 .../filter/matcher/impl/AbstractStringMatcher.java |  113 -
 .../matcher/impl/AttributeScopeRegexpMatcher.java  |   57 -
 .../matcher/impl/AttributeScopeStringMatcher.java  |   59 -
 .../matcher/impl/AttributeValueRegexpMatcher.java  |   61 -
 .../matcher/impl/AttributeValueStringMatcher.java  |   68 -
 .../filter/matcher/impl/ScriptedMatcher.java       |  303 --
 .../filter/matcher/impl/package-info.java          |   25 -
 .../logic/impl/AbstractComposedMatcher.java        |   75 -
 .../filter/matcher/logic/impl/AndMatcher.java      |  100 -
 .../filter/matcher/logic/impl/NotMatcher.java      |  113 -
 .../filter/matcher/logic/impl/OrMatcher.java       |   77 -
 .../filter/matcher/logic/impl/package-info.java    |   25 -
 .../impl/AbstractMatchesShibMDScopeMatcher.java    |  150 -
 .../saml/impl/AttributeInMetadataMatcher.java      |  437 --
 .../impl/AttributeScopeMatchesShibMDScope.java     |   46 -
 .../impl/AttributeValueMatchesShibMDScope.java     |   52 -
 .../filter/matcher/saml/impl/package-info.java     |   23 -
 .../impl/AttributeIssuerPolicyRule.java            |   57 -
 .../impl/AttributeIssuerRegexpPolicyRule.java      |   57 -
 .../impl/AttributeRequesterPolicyRule.java         |   58 -
 .../impl/AttributeRequesterRegexpPolicyRule.java   |   57 -
 .../impl/NumOfAttributeValuesPolicyRule.java       |  149 -
 .../filtercontext/impl/PredicatePolicyRule.java    |  133 -
 .../impl/PrincipalNamePolicyRule.java              |   59 -
 .../impl/PrincipalNameRegexpPolicyRule.java        |   55 -
 .../filtercontext/impl/ProfilePolicyRule.java      |   93 -
 .../impl/ProxiedRequesterPolicyRule.java           |   66 -
 .../impl/ProxiedRequesterRegexpPolicyRule.java     |   63 -
 .../filtercontext/impl/package-info.java           |   27 -
 .../filter/policyrule/impl/AbstractPolicyRule.java |   59 -
 .../policyrule/impl/AbstractRegexpPolicyRule.java  |   88 -
 .../policyrule/impl/AbstractStringPolicyRule.java  |  118 -
 .../policyrule/impl/DirectionPolicyRule.java       |   68 -
 .../filter/policyrule/impl/ScriptedPolicyRule.java |  297 --
 .../filter/policyrule/impl/package-info.java       |   22 -
 .../logic/impl/AbstractComposedPolicyRule.java     |   81 -
 .../policyrule/logic/impl/AndPolicyRule.java       |   77 -
 .../policyrule/logic/impl/NotPolicyRule.java       |   89 -
 .../filter/policyrule/logic/impl/OrPolicyRule.java |   76 -
 .../filter/policyrule/logic/impl/package-info.java |   24 -
 .../AbstractEntityAttributeExactPolicyRule.java    |   72 -
 .../impl/AbstractEntityAttributePolicyRule.java    |  390 --
 .../AbstractEntityAttributeRegexPolicyRule.java    |   71 -
 .../saml/impl/AbstractEntityGroupPolicyRule.java   |  144 -
 .../impl/AbstractNameIDFormatExactPolicyRule.java  |  121 -
 .../AbstractRegistrationAuthorityPolicyRule.java   |  173 -
 .../impl/IssuerEntityAttributeExactPolicyRule.java |   40 -
 .../impl/IssuerEntityAttributeRegexPolicyRule.java |   40 -
 .../saml/impl/IssuerInEntityGroupPolicyRule.java   |   58 -
 .../impl/IssuerNameIDFormatExactPolicyRule.java    |   65 -
 .../IssuerRegistrationAuthorityPolicyRule.java     |   49 -
 ...iedRequesterEntityAttributeExactPolicyRule.java |   43 -
 ...iedRequesterEntityAttributeRegexPolicyRule.java |   41 -
 .../ProxiedRequesterInEntityGroupPolicyRule.java   |   56 -
 ...edRequesterRegistrationAuthorityPolicyRule.java |   40 -
 .../RequesterEntityAttributeExactPolicyRule.java   |   41 -
 .../RequesterEntityAttributeRegexPolicyRule.java   |   41 -
 .../impl/RequesterInEntityGroupPolicyRule.java     |   56 -
 .../impl/RequesterNameIDFormatExactPolicyRule.java |   65 -
 .../RequesterRegistrationAuthorityPolicyRule.java  |   40 -
 .../filter/policyrule/saml/impl/package-info.java  |   22 -
 .../src/main/resources/.gitkeep                    |    0
 .../impl/BaseComplexAttributeFilterTestCase.java   |   72 -
 .../impl/TargettedAttributeValueFilterTest.java    |  260 --
 .../impl/UntargettedAttributeValueFilterTest.java  |  181 -
 .../filter/impl/AttributeFilterImplTest.java       |  400 --
 .../impl/AbstractMatcherPolicyRuleTest.java        |   60 -
 .../impl/AbstractRegexpStringMatcherTest.java      |   64 -
 .../matcher/impl/AbstractStringMatcherTest.java    |  118 -
 .../impl/AttributeScopeRegexpMatcherTest.java      |   48 -
 .../impl/AttributeScopeStringMatcherTest.java      |   47 -
 .../impl/AttributeValueRegexpMatcherTest.java      |   60 -
 .../impl/AttributeValueStringMatcherTest.java      |   66 -
 .../attribute/filter/matcher/impl/DataSources.java |   88 -
 .../matcher/impl/MockValuePredicateMatcher.java    |   49 -
 .../filter/matcher/impl/ScriptedMatcherTest.java   |  325 --
 .../logic/impl/AbstractComposedMatcherTest.java    |  154 -
 .../filter/matcher/logic/impl/AndMatcherTest.java  |  168 -
 .../filter/matcher/logic/impl/NotMatcherTest.java  |  162 -
 .../filter/matcher/logic/impl/OrMatcherTest.java   |  194 -
 .../saml/impl/AttributeInMetadataMatcherTest.java  |  278 --
 .../impl/MappedAttributeInMetadataMatcherTest.java |  228 --
 .../saml/impl/ScopeMatchesShibMDScopeTests.java    |  181 -
 .../impl/AttributeIssuerPolicyRuleTest.java        |   96 -
 .../impl/AttributeIssuerRegexpPolicyRuleTest.java  |   83 -
 .../impl/AttributeRequesterPolicyRuleTest.java     |   87 -
 .../AttributeRequesterRegexpPolicyRuleTest.java    |   71 -
 .../impl/NumOfAttributeValuesPolicyRuleTest.java   |  141 -
 .../impl/PredicatePolicyRuleTest.java              |  109 -
 .../impl/PrincipalNamePolicyRuleTest.java          |   84 -
 .../impl/PrincipalNameRegexpPolicyRuleTest.java    |   72 -
 .../filtercontext/impl/ProfilePolicyRuleTest.java  |   97 -
 .../impl/ProxiedRequesterPolicyRuleTest.java       |  105 -
 .../impl/ProxiedRequesterRegexpPolicyRuleTest.java |   83 -
 .../policyrule/impl/ScriptedPolicyRuleTest.java    |  268 --
 .../logic/impl/AbstractComposedPolicyRuleTest.java |  153 -
 .../policyrule/logic/impl/AndPolicyRuleTest.java   |  111 -
 .../policyrule/logic/impl/NotPolicyRuleTest.java   |  116 -
 .../policyrule/logic/impl/OrPolicyRuleTest.java    |  121 -
 .../policyrule/saml/impl/BaseMetadataTests.java    |  127 -
 .../IssuerEntityAttributeExactPolicyRuleTest.java  |  113 -
 .../IssuerEntityAttributeRegexPolicyRuleTest.java  |   63 -
 .../impl/IssuerInEntityGroupPolicyRuleTest.java    |   63 -
 .../IssuerNameIDFormatExactPolicyRuleTest.java     |   52 -
 .../saml/impl/IssuerRegistrationAuthorityTest.java |  100 -
 ...equesterEntityAttributeExactPolicyRuleTest.java |  113 -
 ...equesterEntityAttributeRegexPolicyRuleTest.java |   63 -
 .../impl/RequesterInEntityGroupPolicyRuleTest.java |   62 -
 .../RequesterNameIDFormatExactPolicyRuleTest.java  |   57 -
 .../impl/RequesterRegistrationAuthorityTest.java   |  100 -
 .../src/test/resources/logback-test.xml            |   17 -
 .../shibboleth/idp/filter/impl/complex/epa-uid.xml |   10 -
 .../idp/filter/impl/complex/epa-uidwithjsmith.xml  |   11 -
 .../idp/filter/impl/complex/uid-epawithjsmith.xml  |   11 -
 .../idp/filter/impl/saml/mdrpi-metadata.xml        |  419 --
 .../net/shibboleth/idp/filter/impl/saml/orphan.xml |   39 -
 .../filter/impl/saml/shibboleth.net-metadata.xml   |  463 ---
 .../idp/filter/impl/saml/shibmd-metadata.xml       |   43 -
 idp-attribute-filter-spring/.classpath             |   38 -
 idp-attribute-filter-spring/.gitignore             |    2 -
 idp-attribute-filter-spring/.project               |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-filter-spring/pom.xml                |  198 -
 .../attribute/filter/spring/BaseFilterParser.java  |  246 --
 .../filter/spring/basic/impl/AndMatcherParser.java |   71 -
 .../filter/spring/basic/impl/AnyParser.java        |   56 -
 .../filter/spring/basic/impl/NotMatcherParser.java |   70 -
 .../filter/spring/basic/impl/OrMatcherParser.java  |   71 -
 .../spring/basic/impl/ScriptedMatcherParser.java   |  114 -
 .../filter/spring/basic/impl/package-info.java     |   23 -
 .../impl/AttributeFilterNamespaceHandler.java      |  193 -
 .../impl/AttributeFilterPolicyGroupParser.java     |   97 -
 .../spring/impl/AttributeFilterPolicyParser.java   |   89 -
 .../impl/AttributeFilterServiceStrategy.java       |   64 -
 .../filter/spring/impl/AttributeRuleParser.java    |  114 -
 .../attribute/filter/spring/impl/package-info.java |   22 -
 .../matcher/BaseAttributeValueMatcherParser.java   |  156 -
 .../matcher/impl/AbstractRegexMatcherParser.java   |   58 -
 .../matcher/impl/AbstractStringMatcherParser.java  |   69 -
 .../matcher/impl/AttributeScopeMatcherParser.java  |   40 -
 .../impl/AttributeScopeRegexMatcherParser.java     |   38 -
 .../impl/AttributeValueRegexMatcherParser.java     |   38 -
 .../impl/AttributeValueStringMatcherParser.java    |   38 -
 .../filter/spring/matcher/impl/package-info.java   |   27 -
 .../filter/spring/matcher/package-info.java        |   24 -
 .../idp/attribute/filter/spring/package-info.java  |   23 -
 .../spring/policyrule/BasePolicyRuleParser.java    |  116 -
 .../impl/AbstractRegexPolicyRuleParser.java        |   58 -
 .../impl/AbstractStringPolicyRuleParser.java       |   67 -
 .../impl/AttributeIssuerRegexRuleParser.java       |   39 -
 .../policyrule/impl/AttributeIssuerRuleParser.java |   38 -
 .../impl/AttributeRequesterRegexRuleParser.java    |   38 -
 .../impl/AttributeRequesterRuleParser.java         |   39 -
 .../spring/policyrule/impl/InboundRuleParser.java  |   53 -
 .../impl/NumOfAttributeValuesRuleParser.java       |   59 -
 .../spring/policyrule/impl/OutboundRuleParser.java |   53 -
 .../policyrule/impl/PredicateRuleParser.java       |   56 -
 .../impl/PrincipalNameRegexRuleParser.java         |   38 -
 .../policyrule/impl/PrincipalNameRuleParser.java   |   39 -
 .../spring/policyrule/impl/ProfileRuleParser.java  |   39 -
 .../impl/ProxiedRequesterRegexRuleParser.java      |   39 -
 .../impl/ProxiedRequesterRuleParser.java           |   39 -
 .../spring/policyrule/impl/package-info.java       |   25 -
 .../filter/spring/policyrule/package-info.java     |   23 -
 .../AbstractEntityAttributeExactRuleParser.java    |   38 -
 .../AbstractEntityAttributeRegexRuleParser.java    |   39 -
 .../impl/AbstractEntityAttributeRuleParser.java    |   52 -
 .../saml/impl/AbstractEntityGroupRuleParser.java   |   46 -
 .../saml/impl/AbstractNameIDFormatRuleParser.java  |   42 -
 .../AbstractRegistrationAuthorityRuleParser.java   |   63 -
 .../saml/impl/AttributeInMetadataRuleParser.java   |   72 -
 .../impl/IssuerEntityAttributeExactRuleParser.java |   40 -
 .../impl/IssuerEntityAttributeRegexRuleParser.java |   41 -
 .../saml/impl/IssuerInEntityGroupRuleParser.java   |   39 -
 .../saml/impl/IssuerNameIDFormatRuleParser.java    |   40 -
 .../IssuerRegistrationAuthorityRuleParser.java     |   38 -
 .../impl/MappedAttributeInMetadataRuleParser.java  |   58 -
 ...iedRequesterEntityAttributeExactRuleParser.java |   39 -
 ...iedRequesterEntityAttributeRegexRuleParser.java |   41 -
 .../ProxiedRequesterInEntityGroupRuleParser.java   |   39 -
 ...edRequesterRegistrationAuthorityRuleParser.java |   38 -
 .../RequesterEntityAttributeExactRuleParser.java   |   40 -
 .../RequesterEntityAttributeRegexRuleParser.java   |   41 -
 .../impl/RequesterInEntityGroupRuleParser.java     |   39 -
 .../saml/impl/RequesterNameIDFormatRuleParser.java |   40 -
 .../RequesterRegistrationAuthorityRuleParser.java  |   38 -
 .../saml/impl/ScopeMatchesShibMDScopeParser.java   |   51 -
 .../saml/impl/ValueMatchesShibMDScopeParser.java   |   50 -
 .../filter/spring/saml/impl/package-info.java      |   28 -
 .../src/main/resources/META-INF/spring.handlers    |    1 -
 .../filter/spring/AttributeFilterServiceTest.java  |  273 --
 .../idp/attribute/filter/spring/basic/AndTest.java |   87 -
 .../idp/attribute/filter/spring/basic/AnyTest.java |   46 -
 .../attribute/filter/spring/basic/Implicit.java    |   40 -
 .../idp/attribute/filter/spring/basic/NotTest.java |   53 -
 .../idp/attribute/filter/spring/basic/OrTest.java  |   78 -
 .../filter/spring/basic/ScriptedTest.java          |  125 -
 .../matcher/AttributeRegexMatcherParserTest.java   |   62 -
 .../matcher/AttributeScopeMatcherParserTest.java   |   68 -
 .../AttributeScopeRegexMatcherParserTest.java      |   41 -
 .../matcher/AttributeValueMatcherParserTest.java   |  187 -
 .../policy/AttributeIssuerRegexRuleParserTest.java |   38 -
 .../policy/AttributeIssuerRuleParserTest.java      |   48 -
 .../AttributeRequesterRegexRuleParserTest.java     |   65 -
 .../policy/AttributeRequesterRuleParserTest.java   |  133 -
 .../filter/spring/policy/DataSources.java          |   87 -
 .../filter/spring/policy/InboundRuleTest.java      |   41 -
 .../policy/NumOfAttributeValuesRuleParserTest.java |   38 -
 .../filter/spring/policy/OutboundRuleTest.java     |   42 -
 .../spring/policy/PredicateRuleParserTest.java     |  130 -
 .../policy/PrincipalNameRegexRuleParserTest.java   |   36 -
 .../spring/policy/PrincipalNameRuleParserTest.java |   36 -
 .../spring/policy/ProfileRuleParserTest.java       |   43 -
 .../ProxiedRequesterRegexRuleParserTest.java       |   38 -
 .../policy/ProxiedRequesterRuleParserTest.java     |   90 -
 .../saml/AttributeInMetadataRuleParserTest.java    |   60 -
 .../IssuerEntityAttributeExactRuleParserTest.java  |   53 -
 .../IssuerEntityAttributeRegexRuleParserTest.java  |   40 -
 .../saml/IssuerInEntityGroupRuleParserTest.java    |   55 -
 .../saml/IssuerNameIDFormatRuleParserTest.java     |   46 -
 .../IssuerRegistrationAuthorityRuleParserTest.java |   64 -
 .../MappedAttributeInMetadataRuleParserTest.java   |   75 -
 ...equesterEntityAttributeExactRuleParserTest.java |   47 -
 ...equesterEntityAttributeRegexRuleParserTest.java |   47 -
 ...roxiedRequesterInEntityGroupRuleParserTest.java |   67 -
 ...questerRegistrationAuthorityRuleParserTest.java |   63 -
 ...equesterEntityAttributeExactRuleParserTest.java |   47 -
 ...equesterEntityAttributeRegexRuleParserTest.java |   46 -
 .../saml/RequesterInEntityGroupRuleParserTest.java |   54 -
 .../saml/RequesterNameIDFormatRuleParserTest.java  |   46 -
 ...questerRegistrationAuthorityRuleParserTest.java |   63 -
 .../filter/spring/saml/ScopeMatchesMDTest.java     |   39 -
 .../filter/spring/saml/ValueMatchesMDTest.java     |   39 -
 .../testing/BaseAttributeFilterParserTest.java     |  195 -
 .../filter/spring/testing/package-info.java        |   22 -
 .../src/test/resources/logback-test.xml            |   20 -
 .../idp/attribute/filter/attribute/epa-uid.xml     |   17 -
 .../filter/attribute/epa-uidwithjsmith.xml         |   18 -
 .../filter/attribute/uid-epawithjsmith.xml         |   18 -
 .../idp/attribute/filter/matcher/and.xml           |   11 -
 .../idp/attribute/filter/matcher/andMulti.xml      |   22 -
 .../idp/attribute/filter/matcher/andSingleton.xml  |    8 -
 .../idp/attribute/filter/matcher/any.xml           |    4 -
 .../attribute/filter/matcher/attributeRegex.xml    |    7 -
 .../matcher/attributeRegexCaseInsensitive.xml      |    6 -
 .../filter/matcher/attributeRequester.xml          |    4 -
 .../attribute/filter/matcher/attributeScope.xml    |    4 -
 .../filter/matcher/attributeScopeBoth.xml          |    4 -
 .../filter/matcher/attributeScopeDefault.xml       |    4 -
 .../filter/matcher/attributeScopeDeprecated.xml    |    4 -
 .../filter/matcher/attributeScopeRegex.xml         |    7 -
 .../matcher/attributeValueEmptyCaseSensitive.xml   |    7 -
 .../attribute/filter/matcher/attributeValueId.xml  |    7 -
 .../filter/matcher/attributeValueNoId.xml          |    4 -
 .../attributeValuePropertyCaseSensitive.xml        |    6 -
 .../idp/attribute/filter/matcher/customBean.xml    |   20 -
 .../idp/attribute/filter/matcher/implicit.xml      |    2 -
 .../attribute/filter/matcher/mappedInMetadata.xml  |   17 -
 .../idp/attribute/filter/matcher/mdscope.xml       |    4 -
 .../idp/attribute/filter/matcher/mdvalue.xml       |    4 -
 .../idp/attribute/filter/matcher/not.xml           |    8 -
 .../shibboleth/idp/attribute/filter/matcher/or.xml |    9 -
 .../idp/attribute/filter/matcher/orSingleton.xml   |    8 -
 .../attribute/filter/matcher/proxiedRequester.xml  |    4 -
 .../filter/matcher/requestedInMetadata.xml         |   11 -
 .../attribute/filter/matcher/scripted-rhino.xml    |   15 -
 .../idp/attribute/filter/matcher/scripted.xml      |   13 -
 .../idp/attribute/filter/policyrule/and.xml        |    9 -
 .../attribute/filter/policyrule/andSingleton.xml   |    8 -
 .../idp/attribute/filter/policyrule/any.xml        |    4 -
 .../filter/policyrule/attributeIssuer.xml          |    4 -
 .../filter/policyrule/attributeRegexRequester.xml  |    4 -
 .../attributeRegexRequesterCaseInsensitive.xml     |    4 -
 .../filter/policyrule/attributeRequester.xml       |    4 -
 .../filter/policyrule/attributeRequesterBoth.xml   |    4 -
 .../policyrule/attributeRequesterDefault.xml       |    4 -
 .../policyrule/attributeRequesterDeprecated.xml    |    4 -
 .../filter/policyrule/attributeValueId.xml         |    5 -
 .../filter/policyrule/attributeValueNoId.xml       |    4 -
 .../idp/attribute/filter/policyrule/file.script    |    2 -
 .../attribute/filter/policyrule/file.script.rhino  |    1 -
 .../idp/attribute/filter/policyrule/inbound.xml    |    4 -
 .../filter/policyrule/issuerAuthorityOne.xml       |    9 -
 .../filter/policyrule/issuerAuthorityTwo.xml       |    9 -
 .../idp/attribute/filter/policyrule/issuerEA2.xml  |    8 -
 .../idp/attribute/filter/policyrule/issuerEA3.xml  |    8 -
 .../attribute/filter/policyrule/issuerEARegex2.xml |    6 -
 .../idp/attribute/filter/policyrule/issuerEG2.xml  |    5 -
 .../attribute/filter/policyrule/issuerNameId2.xml  |    6 -
 .../attribute/filter/policyrule/issuerRegex.xml    |    5 -
 .../idp/attribute/filter/policyrule/not.xml        |    8 -
 .../filter/policyrule/numberAttrValues.xml         |    7 -
 .../idp/attribute/filter/policyrule/or.xml         |    9 -
 .../attribute/filter/policyrule/orSingleton.xml    |    6 -
 .../idp/attribute/filter/policyrule/outbound.xml   |    4 -
 .../idp/attribute/filter/policyrule/predicate1.xml |    5 -
 .../idp/attribute/filter/policyrule/predicate2.xml |    5 -
 .../attribute/filter/policyrule/predicateBeans.xml |   26 -
 .../attribute/filter/policyrule/predicateRp.xml    |    5 -
 .../attribute/filter/policyrule/principalName.xml  |    5 -
 .../filter/policyrule/principalNameRegex.xml       |    4 -
 .../idp/attribute/filter/policyrule/profile.xml    |    5 -
 .../filter/policyrule/proxiedRegexRequester.xml    |    4 -
 .../filter/policyrule/proxiedRequester.xml         |    4 -
 .../policyrule/proxiedregistrationAuthorityOne.xml |    9 -
 .../policyrule/proxiedregistrationAuthorityTwo.xml |    9 -
 .../filter/policyrule/proxiedrequesterEA2.xml      |    8 -
 .../filter/policyrule/proxiedrequesterEARegex2.xml |    7 -
 .../filter/policyrule/proxiedrequesterEG2.xml      |    5 -
 .../filter/policyrule/registrationAuthorityOne.xml |    9 -
 .../filter/policyrule/registrationAuthorityTwo.xml |    9 -
 .../attribute/filter/policyrule/requesterEA2.xml   |    8 -
 .../filter/policyrule/requesterEARegex2.xml        |    6 -
 .../attribute/filter/policyrule/requesterEG2.xml   |    5 -
 .../filter/policyrule/requesterNameId2.xml         |    6 -
 .../attribute/filter/policyrule/scripted-rhino.xml |    7 -
 .../idp/attribute/filter/policyrule/scripted.xml   |    8 -
 .../filter/policyrule/scriptedNotThere.xml         |    8 -
 .../idp/attribute/filter/spring/deny1.xml          |   23 -
 .../idp/attribute/filter/spring/deny2.xml          |   27 -
 .../idp/attribute/filter/spring/policy2.xml        |   24 -
 .../idp/attribute/filter/spring/policy3.xml        |   15 -
 .../idp/attribute/filter/spring/policy4.xml        |   25 -
 .../idp/attribute/filter/spring/policy5.xml        |   27 -
 .../idp/attribute/filter/spring/policyAll.xml      |   13 -
 idp-attribute-impl/.checkstyle                     |   15 -
 idp-attribute-impl/.classpath                      |   38 -
 idp-attribute-impl/.gitignore                      |   21 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-impl/pom.xml                         |  108 -
 idp-attribute-impl/src/main/java/.gitkeep          |    0
 .../attribute/impl/ComputedPairwiseIdStore.java    |  322 --
 .../idp/attribute/impl/JDBCPairwiseIdStore.java    |  984 -----
 .../idp/attribute/impl/package-info.java           |   22 -
 .../impl/AttributeRegistryServiceStrategy.java     |  105 -
 .../impl/AttributeTranscoderRegistryImpl.java      |  409 --
 .../transcoding/impl/TranscodingRuleLoader.java    |  146 -
 .../attribute/transcoding/impl/package-info.java   |   22 -
 idp-attribute-impl/src/main/resources/.gitkeep     |    0
 idp-attribute-impl/src/test/java/.gitkeep          |    0
 .../impl/ComputedPairwiseIdStoreTest.java          |  178 -
 .../attribute/impl/JDBCPairwiseIdStoreTest.java    |  183 -
 .../impl/AttributeTranscoderRegistryImplTest.java  |  374 --
 .../attribute/transcoding/impl/PairTranscoder.java |  100 -
 .../src/test/resources/logback-test.xml            |   17 -
 .../shibboleth/idp/attribute/impl/DeleteStore.sql  |    1 -
 .../idp/attribute/impl/StoredIdStore.sql           |   11 -
 idp-attribute-resolver-api/.checkstyle             |   15 -
 idp-attribute-resolver-api/.classpath              |   38 -
 idp-attribute-resolver-api/.gitignore              |    2 -
 idp-attribute-resolver-api/.project                |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-resolver-api/pom.xml                 |  103 -
 .../resolver/AbstractAttributeDefinition.java      |  179 -
 .../attribute/resolver/AbstractDataConnector.java  |  261 --
 .../attribute/resolver/AbstractResolverPlugin.java |  419 --
 .../attribute/resolver/AttributeDefinition.java    |   42 -
 .../idp/attribute/resolver/AttributeResolver.java  |   51 -
 .../idp/attribute/resolver/DataConnector.java      |   92 -
 .../MultipleResultAnErrorResolutionException.java  |   38 -
 .../NoResultAnErrorResolutionException.java        |   39 -
 .../resolver/PluginDependencySupport.java          |  238 --
 .../attribute/resolver/ResolutionException.java    |   62 -
 .../resolver/ResolvedAttributeDefinition.java      |  150 -
 .../attribute/resolver/ResolvedDataConnector.java  |  174 -
 .../ResolverAttributeDefinitionDependency.java     |   90 -
 .../resolver/ResolverDataConnectorDependency.java  |  136 -
 .../idp/attribute/resolver/ResolverPlugin.java     |   90 -
 .../context/AttributeResolutionContext.java        |  344 --
 .../context/AttributeResolverWorkContext.java      |  157 -
 .../AbstractAttributeResolutionLookupFunction.java |   86 -
 .../navigate/AttributeIssuerIdLookupFunction.java  |   39 -
 .../navigate/AttributePrincipalLookupFunction.java |   39 -
 .../AttributeRecipientIdLookupFunction.java        |   39 -
 .../navigate/ResolutionLabelLookupFunction.java    |   41 -
 .../resolver/context/navigate/package-info.java    |   22 -
 .../attribute/resolver/context/package-info.java   |   22 -
 .../resolver/dc/AbstractMappingStrategy.java       |  113 -
 .../attribute/resolver/dc/ExecutableSearch.java    |   33 -
 .../resolver/dc/ExecutableSearchBuilder.java       |   48 -
 .../idp/attribute/resolver/dc/MappingStrategy.java |   46 -
 .../resolver/dc/NonFailFastValidator.java          |   76 -
 .../attribute/resolver/dc/ValidationException.java |   60 -
 .../idp/attribute/resolver/dc/Validator.java       |   43 -
 .../dc/http/HTTPResponseMappingStrategy.java       |   34 -
 .../idp/attribute/resolver/dc/http/HTTPSearch.java |   49 -
 .../attribute/resolver/dc/http/package-info.java   |   21 -
 .../AbstractExecutableSearchFilterBuilder.java     |   85 -
 .../resolver/dc/ldap/ExecutableSearchFilter.java   |   52 -
 ...ParameterizedExecutableSearchFilterBuilder.java |   87 -
 .../dc/ldap/SearchResultMappingStrategy.java       |   29 -
 .../ldap/StringAttributeValueMappingStrategy.java  |  110 -
 .../TemplatedExecutableSearchFilterBuilder.java    |  273 --
 .../attribute/resolver/dc/ldap/package-info.java   |   21 -
 .../idp/attribute/resolver/dc/package-info.java    |   22 -
 .../rdbms/AbstractExecutableStatementBuilder.java  |  112 -
 .../resolver/dc/rdbms/ExecutableStatement.java     |   42 -
 .../dc/rdbms/FormatExecutableStatementBuilder.java |   84 -
 .../resolver/dc/rdbms/ResultMappingStrategy.java   |   29 -
 .../dc/rdbms/StringResultMappingStrategy.java      |  117 -
 .../rdbms/TemplatedExecutableStatementBuilder.java |  272 --
 .../attribute/resolver/dc/rdbms/package-info.java  |   21 -
 .../dc/storage/StorageMappingStrategy.java         |   33 -
 .../resolver/dc/storage/StorageServiceSearch.java  |   46 -
 .../resolver/dc/storage/package-info.java          |   22 -
 .../resolver/logic/AttributeIssuerIdPredicate.java |   58 -
 .../logic/AttributePrincipalPredicate.java         |   58 -
 .../logic/AttributeRecipientIdPredicate.java       |   58 -
 .../resolver/logic/ResolutionLabelPredicate.java   |   79 -
 .../idp/attribute/resolver/logic/package-info.java |   22 -
 .../idp/attribute/resolver/package-info.java       |   24 -
 .../resolver/scripted/ScriptedIdPAttribute.java    |   66 -
 .../attribute/resolver/scripted/package-info.java  |   27 -
 .../src/main/resources/.gitkeep                    |    0
 .../resolver/AbstractAttributeDefinitionTest.java  |  164 -
 .../resolver/AbstractDataConnectorTest.java        |  136 -
 .../resolver/AbstractResolverPluginTest.java       |  216 -
 .../resolver/AttributeResolutionLookupTest.java    |   63 -
 .../resolver/AttributeResolverContextTest.java     |   59 -
 .../resolver/AttributeResolverWorkContextTest.java |  147 -
 .../resolver/PluginDependencySupportTest.java      |  334 --
 .../resolver/ResolvedAttributeDefinitionTest.java  |  121 -
 .../resolver/ResolvedDataConnectorTest.java        |  131 -
 .../resolver/testing/MockAttributeDefinition.java  |  121 -
 .../resolver/testing/MockDataConnector.java        |  143 -
 .../testing/MockStaticAttributeDefinition.java     |   89 -
 .../resolver/testing/MockStaticDataConnector.java  |  104 -
 .../resolver/testing/ResolverTestSupport.java      |  124 -
 .../attribute/resolver/testing/package-info.java   |   22 -
 .../src/test/resources/logback-test.xml            |   17 -
 idp-attribute-resolver-impl/.checkstyle            |   15 -
 idp-attribute-resolver-impl/.classpath             |   38 -
 idp-attribute-resolver-impl/.gitignore             |    2 -
 idp-attribute-resolver-impl/.project               |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-resolver-impl/pom.xml                |  255 --
 .../ad/impl/ContextDerivedAttributeDefinition.java |  116 -
 .../ad/impl/DecryptedAttributeDefinition.java      |  126 -
 .../ad/impl/PrescopedAttributeDefinition.java      |  151 -
 .../ad/impl/PrincipalNameAttributeDefinition.java  |   52 -
 .../ad/impl/RegexSplitAttributeDefinition.java     |  147 -
 .../ad/impl/ScopedAttributeDefinition.java         |  214 -
 .../ad/impl/ScriptedAttributeDefinition.java       |  301 --
 .../resolver/ad/impl/ScriptedIdPAttributeImpl.java |  241 --
 .../ad/impl/SimpleAttributeDefinition.java         |   93 -
 .../ad/impl/StaticAttributeDefinition.java         |   84 -
 .../ad/impl/TemplateAttributeDefinition.java       |  267 --
 .../attribute/resolver/ad/impl/package-info.java   |   20 -
 .../ad/mapped/impl/MappedAttributeDefinition.java  |  252 --
 .../resolver/ad/mapped/impl/SourceValue.java       |  172 -
 .../resolver/ad/mapped/impl/ValueMap.java          |  154 -
 .../resolver/ad/mapped/impl/package-info.java      |   23 -
 .../dc/http/impl/AbstractHTTPSearchBuilder.java    |  232 --
 .../resolver/dc/http/impl/HTTPDataConnector.java   |  120 -
 .../http/impl/ScriptedResponseMappingStrategy.java |  370 --
 .../dc/http/impl/TemplatedBodyBuilder.java         |  410 --
 .../resolver/dc/http/impl/TemplatedURLBuilder.java |  208 -
 .../resolver/dc/http/impl/package-info.java        |   22 -
 .../dc/impl/AbstractSearchDataConnector.java       |  230 --
 .../resolver/dc/impl/PairwiseIdDataConnector.java  |  308 --
 .../resolver/dc/impl/ScriptedDataConnector.java    |  326 --
 .../resolver/dc/impl/StaticDataConnector.java      |  102 -
 .../resolver/dc/impl/SubjectDataConnector.java     |  206 -
 .../attribute/resolver/dc/impl/package-info.java   |   22 -
 .../dc/ldap/impl/ConnectionFactoryValidator.java   |  117 -
 .../resolver/dc/ldap/impl/LDAPDataConnector.java   |  224 -
 .../resolver/dc/ldap/impl/package-info.java        |   22 -
 .../dc/rdbms/impl/DataSourceValidator.java         |  134 -
 .../resolver/dc/rdbms/impl/RDBMSDataConnector.java |  165 -
 .../resolver/dc/rdbms/impl/package-info.java       |   23 -
 .../impl/ScriptedStorageMappingStrategy.java       |  229 --
 .../storage/impl/SimpleStorageMappingStrategy.java |   66 -
 .../storage/impl/StorageServiceDataConnector.java  |  163 -
 .../dc/storage/impl/TemplatedSearchBuilder.java    |  235 --
 .../resolver/dc/storage/impl/package-info.java     |   22 -
 .../resolver/impl/AttributeResolverImpl.java       |  802 ----
 .../impl/AttributeResolverServiceGaugeSet.java     |  152 -
 .../idp/attribute/resolver/impl/package-info.java  |   20 -
 .../src/main/resources/.gitkeep                    |    0
 .../resolver/ad/impl/DecryptedAttributeTest.java   |  250 --
 .../idp/attribute/resolver/ad/impl/LogicTest.java  |   83 -
 .../resolver/ad/impl/PrescopedAtributeTest.java    |  293 --
 .../impl/PrincipalNameAttributeDefinitionTest.java |   85 -
 .../resolver/ad/impl/RegexAtributeTest.java        |  255 --
 ...SAML1NameIdentifierAttributeDefinitionTest.java |  260 --
 .../impl/SAML2NameIDAttributeDefinitionTest.java   |  285 --
 .../resolver/ad/impl/ScopedAttributeTest.java      |  284 --
 .../resolver/ad/impl/ScriptedAttributeTest.java    |  619 ---
 .../resolver/ad/impl/SimpleAttributeTest.java      |  283 --
 .../ad/impl/StaticAttributeDefinitionTest.java     |  118 -
 .../resolver/ad/impl/TemplateAttributeTest.java    |  417 --
 .../ad/mapped/impl/MappedAttributeTest.java        |  296 --
 .../resolver/ad/mapped/impl/SourceValueTest.java   |   82 -
 .../resolver/ad/mapped/impl/ValueMapTest.java      |   89 -
 .../dc/http/impl/HTTPDataConnectorTest.java        |  398 --
 .../dc/impl/ComputedIDDataConnectorTest.java       |  410 --
 .../dc/impl/SAMLAttributeDataConnectorTest.java    |   91 -
 .../dc/impl/ScriptedDataConnectorTest.java         |  148 -
 .../resolver/dc/impl/StaticDataConnectorTest.java  |  125 -
 .../dc/impl/StoredIDDataConnectorTest.java         |  240 --
 .../resolver/dc/impl/SubjectDataConnectorTest.java |  161 -
 .../idp/attribute/resolver/dc/impl/TestCache.java  |  119 -
 .../impl/testing/SAMLAttributeDataConnector.java   |  173 -
 .../resolver/dc/impl/testing/package-info.java     |   22 -
 .../dc/ldap/impl/LDAPDataConnectorTest.java        |  596 ---
 .../resolver/dc/ldap/impl/Regressions.java         |  138 -
 .../dc/rdbms/impl/RDBMSDataConnectorTest.java      |  419 --
 .../impl/StorageServiceDataConnectorTest.java      |  203 -
 .../impl/AttributeResolutionContextTest.java       |  151 -
 .../resolver/impl/AttributeResolverImplTest.java   | 1065 -----
 .../src/test/resources/logback-test.xml            |   19 -
 .../attribute/resolver/impl/ad/SealerKeyStore.jks  |  Bin 984 -> 0 bytes
 .../attribute/resolver/impl/ad/SealerKeyStore.kver |    1 -
 .../resolver/impl/ad/addAfterGetValues.script      |    2 -
 .../attribute/resolver/impl/ad/attributes.script   |    6 -
 .../attribute/resolver/impl/ad/attributes2.script  |    8 -
 .../idp/attribute/resolver/impl/ad/context.script  |    7 -
 .../idp/attribute/resolver/impl/ad/custom.script   |    1 -
 .../resolver/impl/ad/example1.attribute.xml        |    5 -
 .../idp/attribute/resolver/impl/ad/example1.script |   17 -
 .../resolver/impl/ad/example2.attribute.xml        |    6 -
 .../idp/attribute/resolver/impl/ad/example2.script |   27 -
 .../resolver/impl/ad/example3.attribute.2.xml      |    9 -
 .../resolver/impl/ad/example3.attribute.xml        |    6 -
 .../idp/attribute/resolver/impl/ad/example3.script |    7 -
 .../resolver/impl/ad/example4.attribute.2.xml      |    8 -
 .../resolver/impl/ad/example4.attribute.3.xml      |    5 -
 .../resolver/impl/ad/example4.attribute.xml        |    5 -
 .../idp/attribute/resolver/impl/ad/example4.script |    8 -
 .../idp/attribute/resolver/impl/ad/fail1.script    |    1 -
 .../idp/attribute/resolver/impl/ad/fail2.script    |    2 -
 .../idp/attribute/resolver/impl/ad/fail4.script    |    2 -
 .../idp/attribute/resolver/impl/ad/fail5.script    |    2 -
 .../idp/attribute/resolver/impl/ad/fail6.script    |    1 -
 .../idp/attribute/resolver/impl/ad/logging.script  |    6 -
 .../attribute/resolver/impl/ad/nullValue.script    |    5 -
 .../resolver/impl/ad/requestContext.script         |    5 -
 .../impl/ad/requestContextUnimplemented.script     |   89 -
 .../idp/attribute/resolver/impl/ad/simple.script   |    1 -
 .../idp/attribute/resolver/impl/ad/simple2.script  |    3 -
 .../resolver/impl/ad/simpleWithPredef.script       |    6 -
 .../idp/attribute/resolver/impl/ad/subjects.script |    8 -
 .../idp/attribute/resolver/impl/dc/DeleteStore.sql |    1 -
 .../attribute/resolver/impl/dc/StoredIdStore.sql   |   11 -
 .../idp/attribute/resolver/impl/dc/custom.js       |    1 -
 .../resolver/impl/dc/entityAttributes.xml          |   10 -
 .../idp/attribute/resolver/impl/dc/error.js        |    1 -
 .../resolver/impl/dc/http/repo-entity.crt          |   39 -
 .../idp/attribute/resolver/impl/dc/http/test.js    |   20 -
 .../idp/attribute/resolver/impl/dc/http/test.json  |   10 -
 .../attribute/resolver/impl/dc/http/testsize.js    |   20 -
 .../impl/dc/ldap/ldapDataConnectorTest.ldif        |   68 -
 .../impl/dc/ldap/ldapDataConnectorTestEmpty.ldif   |   36 -
 .../attribute/resolver/impl/dc/rdbms/RdbmsData.sql |   68 -
 .../resolver/impl/dc/rdbms/RdbmsStore.sql          |   13 -
 .../resolver/impl/dc/scriptedConnector.js          |   45 -
 .../idp/attribute/resolver/impl/dc/storage/test.js |   18 -
 .../attribute/resolver/impl/dc/storage/test.json   |   10 -
 idp-attribute-resolver-spring/.checkstyle          |   15 -
 idp-attribute-resolver-spring/.classpath           |   38 -
 idp-attribute-resolver-spring/.gitignore           |    2 -
 idp-attribute-resolver-spring/.project             |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-attribute-resolver-spring/pom.xml              |  266 --
 .../spring/BaseResolverPluginDependencyParser.java |   54 -
 .../resolver/spring/BaseResolverPluginParser.java  |  221 -
 .../spring/ad/BaseAttributeDefinitionParser.java   |   81 -
 .../ContextDerivedAttributeDefinitionParser.java   |   61 -
 .../impl/DecryptedAttributeDefinitionParser.java   |   54 -
 .../impl/PrescopedAttributeDefinitionParser.java   |   62 -
 .../PrincipalNameAttributeDefinitionParser.java    |   41 -
 .../impl/RegexSplitAttributeDefinitionParser.java  |   75 -
 ...ML1NameIdentifierAttributeDefinitionParser.java |   72 -
 .../impl/SAML2NameIDAttributeDefinitionParser.java |   77 -
 .../ad/impl/ScopedAttributeDefinitionParser.java   |   69 -
 .../ad/impl/ScriptedAttributeDefinitionParser.java |  113 -
 .../ad/impl/SimpleAttributeDefinitionParser.java   |   55 -
 .../SubjectDerivedAttributeDefinitionParser.java   |  105 -
 .../ad/impl/TemplateAttributeDefinitionParser.java |   85 -
 .../resolver/spring/ad/impl/package-info.java      |   22 -
 .../impl/MappedAttributeDefinitionParser.java      |  105 -
 .../spring/ad/mapped/impl/SourceValueParser.java   |   96 -
 .../spring/ad/mapped/impl/ValueMapParser.java      |   99 -
 .../spring/ad/mapped/impl/package-info.java        |   23 -
 .../attribute/resolver/spring/ad/package-info.java |   23 -
 .../spring/dc/AbstractDataConnectorParser.java     |  230 --
 .../dc/http/impl/HTTPDataConnectorParser.java      |  473 ---
 .../resolver/spring/dc/http/impl/package-info.java |   22 -
 .../resolver/spring/dc/impl/CacheConfigParser.java |  217 -
 .../dc/impl/ComputedIdDataConnectorParser.java     |  111 -
 .../spring/dc/impl/DataConnectorFactoryBean.java   |  305 --
 .../spring/dc/impl/ManagedConnectionParser.java    |  218 -
 .../dc/impl/PairwiseIdDataConnectorParser.java     |  112 -
 .../spring/dc/impl/ScriptDataConnectorParser.java  |  126 -
 .../spring/dc/impl/StaticDataConnectorParser.java  |   97 -
 .../dc/impl/StoredIdDataConnectorParser.java       |  129 -
 .../spring/dc/impl/SubjectDataConnectorParser.java |   64 -
 .../resolver/spring/dc/impl/package-info.java      |   22 -
 .../dc/ldap/impl/CredentialConfigFactoryBean.java  |  123 -
 .../dc/ldap/impl/LDAPDataConnectorParser.java      |  978 -----
 .../resolver/spring/dc/ldap/impl/package-info.java |   22 -
 .../attribute/resolver/spring/dc/package-info.java |   22 -
 .../dc/rdbms/impl/RDBMSDataConnectorParser.java    |  329 --
 .../spring/dc/rdbms/impl/package-info.java         |   22 -
 .../impl/StorageServiceDataConnectorParser.java    |  256 --
 .../spring/dc/storage/impl/package-info.java       |   22 -
 .../spring/enc/BaseAttributeEncoderParser.java     |  177 -
 .../enc/BaseSAML1AttributeEncoderParser.java       |   60 -
 .../enc/BaseSAML2AttributeEncoderParser.java       |   64 -
 .../impl/SAML1Base64AttributeEncoderParser.java    |   45 -
 .../SAML1ScopedStringAttributeEncoderParser.java   |   71 -
 .../impl/SAML1StringAttributeEncoderParser.java    |   45 -
 .../impl/SAML1XMLObjectAttributeEncoderParser.java |   43 -
 .../impl/SAML2Base64AttributeEncoderParser.java    |   45 -
 .../SAML2ScopedStringAttributeEncoderParser.java   |   71 -
 .../impl/SAML2StringAttributeEncoderParser.java    |   45 -
 .../impl/SAML2XMLObjectAttributeEncoderParser.java |   43 -
 .../resolver/spring/enc/impl/package-info.java     |   22 -
 .../resolver/spring/enc/package-info.java          |   22 -
 .../impl/AbstractResolverPluginFactoryBean.java    |  193 -
 .../impl/AttributeResolverNamespaceHandler.java    |  149 -
 .../spring/impl/AttributeResolverParser.java       |   81 -
 .../impl/AttributeResolverServiceStrategy.java     |  117 -
 .../impl/InputAttributeDefinitionParser.java       |   40 -
 .../spring/impl/InputDataConnectorParser.java      |   75 -
 .../resolver/spring/impl/package-info.java         |   22 -
 .../attribute/resolver/spring/package-info.java    |   23 -
 .../src/main/resources/META-INF/spring.handlers    |    1 -
 .../resolver/spring/AttributeMapperTest.java       |  173 -
 .../spring/AttributeMappingNodeProcessorTest.java  |  166 -
 .../resolver/spring/AttributeResolverTest.java     |  570 ---
 .../resolver/spring/DependencyTypesTest.java       |   76 -
 .../idp/attribute/resolver/spring/IdP1676Test.java |  222 -
 .../ad/PrescopedAttributeDefinitionParserTest.java |   49 -
 ...PrincipalNameAttributeDefinitionParserTest.java |   40 -
 .../RegexSplitAttributeDefinitionParserTest.java   |   85 -
 ...ameIdentifierAttributeDefinitionParserTest.java |   53 -
 ...meIDdentifierAttributeDefinitionParserTest.java |   53 -
 .../ad/ScopedAttributeDefinitionParserTest.java    |   66 -
 .../spring/ad/ScriptedAttributeParserTest.java     |  103 -
 .../spring/ad/SimpleAttributeParserTest.java       |  262 --
 .../ad/TemplateAttributeDefinitionParserTest.java  |   62 -
 .../MappedAttributeDefinitionParserTest.java       |   86 -
 .../spring/ad/mapped/SourceValueParserTest.java    |  124 -
 .../spring/ad/mapped/ValueMapParserTest.java       |   76 -
 .../resolver/spring/dc/CacheConfigParserTest.java  |   96 -
 .../dc/ComputedIdDataConnectorParserTest.java      |  122 -
 .../resolver/spring/dc/ManagedConnectionTest.java  |  302 --
 .../spring/dc/ScriptDataConnectorParserTest.java   |  101 -
 .../spring/dc/StaticDataConnectorParserTest.java   |   94 -
 .../spring/dc/StoredIdDataConnectorParserTest.java |  116 -
 .../spring/dc/SubjectDataConnectorParserTest.java  |   57 -
 .../dc/http/HTTPDataConnectorParserTest.java       |  378 --
 .../dc/ldap/LDAPDataConnectorParserTest.java       |  658 ---
 .../dc/rdbms/RDBMSDataConnectorParserTest.java     |  217 -
 .../StorageServiceDataConnectorParserTest.java     |  226 -
 .../attribute/resolver/spring/enc/Regressions.java |   56 -
 .../enc/SAML1Base64AttributeEncoderParserTest.java |   69 -
 ...AML1ScopedStringAttributeEncoderParserTest.java |   76 -
 .../enc/SAML1StringAttributeEncoderParserTest.java |   70 -
 .../SAML1XMLObjectAttributeEncoderParserTest.java  |   68 -
 .../enc/SAML2Base64AttributeEncoderParserTest.java |   70 -
 ...AML2ScopedStringAttributeEncoderParserTest.java |   76 -
 .../enc/SAML2StringAttributeEncoderParserTest.java |   71 -
 .../SAML2XMLObjectAttributeEncoderParserTest.java  |   71 -
 .../failfast/AttributeResolverFailFastTest.java    |  215 -
 .../testing/BaseAttributeDefinitionParserTest.java |  203 -
 .../testing/BaseEncoderDefinitionParserTest.java   |  103 -
 .../resolver/spring/testing/package-info.java      |   22 -
 .../src/test/resources/logback-test.xml            |   27 -
 .../idp/attribute/resolver/failfast/RdbmsStore.sql |   25 -
 .../resolver/failfast/attributeResolverBad.xml     |   20 -
 .../resolver/failfast/attributeResolverBeans.xml   |   66 -
 .../failfast/attributeResolverBeansDefaultFF.xml   |   65 -
 .../resolver/failfast/attributeResolverGood.xml    |   20 -
 .../resolver/failfast/attributeResolverLDAP.xml    |   23 -
 .../resolver/failfast/attributeResolverRDBMS.xml   |   27 -
 .../resolver/failfast/attributeResolverStored.xml  |   29 -
 .../idp/attribute/resolver/filter/resolver.xml     |   33 -
 .../idp/attribute/resolver/filter/service.xml      |   61 -
 .../attribute/resolver/filter/withAttributes.xml   |   26 -
 .../resolver/spring/PropertyPlaceholder.xml        |   11 -
 .../idp/attribute/resolver/spring/RdbmsData.sql    |   10 -
 .../idp/attribute/resolver/spring/RdbmsStore.sql   |    8 -
 .../resolver/spring/ad/SealerKeyStore.jks          |  Bin 984 -> 0 bytes
 .../resolver/spring/ad/SealerKeyStore.kver         |    1 -
 .../idp/attribute/resolver/spring/ad/file.script   |    1 -
 .../resolver/spring/ad/mapped/resolver/empty.xml   |   14 -
 .../resolver/spring/ad/mapped/resolver/mapped.xml  |   14 -
 .../spring/ad/mapped/resolver/mappedNoDefault.xml  |    9 -
 .../spring/ad/mapped/resolver/mappedNoValueMap.xml |    5 -
 .../spring/ad/mapped/resolver/multiDefault.xml     |   16 -
 .../spring/ad/mapped/resolver/sourceValue.xml      |   10 -
 .../ad/mapped/resolver/sourceValueAttributes1.xml  |   10 -
 .../ad/mapped/resolver/sourceValueAttributes2.xml  |   10 -
 .../spring/ad/mapped/resolver/sourceValueBoth.xml  |   10 -
 .../ad/mapped/resolver/sourceValueDefault.xml      |   10 -
 .../ad/mapped/resolver/sourceValueDeprecated.xml   |   10 -
 .../ad/mapped/resolver/sourceValueEmptyCase.xml    |   10 -
 .../ad/mapped/resolver/sourceValueEmptyPartial.xml |   10 -
 .../spring/ad/mapped/resolver/valueMap.xml         |   11 -
 .../ad/mapped/resolver/valueMapNoSourceValue.xml   |    3 -
 .../spring/ad/mapped/resolver/valueMapNoValues.xml |    2 -
 .../spring/ad/resolver/excludeRelyingParties.xml   |    8 -
 .../spring/ad/resolver/excludeResolutionPhases.xml |    8 -
 .../spring/ad/resolver/phasesAndParties.xml        |    9 -
 .../resolver/spring/ad/resolver/prescopedWith.xml  |    8 -
 .../spring/ad/resolver/prescopedWithout.xml        |    8 -
 .../resolver/spring/ad/resolver/principalName.xml  |    6 -
 .../resolver/spring/ad/resolver/regexDefault.xml   |    9 -
 .../spring/ad/resolver/regexInsensitive.xml        |   10 -
 .../resolver/spring/ad/resolver/regexNone.xml      |   10 -
 .../resolver/spring/ad/resolver/regexSensitive.xml |   10 -
 .../resolver/spring/ad/resolver/relyingParties.xml |    8 -
 .../spring/ad/resolver/resolutionPhases.xml        |    8 -
 .../spring/ad/resolver/saml1NameIdDefault.xml      |    5 -
 .../ad/resolver/saml1NameIdentifierAttributes.xml  |    9 -
 .../spring/ad/resolver/saml2NameIdAttributes.xml   |    9 -
 .../spring/ad/resolver/saml2NameIdDefault.xml      |    3 -
 .../resolver/spring/ad/resolver/scoped.xml         |    7 -
 .../resolver/spring/ad/resolver/scopedBoth.xml     |    7 -
 .../resolver/spring/ad/resolver/scopedSource.xml   |    7 -
 .../spring/ad/resolver/scriptedAttributeAbsent.xml |    5 -
 .../spring/ad/resolver/scriptedAttributeBad.xml    |    6 -
 .../spring/ad/resolver/scriptedAttributeDupl.xml   |    9 -
 .../ad/resolver/scriptedAttributeDuplFile.xml      |    9 -
 .../spring/ad/resolver/scriptedAttributeFile.xml   |    8 -
 .../ad/resolver/scriptedAttributeFileMissing.xml   |    8 -
 .../spring/ad/resolver/scriptedAttributeInline.xml |    8 -
 .../ad/resolver/simpleAttributeBadValues.xml       |    6 -
 .../ad/resolver/simpleAttributePopulated.xml       |   21 -
 .../ad/resolver/simpleAttributePopulated2.xml      |   14 -
 .../ad/resolver/simpleAttributeUnpopulated.xml     |    5 -
 .../spring/ad/resolver/templateAttributes.xml      |   10 -
 .../spring/ad/resolver/templateNoAttributes.xml    |    8 -
 .../spring/ad/resolver/templateTwoTemplate.xml     |   13 -
 .../spring/attribute-resolver-preresolve.xml       |   34 -
 .../spring/attribute-resolver-preresolve2.xml      |   29 -
 .../attribute-resolver-selective-navigate.xml      |   36 -
 .../spring/attribute-resolver-selective.xml        |   28 -
 .../resolver/spring/attribute-resolver.xml         |  258 --
 .../resolver/spring/attribute-resolver2.xml        |    5 -
 .../idp/attribute/resolver/spring/dc/IdP338.xml    |   17 -
 .../spring/dc/ResultCacheElementTimeToLive.xml     |    5 -
 .../spring/dc/ResultCacheExpireAfterAccess.xml     |    5 -
 .../spring/dc/ResultCacheExpireAfterWrite.xml      |    5 -
 .../resolver/spring/dc/ResultCacheExpireBoth.xml   |    5 -
 .../attribute/resolver/spring/dc/http/client.crt   |   14 -
 .../attribute/resolver/spring/dc/http/client.key   |   15 -
 .../http-attribute-resolver-spring-context.xml     |   25 -
 .../http-attribute-resolver-v2-badprotocol.xml     |   18 -
 .../dc/http/http-attribute-resolver-v2-body.xml    |   20 -
 .../dc/http/http-attribute-resolver-v2-ca.xml      |   18 -
 .../http-attribute-resolver-v2-certificate.xml     |   18 -
 .../http/http-attribute-resolver-v2-clientcert.xml |   20 -
 .../dc/http/http-attribute-resolver-v2-hybrid.xml  |   17 -
 .../http/http-attribute-resolver-v2-missingok.xml  |   20 -
 .../spring/dc/http/http-attribute-resolver-v2.xml  |   22 -
 .../resolver/spring/dc/http/spring-beans.xml       |   54 -
 .../attribute/resolver/spring/dc/ldap/client.crt   |   14 -
 .../attribute/resolver/spring/dc/ldap/client.key   |   15 -
 .../resolver/spring/dc/ldap/client.keystore        |  Bin 1293 -> 0 bytes
 .../resolver/spring/dc/ldap/client.pkcs12          |  Bin 1549 -> 0 bytes
 .../attribute/resolver/spring/dc/ldap/client.pkcs8 |  Bin 634 -> 0 bytes
 .../ldap-attribute-resolver-spring-context.xml     |   66 -
 ...dap-attribute-resolver-spring-props-context.xml |   76 -
 .../resolver/spring/dc/ldap/ldap-v2.properties     |   31 -
 .../resolver/spring/dc/ldap/ldap-v3.properties     |   28 -
 .../spring/dc/ldap/ldapDataConnectorTest.ldif      |   59 -
 .../ldap-attribute-resolver-spring-props.xml       |   12 -
 .../resolver/ldap-attribute-resolver-spring.xml    |   13 -
 ...ap-attribute-resolver-v2-authenticationType.xml |   19 -
 .../ldap-attribute-resolver-v2-external.xml        |   17 -
 .../resolver/ldap-attribute-resolver-v2-hybrid.xml |   32 -
 .../ldap-attribute-resolver-v2-minimal-pool.xml    |   18 -
 .../ldap-attribute-resolver-v2-minimal.xml         |   18 -
 .../resolver/ldap-attribute-resolver-v2-multi.xml  |   62 -
 .../resolver/ldap-attribute-resolver-v2-nosec.xml  |   76 -
 .../resolver/ldap-attribute-resolver-v2-props.xml  |   61 -
 .../ldap-attribute-resolver-v2-referral.xml        |   19 -
 .../resolver/ldap-attribute-resolver-v2-sasl.xml   |   25 -
 .../ldap/resolver/ldap-attribute-resolver-v2.xml   |   94 -
 .../resolver/spring/dc/ldap/resolver/ldap.crt      |   13 -
 .../attribute/resolver/spring/dc/ldap/server.crt   |   13 -
 .../attribute/resolver/spring/dc/ldap/server.key   |   15 -
 .../resolver/spring/dc/ldap/server.keystore        |  Bin 1283 -> 0 bytes
 .../resolver/spring/dc/ldap/server.pkcs12          |  Bin 1533 -> 0 bytes
 .../attribute/resolver/spring/dc/ldap/server.pkcs8 |  Bin 636 -> 0 bytes
 .../resolver/spring/dc/rdbms/RdbmsData.sql         |   20 -
 .../resolver/spring/dc/rdbms/RdbmsStore.sql        |    8 -
 .../rdbms-attribute-resolver-spring-context.xml    |   41 -
 ...bms-attribute-resolver-spring-props-context.xml |   29 -
 .../resolver/spring/dc/rdbms/rdbms-v2.properties   |   23 -
 .../resolver/spring/dc/rdbms/rdbms-v3.properties   |   19 -
 .../rdbms-attribute-resolver-spring-props.xml      |   12 -
 .../resolver/rdbms-attribute-resolver-spring.xml   |   12 -
 .../rdbms-attribute-resolver-v2-hybrid.xml         |   14 -
 .../resolver/rdbms-attribute-resolver-v2-props.xml |   23 -
 .../rdbms-attribute-resolver-v2-simple.xml         |   22 -
 .../rdbms/resolver/rdbms-attribute-resolver-v2.xml |   37 -
 .../resolver/spring/dc/resolver/computed.xml       |   12 -
 .../spring/dc/resolver/computedDataConnector.xml   |   10 -
 .../spring/dc/resolver/computedNoSource1.xml       |   10 -
 .../spring/dc/resolver/computedProperty.xml        |    8 -
 .../dc/resolver/containerManagedConnection.xml     |   16 -
 .../spring/dc/resolver/scriptedAttributeBoth.xml   |   12 -
 .../spring/dc/resolver/scriptedAttributeNone.xml   |    7 -
 .../dc/resolver/scriptedAttributeTooManyFiles.xml  |   10 -
 .../resolver/scriptedAttributeTooManyScripts.xml   |   14 -
 .../spring/dc/resolver/scriptedAttributes.xml      |   10 -
 .../spring/dc/resolver/staticAttributes.xml        |   13 -
 .../spring/dc/resolver/staticAttributesHybrid.xml  |    6 -
 .../dc/resolver/staticAttributesHybridSpring.xml   |   26 -
 .../resolver/spring/dc/resolver/stored.xml         |   21 -
 .../spring/dc/resolver/storedBeanManaged.xml       |   20 -
 .../resolver/spring/dc/resolver/storedNoSalt.xml   |   18 -
 .../spring/dc/resolver/subjectAttributes.xml       |    7 -
 .../spring/dc/resolver/subjectAttributesNull.xml   |    6 -
 .../resolver/spring/dc/scriptedConnector.8.js      |   19 -
 .../resolver/spring/dc/staticAttributesNative.xml  |   33 -
 .../resolver/spring/dc/storage/spring-beans.xml    |   31 -
 .../storage-attribute-resolver-spring-context.xml  |   24 -
 .../storage-attribute-resolver-v2-hybrid.xml       |   17 -
 .../storage-attribute-resolver-v2-simple.xml       |   16 -
 .../dc/storage/storage-attribute-resolver-v2.xml   |   22 -
 .../resolver/spring/enc/resolver/idp-571.xml       |   23 -
 .../resolver/spring/enc/resolver/saml1Base64.xml   |   14 -
 .../spring/enc/resolver/saml1Base64Default.xml     |    6 -
 .../spring/enc/resolver/saml1Base64NoName.xml      |    5 -
 .../resolver/spring/enc/resolver/saml1Scoped.xml   |   18 -
 .../spring/enc/resolver/saml1ScopedDefault.xml     |    6 -
 .../spring/enc/resolver/saml1ScopedNoName.xml      |    4 -
 .../resolver/spring/enc/resolver/saml1String.xml   |   14 -
 .../spring/enc/resolver/saml1StringDefault.xml     |    6 -
 .../spring/enc/resolver/saml1StringNoName.xml      |    6 -
 .../spring/enc/resolver/saml1XmlObject.xml         |   14 -
 .../spring/enc/resolver/saml1XmlObjectDefault.xml  |    8 -
 .../spring/enc/resolver/saml1XmlObjectNoName.xml   |   13 -
 .../resolver/spring/enc/resolver/saml2Base64.xml   |   15 -
 .../spring/enc/resolver/saml2Base64Default.xml     |    8 -
 .../spring/enc/resolver/saml2Base64NoName.xml      |   13 -
 .../resolver/spring/enc/resolver/saml2Scoped.xml   |   18 -
 .../spring/enc/resolver/saml2ScopedDefault.xml     |    8 -
 .../spring/enc/resolver/saml2ScopedNoName.xml      |    8 -
 .../resolver/spring/enc/resolver/saml2String.xml   |   15 -
 .../spring/enc/resolver/saml2StringConditional.xml |    8 -
 .../spring/enc/resolver/saml2StringDefault.xml     |    8 -
 .../spring/enc/resolver/saml2StringNoName.xml      |   12 -
 .../spring/enc/resolver/saml2XmlObject.xml         |   15 -
 .../spring/enc/resolver/saml2XmlObjectDefault.xml  |    8 -
 .../spring/enc/resolver/saml2XmlObjectNoName.xml   |   12 -
 .../attribute/resolver/spring/externalBeans.xml    |   55 -
 .../idp/attribute/resolver/spring/idStore.xml      |    9 -
 .../idp/attribute/resolver/spring/idStore2.xml     |    9 -
 .../resolver/spring/idp-1676-resolver.xml          |   53 -
 .../attribute/resolver/spring/idp-1676-service.xml |   49 -
 .../resolver/spring/inputAttributeDefinition1.xml  |    5 -
 .../resolver/spring/inputDataConnector1.xml        |    6 -
 .../resolver/spring/inputDataConnector2.xml        |    6 -
 .../resolver/spring/inputDataConnector3.xml        |    7 -
 .../resolver/spring/inputDataConnector4.xml        |    5 -
 .../resolver/spring/ldapDataConnectorTest.ldif     |   35 -
 .../attribute/resolver/spring/mappedTemplate.xml   |   50 -
 .../resolver/spring/mappedTemplateService.xml      |   49 -
 .../resolver/spring/mapperTest-attributes.xml      |   59 -
 .../idp/attribute/resolver/spring/mapperTest.xml   |   62 -
 .../resolver/spring/multiFileResolver1.xml         |   23 -
 .../resolver/spring/multiFileResolver2.xml         |   13 -
 .../attribute/resolver/spring/multiFileService.xml |   40 -
 .../resolver/spring/predicates-navigate.xml        |   33 -
 .../idp/attribute/resolver/spring/predicates.xml   |   53 -
 .../idp/attribute/resolver/spring/service.xml      |   50 -
 .../idp/attribute/resolver/spring/service2.xml     |   40 -
 .../attribute/resolver/spring/serviceNullStrip.xml |   51 -
 .../resolver/spring/simpleDependencies.xml         |   10 -
 .../attribute/resolver/spring/storageService.xml   |   23 -
 .../idp/attribute/resolver/spring/velocity2.xml    |   20 -
 idp-authn-api/.classpath                           |    1 +
 idp-authn-api/.project                             |   13 +
 idp-authn-api/.settings/org.eclipse.jdt.core.prefs |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-authn-api/pom.xml                              |    8 +-
 idp-authn-impl/.classpath                          |    1 +
 idp-authn-impl/.project                            |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-authn-impl/pom.xml                             |   95 +-
 .../impl/IdPAttributePrincipalValuesFunction.java  |    2 +-
 .../SubjectDerivedAttributeValuesFunction.java     |   25 +-
 .../context/impl/SubjectScriptContextExtender.java |   92 +
 .../idp/authn/context/impl}/package-info.java      |    4 +-
 ...ontextDerivedAttributeDefinitionParserTest.java |   20 +-
 .../SubjectDerivedAttributeValuesFunctionTest.java |    7 +-
 .../resolver/spring/ad}/contextDerived.xml         |    0
 .../resolver/spring/ad}/subjectDerived.xml         |    0
 .../resolver/spring/ad}/subjectDerivedComplex.xml  |    0
 .../spring/ad}/subjectDerivedDependency.xml        |    0
 .../resolver/spring/ad}/subjectDerivedFail.xml     |    0
 .../resolver/spring/ad}/subjectDerivedViaC14N.xml  |    0
 .../resolver/spring/ad}/subjectDerivedWarn.xml     |    0
 .../resolver/spring/contextDerivedBeans.xml        |    4 +-
 .../idp/attribute/resolver/spring/customBean.xml   |    4 +-
 idp-bom/pom.xml                                    |   37 +-
 idp-cas-api/.classpath                             |    1 +
 idp-cas-api/.project                               |   13 +
 idp-cas-api/.settings/org.eclipse.jdt.core.prefs   |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-cas-api/pom.xml                                |   10 +-
 idp-cas-impl/.classpath                            |    1 +
 idp-cas-impl/.project                              |   13 +
 idp-cas-impl/.settings/org.eclipse.jdt.core.prefs  |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-cas-impl/pom.xml                               |   66 +-
 .../src/test/resources/spring/test-flow-beans.xml  |  107 +-
 idp-conf-impl/.classpath                           |    1 +
 idp-conf-impl/.project                             |   61 +-
 idp-conf-impl/.settings/org.eclipse.jdt.core.prefs |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-conf-impl/pom.xml                              |    6 +
 .../net/shibboleth/idp/conf/admin-system.xml       |   16 +-
 .../idp/conf/attribute-filter-system.xml           |    3 +
 .../idp/conf/attribute-resolver-system.xml         |    3 +
 .../net/shibboleth/idp/conf/http-client.xml        |   50 +-
 .../idp/conf/metadata-providers-system.xml         |    8 +-
 .../net/shibboleth/idp/conf/primitives.xml         |    4 +-
 .../net/shibboleth/idp/conf/services-system.xml    |    4 +-
 idp-conf/.classpath                                |    1 +
 idp-conf/.project                                  |   13 +
 idp-conf/.settings/org.eclipse.jdt.core.prefs      |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-conf/pom.xml                                   |   78 +-
 idp-consent-api/.classpath                         |    1 +
 idp-consent-api/.project                           |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-consent-api/pom.xml                            |    5 +-
 idp-consent-impl/.classpath                        |    1 +
 idp-consent-impl/.project                          |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-consent-impl/pom.xml                           |   25 +-
 idp-core/.classpath                                |    1 +
 idp-core/.project                                  |   13 +
 idp-core/.settings/org.eclipse.jdt.core.prefs      |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../idp/metrics/ReloadableServiceGaugeSet.java     |  151 -
 .../net/shibboleth/idp/metrics/package-info.java   |   22 -
 idp-installer/pom.xml                              |   16 +-
 idp-parent/pom.xml                                 |   44 +-
 idp-profile-api/.classpath                         |    1 +
 idp-profile-api/.project                           |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-profile-api/pom.xml                            |   16 +-
 .../shibboleth/idp/profile/logic/inlineBean.xml    |   27 +-
 .../shibboleth/idp/profile/logic/resourceBean.xml  |    2 +-
 idp-profile-impl/.classpath                        |    1 +
 idp-profile-impl/.project                          |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-profile-impl/pom.xml                           |   99 +-
 .../ProfileActionBeanFactoryPostProcessorTest.xml  |    4 +-
 .../impl/ProfileActionBeanPostProcessorTest.xml    |    4 +-
 idp-profile-spring/.checkstyle                     |   15 -
 idp-profile-spring/.classpath                      |   38 -
 idp-profile-spring/.gitignore                      |    2 -
 idp-profile-spring/.project                        |   30 -
 .../.settings/org.eclipse.core.resources.prefs     |    6 -
 .../.settings/org.eclipse.jdt.core.prefs           |  413 --
 .../.settings/org.eclipse.jdt.ui.prefs             |   63 -
 .../.settings/org.eclipse.m2e.core.prefs           |    4 -
 idp-profile-spring/pom.xml                         |  245 --
 .../AbstractBasicCredentialFactoryBean.java        |  207 -
 .../factory/AbstractCredentialFactoryBean.java     |  144 -
 .../factory/AbstractX509CredentialFactoryBean.java |  133 -
 .../factory/BasicInlineCredentialFactoryBean.java  |  126 -
 .../BasicResourceCredentialFactoryBean.java        |  147 -
 .../factory/BasicX509CredentialFactoryBean.java    |  224 -
 .../factory/StaticExplicitKeyFactoryBean.java      |  140 -
 .../spring/factory/StaticPKIXFactoryBean.java      |  277 --
 .../factory/X509InlineCredentialFactoryBean.java   |  147 -
 .../metadata/AbstractMetadataProviderParser.java   |  241 --
 .../metadata/FileCachingHttpClientFactoryBean.java |   38 -
 .../metadata/HttpClientFactoryBean.java            |   37 -
 .../InMemoryCachingHttpClientFactoryBean.java      |   38 -
 .../metadata/MetadataProviderContainer.java        |  139 -
 .../metadata/ScriptTypeBeanParser.java             |   78 -
 .../metadata/TLSSocketFactoryFactoryBean.java      |   94 -
 .../filter/impl/AlgorithmFilterParser.java         |  170 -
 .../metadata/filter/impl/ByReferenceParser.java    |   97 -
 .../impl/DeprecatedEntityRoleFilterParser.java     |   54 -
 .../filter/impl/EntitiesDescriptorNameParser.java  |   56 -
 .../filter/impl/EntityAttributesFilterParser.java  |  164 -
 .../filter/impl/EntityRoleFilterParser.java        |   82 -
 .../metadata/filter/impl/KeyAuthorityParser.java   |   57 -
 .../filter/impl/NameIDFormatFilterParser.java      |  143 -
 .../metadata/filter/impl/NodeProcessingParser.java |   71 -
 .../impl/PredicateFilterDirectionFactoryBean.java  |   63 -
 .../filter/impl/PredicateFilterParser.java         |  312 --
 .../filter/impl/RequiredValidUntilParser.java      |   65 -
 .../filter/impl/SchemaValidationParser.java        |   67 -
 .../SignatureValidationCriteriaSetFactoryBean.java |  165 -
 .../filter/impl/SignatureValidationParser.java     |  243 --
 .../metadata/filter/impl/package-info.java         |   22 -
 .../AbstractDynamicHTTPMetadataProviderParser.java |  168 -
 .../AbstractDynamicMetadataProviderParser.java     |  211 -
 .../AbstractReloadingMetadataProviderParser.java   |  121 -
 .../impl/ByReferenceFilterBeanPostProcessor.java   |  117 -
 .../impl/ChainingMetadataProviderParser.java       |   58 -
 .../impl/DynamicHTTPMetadataProviderParser.java    |  173 -
 .../impl/FileBackedHTTPMetadataProviderParser.java |   62 -
 .../impl/FileCachingHttpClientFactoryBean.java     |   41 -
 .../impl/FilesystemMetadataProviderParser.java     |   51 -
 .../metadata/impl/HTTPMetadataProviderParser.java  |  110 -
 .../impl/HTTPMetadataProvidersParserSupport.java   |  194 -
 .../impl/InMemoryCachingHttpClientFactoryBean.java |   41 -
 .../impl/InlineMetadataProviderParser.java         |   73 -
 .../impl/LocalDynamicMetadataProviderParser.java   |  221 -
 .../metadata/impl/MetadataNamespaceHandler.java    |   86 -
 .../impl/MetadataResolverServiceStrategy.java      |   95 -
 .../NodeProcessingAttachingBeanPostProcessor.java  |  132 -
 .../impl/ResourceBackedMetadataProviderParser.java |   95 -
 .../relyingparty/metadata/impl/package-info.java   |   22 -
 .../spring/relyingparty/metadata/package-info.java |   24 -
 .../impl/AbstractBasicCredentialParser.java        |  163 -
 .../credential/impl/AbstractCredentialParser.java  |   94 -
 .../impl/AbstractX509CredentialParser.java         |  141 -
 .../impl/BasicInlineCredentialParser.java          |   39 -
 .../impl/BasicResourceCredentialParser.java        |   40 -
 .../impl/X509InlineCredentialParser.java           |   38 -
 .../impl/X509ResourceCredentialParser.java         |   41 -
 .../security/credential/impl/package-info.java     |   22 -
 .../security/impl/SecurityNamespaceHandler.java    |   83 -
 .../relyingparty/security/impl/package-info.java   |   26 -
 ...AbstractBasicPKIXValidationInfoFactoryBean.java |  103 -
 .../trustengine/impl/AbstractChainingParser.java   |   62 -
 .../impl/AbstractPKIXValidationInfoParser.java     |   78 -
 .../trustengine/impl/AbstractStaticPKIXParser.java |  154 -
 .../impl/AbstractTrustEngineParser.java            |   44 -
 .../impl/CertPathPKIXValidationOptionsParser.java  |   89 -
 .../security/trustengine/impl/ChainingParser.java  |   38 -
 .../impl/ChainingSignatureTrustEngineFactory.java  |   69 -
 .../impl/ChainingTrustEngineFactory.java           |   70 -
 .../impl/PKIXInlineValidationInfoFactoryBean.java  |  107 -
 .../impl/PKIXInlineValidationInfoParser.java       |   43 -
 .../PKIXResourceValidationInfoFactoryBean.java     |  112 -
 .../impl/PKIXResourceValidationInfoParser.java     |   44 -
 .../impl/PKIXValidationOptionsParser.java          |   76 -
 .../trustengine/impl/SignatureChainingParser.java  |   39 -
 .../trustengine/impl/StaticExplicitKeyParser.java  |   63 -
 .../impl/StaticExplicitKeySignatureParser.java     |   67 -
 .../impl/StaticPKIXSignatureParser.java            |   67 -
 .../impl/StaticPKIXX509CredentialParser.java       |   63 -
 .../security/trustengine/impl/package-info.java    |   22 -
 .../resource/impl/HTTPResourceFactoryBean.java     |  290 --
 .../profile/spring/resource/impl/package-info.java |   22 -
 .../src/main/resources/META-INF/spring.handlers    |    3 -
 .../BasicX509CredentialFactoryBeanTest.java        |   60 -
 .../spring/factory/StaticPKIXFactoryBeanTest.java  |  132 -
 .../spring/failfast/AbstractFailFastTest.java      |  175 -
 .../spring/failfast/FilterFailFastTest.java        |   92 -
 .../spring/failfast/MetadataFailFastTest.java      |  184 -
 .../metadata/AbstractMetadataParserTest.java       |  178 -
 .../metadata/ChainingMetadataParserTest.java       |   65 -
 .../DynamicHTTPMetadataProviderParserTest.java     |  463 ---
 .../relyingparty/metadata/EmptyChainService.java   |   45 -
 .../FileBackedHTTPMetadataProviderParserTest.java  |  298 --
 .../metadata/FilesystemMetadataParserTest.java     |  132 -
 .../metadata/HTTPResourceConfigurationTests.java   |  129 -
 .../metadata/InlineMetadataParserTest.java         |  130 -
 .../LocalDynamicMetadataProviderParserTest.java    |  298 --
 .../relyingparty/metadata/ReloadMetadataTest.java  |  134 -
 .../metadata/ReloadServiceConfigurationTest.java   |  111 -
 .../metadata/ResourceMetadataParserTest.java       |   37 -
 .../metadata/filter/AlgorithmFilterParserTest.java |  129 -
 .../filter/ByReferenceFilterParserTest.java        |   76 -
 .../filter/EntityAttributesFilterParserTest.java   |   92 -
 .../filter/EntityRoleFilterParserTest.java         |   63 -
 .../filter/NameIDFormatFilterParserTest.java       |   72 -
 .../metadata/filter/NodeProcessingTest.java        |   66 -
 .../metadata/filter/PredicateFilterParserTest.java |  156 -
 .../filter/RequiredValidUntilParserTest.java       |   56 -
 .../filter/SchemaValidationParserTest.java         |   46 -
 ...natureValidationCriteriaSetFactoryBeanTest.java |  124 -
 .../filter/SignatureValidationParserTest.java      |  136 -
 .../security/AbstractSecurityParserTest.java       |   97 -
 .../security/credential/BasicInlineParserTest.java |   71 -
 .../credential/BasicResourceParserTest.java        |   80 -
 .../credential/X509FilesystemParserTest.java       |   88 -
 .../security/credential/X509InlineParserTest.java  |   62 -
 .../trustengine/ChainingTrustEngineTest.java       |   50 -
 .../security/trustengine/MockTrustEngine.java      |   44 -
 .../trustengine/PKIXFilesystemParserTest.java      |   52 -
 .../security/trustengine/PKIXInlineParserTest.java |   53 -
 .../PKIXValidationOptionsParserTest.java           |   54 -
 .../trustengine/SignatureChainingParserTest.java   |   56 -
 .../StaticExplicitKeyFactoryBeanTest.java          |   97 -
 .../trustengine/StaticExplicitKeyParserTest.java   |   52 -
 .../StaticExplicitKeySignatureParserTest.java      |   52 -
 .../trustengine/StaticPKIXSignatureParserTest.java |  163 -
 .../StaticPKIXX509CredentialParserTest.java        |  116 -
 .../shibboleth/idp/profile/spring/factory/bean.xml |   28 -
 .../idp/profile/spring/factory/idp-signing.crt     |   22 -
 .../idp/profile/spring/factory/idp-signing.key     |   27 -
 .../profile/spring/factory/idp-signing.key.pass    |   30 -
 .../static-pkix-factory-custom-failsValidation.xml |   33 -
 .../factory/static-pkix-factory-custom-success.xml |   30 -
 .../factory/static-pkix-factory-defaults.xml       |   24 -
 .../profile/spring/failfast/attributeFilterBad.xml |   15 -
 .../spring/failfast/attributeFilterBadScript.xml   |   19 -
 .../spring/failfast/attributeFilterGood.xml        |   15 -
 .../idp/profile/spring/failfast/fileMetadata.xml   |   10 -
 .../idp/profile/spring/failfast/filterBeans.xml    |   51 -
 .../spring/failfast/filterBeansDefaultFF.xml       |   50 -
 .../idp/profile/spring/failfast/httpMetadata.xml   |   12 -
 .../profile/spring/failfast/inLineMetadataBad.xml  |   19 -
 .../profile/spring/failfast/inLineMetadataGood.xml |   19 -
 .../idp/profile/spring/failfast/metadataBeans.xml  |   50 -
 .../spring/failfast/metadataBeansDefaultFF.xml     |   50 -
 .../profile/spring/failfast/metadataFileBad.xml    |   11 -
 .../profile/spring/failfast/metadataFileGood.xml   |   12 -
 .../profile/spring/relyingparty/file.properties    |   10 -
 .../spring/relyingparty/metadata/HTTPResources.xml |   38 -
 .../profile/spring/relyingparty/metadata/beans.xml |  105 -
 .../profile/spring/relyingparty/metadata/chain.xml |   39 -
 .../spring/relyingparty/metadata/chain2.xml        |   22 -
 .../spring/relyingparty/metadata/document.xml      |    4 -
 .../metadata/dynamic-httpCaching-file.xml          |   17 -
 .../metadata/dynamic-httpCaching-memory.xml        |   16 -
 .../metadata/dynamic-httpCaching-none.xml          |   17 -
 .../metadata/dynamic-https-noTrustEngine.xml       |   18 -
 .../dynamic-https-trustEngine-explicitKey.xml      |   63 -
 .../dynamic-https-trustEngine-invalidKey.xml       |   47 -
 .../dynamic-https-trustEngine-invalidPKIX.xml      |   49 -
 ...s-trustEngine-validPKIX-explicitTrustedName.xml |   60 -
 .../dynamic-https-trustEngine-validPKIX.xml        |   59 -
 .../relyingparty/metadata/dynamicBasicParams.xml   |   24 -
 .../metadata/dynamicClientSecurityParams.xml       |   12 -
 .../relyingparty/metadata/dynamicDefaults.xml      |   10 -
 .../relyingparty/metadata/dynamicIndexes.xml       |   10 -
 .../metadata/dynamicMaxConnections.xml             |   13 -
 .../metadata/dynamicMetadataQueryProtocol.xml      |   14 -
 ...etadataQueryProtocolWithContentTypeOverride.xml |   15 -
 ...tadataQueryProtocolWithSecondaryURLBuilders.xml |   14 -
 .../metadata/dynamicPersistentCacheBean.xml        |   16 -
 .../metadata/dynamicPersistentCacheDirectory.xml   |   16 -
 .../spring/relyingparty/metadata/dynamicRegex.xml  |   15 -
 .../relyingparty/metadata/dynamicTemplate.xml      |   15 -
 .../relyingparty/metadata/dynamicTimeouts.xml      |   14 -
 .../relyingparty/metadata/dynamicWellKnown.xml     |   10 -
 .../relyingparty/metadata/empty-chain-svc.xml      |   29 -
 .../spring/relyingparty/metadata/empty-chain.xml   |    9 -
 .../spring/relyingparty/metadata/entities.xml      |   28 -
 .../spring/relyingparty/metadata/entity.xml        |   13 -
 .../metadata/fileBackedHTTPEntities.xml            |   12 -
 .../relyingparty/metadata/fileBackedHTTPEntity.xml |   15 -
 .../metadata/fileBackedHTTPEntityBadIFBF.xml       |   15 -
 .../fileBackedHTTPEntityDisRegardTLSBad.xml        |   16 -
 .../spring/relyingparty/metadata/fileBadRVPO.xml   |   13 -
 .../spring/relyingparty/metadata/fileEntities.xml  |   11 -
 .../spring/relyingparty/metadata/fileEntity.xml    |   10 -
 .../metadata/filePredicatesDefaults.xml            |   10 -
 .../metadata/filePredicatesNoDefaultRegistry.xml   |   11 -
 .../metadata/filePredicatesOptions.xml             |   13 -
 .../relyingparty/metadata/filter/algorithm.xml     |   73 -
 .../metadata/filter/algorithmBeans.xml             |   14 -
 .../metadata/filter/algorithmConditionScript.js    |    2 -
 .../metadata/filter/algorithmWithScript.xml        |   58 -
 .../filter/algorithmWithScriptResource.xml         |   58 -
 .../metadata/filter/entityAttributes.xml           |   23 -
 .../entityAttributesAttributeFilterScript.js       |    2 -
 .../metadata/filter/entityAttributesBeans.xml      |   24 -
 .../metadata/filter/entityAttributesByRef.xml      |   28 -
 .../metadata/filter/entityAttributesByRefBeans.xml |   16 -
 .../filter/entityAttributesConditionScript.js      |    2 -
 .../metadata/filter/entityAttributesMetadata.xml   |   52 -
 .../filter/entityAttributesMetadataOnly.xml        |   56 -
 .../metadata/filter/entityAttributesWithScript.xml |   26 -
 .../filter/entityAttributesWithScriptResource.xml  |   25 -
 .../relyingparty/metadata/filter/entityRole.xml    |   24 -
 .../metadata/filter/entityRoleParams.xml           |   27 -
 .../metadata/filter/entityTrueResolver.xml         |   20 -
 .../metadata/filter/metadata.switchaai_signed.xml  | 4320 --------------------
 .../relyingparty/metadata/filter/nameIDFormat.xml  |   45 -
 .../metadata/filter/nameIDFormatWithScript.xml     |   48 -
 .../spring/relyingparty/metadata/filter/other.xml  |   32 -
 .../metadata/filter/predicateBadDirection.xml      |   11 -
 .../metadata/filter/predicateCustomBean.xml        |   23 -
 .../metadata/filter/predicateEmpty.xml             |    9 -
 .../metadata/filter/predicateEntity.xml            |   12 -
 .../metadata/filter/predicateGroup.xml             |   12 -
 .../metadata/filter/predicateMappedTag.xml         |   18 -
 .../relyingparty/metadata/filter/predicateOr.xml   |   22 -
 .../metadata/filter/predicateScript.xml            |   12 -
 .../metadata/filter/predicateScriptCustom.xml      |   12 -
 .../metadata/filter/predicateScriptOr.xml          |   15 -
 .../relyingparty/metadata/filter/predicateTag.xml  |   18 -
 .../metadata/filter/requiredValidUntil.xml         |   25 -
 .../metadata/filter/requiredValidUntilParam.xml    |   25 -
 .../filter/requiredValidUntilParamNonDuration.xml  |   25 -
 .../metadata/filter/schemaValidation.xml           |   24 -
 .../metadata/filter/schemaValidationRefs-beans.xml |   24 -
 .../metadata/filter/schemaValidationRefs.xml       |   24 -
 .../metadata/filter/signature-config-custom.xml    |   11 -
 .../metadata/filter/signature-config-defaults.xml  |    9 -
 .../filter/signatureValidationRefs-beans.xml       |   19 -
 .../metadata/filter/signatureValidationRefs.xml    |   19 -
 .../metadata/filter/signingCertCheck.xml           |   24 -
 .../metadata/filter/signingNoCertCheck.xml         |   25 -
 .../relyingparty/metadata/filter/signingNone.xml   |   25 -
 .../metadata/filter/switch-metadata-file.xml       |   12 -
 .../metadata/filter/switch-metadata-inline.xml     |   20 -
 .../switch-metadata-trustengine-inline-filter.xml  |   20 -
 .../metadata/filter/switch-metadata.xml            |   12 -
 .../spring/relyingparty/metadata/filter/switch.pem |   15 -
 .../spring/relyingparty/metadata/filter/switch.xml |   25 -
 .../relyingparty/metadata/http-entities-client.xml |   14 -
 .../metadata/http-entity-httpCaching-file.xml      |   14 -
 .../metadata/http-entity-httpCaching-memory.xml    |   14 -
 .../metadata/http-entity-httpCaching-none.xml      |   13 -
 .../spring/relyingparty/metadata/http-proxy.xml    |   13 -
 .../spring/relyingparty/metadata/httpClient.xml    |   23 -
 .../metadata/https-client-security-params.xml      |   20 -
 .../spring/relyingparty/metadata/https-indexes.xml |   62 -
 .../relyingparty/metadata/https-noTrustEngine.xml  |   15 -
 .../relyingparty/metadata/https-timeouts.xml       |   64 -
 .../metadata/https-trustEngine-explicitKey.xml     |   61 -
 .../metadata/https-trustEngine-invalidKey.xml      |   45 -
 .../metadata/https-trustEngine-invalidPKIX.xml     |   47 -
 ...s-trustEngine-validPKIX-explicitTrustedName.xml |   58 -
 .../metadata/https-trustEngine-validPKIX.xml       |   57 -
 .../relyingparty/metadata/idp.example.org.xml      |   13 -
 .../spring/relyingparty/metadata/inLineChain.xml   |   41 -
 .../relyingparty/metadata/inLineEntities.xml       |   29 -
 .../relyingparty/metadata/inLineEntities2.xml      |   29 -
 .../spring/relyingparty/metadata/inLineEntity.xml  |   21 -
 .../relyingparty/metadata/inLineEntityBadRVPO.xml  |   21 -
 .../relyingparty/metadata/localDynamicDefaults.xml |   13 -
 ...namicMissingSourceManagerAndSourceDirectory.xml |   12 -
 .../localDynamicWithManagerAndGenerator.xml        |   14 -
 .../metadata/localDynamicWithSourceDirectory.xml   |   13 -
 ...DirectoryAndIntermediateLengthWithoutNumber.xml |   14 -
 ...urceDirectoryAndIntermediateNumberAndLength.xml |   15 -
 ...DirectoryAndIntermediateNumberWithoutLength.xml |   14 -
 ...thSourceDirectoryAndIntermediateStrategyRef.xml |   14 -
 .../relyingparty/metadata/multipleResolvers.xml    |   33 -
 .../spring/relyingparty/metadata/nodeproc/both.xml |   28 -
 .../relyingparty/metadata/nodeproc/empty.xml       |   23 -
 .../spring/relyingparty/metadata/parent.xml        |   31 -
 .../spring/relyingparty/metadata/resourceRef.xml   |    7 -
 .../spring/relyingparty/metadata/serviceBeans.xml  |   41 -
 .../profile/spring/relyingparty/reload/beans.xml   |   45 -
 .../spring/relyingparty/reload/chainingbeans.xml   |   45 -
 .../relyingparty/reload/chainingmetadata.xml       |   20 -
 .../profile/spring/relyingparty/reload/entity.xml  |   13 -
 .../spring/relyingparty/reload/metadata.xml        |   10 -
 .../security/credential/aes-base64.txt             |    1 -
 .../security/credential/aes-binary.data            |    1 -
 .../relyingparty/security/credential/aes-hex.txt   |    1 -
 .../relyingparty/security/credential/cert.pem      |   22 -
 .../security/credential/certificate.pem            |   52 -
 .../relyingparty/security/credential/crl.pem       |   19 -
 .../security/credential/inlineCertOnly.xml         |   30 -
 .../security/credential/inlineKeyCertCrl.xml       |  128 -
 .../security/credential/inlinePublicOnly.xml       |   17 -
 .../security/credential/inlinePublicPrivate.xml    |   48 -
 .../security/credential/inlineWrongCert.xml        |   87 -
 .../relyingparty/security/credential/key.pem       |   27 -
 .../relyingparty/security/credential/publicKey.pem |    9 -
 .../security/credential/resourceBasic.xml          |    8 -
 .../credential/resourceCertElementsKeyName.xml     |   10 -
 .../security/credential/resourceCertOnly.xml       |    8 -
 .../security/credential/resourceKeyCertCrl.xml     |   11 -
 .../security/credential/resourcePublicOnly.xml     |    9 -
 .../security/credential/resourcePublicPrivate.xml  |    9 -
 .../credential/resourceSecretAESBase64.xml         |    9 -
 .../credential/resourceSecretAESBinary.xml         |    9 -
 .../security/credential/resourceSecretAESHex.xml   |    9 -
 .../security/credential/resourceTwoCert.xml        |    8 -
 .../security/credential/resourceWrongCert.xml      |    9 -
 .../security/credential/resourceWrongPublic.xml    |    9 -
 .../security/credential/resourceX509.xml           |    8 -
 .../security/credential/secretKeyAESBase64.xml     |   11 -
 .../security/credential/secretKeyAESHex.xml        |   11 -
 .../security/credential/wrongPublicKey.pem         |    6 -
 .../relyingparty/security/trustengine/cert.pem     |   22 -
 .../relyingparty/security/trustengine/chain.xml    |   41 -
 .../security/trustengine/chainingTrue.xml          |   18 -
 .../security/trustengine/chainingTrueFalse.xml     |   22 -
 .../relyingparty/security/trustengine/crl.pem      |   19 -
 .../security/trustengine/inlineValidationInfo.xml  |    5 -
 .../trustengine/inlineValidationInfoValues.xml     |   77 -
 .../trustengine/resourceValidationInfo.xml         |    5 -
 .../trustengine/resourceValidationInfoValues.xml   |   10 -
 .../security/trustengine/staticExplicit.xml        |   30 -
 .../security/trustengine/staticExplicitNative.xml  |   31 -
 .../trustengine/staticExplicitSignature.xml        |   30 -
 .../trustengine/staticPKIX-nameCheckDisabled.xml   |    8 -
 .../security/trustengine/staticPKIX.xml            |    8 -
 .../staticPKIXCredentials-nameCheckDisabled.xml    |   18 -
 .../security/trustengine/staticPKIXCredentials.xml |   19 -
 .../security/trustengine/staticPKIXValues.xml      |   16 -
 .../trustengine/staticPKIXValuesCertPathOpts.xml   |   19 -
 .../security/trustengine/validationOptions.xml     |    5 -
 .../trustengine/validationOptionsValues.xml        |    7 -
 .../spring/relyingparty/test-metadata-in.xml       |  165 -
 .../spring/relyingparty/test-metadata-out.xml      |  219 -
 idp-saml-api/.classpath                            |    6 +-
 idp-saml-api/.project                              |   13 +
 idp-saml-api/.settings/org.eclipse.jdt.core.prefs  |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-saml-api/pom.xml                               |   17 +-
 .../AbstractSAML1AttributeTranscoder.java          |  187 -
 .../AbstractSAML2AttributeTranscoder.java          |  188 -
 .../AbstractSAMLAttributeTranscoder.java           |  284 --
 .../transcoding/SAML1AttributeTranscoder.java      |   46 -
 .../transcoding/SAML2AttributeTranscoder.java      |   49 -
 .../attribute/transcoding/SAMLEncoderSupport.java  |  224 -
 .../saml/attribute/transcoding/package-info.java   |   22 -
 .../shibboleth/idp/saml/metadata/ACSUIInfo.java    |  108 -
 .../shibboleth/idp/saml/metadata/IdPUIInfo.java    |  261 --
 .../idp/saml/metadata/OrganizationUIInfo.java      |  146 -
 .../idp/saml/metadata/ScopesContainer.java         |  104 -
 .../shibboleth/idp/saml/metadata/package-info.java |   24 -
 .../idp/saml/security/KeyAuthoritySupport.java     |  182 -
 .../shibboleth/idp/saml/security/package-info.java |   21 -
 .../net/shibboleth/idp/saml/xml/SAMLConstants.java |   39 -
 .../net/shibboleth/idp/saml/xml/package-info.java  |   22 -
 .../idp/saml/xmlobject/ExtensionsConstants.java    |   35 -
 .../idp/saml/xmlobject/KeyAuthority.java           |   61 -
 .../net/shibboleth/idp/saml/xmlobject/Scope.java   |   66 -
 .../shibboleth/idp/saml/xmlobject/ScopedValue.java |   76 -
 .../idp/saml/xmlobject/package-info.java           |   20 -
 .../src/main/resources/META-INF/spring.schemas     |   17 -
 .../resources/schema/shibboleth-metadata-1.0.xsd   |   37 -
 .../transcoding/SAMLEncoderSupportTest.java        |  348 --
 .../idp/saml/metadata/ACSUIInfoTest.java           |   57 -
 .../idp/saml/metadata/IdPUIInfoTest.java           |   63 -
 .../idp/saml/metadata/OrganizationUIInfoTest.java  |   59 -
 .../idp/saml/metadata/ScopesContainerTest.java     |   76 -
 .../logic}/EntityAttributesPredicateTest.java      |   12 +-
 .../profile/logic}/attribute-mapping-metadata.xml  |    0
 .../profile/logic}/attribute-registry-service.xml  |    8 +-
 .../idp/saml/profile/logic}/attribute-registry.xml |    4 +-
 .../idp/saml/profile/logic}/rules/subjectid.txt    |    0
 .../idp/saml/profile/logic}/rules/zorkmids.txt     |    0
 idp-saml-impl/.classpath                           |    6 +-
 idp-saml-impl/.project                             |   13 +
 idp-saml-impl/.settings/org.eclipse.jdt.core.prefs |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-saml-impl/pom.xml                              |   80 +-
 .../impl/AbstractPersistentIdDataConnector.java    |  225 -
 .../SAML1NameIdentifierAttributeDefinition.java    |  226 -
 .../impl/SAML2NameIDAttributeDefinition.java       |  263 --
 .../saml/attribute/resolver/impl/package-info.java |   23 -
 .../impl/SAML1ByteAttributeTranscoder.java         |   94 -
 .../impl/SAML1ScopedStringAttributeTranscoder.java |  133 -
 .../impl/SAML1StringAttributeTranscoder.java       |   78 -
 .../impl/SAML1XMLObjectAttributeTranscoder.java    |   97 -
 .../impl/SAML2ByteAttributeTranscoder.java         |   94 -
 .../impl/SAML2ScopedStringAttributeTranscoder.java |  134 -
 .../impl/SAML2StringAttributeTranscoder.java       |   78 -
 .../impl/SAML2XMLObjectAttributeTranscoder.java    |   97 -
 .../attribute/transcoding/impl/package-info.java   |   22 -
 .../impl/AttributeMappingNodeProcessor.java        |  232 --
 .../impl/ByReferenceMetadataFilterBridge.java      |   89 -
 .../impl/MetadataResolverServiceGaugeSet.java      |  281 --
 .../ReloadingRelyingPartyMetadataProvider.java     |  163 -
 .../saml/metadata/impl/ScopesNodeProcessor.java    |   82 -
 .../saml/metadata/impl/UIInfoNodeProcessor.java    |   53 -
 .../idp/saml/metadata/impl/package-info.java       |   23 -
 ...estedAttributesInAttributeConsumingService.java |    2 +-
 .../security/impl/KeyAuthorityNodeProcessor.java   |  131 -
 .../MetadataPKIXValidationInformationResolver.java |  439 --
 .../idp/saml/security/impl/package-info.java       |   21 -
 .../saml/xmlobject/impl/KeyAuthorityBuilder.java   |   45 -
 .../idp/saml/xmlobject/impl/KeyAuthorityImpl.java  |   95 -
 .../xmlobject/impl/KeyAuthorityMarshaller.java     |   46 -
 .../xmlobject/impl/KeyAuthorityUnmarshaller.java   |   67 -
 .../idp/saml/xmlobject/impl/ScopeBuilder.java      |   45 -
 .../idp/saml/xmlobject/impl/ScopeImpl.java         |   93 -
 .../idp/saml/xmlobject/impl/ScopeMarshaller.java   |   51 -
 .../idp/saml/xmlobject/impl/ScopeUnmarshaller.java |   55 -
 .../saml/xmlobject/impl/ScopedValueBuilder.java    |   34 -
 .../idp/saml/xmlobject/impl/ScopedValueImpl.java   |   91 -
 .../saml/xmlobject/impl/ScopedValueMarshaller.java |   51 -
 .../xmlobject/impl/ScopedValueUnmarshaller.java    |   52 -
 .../impl/XMLObjectProviderInitializer.java         |   37 -
 .../idp/saml/xmlobject/impl/package-info.java      |   20 -
 .../services/org.opensaml.core.config.Initializer  |    1 -
 .../main/resources/shibboleth-saml-ext-config.xml  |   29 -
 .../impl/SAML1ByteAttributeTranscoderTest.java     |  388 --
 .../SAML1ScopedStringAttributeTranscoderTest.java  |  372 --
 .../impl/SAML1StringAttributeTranscoderTest.java   |  328 --
 .../impl/SAML2ByteAttributeTranscoderTest.java     |  425 --
 .../SAML2ScopedStringAttributeTranscoderTest.java  |  397 --
 .../impl/SAML2StringAttributeTranscoderTest.java   |  364 --
 .../SAML2XMLObjectAttributeTranscoderTest.java     |  427 --
 .../saml/metadata/impl/BaseNodeProcessorTest.java  |   60 -
 .../metadata/impl/ScopesNodeProcessorTest.java     |  100 -
 .../metadata/impl/UIInfoNodeProcessorTest.java     |   96 -
 .../impl/KeyAuthorityNodeProcessorTest.java        |   91 -
 ...adataPKIXValidationInformationResolverTest.java |  363 --
 .../idp/saml/xmlobject/impl/KeyAuthorityTest.java  |  130 -
 .../idp/saml/xmlobject/impl/ScopeTest.java         |  118 -
 .../idp/saml/xmlobject/impl/ScopedValueTest.java   |  107 -
 idp-schema/.classpath                              |    1 +
 idp-schema/.project                                |   13 +
 idp-schema/.settings/org.eclipse.jdt.core.prefs    |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../src/main/resources/META-INF/spring.schemas     |   50 -
 .../resources/schema/shibboleth-afp-mf-basic.xsd   |  394 --
 .../resources/schema/shibboleth-afp-mf-saml.xsd    |  394 --
 .../src/main/resources/schema/shibboleth-afp.xsd   |  983 -----
 .../schema/shibboleth-attribute-encoder.xsd        |  222 -
 .../schema/shibboleth-attribute-resolver-ad.xsd    |  376 --
 .../schema/shibboleth-attribute-resolver-dc.xsd    |  860 ----
 .../schema/shibboleth-attribute-resolver-pc.xsd    |   82 -
 .../schema/shibboleth-attribute-resolver.xsd       | 2235 ----------
 .../main/resources/schema/shibboleth-metadata.xsd  | 1437 -------
 .../main/resources/schema/shibboleth-security.xsd  |  612 ---
 idp-session-api/.classpath                         |    1 +
 idp-session-api/.project                           |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-session-impl/.classpath                        |    1 +
 idp-session-impl/.project                          |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 .../.checkstyle                                    |    0
 {idp-attribute-api => idp-spring}/.classpath       |    8 +-
 {idp-attribute-api => idp-spring}/.gitignore       |    0
 {idp-attribute-impl => idp-spring}/.project        |   12 +-
 .../.settings/org.eclipse.core.resources.prefs     |    0
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |    0
 .../.settings/org.eclipse.m2e.core.prefs           |    0
 .../.settings/org.eclipse.wst.common.component     |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 {idp-profile-api => idp-spring}/pom.xml            |   93 +-
 .../factory/BasicX509CredentialFactoryBean.java    |   24 +-
 .../factory/FlowDefinitionRegistryFactoryBean.java |    0
 .../factory/FlowDefinitionResourceFactory.java     |    0
 .../spring/factory/FlowModelFlowBuilder.java       |    0
 .../spring/factory/FlowRelativeResourceLoader.java |    0
 .../spring/factory/LocalFlowBuilderContext.java    |    0
 .../profile/spring/factory/SubflowExpression.java  |    0
 .../idp/profile/spring/factory/package-info.java   |    0
 .../factory/FlowRelativeResourceLoaderTest.java    |    0
 .../idp/profile/spring/logic/DummyPredicate.java   |    0
 .../spring/logic/RelyingPartyIdPredicateTest.java  |    0
 .../src/test/resources/logback-test.xml            |    0
 .../idp/profile/spring/factory/idp1833-beans.xml   |    0
 .../spring/factory/idp1833-flow-example.xml        |    0
 .../spring/logic/relyingPartyIdPredicates.xml      |    3 +-
 idp-tests-bom/pom.xml                              |   67 +-
 idp-ui/.classpath                                  |    1 +
 idp-ui/.project                                    |   13 +
 idp-ui/.settings/org.eclipse.jdt.core.prefs        |   30 +-
 idp-ui/.settings/org.eclipse.wst.common.component  |    6 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    5 +
 idp-ui/pom.xml                                     |   15 +-
 idp-war-distribution/.classpath                    |    1 +
 idp-war-distribution/.project                      |   14 +
 idp-war-distribution/.settings/.jsdtscope          |   13 +
 .../.settings/org.eclipse.jdt.core.prefs           |   30 +-
 .../.settings/org.eclipse.wst.common.component     |   15 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    7 +
 .../org.eclipse.wst.jsdt.ui.superType.container    |    1 +
 .../org.eclipse.wst.jsdt.ui.superType.name         |    1 +
 idp-war/.classpath                                 |    1 +
 idp-war/.project                                   |    8 +
 idp-war/.settings/.jsdtscope                       |   13 +
 idp-war/.settings/org.eclipse.core.resources.prefs |    2 -
 idp-war/.settings/org.eclipse.jdt.core.prefs       |   30 +-
 idp-war/.settings/org.eclipse.wst.common.component |  200 +
 .../org.eclipse.wst.common.project.facet.core.xml  |    7 +
 .../org.eclipse.wst.jsdt.ui.superType.container    |    1 +
 .../org.eclipse.wst.jsdt.ui.superType.name         |    1 +
 idp-war/pom.xml                                    |   93 +-
 1610 files changed, 2043 insertions(+), 118279 deletions(-)
 create mode 100644 idp-admin-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-admin-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-admin-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-admin-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-attribute-api/.checkstyle
 delete mode 100644 idp-attribute-api/.project
 delete mode 100644 idp-attribute-api/pom.xml
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecodingException.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeEncodingException.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeException.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributesMapContainer.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ByteAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/DurablePairwiseIdStore.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPRequestedAttribute.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseId.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseIdStore.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ScopedStringAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/UnsupportedAttributeTypeException.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/package-info.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/package-info.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AbstractAttributeTranscoder.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoder.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoderRegistry.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/BasicNamingFunction.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscoderSupport.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscodingRule.java
 delete mode 100644 idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/package-info.java
 delete mode 100644 idp-attribute-api/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ByteAttributeValueTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/EmptyAttributeValueTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/RequestedAttributeTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedStringAttributeValueTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/StringAttributeValueTest.java
 delete mode 100644 idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java
 delete mode 100644 idp-attribute-api/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-filter-api/.checkstyle
 delete mode 100644 idp-attribute-filter-api/.classpath
 delete mode 100644 idp-attribute-filter-api/.gitignore
 delete mode 100644 idp-attribute-filter-api/.project
 delete mode 100644 idp-attribute-filter-api/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-filter-api/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-filter-api/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-filter-api/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-filter-api/pom.xml
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterException.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/BaseBridgingClass.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java
 delete mode 100644 idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/package-info.java
 delete mode 100644 idp-attribute-filter-api/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeRuleTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicyTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherIdTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockMatcher.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/MockPolicyRequirementRule.java
 delete mode 100644 idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/testing/package-info.java
 delete mode 100644 idp-attribute-filter-api/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-filter-impl/.checkstyle
 delete mode 100644 idp-attribute-filter-impl/.classpath
 delete mode 100644 idp-attribute-filter-impl/.gitignore
 delete mode 100644 idp-attribute-filter-impl/.project
 delete mode 100644 idp-attribute-filter-impl/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-filter-impl/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-filter-impl/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-filter-impl/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-filter-impl/pom.xml
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeScopeMatchesShibMDScope.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeValueMatchesShibMDScope.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractRegexpPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractStringPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/DirectionPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributePolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityAttributeRegexPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractEntityGroupPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractNameIDFormatExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AbstractRegistrationAuthorityPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterEntityAttributeRegexPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterInEntityGroupPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/ProxiedRequesterRegistrationAuthorityPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityPolicyRule.java
 delete mode 100644 idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/package-info.java
 delete mode 100644 idp-attribute-filter-impl/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractMatcherPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractRegexpStringMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AbstractStringMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeRegexpMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeScopeStringMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/DataSources.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/MockValuePredicateMatcher.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AndMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/NotMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/MappedAttributeInMetadataMatcherTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProxiedRequesterRegexpPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AndPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/NotPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/OrPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/BaseMetadataTests.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeExactPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerEntityAttributeRegexPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerInEntityGroupPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerNameIDFormatExactPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/IssuerRegistrationAuthorityTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeExactPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterEntityAttributeRegexPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterInEntityGroupPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterNameIDFormatExactPolicyRuleTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RequesterRegistrationAuthorityTest.java
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uid.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/epa-uidwithjsmith.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/complex/uid-epawithjsmith.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/mdrpi-metadata.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/orphan.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibboleth.net-metadata.xml
 delete mode 100644 idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibmd-metadata.xml
 delete mode 100644 idp-attribute-filter-spring/.classpath
 delete mode 100644 idp-attribute-filter-spring/.gitignore
 delete mode 100644 idp-attribute-filter-spring/.project
 delete mode 100644 idp-attribute-filter-spring/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-filter-spring/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-filter-spring/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-filter-spring/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-filter-spring/pom.xml
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AndMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AnyParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/NotMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/OrMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/ScriptedMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterNamespaceHandler.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyGroupParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterServiceStrategy.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AbstractRegexMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AbstractStringMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AttributeScopeMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AttributeScopeRegexMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AttributeValueRegexMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/AttributeValueStringMatcherParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/impl/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AbstractRegexPolicyRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AbstractStringPolicyRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AttributeIssuerRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AttributeIssuerRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AttributeRequesterRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/AttributeRequesterRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/InboundRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/NumOfAttributeValuesRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/OutboundRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PrincipalNameRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PrincipalNameRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/ProfileRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/ProxiedRequesterRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/ProxiedRequesterRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractEntityAttributeExactRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractEntityAttributeRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractEntityAttributeRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractEntityGroupRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractNameIDFormatRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AbstractRegistrationAuthorityRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeInMetadataRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeExactRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerEntityAttributeRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerInEntityGroupRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerNameIDFormatRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/IssuerRegistrationAuthorityRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/MappedAttributeInMetadataRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeExactRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterEntityAttributeRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterInEntityGroupRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ProxiedRequesterRegistrationAuthorityRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeExactRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterEntityAttributeRegexRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterInEntityGroupRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterNameIDFormatRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/RequesterRegistrationAuthorityRuleParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ScopeMatchesShibMDScopeParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/ValueMatchesShibMDScopeParser.java
 delete mode 100644 idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/main/resources/META-INF/spring.handlers
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AndTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/AnyTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/Implicit.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/NotTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/OrTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/basic/ScriptedTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeRegexMatcherParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeMatcherParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeScopeRegexMatcherParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeIssuerRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/DataSources.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/InboundRuleTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/OutboundRuleTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PrincipalNameRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProfileRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/ProxiedRequesterRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerEntityAttributeExactRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerEntityAttributeRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerInEntityGroupRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerNameIDFormatRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/IssuerRegistrationAuthorityRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/MappedAttributeInMetadataRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeExactRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterEntityAttributeRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterInEntityGroupRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ProxiedRequesterRegistrationAuthorityRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeExactRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterEntityAttributeRegexRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterInEntityGroupRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterNameIDFormatRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/RequesterRegistrationAuthorityRuleParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ScopeMatchesMDTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/ValueMatchesMDTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/BaseAttributeFilterParserTest.java
 delete mode 100644 idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/testing/package-info.java
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uid.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/epa-uidwithjsmith.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/attribute/uid-epawithjsmith.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/and.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andMulti.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/andSingleton.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/any.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegex.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRegexCaseInsensitive.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScope.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeBoth.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeDefault.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeDeprecated.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeScopeRegex.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueEmptyCaseSensitive.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueId.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValueNoId.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/attributeValuePropertyCaseSensitive.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/customBean.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/implicit.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mappedInMetadata.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mdscope.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/mdvalue.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/not.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/or.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/orSingleton.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/proxiedRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted-rhino.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/scripted.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/and.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/andSingleton.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/any.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeIssuer.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRegexRequesterCaseInsensitive.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequesterBoth.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequesterDefault.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeRequesterDeprecated.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueId.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/attributeValueNoId.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/file.script.rhino
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/inbound.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerAuthorityOne.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerAuthorityTwo.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerEA2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerEA3.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerEARegex2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerEG2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerNameId2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/issuerRegex.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/not.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/numberAttrValues.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/or.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/orSingleton.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/outbound.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate1.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicate2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateRp.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalName.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/principalNameRegex.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/profile.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRegexRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedRequester.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityOne.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedregistrationAuthorityTwo.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEA2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEARegex2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/proxiedrequesterEG2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityOne.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/registrationAuthorityTwo.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEA2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEARegex2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterEG2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/requesterNameId2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted-rhino.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scripted.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/scriptedNotThere.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny1.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/deny2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy2.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy3.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy4.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policy5.xml
 delete mode 100644 idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/spring/policyAll.xml
 delete mode 100644 idp-attribute-impl/.checkstyle
 delete mode 100644 idp-attribute-impl/.classpath
 delete mode 100644 idp-attribute-impl/.gitignore
 delete mode 100644 idp-attribute-impl/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-impl/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-impl/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-impl/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-impl/pom.xml
 delete mode 100644 idp-attribute-impl/src/main/java/.gitkeep
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStore.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/package-info.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeRegistryServiceStrategy.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImpl.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
 delete mode 100644 idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/package-info.java
 delete mode 100644 idp-attribute-impl/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-impl/src/test/java/.gitkeep
 delete mode 100644 idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/ComputedPairwiseIdStoreTest.java
 delete mode 100644 idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStoreTest.java
 delete mode 100644 idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
 delete mode 100644 idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/PairTranscoder.java
 delete mode 100644 idp-attribute-impl/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-impl/src/test/resources/net/shibboleth/idp/attribute/impl/DeleteStore.sql
 delete mode 100644 idp-attribute-impl/src/test/resources/net/shibboleth/idp/attribute/impl/StoredIdStore.sql
 delete mode 100644 idp-attribute-resolver-api/.checkstyle
 delete mode 100644 idp-attribute-resolver-api/.classpath
 delete mode 100644 idp-attribute-resolver-api/.gitignore
 delete mode 100644 idp-attribute-resolver-api/.project
 delete mode 100644 idp-attribute-resolver-api/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-resolver-api/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-resolver-api/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-resolver-api/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-resolver-api/pom.xml
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/MultipleResultAnErrorResolutionException.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/NoResultAnErrorResolutionException.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolutionException.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverAttributeDefinitionDependency.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AbstractAttributeResolutionLookupFunction.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributePrincipalLookupFunction.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeRecipientIdLookupFunction.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/ResolutionLabelLookupFunction.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/AbstractMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ExecutableSearch.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ExecutableSearchBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/MappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/NonFailFastValidator.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ValidationException.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/Validator.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/HTTPResponseMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/HTTPSearch.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/AbstractExecutableSearchFilterBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/ExecutableSearchFilter.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/SearchResultMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/StringAttributeValueMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/AbstractExecutableStatementBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/ExecutableStatement.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/FormatExecutableStatementBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/ResultMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/StringResultMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/TemplatedExecutableStatementBuilder.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/StorageMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/StorageServiceSearch.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeRecipientIdPredicate.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/logic/ResolutionLabelPredicate.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/logic/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java
 delete mode 100644 idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupportTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/MockStaticDataConnector.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/ResolverTestSupport.java
 delete mode 100644 idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/testing/package-info.java
 delete mode 100644 idp-attribute-resolver-api/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-resolver-impl/.checkstyle
 delete mode 100644 idp-attribute-resolver-impl/.classpath
 delete mode 100644 idp-attribute-resolver-impl/.gitignore
 delete mode 100644 idp-attribute-resolver-impl/.project
 delete mode 100644 idp-attribute-resolver-impl/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-resolver-impl/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-resolver-impl/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-resolver-impl/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-resolver-impl/pom.xml
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexSplitAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValue.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/TemplatedBodyBuilder.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/TemplatedURLBuilder.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/PairwiseIdDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/DataSourceValidator.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/ScriptedStorageMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/SimpleStorageMappingStrategy.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/TemplatedSearchBuilder.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverServiceGaugeSet.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/main/resources/.gitkeep
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/DecryptedAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/LogicTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalNameAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/StaticAttributeDefinitionTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/SourceValueTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMapTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StaticDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/StoredIDDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SubjectDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/TestCache.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/SAMLAttributeDataConnector.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/testing/package-info.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnectorTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/SealerKeyStore.jks
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/SealerKeyStore.kver
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/addAfterGetValues.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/attributes2.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/custom.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.attribute.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example1.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.attribute.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example2.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.2.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.attribute.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example3.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.2.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.3.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.attribute.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/example4.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail1.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail2.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail4.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail5.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/fail6.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/logging.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/nullValue.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContext.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simple2.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/simpleWithPredef.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/ad/subjects.script
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/DeleteStore.sql
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/custom.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/entityAttributes.xml
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/error.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/repo-entity.crt
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/test.json
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/http/testsize.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTestEmpty.ldif
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsData.sql
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/RdbmsStore.sql
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.js
 delete mode 100644 idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/storage/test.json
 delete mode 100644 idp-attribute-resolver-spring/.checkstyle
 delete mode 100644 idp-attribute-resolver-spring/.classpath
 delete mode 100644 idp-attribute-resolver-spring/.gitignore
 delete mode 100644 idp-attribute-resolver-spring/.project
 delete mode 100644 idp-attribute-resolver-spring/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-attribute-resolver-spring/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-attribute-resolver-spring/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-attribute-resolver-spring/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-attribute-resolver-spring/pom.xml
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginDependencyParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/DecryptedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/PairwiseIdDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StaticDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseSAML1AttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseSAML2AttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AbstractResolverPluginFactoryBean.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/InputAttributeDefinitionParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/InputDataConnectorParser.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/main/resources/META-INF/spring.handlers
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMappingNodeProcessorTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/IdP1676Test.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/CacheConfigParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIdDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ScriptDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIdDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/SubjectDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/StorageServiceDataConnectorParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseAttributeDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/BaseEncoderDefinitionParserTest.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/testing/package-info.java
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/logback-test.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/RdbmsStore.sql
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBad.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverGood.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverLDAP.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverRDBMS.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverStored.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/withAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsData.sql
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/RdbmsStore.sql
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.jks
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/SealerKeyStore.kver
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/file.script
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/empty.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoValueMap.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/multiDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes1.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueAttributes2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueBoth.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueDeprecated.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueEmptyCase.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValueEmptyPartial.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoSourceValue.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMapNoValues.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/excludeRelyingParties.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/excludeResolutionPhases.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/phasesAndParties.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWith.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWithout.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/principalName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexInsensitive.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexNone.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexSensitive.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/relyingParties.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/resolutionPhases.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml1NameIdDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml1NameIdentifierAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml2NameIdAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml2NameIdDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scoped.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scopedBoth.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scopedSource.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeAbsent.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeBad.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDupl.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDuplFile.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFile.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFileMissing.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeInline.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeBadValues.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeUnpopulated.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateNoAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateTwoTemplate.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-preresolve.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-preresolve2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective-navigate.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver-selective.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/IdP338.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheElementTimeToLive.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheExpireAfterAccess.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheExpireAfterWrite.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ResultCacheExpireBoth.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/client.crt
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/client.key
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-spring-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-badprotocol.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-body.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-ca.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-clientcert.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-hybrid.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-missingok.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/spring-beans.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.keystore
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.pkcs12
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.pkcs8
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldapDataConnectorTest.ldif
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring-props.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-spring.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-authenticationType.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-hybrid.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-minimal-pool.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-minimal.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-props.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-referral.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap.crt
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.crt
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.key
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.keystore
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.pkcs12
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/server.pkcs8
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-v2.properties
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-v3.properties
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring-props.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-spring.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-hybrid.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-props.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2-simple.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computed.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedDataConnector.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource1.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedProperty.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/containerManagedConnection.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeBoth.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeNone.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyFiles.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyScripts.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybrid.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/stored.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedBeanManaged.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/storedNoSalt.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/subjectAttributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/subjectAttributesNull.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributesNative.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/spring-beans.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/storage-attribute-resolver-spring-context.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/storage-attribute-resolver-v2-hybrid.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/storage-attribute-resolver-v2-simple.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/storage-attribute-resolver-v2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64Default.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64NoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Scoped.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1String.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObject.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64NoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Scoped.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2String.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObject.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectNoName.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idStore.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idStore2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-resolver.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputAttributeDefinition1.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector1.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector3.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/inputDataConnector4.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ldapDataConnectorTest.ldif
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplate.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mappedTemplateService.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileService.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service2.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/serviceNullStrip.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
 delete mode 100644 idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/velocity2.xml
 create mode 100644 idp-authn-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-authn-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-authn-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-authn-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 rename {idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad => idp-authn-impl/src/main/java/net/shibboleth/idp/authn/context}/impl/IdPAttributePrincipalValuesFunction.java (98%)
 rename {idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad => idp-authn-impl/src/main/java/net/shibboleth/idp/authn/context}/impl/SubjectDerivedAttributeValuesFunction.java (93%)
 create mode 100644 idp-authn-impl/src/main/java/net/shibboleth/idp/authn/context/impl/SubjectScriptContextExtender.java
 rename {idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context => idp-authn-impl/src/main/java/net/shibboleth/idp/authn/context/impl}/package-info.java (88%)
 rename idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java => idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/ContextDerivedAttributeDefinitionParserTest.java (85%)
 rename idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java => idp-authn-impl/src/test/java/net/shibboleth/idp/authn/context/impl/SubjectDerivedAttributeValuesFunctionTest.java (97%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/contextDerived.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerived.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerivedComplex.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerivedDependency.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerivedFail.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerivedViaC14N.xml (100%)
 rename {idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver => idp-authn-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad}/subjectDerivedWarn.xml (100%)
 rename {idp-attribute-resolver-spring => idp-authn-impl}/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/contextDerivedBeans.xml (88%)
 rename {idp-attribute-resolver-spring => idp-authn-impl}/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml (92%)
 create mode 100644 idp-cas-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-cas-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-cas-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-cas-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-conf-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-conf-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-conf/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-conf/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-consent-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-consent-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-consent-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-consent-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-core/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-core/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java
 delete mode 100644 idp-core/src/main/java/net/shibboleth/idp/metrics/package-info.java
 create mode 100644 idp-profile-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-profile-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-profile-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-profile-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-profile-spring/.checkstyle
 delete mode 100644 idp-profile-spring/.classpath
 delete mode 100644 idp-profile-spring/.gitignore
 delete mode 100644 idp-profile-spring/.project
 delete mode 100644 idp-profile-spring/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 idp-profile-spring/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 idp-profile-spring/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 idp-profile-spring/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 idp-profile-spring/pom.xml
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractBasicCredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractCredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/AbstractX509CredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicInlineCredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicResourceCredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicX509CredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticPKIXFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/X509InlineCredentialFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataProviderContainer.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ScriptTypeBeanParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/AlgorithmFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/ByReferenceParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/DeprecatedEntityRoleFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntitiesDescriptorNameParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityAttributesFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityRoleFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/KeyAuthorityParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NameIDFormatFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NodeProcessingParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterDirectionFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationCriteriaSetFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ByReferenceFilterBeanPostProcessor.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ChainingMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/DynamicHTTPMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileBackedHTTPMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FileCachingHttpClientFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/FilesystemMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InMemoryCachingHttpClientFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/InlineMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/NodeProcessingAttachingBeanPostProcessor.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ResourceBackedMetadataProviderParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractBasicCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/AbstractX509CredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicInlineCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509InlineCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/SecurityNamespaceHandler.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/AbstractBasicPKIXValidationInfoFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/AbstractChainingParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/AbstractPKIXValidationInfoParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/AbstractStaticPKIXParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/AbstractTrustEngineParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/CertPathPKIXValidationOptionsParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/ChainingParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/ChainingSignatureTrustEngineFactory.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/ChainingTrustEngineFactory.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXInlineValidationInfoParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXResourceValidationInfoParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/PKIXValidationOptionsParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/SignatureChainingParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeySignatureParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXSignatureParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticPKIXX509CredentialParser.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/impl/HTTPResourceFactoryBean.java
 delete mode 100644 idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/resource/impl/package-info.java
 delete mode 100644 idp-profile-spring/src/main/resources/META-INF/spring.handlers
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/factory/BasicX509CredentialFactoryBeanTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/factory/StaticPKIXFactoryBeanTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/AbstractFailFastTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/FilterFailFastTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/MetadataFailFastTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ChainingMetadataParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/EmptyChainService.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FilesystemMetadataParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InlineMetadataParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/LocalDynamicMetadataProviderParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadMetadataTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadServiceConfigurationTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ResourceMetadataParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/AlgorithmFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/ByReferenceFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityAttributesFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/EntityRoleFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/NameIDFormatFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/NodeProcessingTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/PredicateFilterParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/RequiredValidUntilParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationCriteriaSetFactoryBeanTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicInlineParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/BasicResourceParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509FilesystemParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/X509InlineParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingTrustEngineTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXFilesystemParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXInlineParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/PKIXValidationOptionsParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/SignatureChainingParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeyFactoryBeanTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeyParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeySignatureParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticPKIXSignatureParserTest.java
 delete mode 100644 idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticPKIXX509CredentialParserTest.java
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/bean.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/idp-signing.crt
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/idp-signing.key
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/idp-signing.key.pass
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/static-pkix-factory-custom-failsValidation.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/static-pkix-factory-custom-success.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/factory/static-pkix-factory-defaults.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/attributeFilterBad.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/attributeFilterBadScript.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/attributeFilterGood.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/fileMetadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/filterBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/filterBeansDefaultFF.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/httpMetadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/inLineMetadataBad.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/inLineMetadataGood.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/metadataBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/metadataBeansDefaultFF.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/metadataFileBad.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/failfast/metadataFileGood.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResources.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/chain2.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/document.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-file.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-memory.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-httpCaching-none.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-noTrustEngine.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-explicitKey.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-invalidKey.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-invalidPKIX.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-validPKIX-explicitTrustedName.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamic-https-trustEngine-validPKIX.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicBasicParams.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicClientSecurityParams.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicDefaults.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicIndexes.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicMaxConnections.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicMetadataQueryProtocol.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicMetadataQueryProtocolWithContentTypeOverride.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicMetadataQueryProtocolWithSecondaryURLBuilders.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicPersistentCacheBean.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicPersistentCacheDirectory.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicRegex.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicTemplate.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicTimeouts.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicWellKnown.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain-svc.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/empty-chain.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntities.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntityBadIFBF.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBackedHTTPEntityDisRegardTLSBad.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileBadRVPO.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntities.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/fileEntity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filePredicatesDefaults.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filePredicatesNoDefaultRegistry.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filePredicatesOptions.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithm.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithmBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithmConditionScript.js
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithmWithScript.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/algorithmWithScriptResource.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributes.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesAttributeFilterScript.js
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesByRef.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesByRefBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesConditionScript.js
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesMetadataOnly.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScript.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityAttributesWithScriptResource.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityRole.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityRoleParams.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/entityTrueResolver.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/metadata.switchaai_signed.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormat.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/nameIDFormatWithScript.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateBadDirection.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateCustomBean.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateEmpty.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateEntity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateGroup.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateMappedTag.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateOr.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateScript.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateScriptCustom.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateScriptOr.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/predicateTag.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntil.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParam.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/requiredValidUntilParamNonDuration.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidation.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidationRefs-beans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidationRefs.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signature-config-custom.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signature-config-defaults.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs-beans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingCertCheck.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingNoCertCheck.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingNone.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-file.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline-filter.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entities-client.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-file.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-memory.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-none.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-proxy.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-timeouts.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-explicitKey.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidKey.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/idp.example.org.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineChain.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntities2.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/inLineEntityBadRVPO.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicDefaults.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicMissingSourceManagerAndSourceDirectory.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithManagerAndGenerator.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectory.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectoryAndIntermediateLengthWithoutNumber.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectoryAndIntermediateNumberAndLength.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectoryAndIntermediateNumberWithoutLength.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectoryAndIntermediateStrategyRef.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/multipleResolvers.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/nodeproc/both.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/nodeproc/empty.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/parent.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/resourceRef.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/serviceBeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/chainingbeans.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/chainingmetadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/aes-base64.txt
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/aes-binary.data
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/aes-hex.txt
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/certificate.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/crl.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineCertOnly.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineKeyCertCrl.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicOnly.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlinePublicPrivate.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/inlineWrongCert.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/key.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceBasic.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertElementsKeyName.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceCertOnly.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceKeyCertCrl.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicOnly.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourcePublicPrivate.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBase64.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESBinary.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceSecretAESHex.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceTwoCert.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongCert.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceWrongPublic.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/resourceX509.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/secretKeyAESBase64.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/secretKeyAESHex.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/credential/wrongPublicKey.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/cert.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chain.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chainingTrue.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/chainingTrueFalse.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/crl.pem
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfo.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/inlineValidationInfoValues.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfo.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/resourceValidationInfoValues.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitSignature.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX-nameCheckDisabled.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIX.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials-nameCheckDisabled.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXCredentials.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValues.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticPKIXValuesCertPathOpts.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptions.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/validationOptionsValues.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-in.xml
 delete mode 100644 idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/test-metadata-out.xml
 create mode 100644 idp-saml-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-saml-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML1AttributeTranscoder.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAML2AttributeTranscoder.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/AbstractSAMLAttributeTranscoder.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAML1AttributeTranscoder.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAML2AttributeTranscoder.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupport.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/package-info.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ACSUIInfo.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/IdPUIInfo.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfo.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/ScopesContainer.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/package-info.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/security/KeyAuthoritySupport.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/security/package-info.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xml/SAMLConstants.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xml/package-info.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/KeyAuthority.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/Scope.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java
 delete mode 100644 idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/package-info.java
 delete mode 100644 idp-saml-api/src/main/resources/META-INF/spring.schemas
 delete mode 100644 idp-saml-api/src/main/resources/schema/shibboleth-metadata-1.0.xsd
 delete mode 100644 idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/SAMLEncoderSupportTest.java
 delete mode 100644 idp-saml-api/src/test/java/net/shibboleth/idp/saml/metadata/ACSUIInfoTest.java
 delete mode 100644 idp-saml-api/src/test/java/net/shibboleth/idp/saml/metadata/IdPUIInfoTest.java
 delete mode 100644 idp-saml-api/src/test/java/net/shibboleth/idp/saml/metadata/OrganizationUIInfoTest.java
 delete mode 100644 idp-saml-api/src/test/java/net/shibboleth/idp/saml/metadata/ScopesContainerTest.java
 rename {idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl => idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/logic}/EntityAttributesPredicateTest.java (94%)
 rename {idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata => idp-saml-api/src/test/resources/net/shibboleth/idp/saml/profile/logic}/attribute-mapping-metadata.xml (100%)
 rename {idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata => idp-saml-api/src/test/resources/net/shibboleth/idp/saml/profile/logic}/attribute-registry-service.xml (83%)
 rename {idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata => idp-saml-api/src/test/resources/net/shibboleth/idp/saml/profile/logic}/attribute-registry.xml (92%)
 rename {idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata => idp-saml-api/src/test/resources/net/shibboleth/idp/saml/profile/logic}/rules/subjectid.txt (100%)
 rename {idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata => idp-saml-api/src/test/resources/net/shibboleth/idp/saml/profile/logic}/rules/zorkmids.txt (100%)
 create mode 100644 idp-saml-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-saml-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/AbstractPersistentIdDataConnector.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/package-info.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1XMLObjectAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/transcoding/impl/package-info.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/AttributeMappingNodeProcessor.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ByReferenceMetadataFilterBridge.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessor.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessor.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/package-info.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessor.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/security/impl/package-info.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityBuilder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityImpl.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityMarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityUnmarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeBuilder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeImpl.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeMarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeUnmarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueBuilder.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueImpl.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueMarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueUnmarshaller.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/XMLObjectProviderInitializer.java
 delete mode 100644 idp-saml-impl/src/main/java/net/shibboleth/idp/saml/xmlobject/impl/package-info.java
 delete mode 100644 idp-saml-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer
 delete mode 100644 idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/BaseNodeProcessorTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/ScopesNodeProcessorTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/UIInfoNodeProcessorTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/KeyAuthorityNodeProcessorTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/xmlobject/impl/KeyAuthorityTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/xmlobject/impl/ScopeTest.java
 delete mode 100644 idp-saml-impl/src/test/java/net/shibboleth/idp/saml/xmlobject/impl/ScopedValueTest.java
 create mode 100644 idp-schema/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-schema/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-afp-mf-basic.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-afp-mf-saml.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-afp.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-pc.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
 delete mode 100644 idp-schema/src/main/resources/schema/shibboleth-security.xsd
 create mode 100644 idp-session-api/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-session-api/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-session-impl/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-session-impl/.settings/org.eclipse.wst.common.project.facet.core.xml
 rename {idp-attribute-filter-spring => idp-spring}/.checkstyle (100%)
 rename {idp-attribute-api => idp-spring}/.classpath (86%)
 rename {idp-attribute-api => idp-spring}/.gitignore (100%)
 rename {idp-attribute-impl => idp-spring}/.project (66%)
 rename {idp-attribute-api => idp-spring}/.settings/org.eclipse.core.resources.prefs (100%)
 rename {idp-attribute-api => idp-spring}/.settings/org.eclipse.jdt.core.prefs (94%)
 rename {idp-attribute-api => idp-spring}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {idp-attribute-api => idp-spring}/.settings/org.eclipse.m2e.core.prefs (100%)
 create mode 100644 idp-spring/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-spring/.settings/org.eclipse.wst.common.project.facet.core.xml
 copy {idp-profile-api => idp-spring}/pom.xml (78%)
 rename idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HttpClientFactoryBean.java => idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/BasicX509CredentialFactoryBean.java (62%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowDefinitionRegistryFactoryBean.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowDefinitionResourceFactory.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoader.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/LocalFlowBuilderContext.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/SubflowExpression.java (100%)
 rename {idp-profile-spring => idp-spring}/src/main/java/net/shibboleth/idp/profile/spring/factory/package-info.java (100%)
 rename {idp-profile-spring => idp-spring}/src/test/java/net/shibboleth/idp/profile/spring/factory/FlowRelativeResourceLoaderTest.java (100%)
 rename {idp-profile-spring => idp-spring}/src/test/java/net/shibboleth/idp/profile/spring/logic/DummyPredicate.java (100%)
 rename {idp-profile-spring => idp-spring}/src/test/java/net/shibboleth/idp/profile/spring/logic/RelyingPartyIdPredicateTest.java (100%)
 rename {idp-profile-spring => idp-spring}/src/test/resources/logback-test.xml (100%)
 rename {idp-profile-spring => idp-spring}/src/test/resources/net/shibboleth/idp/profile/spring/factory/idp1833-beans.xml (100%)
 rename {idp-profile-spring => idp-spring}/src/test/resources/net/shibboleth/idp/profile/spring/factory/idp1833-flow-example.xml (100%)
 rename {idp-profile-spring => idp-spring}/src/test/resources/net/shibboleth/idp/profile/spring/logic/relyingPartyIdPredicates.xml (96%)
 create mode 100644 idp-ui/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-ui/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-war-distribution/.settings/.jsdtscope
 create mode 100644 idp-war-distribution/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-war-distribution/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-war-distribution/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 idp-war-distribution/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 idp-war/.settings/.jsdtscope
 create mode 100644 idp-war/.settings/org.eclipse.wst.common.component
 create mode 100644 idp-war/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 idp-war/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 idp-war/.settings/org.eclipse.wst.jsdt.ui.superType.name

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list