[java-metadata-aggregator] 01/01: MDA-266 - Rework module structure and packaging
Ian Young
ian at iay.org.uk
Fri Dec 3 12:27:01 UTC 2021
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch dev/MDA-266
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=2c8a3015c5755c266dd15571786a436c2b8598e0
commit 2c8a3015c5755c266dd15571786a436c2b8598e0
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Dec 3 12:24:07 2021 +0000
MDA-266 - Rework module structure and packaging
Stage 1: Rework module structure
* aggregator- becomes mda- in general
* aggregator-blacklists becomes mda-keylists-rsa
---
.project | 2 +-
{aggregator-bom => mda-bom}/.gitignore | 0
{aggregator-bom => mda-bom}/.project | 2 +-
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.m2e.core.prefs | 0
.../.settings/org.maven.ide.eclipse.prefs | 0
{aggregator-bom => mda-bom}/pom.xml | 10 +++++-----
{aggregator-cli => mda-cli}/.checkstyle | 2 +-
{aggregator-blacklists => mda-cli}/.classpath | 0
{aggregator-cli => mda-cli}/.gitignore | 0
{aggregator-cli => mda-cli}/.project | 2 +-
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../.settings/org.eclipse.m2e.core.prefs | 0
{aggregator-cli => mda-cli}/pom.xml | 16 ++++++++--------
{aggregator-cli => mda-cli}/src/main/assembly/bin.xml | 0
.../net/shibboleth/metadata/cli/SimpleCommandLine.java | 0
.../metadata/cli/SimpleCommandLineArguments.java | 0
.../java/net/shibboleth/metadata/cli/package-info.java | 0
.../net/shibboleth/metadata/cli/logger-normal.xml | 0
.../net/shibboleth/metadata/cli/logger-quiet.xml | 0
.../net/shibboleth/metadata/cli/logger-verbose.xml | 0
{aggregator-cli => mda-cli}/src/script/bash/mda.sh | 0
{aggregator-cli => mda-cli}/src/script/bat/cpappend.bat | 0
{aggregator-cli => mda-cli}/src/script/bat/mda.bat | 0
.../java/net/shibboleth/metadata/cli/MDA137Stage.java | 0
.../java/net/shibboleth/metadata/dom/MDA125Test.java | 0
.../net/shibboleth/metadata/cli/MDA137Test-config.xml | 0
.../net/shibboleth/metadata/dom/MDA125Test-config.xml | 0
{aggregator-pipeline => mda-framework}/.checkstyle | 2 +-
{aggregator-cli => mda-framework}/.classpath | 0
{aggregator-pipeline => mda-framework}/.gitignore | 0
{aggregator-pipeline => mda-framework}/.project | 2 +-
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../.settings/org.eclipse.m2e.core.prefs | 0
{aggregator-pipeline => mda-framework}/pom.xml | 14 +++++++-------
.../AbstractCompositeItemIdentificationStrategy.java | 0
.../main/java/net/shibboleth/metadata/AbstractItem.java | 0
.../shibboleth/metadata/CollectionMergeStrategy.java | 0
.../metadata/DeduplicatingItemIdMergeStrategy.java | 0
.../main/java/net/shibboleth/metadata/ErrorStatus.java | 0
.../metadata/FirstItemIdItemIdentificationStrategy.java | 0
.../main/java/net/shibboleth/metadata/InfoStatus.java | 0
.../src/main/java/net/shibboleth/metadata/Item.java | 0
.../shibboleth/metadata/ItemCollectionSerializer.java | 0
.../src/main/java/net/shibboleth/metadata/ItemId.java | 0
.../shibboleth/metadata/ItemIdentificationStrategy.java | 0
.../main/java/net/shibboleth/metadata/ItemMetadata.java | 0
.../java/net/shibboleth/metadata/ItemSerializer.java | 0
.../src/main/java/net/shibboleth/metadata/ItemTag.java | 0
.../metadata/SimpleCollectionMergeStrategy.java | 0
.../metadata/SimpleItemCollectionFactory.java | 0
.../metadata/SimpleItemCollectionSerializer.java | 0
.../java/net/shibboleth/metadata/StatusMetadata.java | 0
.../src/main/java/net/shibboleth/metadata/Version.java | 0
.../java/net/shibboleth/metadata/WarningStatus.java | 0
.../metadata/dom/AbstractDOMTraversalStage.java | 0
.../metadata/dom/AbstractDOMValidationStage.java | 0
.../metadata/dom/AbstractElementValidationStage.java | 0
.../metadata/dom/AbstractElementVisitingStage.java | 0
.../metadata/dom/AbstractNamespacesStrippingStage.java | 0
.../metadata/dom/AbstractXSLProcessingStage.java | 0
.../java/net/shibboleth/metadata/dom/AttrVisitor.java | 0
.../net/shibboleth/metadata/dom/CRDetectionStage.java | 0
.../java/net/shibboleth/metadata/dom/Container.java | 0
.../net/shibboleth/metadata/dom/DOMElementItem.java | 0
.../shibboleth/metadata/dom/DOMElementSerializer.java | 0
.../metadata/dom/DOMFilesystemSourceStage.java | 0
.../shibboleth/metadata/dom/DOMResourceSourceStage.java | 0
.../shibboleth/metadata/dom/DOMTraversalContext.java | 0
.../java/net/shibboleth/metadata/dom/ElementMaker.java | 0
.../net/shibboleth/metadata/dom/ElementMatcher.java | 0
.../shibboleth/metadata/dom/ElementStrippingStage.java | 0
.../net/shibboleth/metadata/dom/ElementVisitor.java | 0
.../metadata/dom/ElementWhitespaceTrimmingStage.java | 0
.../shibboleth/metadata/dom/ElementsStrippingStage.java | 0
.../metadata/dom/EmptyContainerStrippingStage.java | 0
.../metadata/dom/MultiOutputXSLTransformationStage.java | 0
.../metadata/dom/NamespaceStrippingStage.java | 0
.../metadata/dom/NamespacesStrippingStage.java | 0
.../java/net/shibboleth/metadata/dom/NodeVisitor.java | 0
.../metadata/dom/SimpleDOMTraversalContext.java | 0
.../metadata/dom/StringElementValidationStage.java | 0
.../metadata/dom/WhitespaceTrimmingVisitor.java | 0
.../metadata/dom/XMLSchemaValidationStage.java | 0
.../metadata/dom/XMLSignatureSigningStage.java | 0
.../metadata/dom/XMLSignatureValidationStage.java | 0
.../shibboleth/metadata/dom/XPathFilteringStage.java | 0
.../metadata/dom/XPathItemSelectionStrategy.java | 0
.../shibboleth/metadata/dom/XSLTransformationStage.java | 0
.../net/shibboleth/metadata/dom/XSLValidationStage.java | 0
.../shibboleth/metadata/dom/ds/X509ValidationStage.java | 0
.../net/shibboleth/metadata/dom/ds/XMLDSIGSupport.java | 0
.../net/shibboleth/metadata/dom/ds/package-info.java | 0
.../metadata/dom/impl/XMLSignatureSigner.java | 0
.../metadata/dom/impl/XMLSignatureValidator.java | 0
.../net/shibboleth/metadata/dom/impl/package-info.java | 0
.../java/net/shibboleth/metadata/dom/package-info.java | 0
.../metadata/dom/saml/AbstractSAMLTraversalStage.java | 0
.../metadata/dom/saml/AttributeElementMaker.java | 0
.../metadata/dom/saml/AttributeElementMatcher.java | 0
.../metadata/dom/saml/AttributeValueElementMaker.java | 0
.../metadata/dom/saml/AttributeValueElementMatcher.java | 0
.../metadata/dom/saml/ContactPersonFilterStage.java | 0
.../dom/saml/DiscoFeedCollectionSerializer.java | 0
.../dom/saml/EntitiesDescriptorAssemblerStage.java | 0
.../dom/saml/EntitiesDescriptorDisassemblerStage.java | 0
.../dom/saml/EntityDescriptorItemIdPopulationStage.java | 0
.../shibboleth/metadata/dom/saml/EntityFilterStage.java | 0
.../metadata/dom/saml/EntityRoleFilterStage.java | 0
.../shibboleth/metadata/dom/saml/GenerateIdStage.java | 0
.../metadata/dom/saml/PullUpCacheDurationStage.java | 0
.../metadata/dom/saml/PullUpValidUntilStage.java | 0
.../metadata/dom/saml/RemoveOrganizationStage.java | 0
.../metadata/dom/saml/SAMLMetadataSupport.java | 0
.../dom/saml/SAMLStringElementCheckingStage.java | 0
.../net/shibboleth/metadata/dom/saml/SAMLSupport.java | 0
.../metadata/dom/saml/SetCacheDurationStage.java | 0
.../metadata/dom/saml/SetValidUntilStage.java | 0
.../metadata/dom/saml/ValidateValidUntilStage.java | 0
.../dom/saml/mdattr/AbstractEntityAttributeMatcher.java | 0
.../dom/saml/mdattr/AbstractExactValueMatcher.java | 0
.../dom/saml/mdattr/AssuranceCertificationMatcher.java | 0
.../dom/saml/mdattr/EntityAttributeAddingStage.java | 0
.../dom/saml/mdattr/EntityAttributeFilteringStage.java | 0
.../metadata/dom/saml/mdattr/EntityCategoryMatcher.java | 0
.../metadata/dom/saml/mdattr/EntityCategorySupport.java | 0
.../dom/saml/mdattr/EntityCategorySupportMatcher.java | 0
.../metadata/dom/saml/mdattr/MDAttrSupport.java | 0
.../metadata/dom/saml/mdattr/MultiPredicateMatcher.java | 0
.../dom/saml/mdattr/RegistrationAuthorityMatcher.java | 0
.../metadata/dom/saml/mdattr/package-info.java | 0
.../mdrpi/EntityRegistrationAuthorityFilterStage.java | 0
.../metadata/dom/saml/mdrpi/MDRPIMetadataSupport.java | 0
.../metadata/dom/saml/mdrpi/RegistrationAuthority.java | 0
...RegistrationAuthorityItemIdentificationStrategy.java | 0
.../mdrpi/RegistrationAuthorityPopulationStage.java | 0
.../metadata/dom/saml/mdrpi/package-info.java | 0
.../metadata/dom/saml/mdui/IPHintValidationStage.java | 0
.../shibboleth/metadata/dom/saml/mdui/MDUISupport.java | 0
.../shibboleth/metadata/dom/saml/mdui/package-info.java | 0
.../net/shibboleth/metadata/dom/saml/package-info.java | 0
.../main/java/net/shibboleth/metadata/package-info.java | 0
.../metadata/pipeline/AbstractFilteringStage.java | 0
.../pipeline/AbstractItemMetadataSelectionStage.java | 0
.../metadata/pipeline/AbstractIteratingStage.java | 0
.../net/shibboleth/metadata/pipeline/AbstractStage.java | 0
.../metadata/pipeline/AtLeastCollectionPredicate.java | 0
.../net/shibboleth/metadata/pipeline/ComponentInfo.java | 0
.../shibboleth/metadata/pipeline/CompositeStage.java | 0
.../pipeline/FilesInDirectoryMultiOutputStrategy.java | 0
.../net/shibboleth/metadata/pipeline/FutureSupport.java | 0
.../metadata/pipeline/ItemIdTransformStage.java | 0
.../metadata/pipeline/ItemMetadataAddingStage.java | 0
.../metadata/pipeline/ItemMetadataFilterStage.java | 0
.../metadata/pipeline/ItemMetadataTerminationStage.java | 0
.../shibboleth/metadata/pipeline/ItemOrderingStage.java | 0
.../metadata/pipeline/ItemOrderingStrategy.java | 0
.../metadata/pipeline/MDQueryMD5ItemIdTransformer.java | 0
.../metadata/pipeline/MDQuerySHA1ItemIdTransformer.java | 0
.../pipeline/MultiOutputSerializationStage.java | 0
.../java/net/shibboleth/metadata/pipeline/Pipeline.java | 0
.../shibboleth/metadata/pipeline/PipelineCallable.java | 0
.../metadata/pipeline/PipelineDemultiplexerStage.java | 0
.../metadata/pipeline/PipelineMergeStage.java | 0
.../metadata/pipeline/PipelineProcessingException.java | 0
.../shibboleth/metadata/pipeline/ScriptletStage.java | 0
.../metadata/pipeline/SerializationStage.java | 0
.../shibboleth/metadata/pipeline/SimplePipeline.java | 0
.../shibboleth/metadata/pipeline/SplitMergeStage.java | 0
.../java/net/shibboleth/metadata/pipeline/Stage.java | 0
.../metadata/pipeline/StageProcessingException.java | 0
.../metadata/pipeline/StaticItemSourceStage.java | 0
.../metadata/pipeline/StatusMetadataLoggingStage.java | 0
.../metadata/pipeline/TerminationException.java | 0
.../impl/BaseIdentifiableInitializableComponent.java | 0
.../pipeline/impl/BaseInitializableComponent.java | 0
.../pipeline/impl/NoOpItemOrderingStrategy.java | 0
.../shibboleth/metadata/pipeline/impl/package-info.java | 0
.../net/shibboleth/metadata/pipeline/package-info.java | 0
.../metadata/util/PathSegmentStringTransformer.java | 0
.../net/shibboleth/metadata/util/RegexFileFilter.java | 0
.../shibboleth/metadata/util/SHA1StringTransformer.java | 0
.../java/net/shibboleth/metadata/util/package-info.java | 0
.../metadata/validate/AcceptAllValidator.java | 0
.../net/shibboleth/metadata/validate/BaseValidator.java | 0
.../metadata/validate/RejectAllValidator.java | 0
.../net/shibboleth/metadata/validate/Validator.java | 0
.../shibboleth/metadata/validate/ValidatorSequence.java | 0
.../net/shibboleth/metadata/validate/package-info.java | 0
.../validate/string/AcceptStringRegexValidator.java | 0
.../validate/string/AcceptStringValueValidator.java | 0
.../validate/string/BaseStringRegexValidator.java | 0
.../validate/string/BaseStringValueValidator.java | 0
.../validate/string/RejectStringRegexValidator.java | 0
.../validate/string/RejectStringValueValidator.java | 0
.../metadata/validate/string/package-info.java | 0
.../metadata/validate/x509/AbstractX509Validator.java | 0
.../metadata/validate/x509/X509DSADetector.java | 0
.../metadata/validate/x509/X509ROCAValidator.java | 0
.../validate/x509/X509RSAExponentValidator.java | 0
.../validate/x509/X509RSAKeyLengthValidator.java | 0
.../validate/x509/X509RSAOpenSSLBlacklistValidator.java | 0
.../shibboleth/metadata/validate/x509/package-info.java | 0
.../java => mda-framework/src/main/resources}/.gitkeep | 0
.../main/resources/net/shibboleth/metadata/beans.xml | 2 +-
...AbstractCompositeItemIdentificationStrategyTest.java | 0
.../java/net/shibboleth/metadata/AssertSupport.java | 0
.../src/test/java/net/shibboleth/metadata/BaseTest.java | 0
.../test/java/net/shibboleth/metadata/BaseTestTest.java | 0
.../java/net/shibboleth/metadata/BeansFileTest.java | 0
.../metadata/DeduplicatingItemIdMergeStrategyTest.java | 0
.../FirstItemIdItemIdentificationStrategyTest.java | 0
.../test/java/net/shibboleth/metadata/ItemIdTest.java | 0
.../test/java/net/shibboleth/metadata/ItemTagTest.java | 0
.../src/test/java/net/shibboleth/metadata/MockItem.java | 0
.../test/java/net/shibboleth/metadata/MockItemTest.java | 0
.../metadata/SimpleItemCollectionSerializerTest.java | 0
.../test/java/net/shibboleth/metadata/TestMarker.java | 0
.../test/java/net/shibboleth/metadata/VersionTest.java | 0
.../metadata/dom/AbstractDOMValidationStageTest.java | 0
.../java/net/shibboleth/metadata/dom/BaseDOMTest.java | 0
.../net/shibboleth/metadata/dom/BaseDOMTestTest.java | 0
.../shibboleth/metadata/dom/CRDetectionStageTest.java | 0
.../java/net/shibboleth/metadata/dom/ContainerTest.java | 0
.../net/shibboleth/metadata/dom/DOMElementItemTest.java | 0
.../metadata/dom/DOMElementSerializerTest.java | 0
.../metadata/dom/DOMFilesystemSourceStageTest.java | 0
.../metadata/dom/DOMResourceSourceStageTest.java | 0
.../net/shibboleth/metadata/dom/ElementMakerTest.java | 0
.../net/shibboleth/metadata/dom/ElementMatcherTest.java | 0
.../metadata/dom/ElementStrippingStageTest.java | 0
.../dom/ElementWhitespaceTrimmingStageTest.java | 0
.../metadata/dom/ElementsStrippingStageTest.java | 0
.../metadata/dom/EmptyContainerStrippingStageTest.java | 0
.../dom/MultiOutputXSLTransformationStageTest.java | 0
.../metadata/dom/NamespaceStrippingStageTest.java | 0
.../metadata/dom/NamespacesStrippingStageTest.java | 0
.../metadata/dom/StringElementValidationStageTest.java | 0
.../metadata/dom/WhitespaceTrimmingVisitorTest.java | 0
.../metadata/dom/XMLSchemaValidationStageTest.java | 0
.../metadata/dom/XMLSignatureSigningStageTest.java | 0
.../metadata/dom/XMLSignatureValidationStageTest.java | 0
.../metadata/dom/XPathFilteringStageTest.java | 0
.../metadata/dom/XPathItemSelectionStrategyTest.java | 0
.../metadata/dom/XSLTtransformationStageTest.java | 0
.../shibboleth/metadata/dom/XSLValidationStageTest.java | 0
.../metadata/dom/ds/X509ValidationStageTest.java | 0
.../metadata/dom/saml/AttributeElementMakerTest.java | 0
.../metadata/dom/saml/AttributeElementMatcherTest.java | 0
.../dom/saml/AttributeValueElementMakerTest.java | 0
.../dom/saml/AttributeValueElementMatcherTest.java | 0
.../metadata/dom/saml/ContactPersonFilterStageTest.java | 0
.../dom/saml/DiscoFeedCollectionSerializerTest.java | 0
.../dom/saml/EntitiesDescriptorAssemblerStageTest.java | 0
.../saml/EntitiesDescriptorDisassemblerStageTest.java | 0
.../saml/EntityDescriptorItemIdPopulationStageTest.java | 0
.../metadata/dom/saml/EntityFilterStageTest.java | 0
.../metadata/dom/saml/EntityRoleFilterStageTest.java | 0
.../metadata/dom/saml/GenerateIdStageTest.java | 0
.../metadata/dom/saml/PullUpCacheDurationStageTest.java | 0
.../metadata/dom/saml/PullUpValidUntilStageTest.java | 0
.../metadata/dom/saml/RemoveOrganizationStageTest.java | 0
.../dom/saml/SAMLStringElementCheckingStageTest.java | 0
.../dom/saml/SetCacheDurationStageSpringTest.java | 0
.../metadata/dom/saml/SetCacheDurationStageTest.java | 0
.../metadata/dom/saml/SetValidUntilStageSpringTest.java | 0
.../metadata/dom/saml/SetValidUntilStageTest.java | 0
.../metadata/dom/saml/ValidateValidUntilStageTest.java | 0
.../mdattr/AssuranceCertificationMatcherSpringTest.java | 0
.../saml/mdattr/AssuranceCertificationMatcherTest.java | 0
.../dom/saml/mdattr/EntityAttributeAddingStageTest.java | 0
.../saml/mdattr/EntityAttributeFilteringStageTest.java | 0
.../saml/mdattr/EntityCategoryMatcherSpringTest.java | 0
.../dom/saml/mdattr/EntityCategoryMatcherTest.java | 0
.../saml/mdattr/EntityCategorySupportMatcherTest.java | 0
.../dom/saml/mdattr/MultiPredicateMatcherTest.java | 0
.../saml/mdattr/RegistrationAuthorityMatcherTest.java | 0
.../EntityRegistrationAuthorityFilterStageTest.java | 0
...strationAuthorityItemIdentificationStrategyTest.java | 0
.../mdrpi/RegistrationAuthorityPopulationStageTest.java | 0
.../dom/saml/mdui/IPHintValidationStageTest.java | 0
.../shibboleth/metadata/pipeline/AbstractStageTest.java | 0
.../pipeline/AtLeastCollectionPredicateTest.java | 0
.../shibboleth/metadata/pipeline/ComponentInfoTest.java | 0
.../metadata/pipeline/CompositeStageTest.java | 0
.../net/shibboleth/metadata/pipeline/CountingStage.java | 0
.../FilesInDirectoryMultiOutputStrategyTest.java | 0
.../metadata/pipeline/ItemIdTransformStageTest.java | 0
.../metadata/pipeline/ItemMetadataAddingStageTest.java | 0
.../metadata/pipeline/ItemMetadataFilterStageTest.java | 0
.../pipeline/ItemMetadataTerminationStageTest.java | 0
.../metadata/pipeline/ItemOrderingStageTest.java | 0
.../net/shibboleth/metadata/pipeline/MarkerStage.java | 0
.../pipeline/MultiOutputSerializationStageTest.java | 0
.../pipeline/PipelineDemultiplexerStageTest.java | 0
.../metadata/pipeline/PipelineMergeStageTest.java | 0
.../metadata/pipeline/ScriptletStageTest.java | 0
.../metadata/pipeline/SerializationStageTest.java | 0
.../metadata/pipeline/SimplePipelineTest.java | 0
.../metadata/pipeline/SplitMergeStageTest.java | 0
.../metadata/pipeline/StaticItemSourceStageTest.java | 0
.../pipeline/StatusMetadataLoggingStageTest.java | 0
.../shibboleth/metadata/pipeline/TerminatingStage.java | 0
.../BaseIdentifiableInitializableComponentTest.java | 0
.../pipeline/impl/BaseInitializableComponentTest.java | 0
.../metadata/util/PathSegmentStringTransformerTest.java | 0
.../shibboleth/metadata/util/RegexFileFilterTest.java | 0
.../metadata/util/SHA1StringTransformerTest.java | 0
.../metadata/validate/AcceptAllValidatorTest.java | 0
.../shibboleth/metadata/validate/BaseValidatorTest.java | 0
.../metadata/validate/RejectAllValidatorTest.java | 0
.../metadata/validate/ValidatorSequenceTest.java | 0
.../validate/string/AcceptStringRegexValidatorTest.java | 0
.../validate/string/AcceptStringValueValidatorTest.java | 0
.../validate/string/RejectStringRegexValidatorTest.java | 0
.../validate/string/RejectStringValueValidatorTest.java | 0
.../metadata/validate/x509/BaseX509ValidatorTest.java | 0
.../metadata/validate/x509/X509DSADetectorTest.java | 0
.../metadata/validate/x509/X509ROCAValidatorTest.java | 0
.../validate/x509/X509RSAExponentValidatorTest.java | 0
.../validate/x509/X509RSAKeyLengthValidatorTest.java | 0
.../x509/X509RSAOpenSSLBlacklistValidatorTest.java | 0
.../src/test/resources/logback-test.xml | 0
.../resources/net/shibboleth/metadata/.gitattributes | 0
.../net/shibboleth/metadata/BaseTest-bytes.bin | 0
.../metadata/dom/AbstractDOMValidationStage-early.xml | 0
.../net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml | 0
.../metadata/dom/CRDetectionStage-assumptions.xml | 0
.../metadata/dom/CRDetectionStage-attribute.xml | 0
.../metadata/dom/CRDetectionStage-comment.xml | 0
.../metadata/dom/CRDetectionStage-element.xml | 0
.../metadata/dom/CRDetectionStage-multiple.xml | 0
.../metadata/dom/CRDetectionStage-nested-attribute.xml | 0
.../metadata/dom/CRDetectionStage-nested-element.xml | 0
.../net/shibboleth/metadata/dom/CRDetectionStage-ok.xml | 0
.../net/shibboleth/metadata/dom/Container-add1.xml | 0
.../net/shibboleth/metadata/dom/Container-addFirst.xml | 0
.../net/shibboleth/metadata/dom/Container-addLast.xml | 0
.../net/shibboleth/metadata/dom/Container-find.xml | 0
.../net/shibboleth/metadata/dom/Container-nested.xml | 0
.../net/shibboleth/metadata/dom/DOMElementItem-in.xml | 0
.../shibboleth/metadata/dom/DOMElementSerializer-1.xml | 0
.../shibboleth/metadata/dom/DOMElementSerializer-2.xml | 0
.../entitiesDescriptor1.xml | 0
.../entitiesDescriptor2.xml | 0
.../entitiesDescriptor2Name.xml | 0
.../entitiesDescriptor2Reversed.xml | 0
.../DOMFilesystemSourceStage-dir/entityDescriptor1.xml | 0
.../DOMFilesystemSourceStage-dir/entityDescriptor2.xml | 0
.../metadata/dom/DOMFilesystemSourceStage-in.xml | 0
.../metadata/dom/DOMFilesystemSourceStage-lorem.txt | 0
.../metadata/dom/ElementFormattingStage-prettyPrint.xml | 0
.../metadata/dom/ElementFormattingStage-singleLine.xml | 0
.../metadata/dom/ElementFormattingStage-unformatted.xml | 0
.../metadata/dom/ElementStrippingStage-in.xml | 0
.../metadata/dom/ElementStrippingStage-out.xml | 0
.../dom/ElementWhitespaceTrimmingStage-1-in.xml | 0
.../dom/ElementWhitespaceTrimmingStage-1-out.xml | 0
.../dom/ElementWhitespaceTrimmingStage-2-in.xml | 0
.../dom/ElementWhitespaceTrimmingStage-2-out.xml | 0
.../metadata/dom/ElementsStrippingStage-in-multi.xml | 0
.../metadata/dom/ElementsStrippingStage-in-sb.xml | 0
.../metadata/dom/ElementsStrippingStage-in-sw.xml | 0
.../metadata/dom/ElementsStrippingStage-out-multi-b.xml | 0
.../metadata/dom/ElementsStrippingStage-out-multi-w.xml | 0
.../metadata/dom/ElementsStrippingStage-out-sb.xml | 0
.../metadata/dom/ElementsStrippingStage-out-sw.xml | 0
.../metadata/dom/EmptyContainerStrippingStage-in.xml | 0
.../metadata/dom/EmptyContainerStrippingStage-out.xml | 0
.../MultiOutputXSLTransformationStage-includeMain.xsl | 0
.../dom/MultiOutputXSLTransformationStage-included.xsl | 0
.../dom/MultiOutputXSLTransformationStage-input.xml | 0
.../dom/MultiOutputXSLTransformationStage-output.xml | 0
.../MultiOutputXSLTransformationStage-paramOutput.xml | 0
.../MultiOutputXSLTransformationStage-transform0.xsl | 0
.../MultiOutputXSLTransformationStage-transform1.xsl | 0
.../MultiOutputXSLTransformationStage-transform2.xsl | 0
...tiOutputXSLTransformationStage-transformListener.xsl | 0
.../metadata/dom/NamespaceStrippingStage-in.xml | 0
.../metadata/dom/NamespaceStrippingStage-out.xml | 0
.../metadata/dom/NamespacesStrippingStage-1-in.xml | 0
.../metadata/dom/NamespacesStrippingStage-1-out.xml | 0
.../metadata/dom/NamespacesStrippingStage-2-bl.xml | 0
.../metadata/dom/NamespacesStrippingStage-2-in.xml | 0
.../metadata/dom/NamespacesStrippingStage-2-wl.xml | 0
.../dom/StringElementValidationStage-two-bad-addrs.xml | 0
.../metadata/dom/XMLSchemaValidationStage-invalid.xml | 0
.../metadata/dom/XMLSchemaValidationStage-schema.xsd | 0
.../metadata/dom/XMLSchemaValidationStage-valid.xml | 0
.../metadata/dom/XMLSignatureSigningStage-input.xml | 0
.../metadata/dom/XMLSignatureSigningStage-mda196.xml | 0
.../metadata/dom/XMLSignatureSigningStage-output.xml | 0
.../dom/XMLSignatureSigningStage-signingCert.pem | 0
.../dom/XMLSignatureSigningStage-signingKey.pem | 0
.../dom/XMLSignatureValidationStage-badSignature.xml | 0
.../dom/XMLSignatureValidationStage-emptyref.xml | 0
.../dom/XMLSignatureValidationStage-entities2.xml | 0
.../metadata/dom/XMLSignatureValidationStage-signed.xml | 0
.../dom/XMLSignatureValidationStage-signingCert.pem | 0
.../dom/XMLSignatureValidationStage-signingKey.pem | 0
.../shibboleth/metadata/dom/XPathFilteringStage-1.xml | 0
.../shibboleth/metadata/dom/XPathFilteringStage-2.xml | 0
.../shibboleth/metadata/dom/XPathFilteringStage-3.xml | 0
.../metadata/dom/XPathItemSelectionStrategy-1.xml | 0
.../metadata/dom/XPathItemSelectionStrategy-2.xml | 0
.../metadata/dom/XPathItemSelectionStrategy-3.xml | 0
.../metadata/dom/XSLTransformationStage-includeMain.xsl | 0
.../metadata/dom/XSLTransformationStage-included.xsl | 0
.../metadata/dom/XSLTransformationStage-included2.xsl | 0
.../metadata/dom/XSLTransformationStage-input.xml | 0
.../metadata/dom/XSLTransformationStage-output.xml | 0
.../metadata/dom/XSLTransformationStage-output2.xml | 0
.../metadata/dom/XSLTransformationStage-paramOutput.xml | 0
.../metadata/dom/XSLTransformationStage-transform1.xml | 0
.../metadata/dom/XSLTransformationStage-transform1.xsl | 0
.../dom/XSLTransformationStage-transformListener1.xsl | 0
.../metadata/dom/XSLValidationStage-input.xml | 0
.../metadata/dom/XSLValidationStage-mda45.xsl | 0
.../metadata/dom/XSLValidationStage-validator.xsl | 0
.../metadata/dom/ds/X509ValidationStage-in.xml | 0
.../dom/saml/ContactPersonFilterStage-entities.xml | 0
.../dom/saml/DiscoFeedCollectionSerializer-base.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-base.xml | 0
.../dom/saml/DiscoFeedCollectionSerializer-entattr.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-entattr.xml | 0
.../dom/saml/DiscoFeedCollectionSerializer-infourl.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-infourl.xml | 0
.../saml/DiscoFeedCollectionSerializer-keywords.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-keywords.xml | 0
.../dom/saml/DiscoFeedCollectionSerializer-legacy.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-legacy.xml | 0
.../saml/DiscoFeedCollectionSerializer-logolang.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-logolang.xml | 0
.../DiscoFeedCollectionSerializer-no-uiinfo-leg.json | 0
.../DiscoFeedCollectionSerializer-no-uiinfo-leg.xml | 0
.../saml/DiscoFeedCollectionSerializer-no-uiinfo.json | 0
.../saml/DiscoFeedCollectionSerializer-no-uiinfo.xml | 0
.../dom/saml/DiscoFeedCollectionSerializer-noidp.xml | 0
.../saml/DiscoFeedCollectionSerializer-nolegacy.json | 0
.../dom/saml/DiscoFeedCollectionSerializer-nolegacy.xml | 0
.../saml/DiscoFeedCollectionSerializer-nonentity.xml | 0
.../saml/DiscoFeedCollectionSerializer-privacyurl.json | 0
.../saml/DiscoFeedCollectionSerializer-privacyurl.xml | 0
.../saml/EntitiesDescriptorAssemblerStage-entities.xml | 0
.../saml/EntitiesDescriptorAssemblerStage-entity1.xml | 0
.../saml/EntitiesDescriptorAssemblerStage-entity2.xml | 0
.../dom/saml/EntitiesDescriptorAssemblerStage-name.xml | 0
.../saml/EntitiesDescriptorAssemblerStage-reversed.xml | 0
.../dom/saml/EntitiesDescriptorDisassemblerStage-in.xml | 0
.../saml/EntityDescriptorItemIdPopulationStage-1.xml | 0
.../saml/EntityDescriptorItemIdPopulationStage-2.xml | 0
.../EntityDescriptorItemIdPopulationStage-different.xml | 0
.../metadata/dom/saml/EntityFilterStage-in.xml | 0
.../metadata/dom/saml/EntityRoleFilterStage-in.xml | 0
.../shibboleth/metadata/dom/saml/GenerateIdStage-in.xml | 0
.../metadata/dom/saml/GenerateIdStage-notentity.xml | 0
.../metadata/dom/saml/PullUpCacheDurationStage-in.xml | 0
.../metadata/dom/saml/PullUpValidUntilStage-in.xml | 0
.../metadata/dom/saml/RemoveOrganizationStage-in.xml | 0
.../dom/saml/SAMLStringElementCheckingStage-fail.xml | 0
.../dom/saml/SAMLStringElementCheckingStage-ok.xml | 0
.../metadata/dom/saml/SetCacheDurationStage-in.xml | 0
.../dom/saml/SetCacheDurationStageSpringTest-config.xml | 0
.../metadata/dom/saml/SetValidUntilStage-in.xml | 0
.../dom/saml/SetValidUntilStageSpringTest-config.xml | 0
.../metadata/dom/saml/ValidateValidUntilStage-in.xml | 0
.../AssuranceCertificationMatcherSpringTest-config.xml | 0
.../saml/mdattr/EntityAttributeAddingStage-added1.xml | 0
.../saml/mdattr/EntityAttributeAddingStage-added2.xml | 0
.../saml/mdattr/EntityAttributeAddingStage-added3.xml | 0
.../mdattr/EntityAttributeAddingStage-extensions.xml | 0
.../mdattr/EntityAttributeAddingStage-noExtensions.xml | 0
.../dom/saml/mdattr/EntityAttributeAddingStage-some.xml | 0
.../mdattr/EntityAttributeFilteringStage-blacklist.xml | 0
.../saml/mdattr/EntityAttributeFilteringStage-input.xml | 0
.../mdattr/EntityAttributeFilteringStage-keepcoc.xml | 0
.../mdattr/EntityAttributeFilteringStage-keepcoc2.xml | 0
.../mdattr/EntityAttributeFilteringStage-keepnone.xml | 0
.../mdattr/EntityAttributeFilteringStage-multi2in.xml | 0
.../mdattr/EntityAttributeFilteringStage-multi2out.xml | 0
.../mdattr/EntityAttributeFilteringStage-multicon.xml | 0
.../mdattr/EntityAttributeFilteringStage-multiout.xml | 0
.../mdattr/EntityCategoryMatcherSpringTest-config.xml | 0
.../mdrpi/EntityRegistrationAuthorityFilterStage-in.xml | 0
.../RegistrationAuthorityPopulationStage-absent.xml | 0
.../RegistrationAuthorityPopulationStage-noext.xml | 0
.../RegistrationAuthorityPopulationStage-present.xml | 0
.../metadata/dom/saml/mdui/IPHintValidationStage-1.xml | 0
.../metadata/dom/saml/mdui/IPHintValidationStage-2.xml | 0
.../metadata/dom/saml/mdui/IPHintValidationStage-3.xml | 0
.../shibboleth/metadata/pipeline/ScriptletStage-bad.js | 0
.../metadata/pipeline/ScriptletStage-script.js | 0
.../metadata/pipeline/ScriptletStage-script.py | 0
.../metadata/pipeline/ScriptletStage-script.rb | 0
.../metadata/validate/x509/X509DSADetector-dsa1.pem | 0
.../metadata/validate/x509/X509DSADetector-rsa.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert01.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert02.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert03.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert04.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert05.pem | 0
.../metadata/validate/x509/X509ROCAValidator-cert06.pem | 0
.../metadata/validate/x509/X509ROCAValidator-dsa.pem | 0
.../validate/x509/X509RSAExponentValidator-3.pem | 0
.../validate/x509/X509RSAExponentValidator-35.pem | 0
.../validate/x509/X509RSAExponentValidator-65537.pem | 0
.../validate/x509/X509RSAExponentValidator-dsa.pem | 0
.../validate/x509/X509RSAKeyLengthValidator-1024.pem | 0
.../validate/x509/X509RSAKeyLengthValidator-2048.pem | 0
.../validate/x509/X509RSAKeyLengthValidator-dsa.pem | 0
.../x509/X509RSAOpenSSLBlacklistValidator-1024.pem | 0
.../x509/X509RSAOpenSSLBlacklistValidator-1024.txt | 0
.../x509/X509RSAOpenSSLBlacklistValidator-2048.pem | 0
.../x509/X509RSAOpenSSLBlacklistValidator-2048.txt | 0
.../x509/X509RSAOpenSSLBlacklistValidator-issue9.txt | 0
.../x509/X509RSAOpenSSLBlacklistValidator-ok.pem | 0
{aggregator-blacklists => mda-keylists-rsa}/.checkstyle | 0
{aggregator-pipeline => mda-keylists-rsa}/.classpath | 0
{aggregator-blacklists => mda-keylists-rsa}/.gitignore | 0
{aggregator-blacklists => mda-keylists-rsa}/.project | 4 ++--
.../.settings/org.eclipse.core.resources.prefs | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
.../.settings/org.eclipse.jdt.ui.prefs | 0
.../.settings/org.eclipse.m2e.core.prefs | 0
{aggregator-blacklists => mda-keylists-rsa}/pom.xml | 12 ++++++------
.../test => mda-keylists-rsa/src/main}/java/.gitkeep | 0
.../metadata/validate/x509/compromised-1024.txt | 0
.../metadata/validate/x509/compromised-2048.txt | 0
.../shibboleth/metadata/validate/x509/debian-1024.txt | 0
.../shibboleth/metadata/validate/x509/debian-2048.txt | 0
.../shibboleth/metadata/validate/x509/debian-4096.txt | 0
.../shibboleth/metadata/validate/x509/debian-512.txt | 0
.../src/test/java}/.gitkeep | 0
.../shibboleth/metadata/validate/x509/MDA183Test.java | 0
.../x509/X509RSAOpenSSLBlacklistValidatorTest.java | 0
.../src/test/resources/logback-test.xml | 0
.../metadata/validate/x509/MDA183Test-keystore.jks | Bin
pom.xml | 12 ++++++------
542 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/.project b/.project
index 3dc3d8c..49e1021 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-parent</name>
+ <name>mda-parent</name>
<comment></comment>
<projects>
</projects>
diff --git a/aggregator-bom/.gitignore b/mda-bom/.gitignore
similarity index 100%
rename from aggregator-bom/.gitignore
rename to mda-bom/.gitignore
diff --git a/aggregator-bom/.project b/mda-bom/.project
similarity index 91%
rename from aggregator-bom/.project
rename to mda-bom/.project
index 57540e3..3608d06 100644
--- a/aggregator-bom/.project
+++ b/mda-bom/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-bom</name>
+ <name>mda-bom</name>
<comment></comment>
<projects>
</projects>
diff --git a/aggregator-blacklists/.settings/org.eclipse.core.resources.prefs b/mda-bom/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-blacklists/.settings/org.eclipse.core.resources.prefs
rename to mda-bom/.settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-blacklists/.settings/org.eclipse.m2e.core.prefs b/mda-bom/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-blacklists/.settings/org.eclipse.m2e.core.prefs
rename to mda-bom/.settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-bom/.settings/org.maven.ide.eclipse.prefs b/mda-bom/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from aggregator-bom/.settings/org.maven.ide.eclipse.prefs
rename to mda-bom/.settings/org.maven.ide.eclipse.prefs
diff --git a/aggregator-bom/pom.xml b/mda-bom/pom.xml
similarity index 83%
rename from aggregator-bom/pom.xml
rename to mda-bom/pom.xml
index ebf26b8..ed124d3 100644
--- a/aggregator-bom/pom.xml
+++ b/mda-bom/pom.xml
@@ -6,25 +6,25 @@
<parent>
<groupId>net.shibboleth.metadata</groupId>
- <artifactId>aggregator-parent</artifactId>
+ <artifactId>mda-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
</parent>
- <name>Shibboleth Metadata Aggregator :: BOM</name>
+ <name>Bill of Materials</name>
<description>Bill of Materials</description>
- <artifactId>aggregator-bom</artifactId>
+ <artifactId>mda-bom</artifactId>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-blacklists</artifactId>
+ <artifactId>mda-keylists-rsa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-pipeline</artifactId>
+ <artifactId>mda-framework</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/aggregator-cli/.checkstyle b/mda-cli/.checkstyle
similarity index 80%
rename from aggregator-cli/.checkstyle
rename to mda-cli/.checkstyle
index 65ff627..31cb140 100644
--- a/aggregator-cli/.checkstyle
+++ b/mda-cli/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/aggregator-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/mda-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/aggregator-blacklists/.classpath b/mda-cli/.classpath
similarity index 100%
rename from aggregator-blacklists/.classpath
rename to mda-cli/.classpath
diff --git a/aggregator-cli/.gitignore b/mda-cli/.gitignore
similarity index 100%
rename from aggregator-cli/.gitignore
rename to mda-cli/.gitignore
diff --git a/aggregator-cli/.project b/mda-cli/.project
similarity index 95%
rename from aggregator-cli/.project
rename to mda-cli/.project
index 7ecc4fb..84fe2b5 100644
--- a/aggregator-cli/.project
+++ b/mda-cli/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-cli</name>
+ <name>mda-cli</name>
<comment></comment>
<projects>
</projects>
diff --git a/aggregator-bom/.settings/org.eclipse.core.resources.prefs b/mda-cli/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-bom/.settings/org.eclipse.core.resources.prefs
rename to mda-cli/.settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs b/mda-cli/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from aggregator-blacklists/.settings/org.eclipse.jdt.core.prefs
rename to mda-cli/.settings/org.eclipse.jdt.core.prefs
diff --git a/aggregator-blacklists/.settings/org.eclipse.jdt.ui.prefs b/mda-cli/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from aggregator-blacklists/.settings/org.eclipse.jdt.ui.prefs
rename to mda-cli/.settings/org.eclipse.jdt.ui.prefs
diff --git a/aggregator-bom/.settings/org.eclipse.m2e.core.prefs b/mda-cli/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-bom/.settings/org.eclipse.m2e.core.prefs
rename to mda-cli/.settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-cli/pom.xml b/mda-cli/pom.xml
similarity index 90%
rename from aggregator-cli/pom.xml
rename to mda-cli/pom.xml
index eb983d8..ce70dac 100644
--- a/aggregator-cli/pom.xml
+++ b/mda-cli/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>net.shibboleth.metadata</groupId>
- <artifactId>aggregator-parent</artifactId>
+ <artifactId>mda-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
</parent>
- <name>Shibboleth Metadata Aggregator :: Command Line Interface</name>
+ <name>Command Line Interface</name>
<description>Command Line Interface</description>
- <artifactId>aggregator-cli</artifactId>
+ <artifactId>mda-cli</artifactId>
<packaging>jar</packaging>
<properties>
@@ -24,7 +24,7 @@
<!-- Compile Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-pipeline</artifactId>
+ <artifactId>mda-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -45,7 +45,7 @@
<!-- Runtime Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-blacklists</artifactId>
+ <artifactId>mda-keylists-rsa</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
@@ -66,9 +66,9 @@
</dependency>
<!-- Test Dependencies -->
-
+
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -79,7 +79,7 @@
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
diff --git a/aggregator-cli/src/main/assembly/bin.xml b/mda-cli/src/main/assembly/bin.xml
similarity index 100%
rename from aggregator-cli/src/main/assembly/bin.xml
rename to mda-cli/src/main/assembly/bin.xml
diff --git a/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java b/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
similarity index 100%
rename from aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
rename to mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
diff --git a/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLineArguments.java b/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLineArguments.java
similarity index 100%
rename from aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLineArguments.java
rename to mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLineArguments.java
diff --git a/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/package-info.java b/mda-cli/src/main/java/net/shibboleth/metadata/cli/package-info.java
similarity index 100%
rename from aggregator-cli/src/main/java/net/shibboleth/metadata/cli/package-info.java
rename to mda-cli/src/main/java/net/shibboleth/metadata/cli/package-info.java
diff --git a/aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-normal.xml b/mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-normal.xml
similarity index 100%
rename from aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-normal.xml
rename to mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-normal.xml
diff --git a/aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-quiet.xml b/mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-quiet.xml
similarity index 100%
rename from aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-quiet.xml
rename to mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-quiet.xml
diff --git a/aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-verbose.xml b/mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-verbose.xml
similarity index 100%
rename from aggregator-cli/src/main/resources/net/shibboleth/metadata/cli/logger-verbose.xml
rename to mda-cli/src/main/resources/net/shibboleth/metadata/cli/logger-verbose.xml
diff --git a/aggregator-cli/src/script/bash/mda.sh b/mda-cli/src/script/bash/mda.sh
similarity index 100%
rename from aggregator-cli/src/script/bash/mda.sh
rename to mda-cli/src/script/bash/mda.sh
diff --git a/aggregator-cli/src/script/bat/cpappend.bat b/mda-cli/src/script/bat/cpappend.bat
similarity index 100%
rename from aggregator-cli/src/script/bat/cpappend.bat
rename to mda-cli/src/script/bat/cpappend.bat
diff --git a/aggregator-cli/src/script/bat/mda.bat b/mda-cli/src/script/bat/mda.bat
similarity index 100%
rename from aggregator-cli/src/script/bat/mda.bat
rename to mda-cli/src/script/bat/mda.bat
diff --git a/aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java b/mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
similarity index 100%
rename from aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
rename to mda-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
diff --git a/aggregator-cli/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java b/mda-cli/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
similarity index 100%
rename from aggregator-cli/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
rename to mda-cli/src/test/java/net/shibboleth/metadata/dom/MDA125Test.java
diff --git a/aggregator-cli/src/test/resources/net/shibboleth/metadata/cli/MDA137Test-config.xml b/mda-cli/src/test/resources/net/shibboleth/metadata/cli/MDA137Test-config.xml
similarity index 100%
rename from aggregator-cli/src/test/resources/net/shibboleth/metadata/cli/MDA137Test-config.xml
rename to mda-cli/src/test/resources/net/shibboleth/metadata/cli/MDA137Test-config.xml
diff --git a/aggregator-cli/src/test/resources/net/shibboleth/metadata/dom/MDA125Test-config.xml b/mda-cli/src/test/resources/net/shibboleth/metadata/dom/MDA125Test-config.xml
similarity index 100%
rename from aggregator-cli/src/test/resources/net/shibboleth/metadata/dom/MDA125Test-config.xml
rename to mda-cli/src/test/resources/net/shibboleth/metadata/dom/MDA125Test-config.xml
diff --git a/aggregator-pipeline/.checkstyle b/mda-framework/.checkstyle
similarity index 80%
rename from aggregator-pipeline/.checkstyle
rename to mda-framework/.checkstyle
index 65ff627..31cb140 100644
--- a/aggregator-pipeline/.checkstyle
+++ b/mda-framework/.checkstyle
@@ -2,7 +2,7 @@
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/aggregator-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/mda-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-file" value="true"/>
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
diff --git a/aggregator-cli/.classpath b/mda-framework/.classpath
similarity index 100%
rename from aggregator-cli/.classpath
rename to mda-framework/.classpath
diff --git a/aggregator-pipeline/.gitignore b/mda-framework/.gitignore
similarity index 100%
rename from aggregator-pipeline/.gitignore
rename to mda-framework/.gitignore
diff --git a/aggregator-pipeline/.project b/mda-framework/.project
similarity index 95%
rename from aggregator-pipeline/.project
rename to mda-framework/.project
index acf4334..5288eb8 100644
--- a/aggregator-pipeline/.project
+++ b/mda-framework/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-pipeline</name>
+ <name>mda-framework</name>
<comment></comment>
<projects>
</projects>
diff --git a/aggregator-cli/.settings/org.eclipse.core.resources.prefs b/mda-framework/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-cli/.settings/org.eclipse.core.resources.prefs
rename to mda-framework/.settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-cli/.settings/org.eclipse.jdt.core.prefs b/mda-framework/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from aggregator-cli/.settings/org.eclipse.jdt.core.prefs
rename to mda-framework/.settings/org.eclipse.jdt.core.prefs
diff --git a/aggregator-cli/.settings/org.eclipse.jdt.ui.prefs b/mda-framework/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from aggregator-cli/.settings/org.eclipse.jdt.ui.prefs
rename to mda-framework/.settings/org.eclipse.jdt.ui.prefs
diff --git a/aggregator-cli/.settings/org.eclipse.m2e.core.prefs b/mda-framework/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-cli/.settings/org.eclipse.m2e.core.prefs
rename to mda-framework/.settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-pipeline/pom.xml b/mda-framework/pom.xml
similarity index 96%
rename from aggregator-pipeline/pom.xml
rename to mda-framework/pom.xml
index 2b42c9b..0b74aa8 100644
--- a/aggregator-pipeline/pom.xml
+++ b/mda-framework/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>net.shibboleth.metadata</groupId>
- <artifactId>aggregator-parent</artifactId>
+ <artifactId>mda-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
</parent>
- <name>Shibboleth Metadata Aggregator :: Processing Pipeline</name>
- <description>Processing Pipeline</description>
- <artifactId>aggregator-pipeline</artifactId>
+ <name>Processing Framework</name>
+ <description>Processing Framework</description>
+ <artifactId>mda-framework</artifactId>
<packaging>jar</packaging>
<properties>
@@ -270,9 +270,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.openjdk.nashorn</groupId>
- <artifactId>nashorn-core</artifactId>
- <version>${nashorn.jdk.version}</version>
+ <groupId>org.openjdk.nashorn</groupId>
+ <artifactId>nashorn-core</artifactId>
+ <version>${nashorn.jdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java b/mda-framework/src/main/java/net/shibboleth/metadata/AbstractItem.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/AbstractItem.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java b/mda-framework/src/main/java/net/shibboleth/metadata/ErrorStatus.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ErrorStatus.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java b/mda-framework/src/main/java/net/shibboleth/metadata/InfoStatus.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/InfoStatus.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java b/mda-framework/src/main/java/net/shibboleth/metadata/Item.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/Item.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemId.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemId.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemIdentificationStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemIdentificationStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemIdentificationStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemIdentificationStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemMetadata.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemMetadata.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemSerializer.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemSerializer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemSerializer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemSerializer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java b/mda-framework/src/main/java/net/shibboleth/metadata/ItemTag.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/ItemTag.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java b/mda-framework/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java b/mda-framework/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java b/mda-framework/src/main/java/net/shibboleth/metadata/StatusMetadata.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/StatusMetadata.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Version.java b/mda-framework/src/main/java/net/shibboleth/metadata/Version.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/Version.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/Version.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java b/mda-framework/src/main/java/net/shibboleth/metadata/WarningStatus.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/WarningStatus.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AttrVisitor.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AttrVisitor.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AttrVisitor.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/AttrVisitor.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/Container.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/Container.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMTraversalContext.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMTraversalContext.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMTraversalContext.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMTraversalContext.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementMaker.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementVisitor.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementVisitor.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementVisitor.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementVisitor.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ElementsStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NodeVisitor.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NodeVisitor.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/NodeVisitor.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/NodeVisitor.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XSLValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/XSLValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/X509ValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/XMLDSIGSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/XMLDSIGSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/XMLDSIGSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/XMLDSIGSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ds/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/ds/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureSigner.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureSigner.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureSigner.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureSigner.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/impl/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMaker.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMaker.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMaker.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMaker.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMaker.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMaker.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMaker.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMaker.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SAMLSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractEntityAttributeMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractExactValueMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractExactValueMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractExactValueMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AbstractExactValueMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MDAttrSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcher.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/MDRPIMetadataSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/MDRPIMetadataSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/MDRPIMetadataSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/MDRPIMetadataSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/MDUISupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/MDUISupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/MDUISupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/MDUISupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicate.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ItemOrderingStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineProcessingException.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineProcessingException.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineProcessingException.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineProcessingException.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Stage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/Stage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Stage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/Stage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StageProcessingException.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StageProcessingException.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StageProcessingException.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StageProcessingException.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/TerminationException.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/TerminationException.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/TerminationException.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/TerminationException.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponent.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponent.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponent.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponent.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponent.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/NoOpItemOrderingStrategy.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/NoOpItemOrderingStrategy.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/NoOpItemOrderingStrategy.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/NoOpItemOrderingStrategy.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/impl/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java b/mda-framework/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/util/PathSegmentStringTransformer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/RegexFileFilter.java b/mda-framework/src/main/java/net/shibboleth/metadata/util/RegexFileFilter.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/RegexFileFilter.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/util/RegexFileFilter.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java b/mda-framework/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/util/SHA1StringTransformer.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/util/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/util/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/BaseValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/Validator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/Validator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/Validator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/Validator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/ValidatorSequence.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringRegexValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/BaseStringValueValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringValueValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/BaseStringValueValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/BaseStringValueValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/string/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/string/package-info.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/AbstractX509Validator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/AbstractX509Validator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/AbstractX509Validator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/AbstractX509Validator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509DSADetector.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509ROCAValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509ROCAValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509ROCAValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509ROCAValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator.java
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/package-info.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/package-info.java
similarity index 100%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/validate/x509/package-info.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/package-info.java
diff --git a/aggregator-blacklists/src/main/java/.gitkeep b/mda-framework/src/main/resources/.gitkeep
similarity index 100%
rename from aggregator-blacklists/src/main/java/.gitkeep
rename to mda-framework/src/main/resources/.gitkeep
diff --git a/aggregator-pipeline/src/main/resources/net/shibboleth/metadata/beans.xml b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
similarity index 99%
rename from aggregator-pipeline/src/main/resources/net/shibboleth/metadata/beans.xml
rename to mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
index a7a1c4e..f02b918 100644
--- a/aggregator-pipeline/src/main/resources/net/shibboleth/metadata/beans.xml
+++ b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
@@ -12,7 +12,7 @@
<!--
Bean definitions for simplified access to components in the
- Shibboleth Metadata Aggregator's aggregator-pipeline artifact.
+ Shibboleth Metadata Aggregator's mda-framework artifact.
All defined bean names are prefixed with "mda.".
-->
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/AbstractCompositeItemIdentificationStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/AssertSupport.java b/mda-framework/src/test/java/net/shibboleth/metadata/AssertSupport.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/AssertSupport.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/AssertSupport.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/BaseTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/BaseTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTestTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/BaseTestTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/BaseTestTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/BaseTestTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/BeansFileTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/BeansFileTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/ItemIdTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/ItemIdTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/ItemTagTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/ItemTagTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java b/mda-framework/src/test/java/net/shibboleth/metadata/MockItem.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/MockItem.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItemTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/SimpleItemCollectionSerializerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/TestMarker.java b/mda-framework/src/test/java/net/shibboleth/metadata/TestMarker.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/TestMarker.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/TestMarker.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/VersionTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/VersionTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/VersionTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/VersionTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/AbstractDOMValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/BaseDOMTestTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementSerializerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMakerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementStrippingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ElementsStrippingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespaceStrippingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/StringElementValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSchemaValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathFilteringStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XPathItemSelectionStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/ds/X509ValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMakerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMakerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategorySupportMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/MultiPredicateMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/RegistrationAuthorityMatcherTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityItemIdentificationStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/AtLeastCollectionPredicateTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ComponentInfoTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ComponentInfoTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ComponentInfoTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ComponentInfoTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ItemOrderingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MarkerStage.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/ScriptletStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SerializationStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StaticItemSourceStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStageTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponentTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponentTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponentTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseIdentifiableInitializableComponentTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponentTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponentTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponentTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/pipeline/impl/BaseInitializableComponentTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/util/PathSegmentStringTransformerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/RegexFileFilterTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/util/RegexFileFilterTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/RegexFileFilterTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/util/RegexFileFilterTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/util/SHA1StringTransformerTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/AcceptAllValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/RejectAllValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/ValidatorSequenceTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/string/RejectStringValueValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/BaseX509ValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509DSADetectorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509ROCAValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509ROCAValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509ROCAValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509ROCAValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAExponentValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidatorTest.java
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
similarity index 100%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
diff --git a/aggregator-pipeline/src/test/resources/logback-test.xml b/mda-framework/src/test/resources/logback-test.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/logback-test.xml
rename to mda-framework/src/test/resources/logback-test.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/.gitattributes b/mda-framework/src/test/resources/net/shibboleth/metadata/.gitattributes
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/.gitattributes
rename to mda-framework/src/test/resources/net/shibboleth/metadata/.gitattributes
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin b/mda-framework/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin
rename to mda-framework/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/AbstractDOMValidationStage-early.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/AbstractDOMValidationStage-early.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/AbstractDOMValidationStage-early.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/AbstractDOMValidationStage-early.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-add1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-add1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-add1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-add1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-addFirst.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-addFirst.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-addFirst.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-addFirst.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-addLast.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-addLast.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-addLast.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-addLast.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-find.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-find.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-find.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-find.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-nested.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-nested.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/Container-nested.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/Container-nested.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementItem-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementItem-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementItem-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementItem-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMElementSerializer-2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Name.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Name.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Name.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Name.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Reversed.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Reversed.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Reversed.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entitiesDescriptor2Reversed.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-dir/entityDescriptor2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-lorem.txt b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-lorem.txt
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-lorem.txt
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/DOMFilesystemSourceStage-lorem.txt
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-prettyPrint.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-prettyPrint.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-prettyPrint.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-prettyPrint.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-singleLine.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-singleLine.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-singleLine.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-singleLine.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-unformatted.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-unformatted.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-unformatted.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementFormattingStage-unformatted.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementStrippingStage-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-1-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementWhitespaceTrimmingStage-2-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-multi.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-multi.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-multi.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-multi.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sb.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sb.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sb.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sb.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sw.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sw.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sw.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-in-sw.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-b.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-b.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-b.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-b.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-w.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-w.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-w.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-multi-w.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sb.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sb.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sb.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sb.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sw.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sw.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sw.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ElementsStrippingStage-out-sw.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/EmptyContainerStrippingStage-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-includeMain.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-includeMain.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-includeMain.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-includeMain.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-included.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-included.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-included.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-included.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-input.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-input.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-input.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-input.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-output.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-output.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-output.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-output.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-paramOutput.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-paramOutput.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-paramOutput.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-paramOutput.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform0.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform0.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform0.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform0.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform1.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform1.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform1.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform1.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform2.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform2.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform2.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transform2.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transformListener.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transformListener.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transformListener.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage-transformListener.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespaceStrippingStage-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-1-out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-bl.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-bl.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-bl.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-bl.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-wl.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-wl.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-wl.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/NamespacesStrippingStage-2-wl.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/StringElementValidationStage-two-bad-addrs.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/StringElementValidationStage-two-bad-addrs.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/StringElementValidationStage-two-bad-addrs.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/StringElementValidationStage-two-bad-addrs.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-invalid.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-invalid.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-invalid.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-invalid.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-schema.xsd b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-schema.xsd
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-schema.xsd
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-schema.xsd
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-valid.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-valid.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-valid.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSchemaValidationStage-valid.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-input.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-input.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-input.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-input.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-mda196.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-mda196.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-mda196.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-mda196.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-output.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-output.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-output.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-output.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingCert.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingCert.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingCert.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingCert.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingKey.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingKey.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingKey.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStage-signingKey.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-badSignature.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-badSignature.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-badSignature.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-badSignature.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-emptyref.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-emptyref.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-emptyref.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-emptyref.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-entities2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-entities2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-entities2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-entities2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signed.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signed.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signed.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signed.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingCert.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingCert.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingCert.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingCert.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingKey.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingKey.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingKey.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureValidationStage-signingKey.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-3.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-3.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-3.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathFilteringStage-3.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-3.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-3.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-3.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XPathItemSelectionStrategy-3.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-includeMain.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-includeMain.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-includeMain.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-includeMain.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included2.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included2.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included2.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-included2.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-input.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-input.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-input.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-input.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-output2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-paramOutput.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-paramOutput.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-paramOutput.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-paramOutput.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transform1.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transformListener1.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transformListener1.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transformListener1.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLTransformationStage-transformListener1.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-input.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-input.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-input.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-input.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-mda45.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-mda45.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-mda45.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-mda45.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-validator.xsl b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-validator.xsl
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-validator.xsl
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/XSLValidationStage-validator.xsl
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ds/X509ValidationStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/ds/X509ValidationStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/ds/X509ValidationStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/ds/X509ValidationStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage-entities.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage-entities.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage-entities.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage-entities.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-base.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-entattr.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-infourl.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-keywords.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-legacy.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-logolang.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo-leg.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-no-uiinfo.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-noidp.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-noidp.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-noidp.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-noidp.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nolegacy.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nonentity.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nonentity.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nonentity.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-nonentity.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.json b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.json
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.json
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.json
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/DiscoFeedCollectionSerializer-privacyurl.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entities.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entities.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entities.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entities.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-entity2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-name.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-name.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-name.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-name.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-reversed.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-reversed.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-reversed.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage-reversed.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-different.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-different.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-different.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage-different.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityFilterStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityFilterStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityFilterStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityFilterStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-notentity.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-notentity.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-notentity.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/GenerateIdStage-notentity.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-fail.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-fail.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-fail.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-fail.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-ok.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-ok.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-ok.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage-ok.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest-config.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest-config.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest-config.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest-config.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest-config.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest-config.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest-config.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest-config.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest-config.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest-config.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest-config.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest-config.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added3.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added3.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added3.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-added3.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-extensions.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-extensions.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-extensions.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-extensions.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-noExtensions.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-noExtensions.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-noExtensions.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-noExtensions.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-some.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-some.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-some.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage-some.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-blacklist.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-blacklist.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-blacklist.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-blacklist.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-input.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-input.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-input.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-input.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepcoc2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepnone.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepnone.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepnone.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-keepnone.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2out.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2out.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2out.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multi2out.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multicon.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multicon.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multicon.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multicon.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multiout.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multiout.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multiout.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage-multiout.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest-config.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest-config.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest-config.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest-config.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage-in.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage-in.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage-in.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage-in.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-absent.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-absent.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-absent.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-absent.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-noext.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-noext.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-noext.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-noext.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-present.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-present.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-present.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage-present.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-1.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-1.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-1.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-1.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-2.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-2.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-2.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-2.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-3.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-3.xml
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-3.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage-3.xml
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
rename to mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
rename to mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
rename to mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
rename to mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-dsa1.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-dsa1.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-dsa1.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-dsa1.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-rsa.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-rsa.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-rsa.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509DSADetector-rsa.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert01.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert01.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert01.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert01.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert02.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert02.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert02.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert02.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert03.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert03.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert03.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert03.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert04.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert04.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert04.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert04.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert05.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert05.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert05.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert05.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert06.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert06.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert06.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-cert06.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-dsa.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-dsa.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-dsa.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509ROCAValidator-dsa.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-3.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-3.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-3.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-3.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-35.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-35.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-35.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-35.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-65537.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-65537.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-65537.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-65537.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-dsa.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-dsa.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-dsa.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAExponentValidator-dsa.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-1024.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-1024.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-1024.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-1024.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-2048.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-2048.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-2048.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-2048.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-dsa.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-dsa.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-dsa.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAKeyLengthValidator-dsa.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.txt b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.txt
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.txt
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-1024.txt
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.pem
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.txt b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.txt
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.txt
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-2048.txt
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-issue9.txt b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-issue9.txt
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-issue9.txt
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-issue9.txt
diff --git a/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-ok.pem b/mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-ok.pem
similarity index 100%
rename from aggregator-pipeline/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-ok.pem
rename to mda-framework/src/test/resources/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidator-ok.pem
diff --git a/aggregator-blacklists/.checkstyle b/mda-keylists-rsa/.checkstyle
similarity index 100%
rename from aggregator-blacklists/.checkstyle
rename to mda-keylists-rsa/.checkstyle
diff --git a/aggregator-pipeline/.classpath b/mda-keylists-rsa/.classpath
similarity index 100%
rename from aggregator-pipeline/.classpath
rename to mda-keylists-rsa/.classpath
diff --git a/aggregator-blacklists/.gitignore b/mda-keylists-rsa/.gitignore
similarity index 100%
rename from aggregator-blacklists/.gitignore
rename to mda-keylists-rsa/.gitignore
diff --git a/aggregator-blacklists/.project b/mda-keylists-rsa/.project
similarity index 91%
rename from aggregator-blacklists/.project
rename to mda-keylists-rsa/.project
index 15c715f..c7e118d 100644
--- a/aggregator-blacklists/.project
+++ b/mda-keylists-rsa/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>aggregator-blacklists</name>
+ <name>mda-keylists-rsa</name>
<comment></comment>
<projects>
</projects>
@@ -20,4 +20,4 @@
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
-</projectDescription>
\ No newline at end of file
+</projectDescription>
diff --git a/aggregator-pipeline/.settings/org.eclipse.core.resources.prefs b/mda-keylists-rsa/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from aggregator-pipeline/.settings/org.eclipse.core.resources.prefs
rename to mda-keylists-rsa/.settings/org.eclipse.core.resources.prefs
diff --git a/aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs b/mda-keylists-rsa/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from aggregator-pipeline/.settings/org.eclipse.jdt.core.prefs
rename to mda-keylists-rsa/.settings/org.eclipse.jdt.core.prefs
diff --git a/aggregator-pipeline/.settings/org.eclipse.jdt.ui.prefs b/mda-keylists-rsa/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from aggregator-pipeline/.settings/org.eclipse.jdt.ui.prefs
rename to mda-keylists-rsa/.settings/org.eclipse.jdt.ui.prefs
diff --git a/aggregator-pipeline/.settings/org.eclipse.m2e.core.prefs b/mda-keylists-rsa/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from aggregator-pipeline/.settings/org.eclipse.m2e.core.prefs
rename to mda-keylists-rsa/.settings/org.eclipse.m2e.core.prefs
diff --git a/aggregator-blacklists/pom.xml b/mda-keylists-rsa/pom.xml
similarity index 85%
rename from aggregator-blacklists/pom.xml
rename to mda-keylists-rsa/pom.xml
index 0624cfe..6915a86 100644
--- a/aggregator-blacklists/pom.xml
+++ b/mda-keylists-rsa/pom.xml
@@ -6,16 +6,16 @@
<parent>
<groupId>net.shibboleth.metadata</groupId>
- <artifactId>aggregator-parent</artifactId>
+ <artifactId>mda-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
</parent>
- <name>Shibboleth Metadata Aggregator :: RSA Key Blacklists</name>
- <artifactId>aggregator-blacklists</artifactId>
+ <name>RSA Key Lists</name>
+ <artifactId>mda-keylists-rsa</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.metadata.blacklists</automatic.module.name>
+ <automatic.module.name>net.shibboleth.metadata.keylists.rsa</automatic.module.name>
<checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
</properties>
@@ -29,13 +29,13 @@
<!-- Test Dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-pipeline</artifactId>
+ <artifactId>mda-framework</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>aggregator-pipeline</artifactId>
+ <artifactId>mda-framework</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/aggregator-blacklists/src/test/java/.gitkeep b/mda-keylists-rsa/src/main/java/.gitkeep
similarity index 100%
rename from aggregator-blacklists/src/test/java/.gitkeep
rename to mda-keylists-rsa/src/main/java/.gitkeep
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-1024.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-1024.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-1024.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-1024.txt
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-2048.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-2048.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-2048.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/compromised-2048.txt
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-1024.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-1024.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-1024.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-1024.txt
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-2048.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-2048.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-2048.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-2048.txt
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-4096.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-4096.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-4096.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-4096.txt
diff --git a/aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-512.txt b/mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-512.txt
similarity index 100%
rename from aggregator-blacklists/src/main/resources/net/shibboleth/metadata/validate/x509/debian-512.txt
rename to mda-keylists-rsa/src/main/resources/net/shibboleth/metadata/validate/x509/debian-512.txt
diff --git a/aggregator-pipeline/src/main/resources/.gitkeep b/mda-keylists-rsa/src/test/java/.gitkeep
similarity index 100%
rename from aggregator-pipeline/src/main/resources/.gitkeep
rename to mda-keylists-rsa/src/test/java/.gitkeep
diff --git a/aggregator-blacklists/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
similarity index 100%
rename from aggregator-blacklists/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
rename to mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/MDA183Test.java
diff --git a/aggregator-blacklists/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java b/mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
similarity index 100%
rename from aggregator-blacklists/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
rename to mda-keylists-rsa/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLBlacklistValidatorTest.java
diff --git a/aggregator-blacklists/src/test/resources/logback-test.xml b/mda-keylists-rsa/src/test/resources/logback-test.xml
similarity index 100%
rename from aggregator-blacklists/src/test/resources/logback-test.xml
rename to mda-keylists-rsa/src/test/resources/logback-test.xml
diff --git a/aggregator-blacklists/src/test/resources/net/shibboleth/metadata/validate/x509/MDA183Test-keystore.jks b/mda-keylists-rsa/src/test/resources/net/shibboleth/metadata/validate/x509/MDA183Test-keystore.jks
similarity index 100%
rename from aggregator-blacklists/src/test/resources/net/shibboleth/metadata/validate/x509/MDA183Test-keystore.jks
rename to mda-keylists-rsa/src/test/resources/net/shibboleth/metadata/validate/x509/MDA183Test-keystore.jks
diff --git a/pom.xml b/pom.xml
index f9ab1b8..ef5bd40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,15 +20,15 @@
<groupId>net.shibboleth.metadata</groupId>
- <artifactId>aggregator-parent</artifactId>
+ <artifactId>mda-parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
- <module>aggregator-blacklists</module>
- <module>aggregator-pipeline</module>
- <module>aggregator-cli</module>
- <module>aggregator-bom</module>
+ <module>mda-keylists-rsa</module>
+ <module>mda-framework</module>
+ <module>mda-cli</module>
+ <module>mda-bom</module>
</modules>
<properties>
@@ -88,7 +88,7 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list