[java-identity-provider] 05/51: IDP-1121 Remove ad: namespace

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=90e22f2a1e8acde91e3e5665185b479685eb9152

commit 90e22f2a1e8acde91e3e5665185b479685eb9152
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 22 14:21:13 2018 +0000

    IDP-1121 Remove ad: namespace
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
---
 .../impl/AttributeDefinitionNamespaceHandler.java  |  72 ----
 .../ContextDerivedAttributeDefinitionParser.java   |   6 +-
 ...CryptoTransientIdAttributeDefinitionParser.java |   6 +-
 .../impl/PrescopedAttributeDefinitionParser.java   |   6 +-
 ...henticationMethodAttributeDefinitionParser.java |   6 +-
 .../PrincipalNameAttributeDefinitionParser.java    |   6 +-
 .../impl/RegexSplitAttributeDefinitionParser.java  |   6 +-
 ...ML1NameIdentifierAttributeDefinitionParser.java |   6 +-
 .../impl/SAML2NameIDAttributeDefinitionParser.java |   6 +-
 .../ad/impl/ScopedAttributeDefinitionParser.java   |   6 +-
 .../ad/impl/ScriptedAttributeDefinitionParser.java |  19 +-
 .../ad/impl/SimpleAttributeDefinitionParser.java   |   6 +-
 .../SubjectDerivedAttributeDefinitionParser.java   |   6 +-
 .../ad/impl/TemplateAttributeDefinitionParser.java |  24 +-
 .../impl/TransientIdAttributeDefinitionParser.java |   6 +-
 .../impl/MappedAttributeDefinitionParser.java      |  42 +--
 .../spring/ad/mapped/impl/SourceValueParser.java   |  15 +-
 .../spring/ad/mapped/impl/ValueMapParser.java      |  18 +-
 .../src/main/resources/META-INF/spring.handlers    |   1 -
 ...ntextDerivedAttributeDefinitionsParserTest.java |  15 +-
 ...toTransientIdAttributeDefinitionParserTest.java |  12 -
 .../ad/PrescopedAttributeDefinitionParserTest.java |   8 -
 ...icationMethodAttributeDefinitionParserTest.java |   7 -
 ...PrincipalNameAttributeDefinitionParserTest.java |   7 -
 .../RegexSplitAttributeDefinitionParserTest.java   |  12 -
 ...ameIdentifierAttributeDefinitionParserTest.java |   9 -
 ...meIDdentifierAttributeDefinitionParserTest.java |  10 -
 .../ad/ScopedAttributeDefinitionParserTest.java    |   7 -
 .../spring/ad/ScriptedAttributeParserTest.java     |  29 +-
 .../ad/TemplateAttributeDefinitionParserTest.java  |  20 +-
 .../TransientIdAttributeDefinitionParserTest.java  |  22 --
 .../MappedAttributeDefinitionParserTest.java       |  10 +-
 .../spring/ad/mapped/SourceValueParserTest.java    |  13 -
 .../spring/ad/mapped/ValueMapParserTest.java       |  17 +-
 .../resolver/spring/ad/contextDerived.xml          |  10 -
 .../resolver/spring/ad/cryptoWithTime.xml          |  16 -
 .../resolver/spring/ad/idInParentDependency.xml    |   7 +-
 .../attribute/resolver/spring/ad/mapped/mapped.xml |  19 --
 .../resolver/spring/ad/mapped/sourceValue.xml      |  17 -
 .../resolver/spring/ad/mapped/valueMap.xml         |  17 -
 .../resolver/spring/ad/noIdInParentDependency.xml  |  11 +-
 .../resolver/spring/ad/orphanDependency.xml        |   9 +-
 .../attribute/resolver/spring/ad/prescopedWith.xml |  15 -
 .../spring/ad/principalAuthenticationMethod.xml    |  12 -
 .../attribute/resolver/spring/ad/principalName.xml |  12 -
 .../attribute/resolver/spring/ad/regexDefault.xml  |  15 -
 .../ad/resolver/scriptedAttributeFileMissing.xml   |   8 +
 .../resolver/spring/ad/saml1NameIdAttributes.xml   |  15 -
 .../resolver/spring/ad/saml2NameIdAttributes.xml   |  15 -
 .../idp/attribute/resolver/spring/ad/scoped.xml    |  13 -
 .../resolver/spring/ad/scriptedAttributeFile.xml   |  15 -
 .../spring/ad/scriptedAttributeFileMissing.xml     |  14 -
 .../resolver/spring/ad/scriptedAttributeInline.xml |  13 -
 .../resolver/spring/ad/templateAttributes.xml      |  17 -
 .../resolver/spring/ad/transientWithTime.xml       |  15 -
 .../resolver/spring/attribute-resolver2.xml        |  15 +-
 .../resolver/spring/multiFileResolver1.xml         |  38 +--
 .../resolver/spring/multiFileResolver2.xml         |  19 +-
 .../schema/shibboleth-attribute-resolver-ad.xsd    | 376 ---------------------
 .../schema/shibboleth-attribute-resolver.xsd       |  92 +----
 60 files changed, 109 insertions(+), 1177 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java
deleted file mode 100644
index 0f26ec7..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/AttributeDefinitionNamespaceHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.ad.impl;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.MappedAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.SourceValueParser;
-import net.shibboleth.idp.attribute.resolver.spring.ad.mapped.impl.ValueMapParser;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/**
- * Namespace handler for {@link net.shibboleth.idp.attribute.resolver.AttributeDefinition}s.
- */
-public class AttributeDefinitionNamespaceHandler extends BaseSpringNamespaceHandler {
-
-    /** Namespace for this handler. */
-    @Nonnull @NotEmpty public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resolver:ad";
-
-    /** {@inheritDoc} */
-    @Override public void init() {
-        registerBeanDefinitionParser(CryptoTransientIdAttributeDefinitionParser.TYPE_NAME_AD,
-                new CryptoTransientIdAttributeDefinitionParser());
-        registerBeanDefinitionParser(PrescopedAttributeDefinitionParser.TYPE_NAME_AD,
-                new PrescopedAttributeDefinitionParser());
-        registerBeanDefinitionParser(PrincipalAuthenticationMethodAttributeDefinitionParser.TYPE_NAME_AD,
-                new PrincipalAuthenticationMethodAttributeDefinitionParser());
-        registerBeanDefinitionParser(PrincipalNameAttributeDefinitionParser.TYPE_NAME_AD,
-                new PrincipalNameAttributeDefinitionParser());
-        registerBeanDefinitionParser(SubjectDerivedAttributeDefinitionParser.TYPE_NAME_AD,
-                new SubjectDerivedAttributeDefinitionParser());
-        registerBeanDefinitionParser(ContextDerivedAttributeDefinitionParser.TYPE_NAME_AD,
-                new ContextDerivedAttributeDefinitionParser());
-        registerBeanDefinitionParser(RegexSplitAttributeDefinitionParser.TYPE_NAME_AD,
-                new RegexSplitAttributeDefinitionParser());
-        registerBeanDefinitionParser(SAML1NameIdentifierAttributeDefinitionParser.TYPE_NAME_AD,
-                new SAML1NameIdentifierAttributeDefinitionParser());
-        registerBeanDefinitionParser(SAML2NameIDAttributeDefinitionParser.TYPE_NAME_AD,
-                new SAML2NameIDAttributeDefinitionParser());
-        registerBeanDefinitionParser(ScopedAttributeDefinitionParser.TYPE_NAME_AD,
-                new ScopedAttributeDefinitionParser());
-        registerBeanDefinitionParser(ScriptedAttributeDefinitionParser.TYPE_NAME_AD,
-                new ScriptedAttributeDefinitionParser());
-        registerBeanDefinitionParser(SimpleAttributeDefinitionParser.TYPE_NAME_AD,
-                new SimpleAttributeDefinitionParser());
-        registerBeanDefinitionParser(TemplateAttributeDefinitionParser.TYPE_NAME_AD,
-                new TemplateAttributeDefinitionParser());
-        registerBeanDefinitionParser(TransientIdAttributeDefinitionParser.TYPE_NAME_AD,
-                new TransientIdAttributeDefinitionParser());
-        registerBeanDefinitionParser(SourceValueParser.TYPE_NAME_AD, new SourceValueParser());
-        registerBeanDefinitionParser(ValueMapParser.TYPE_NAME_AD, new ValueMapParser());
-        registerBeanDefinitionParser(MappedAttributeDefinitionParser.TYPE_NAME_AD,
-                new MappedAttributeDefinitionParser());
-    }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
index b643cf7..8b7aaad 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
@@ -32,11 +32,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 /** Spring Bean Definition Parser for attribute definitions derived from the Principal. */
 public class ContextDerivedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "ContextDerivedAttribute");
-
-    /** Schema type name - resolver: . */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ContextDerivedAttribute");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
index a348705..8d77ce9 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/CryptoTransientIdAttributeDefinitionParser.java
@@ -43,11 +43,7 @@ import org.w3c.dom.Element;
 @SuppressWarnings("deprecation")
 public class CryptoTransientIdAttributeDefinitionParser extends BaseAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE,
-            "CryptoTransientId");
-
-    /** Schema type name - resolver: . */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
             "CryptoTransientId");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
index 6ea152d..961e1ad 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrescopedAttributeDefinitionParser.java
@@ -34,11 +34,7 @@ import org.w3c.dom.Element;
 /** Spring bean definition parser for prescoped attributes. */
 public class PrescopedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Prescoped");
-
-    /** Schema type name resolver: (legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Prescoped");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
index be4e90e..aca3189 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionParser.java
@@ -32,11 +32,7 @@ import org.w3c.dom.Element;
 /** Spring Bean Definition Parser for PrincipalAuthenticationMethod. */
 public class PrincipalAuthenticationMethodAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "PrincipalAuthenticationMethod");
-
-    /** Schema type name resolver:. */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalAuthenticationMethod");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
index f49935c..7ac7f91 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/PrincipalNameAttributeDefinitionParser.java
@@ -29,11 +29,7 @@ import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamesp
 /** Spring Bean Definition Parser for PrincipalName attribute definitions. */
 public class PrincipalNameAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "PrincipalName");
-
-    /** Schema type name ad: (legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalName");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
index 4c2f8d3..dce71fe 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/RegexSplitAttributeDefinitionParser.java
@@ -36,11 +36,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 /** Spring Bean Definition Parser for Regexp split attribute definitions. */
 public class RegexSplitAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name : ad: (Legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "RegexSplit");
-
-    /** Schema type name : ad: (Legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "RegexSplit");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
index 70c8c41..d5a6d52 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML1NameIdentifierAttributeDefinitionParser.java
@@ -34,11 +34,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 /** Spring bean definition parser for SAML 1 NameIdentifier attribute definitions. */
 public class SAML1NameIdentifierAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SAML1NameIdentifier");
-
-    /** Schema type name - resolver:. */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML1NameIdentifier");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
index 278c0ae..c4dd437 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SAML2NameIDAttributeDefinitionParser.java
@@ -34,11 +34,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 /** Spring bean definition parser for SAML 2 NameID attribute definitions. */
 public class SAML2NameIDAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SAML2NameID");
-
-    /** Schema type name - resolver: . */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML2NameID");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
index e2f916b..8fba350 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScopedAttributeDefinitionParser.java
@@ -36,11 +36,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
  */
 public class ScopedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Scoped");
-
-    /** Schema type name - resolver: . */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Scoped");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
index 0402201..7222d6b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ScriptedAttributeDefinitionParser.java
@@ -41,23 +41,12 @@ import org.w3c.dom.Element;
  */
 public class ScriptedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Script");
-
+    /** Schema type name. */
     /** Schema type name - resolver: . */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptedAttribute");
 
     /** Script file element name. */
-    @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "ScriptFile");
-
-    /** Inline Script element name. */
-    @Nonnull public static final QName SCRIPT_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Script");
-
-    /** Script file element name. */
     @Nonnull public static final QName SCRIPT_FILE_ELEMENT_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ScriptFile");
 
@@ -87,10 +76,8 @@ public class ScriptedAttributeDefinitionParser extends AbstractWarningAttributeD
             scriptBuilder.addPropertyValue("engineName", scriptLanguage);
         }
 
-        final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME_AD);
-        scriptElem.addAll(ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME_RESOLVER));
-        final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME_AD);
-        scriptFileElem.addAll(ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME_RESOLVER));
+        final List<Element> scriptElem = ElementSupport.getChildElements(config, SCRIPT_ELEMENT_NAME_RESOLVER);
+        final List<Element> scriptFileElem = ElementSupport.getChildElements(config, SCRIPT_FILE_ELEMENT_NAME_RESOLVER);
         if (scriptElem != null && scriptElem.size() > 0) {
             if (scriptFileElem != null && scriptFileElem.size() > 0) {
                 log.warn("{} definition contains both <Script> and <ScriptFile> elements, taking the "
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
index c26f720..ff2e3dd 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SimpleAttributeDefinitionParser.java
@@ -31,11 +31,7 @@ import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamesp
 /** Bean definition parser for a {@link SimpleAttributeDefinition}. */
 public class SimpleAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type names - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Simple");
-
-    /** Schema type names - ad: (legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Simple");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
index 36189d7..074954f 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
@@ -36,11 +36,7 @@ import org.w3c.dom.Element;
 /** Spring Bean Definition Parser for attribute definitions derived from the Principal. */
 public class SubjectDerivedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SubjectDerivedAttribute");
-
-    /** Schema type name resolver: (legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SubjectDerivedAttribute");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
index 833648e..490e40a 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TemplateAttributeDefinitionParser.java
@@ -42,27 +42,15 @@ import org.w3c.dom.Element;
  */
 public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Template");
-
-    /** Schema type name - resolver: . */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Template");
 
-    /** SourceValue element name - ad: (legacy). */
-    @Nonnull public static final QName TEMPLATE_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Template");
-
-    /** SourceValue element name - - resolver: . */
+    /** SourceValue element name. */
     @Nonnull public static final QName TEMPLATE_ELEMENT_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Template");
 
-    /** SourceValue element name - ad: (legacy). */
-    @Nonnull public static final QName SOURCE_ATTRIBUTE_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SourceAttribute");
-
-    /** SourceValue element name - resolver: . */
+    /** SourceValue element name. */
     @Nonnull public static final QName SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SourceAttribute");
 
@@ -79,8 +67,7 @@ public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeD
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
-        final List<Element> templateElements = ElementSupport.getChildElements(config, TEMPLATE_ELEMENT_NAME_AD);
-        templateElements.addAll(ElementSupport.getChildElements(config, TEMPLATE_ELEMENT_NAME_RESOLVER));
+        final List<Element> templateElements = ElementSupport.getChildElements(config, TEMPLATE_ELEMENT_NAME_RESOLVER);
         if (null == templateElements || templateElements.isEmpty()) {
             DeprecationSupport.warnOnce(ObjectType.ELEMENT, "Missing " + TEMPLATE_ELEMENT_NAME_RESOLVER.getLocalPart(),
                     parserContext.getReaderContext().getResource().getDescription(),
@@ -97,8 +84,7 @@ public class TemplateAttributeDefinitionParser extends AbstractWarningAttributeD
         }
 
         final List<Element> sourceAttributeElements =
-                ElementSupport.getChildElements(config, SOURCE_ATTRIBUTE_ELEMENT_NAME_AD);
-        sourceAttributeElements.addAll(ElementSupport.getChildElements(config, SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER));
+            ElementSupport.getChildElements(config, SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER);
         if (null != sourceAttributeElements && !sourceAttributeElements.isEmpty()) {
             DeprecationSupport.warnOnce(ObjectType.ELEMENT, SOURCE_ATTRIBUTE_ELEMENT_NAME_RESOLVER.getLocalPart(),
                     parserContext.getReaderContext().getResource().getDescription(),
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
index 33e1146..83d2619 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/TransientIdAttributeDefinitionParser.java
@@ -43,11 +43,7 @@ import org.w3c.dom.Element;
 @SuppressWarnings("deprecation")
 public class TransientIdAttributeDefinitionParser extends BaseAttributeDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "TransientId");
-
-    /** Schema type name. - resolver: */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "TransientId");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
index e59bcc8..8a5accc 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
@@ -23,15 +23,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.MappedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.AbstractWarningAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.AttributeDefinitionNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
@@ -40,22 +31,21 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/** Bean definition parser for a {@link MappedAttributeDefinition}. */
-public class MappedAttributeDefinitionParser extends AbstractWarningAttributeDefinitionParser {
+import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.MappedAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Mapped");
+/** Bean definition parser for a {@link MappedAttributeDefinition}. */
+public class MappedAttributeDefinitionParser extends BaseResolverPluginParser {
 
-    /** Schema type name - resolver:. */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "Mapped");
 
-    /** return Value element name - ad: (legacy). */
-    @Nonnull public static final QName DEFAULT_VALUE_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "DefaultValue");
-
-    /** return Value element name - resolver:. */
+    /** return Value element name. */
     @Nonnull public static final QName DEFAULT_VALUE_ELEMENT_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "DefaultValue");
 
@@ -73,8 +63,7 @@ public class MappedAttributeDefinitionParser extends AbstractWarningAttributeDef
         super.doParse(config, parserContext, builder);
 
         final List<Element> defaultValueElements =
-                ElementSupport.getChildElements(config, DEFAULT_VALUE_ELEMENT_NAME_AD);
-        defaultValueElements.addAll(ElementSupport.getChildElements(config, DEFAULT_VALUE_ELEMENT_NAME_RESOLVER));
+                ElementSupport.getChildElements(config, DEFAULT_VALUE_ELEMENT_NAME_RESOLVER);
         String defaultValue = null;
         String passThru = null;
 
@@ -94,8 +83,8 @@ public class MappedAttributeDefinitionParser extends AbstractWarningAttributeDef
             }
         }
 
-        final List<Element> valueMapElements = ElementSupport.getChildElements(config, ValueMapParser.TYPE_NAME_AD);
-        valueMapElements.addAll(ElementSupport.getChildElements(config, ValueMapParser.TYPE_NAME_RESOLVER));
+        final List<Element> valueMapElements = ElementSupport.getChildElements(config, 
+                ValueMapParser.TYPE_NAME_RESOLVER);
         if (null == valueMapElements || valueMapElements.size() == 0) {
             throw new BeanCreationException(
                     "Attribute Definition '" + getDefinitionId() + "' At least one ValueMap must be specified");
@@ -111,9 +100,4 @@ public class MappedAttributeDefinitionParser extends AbstractWarningAttributeDef
         builder.addPropertyValue("valueMaps", valueMaps);
     }
 
-    @Override
-    @Nonnull protected QName getPreferredName() {
-        return TYPE_NAME_RESOLVER;
-    }
-
 }
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
index 10b138b..3811bb7 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
@@ -21,11 +21,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.SourceValue;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.AttributeDefinitionNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -33,14 +28,14 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.SourceValue;
+import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 /** Bean definition parser for a {@link SourceValue}. */
 public class SourceValueParser extends AbstractSingleBeanDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "SourceValue");
-
-    /** Schema type name - ad: (legacy). */
+    /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SourceValue");
 
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
index 54f64e8..27d0fb1 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/ValueMapParser.java
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
 
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.ValueMap;
-import net.shibboleth.idp.attribute.resolver.spring.ad.impl.AttributeDefinitionNamespaceHandler;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -43,19 +42,12 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
 /** Bean definition parser for a {@link ValueMap}. */
 public class ValueMapParser extends AbstractSingleBeanDefinitionParser {
 
-    /** Schema type name - ad: (legacy). */
-    @Nonnull public static final QName TYPE_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "ValueMap");
-
+    /** Schema type name. */
     /** Schema type name - resolver: . */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ValueMap");
 
-    /** return Value element name - ad: (legacy). */
-    @Nonnull public static final QName RETURN_VALUE_ELEMENT_NAME_AD =
-            new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "ReturnValue");
-
-    /** return Value element name - resolver:. */
+    /** return Value element name. */
     @Nonnull public static final QName RETURN_VALUE_ELEMENT_NAME_RESOLVER =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ReturnValue");
 
@@ -72,8 +64,7 @@ public class ValueMapParser extends AbstractSingleBeanDefinitionParser {
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
-        final List<Element> returnElems = ElementSupport.getChildElements(config, RETURN_VALUE_ELEMENT_NAME_AD);
-        returnElems.addAll(ElementSupport.getChildElements(config, RETURN_VALUE_ELEMENT_NAME_RESOLVER));
+        final List<Element> returnElems = ElementSupport.getChildElements(config, RETURN_VALUE_ELEMENT_NAME_RESOLVER);
         String returnValue = null;
 
         if (null != returnElems && returnElems.size() > 0) {
@@ -85,8 +76,7 @@ public class ValueMapParser extends AbstractSingleBeanDefinitionParser {
         }
 
         final List<Element> sourceValueElements =
-                ElementSupport.getChildElements(config, SourceValueParser.TYPE_NAME_AD);
-        sourceValueElements.addAll(ElementSupport.getChildElements(config, SourceValueParser.TYPE_NAME_RESOLVER));
+                ElementSupport.getChildElements(config, SourceValueParser.TYPE_NAME_RESOLVER);
         if (null == sourceValueElements || sourceValueElements.size() == 0) {
             throw new BeanCreationException("Attribute Definition: ValueMap must have at least one SourceValue");
         }
diff --git a/idp-attribute-resolver-spring/src/main/resources/META-INF/spring.handlers b/idp-attribute-resolver-spring/src/main/resources/META-INF/spring.handlers
index d7033cd..e6ffe63 100644
--- a/idp-attribute-resolver-spring/src/main/resources/META-INF/spring.handlers
+++ b/idp-attribute-resolver-spring/src/main/resources/META-INF/spring.handlers
@@ -1,3 +1,2 @@
 urn\:mace\:shibboleth\:2.0\:resolver = net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler
-urn\:mace\:shibboleth\:2.0\:resolver\:ad = net.shibboleth.idp.attribute.resolver.spring.ad.impl.AttributeDefinitionNamespaceHandler
 urn\:mace\:shibboleth\:2.0\:resolver\:dc = net.shibboleth.idp.attribute.resolver.spring.dc.impl.DataConnectorNamespaceHandler
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
index 62dc855..a034500 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
@@ -94,17 +94,6 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
     }
 
     @Test public void context() throws ResolutionException {
-        final AttributeDefinition attrDef = getAttributeDefn("contextDerived.xml", "contextDerivedBeans.xml",
-                ContextDerivedAttributeDefinition.class);
-
-        final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("BeanWhatever")).getValues();
-
-        Assert.assertEquals(2, foo.size());
-        Assert.assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE)));
-        Assert.assertTrue(foo.contains(new StringAttributeValue(SIMPLE_VALUE + "2")));
-    }
-
-    @Test public void resolver() throws ResolutionException {
         final AttributeDefinition attrDef = getAttributeDefn("resolver/contextDerived.xml", "contextDerivedBeans.xml",
                 ContextDerivedAttributeDefinition.class);
 
@@ -126,11 +115,11 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
     }
 
     @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void fail() throws ResolutionException {
-        getAttributeDefn("subjectDerivedFail.xml", ContextDerivedAttributeDefinition.class);
+        getAttributeDefn("resolver/subjectDerivedFail.xml", ContextDerivedAttributeDefinition.class);
     }
 
     @Test(expectedExceptions = {BeanDefinitionStoreException.class}) public void dependency()
             throws ResolutionException {
-        getAttributeDefn("subjectDerivedDependency.xml", ContextDerivedAttributeDefinition.class);
+        getAttributeDefn("resolver/subjectDerivedDependency.xml", ContextDerivedAttributeDefinition.class);
     }
 }
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
index fc2d89f..5ecdae0 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
@@ -37,18 +37,6 @@ public class CryptoTransientIdAttributeDefinitionParserTest extends BaseAttribut
         return getAttributeDefn(fileName, "sealer.xml", TransientIdAttributeDefinition.class);
     }
 
-    @Test public void withTime() throws ComponentInitializationException {
-
-        TransientIdAttributeDefinition defn = getDefinition("cryptoWithTime.xml");
-
-        Assert.assertTrue(defn.isInitialized());
-
-        CryptoTransientIdGenerationStrategy strategy =
-                (CryptoTransientIdGenerationStrategy) defn.getTransientIdGenerationStrategy();
-
-        Assert.assertEquals(strategy.getIdLifetime(), 3 * 60 * 1000);
-    }
-
     @Test public void resolver() throws ComponentInitializationException {
 
         TransientIdAttributeDefinition defn = getDefinition("resolver/cryptoWithTime.xml");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
index 01f0e4f..6ec71c2 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
@@ -29,14 +29,6 @@ import org.testng.annotations.Test;
  */
 public class PrescopedAttributeDefinitionParserTest extends BaseAttributeDefinitionParserTest {
 
-    @Test public void withScope() {
-        PrescopedAttributeDefinition attrDef =
-                getAttributeDefn("prescopedWith.xml", PrescopedAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "prescopedWith");
-        Assert.assertEquals(attrDef.getScopeDelimiter(), "#");
-    }
-
     @Test public void resolver() {
         PrescopedAttributeDefinition attrDef =
                 getAttributeDefn("resolver/prescopedWith.xml", PrescopedAttributeDefinition.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java
index e8a5c81..f8349e7 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalAuthenticationMethodAttributeDefinitionParserTest.java
@@ -29,13 +29,6 @@ import org.testng.annotations.Test;
  */
 public class PrincipalAuthenticationMethodAttributeDefinitionParserTest extends BaseAttributeDefinitionParserTest {
 
-    @Test public void legacy() {
-        PrincipalAuthenticationMethodAttributeDefinition attrDef =
-                getAttributeDefn("principalAuthenticationMethod.xml", PrincipalAuthenticationMethodAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "PrincipalAuthenticationMethod");
-    }
-
     @Test public void resolver() {
         PrincipalAuthenticationMethodAttributeDefinition attrDef =
                 getAttributeDefn("resolver/principalAuthenticationMethod.xml", PrincipalAuthenticationMethodAttributeDefinition.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
index 18207fe..4e7d1c2 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrincipalNameAttributeDefinitionParserTest.java
@@ -31,13 +31,6 @@ public class PrincipalNameAttributeDefinitionParserTest extends BaseAttributeDef
 
     @Test public void test() {
         PrincipalNameAttributeDefinition attrDef =
-                getAttributeDefn("principalName.xml", PrincipalNameAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "PrincipalName");
-    }
-
-    @Test public void legacy() {
-        PrincipalNameAttributeDefinition attrDef =
                 getAttributeDefn("resolver/principalName.xml", PrincipalNameAttributeDefinition.class);
 
         Assert.assertEquals(attrDef.getId(), "PrincipalName");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
index b4b012c..09621fc 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
@@ -34,18 +34,6 @@ public class RegexSplitAttributeDefinitionParserTest extends BaseAttributeDefini
 
     @Test public void defaultCase() {
         RegexSplitAttributeDefinition attrDef =
-                getAttributeDefn("regexDefault.xml", RegexSplitAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "regexSplitDefault");
-
-        Pattern pat = attrDef.getRegularExpression();
-
-        Assert.assertTrue(pat.matcher("at1-FOOBLECONNECTector").matches());
-        Assert.assertFalse(pat.matcher("AT1-foobleconneECTOR").matches());
-    }
-
-    @Test public void resolver() {
-        RegexSplitAttributeDefinition attrDef =
                 getAttributeDefn("resolver/regexDefault.xml", RegexSplitAttributeDefinition.class);
 
         Assert.assertEquals(attrDef.getId(), "regexSplitDefault");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
index 0d75344..02499ed 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
@@ -39,15 +39,6 @@ public class SAML1NameIdentifierAttributeDefinitionParserTest extends BaseAttrib
     }
 
     @Test public void attributes() {
-        SAML1NameIdentifierAttributeDefinition attrDef =
-                getAttributeDefn("saml1NameIdAttributes.xml", SAML1NameIdentifierAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "SAML1NameIdentifierAttributes");
-        Assert.assertEquals(attrDef.getNameIdFormat(), "format");
-        Assert.assertEquals(attrDef.getNameIdQualifier(), "qualifier");
-    }
-
-    @Test public void resolver() {
         SAML1NameIdentifierAttributeDefinition attrDef = getAttributeDefn("resolver/saml1NameIdentifierAttributes.xml",
                 SAML1NameIdentifierAttributeDefinition.class);
 
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
index 8738e87..1cb0464 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
@@ -40,16 +40,6 @@ public class SAML2NameIDdentifierAttributeDefinitionParserTest extends BaseAttri
 
     @Test public void attributes() {
         SAML2NameIDAttributeDefinition attrDef =
-                getAttributeDefn("saml2NameIdAttributes.xml", SAML2NameIDAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "SAML2NameId-Attr");
-        Assert.assertEquals(attrDef.getNameIdFormat(), "format");
-        Assert.assertEquals(attrDef.getNameIdQualifier(), "qualifier");
-        Assert.assertEquals(attrDef.getNameIdSPQualifier(), "name-Id-SP-Qualifier");
-    }
-
-    @Test public void resolver() {
-        SAML2NameIDAttributeDefinition attrDef =
                 getAttributeDefn("resolver/saml2NameIdAttributes.xml", SAML2NameIDAttributeDefinition.class);
 
         Assert.assertEquals(attrDef.getId(), "SAML2NameId-Attr");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
index 203a070..7dafbb1 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScopedAttributeDefinitionParserTest.java
@@ -30,13 +30,6 @@ import net.shibboleth.idp.attribute.resolver.spring.ad.impl.SAML1NameIdentifierA
 public class ScopedAttributeDefinitionParserTest extends BaseAttributeDefinitionParserTest {
 
     @Test public void defaultCase() {
-        ScopedAttributeDefinition attrDef = getAttributeDefn("scoped.xml", ScopedAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "scoped");
-        Assert.assertEquals(attrDef.getScope(), "mYsCoPe");
-    }
-
-    @Test public void resolver() {
         ScopedAttributeDefinition attrDef = getAttributeDefn("resolver/scoped.xml", ScopedAttributeDefinition.class);
 
         Assert.assertEquals(attrDef.getId(), "scoped");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
index 9c0d983..9b1d053 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
@@ -34,27 +34,6 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
 
     @Test public void inline() {
         final ScriptedAttributeDefinition attrDef =
-                getAttributeDefn("scriptedAttributeInline.xml", ScriptedAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "scriptedInline");
-        Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
-        Assert.assertEquals(attrDef.getScript().getScript(), "foo=\"bar\";");
-    }
-
-    @Test public void file() {
-        final ScriptedAttributeDefinition attrDef =
-                getAttributeDefn("scriptedAttributeFile.xml", ScriptedAttributeDefinition.class);
-
-        Assert.assertEquals(attrDef.getId(), "scriptedFile");
-        Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
-        Assert.assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "foo=bar();");
-
-        Assert.assertNull(attrDef.getCustomObject());
-
-    }
-
-    @Test public void resolverInline() {
-        final ScriptedAttributeDefinition attrDef =
                 getAttributeDefn("resolver/scriptedAttributeInline.xml", ScriptedAttributeDefinition.class);
 
         Assert.assertEquals(attrDef.getId(), "scriptedInline");
@@ -62,7 +41,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
         Assert.assertEquals(attrDef.getScript().getScript(), "foo=\"bar\";");
     }
 
-    @Test public void resolverFile() {
+    @Test public void file() {
         final ScriptedAttributeDefinition attrDef =
                 getAttributeDefn("resolver/scriptedAttributeFile.xml", ScriptedAttributeDefinition.class);
 
@@ -91,7 +70,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
 
     @Test public void bad() {
         try {
-            getAttributeDefn("scriptedAttributeBad.xml", ScriptedAttributeDefinition.class);
+            getAttributeDefn("resolver/scriptedAttributeBad.xml", ScriptedAttributeDefinition.class);
             Assert.fail("Bad script worked?");
         } catch (BeanDefinitionStoreException | BeanCreationException e) {
             // OK
@@ -100,7 +79,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
 
     @Test public void absent() {
         try {
-            getAttributeDefn("scriptedAttributeAbsent.xml", ScriptedAttributeDefinition.class);
+            getAttributeDefn("resolverscriptedAttributeAbsent.xml", ScriptedAttributeDefinition.class);
             Assert.fail("Missing script worked?");
         } catch (final BeanDefinitionStoreException e) {
             // OK
@@ -108,7 +87,7 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
     }
 
     @Test(expectedExceptions = {BeanCreationException.class,}) public void missingFile() {
-        getAttributeDefn("scriptedAttributeFileMissing.xml", ScriptedAttributeDefinition.class);
+        getAttributeDefn("resolver/scriptedAttributeFileMissing.xml", ScriptedAttributeDefinition.class);
     }
 
 }
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
index 6bcaab3..d5f10bc 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
@@ -34,7 +34,7 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
     @Test(enabled = false) public void noAttr() throws ComponentInitializationException {
 
         final TemplateAttributeDefinition defn =
-                getAttributeDefn("templateNoAttributes.xml", "externalBeans.xml", TemplateAttributeDefinition.class);
+                getAttributeDefn("resolver/templateNoAttributes.xml", "externalBeans.xml", TemplateAttributeDefinition.class);
 
         Assert.assertEquals(defn.getId(), "templateId");
         Assert.assertNull(defn.getTemplateText());
@@ -43,24 +43,6 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
 
     @Test public void withAttr() throws ComponentInitializationException {
 
-        try {
-            getAttributeDefn("templateAttributes.xml", "externalBeans.xml", TemplateAttributeDefinition.class);
-            Assert.fail("should not find bean");
-        } catch (final BeanCreationException e) {
-            // OK
-        }
-        final TemplateAttributeDefinition defn =
-                getAttributeDefn("templateAttributes.xml", "velocity2.xml", TemplateAttributeDefinition.class);
-
-        Assert.assertEquals(defn.getId(), "templateIdAttr");
-        Assert.assertEquals(defn.getTemplateText(), "TheTemplate");
-        Assert.assertEquals(defn.getSourceAttributes().size(), 2);
-        Assert.assertTrue(defn.getSourceAttributes().contains("att1"));
-        Assert.assertTrue(defn.getSourceAttributes().contains("att2"));
-    }
-
-    @Test public void resolver() throws ComponentInitializationException {
-
         final TemplateAttributeDefinition defn =
                 getAttributeDefn("resolver/templateAttributes.xml", "velocity2.xml", TemplateAttributeDefinition.class);
 
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
index b6f9659..4bda43d 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
@@ -40,28 +40,6 @@ public class TransientIdAttributeDefinitionParserTest extends BaseAttributeDefin
 
     @Test public void withTime() throws ComponentInitializationException {
 
-        try {
-            getDefinition("transientWithTime.xml");
-            Assert.fail();
-        } catch (BeanCreationException e) {
-            // OK
-        }
-        TransientIdAttributeDefinition defn =
-                getAttributeDefn("transientWithTime.xml", "idStore2.xml", TransientIdAttributeDefinition.class);
-
-        Assert.assertEquals(defn.getId(), "transientIdWithTime");
-
-        Assert.assertTrue(defn.isInitialized());
-
-        StoredTransientIdGenerationStrategy generator =
-                (StoredTransientIdGenerationStrategy) defn.getTransientIdGenerationStrategy();
-
-        Assert.assertEquals(generator.getIdLifetime(), 1000 * 60 * 3);
-        Assert.assertEquals(generator.getIdSize(), 16);
-    }
-
-    @Test public void withTimeResolver() throws ComponentInitializationException {
-
         final TransientIdAttributeDefinition defn = getAttributeDefn("resolver/transientWithTime.xml", "idStore2.xml",
                 TransientIdAttributeDefinition.class);
 
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
index bb618c5..bede381 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/MappedAttributeDefinitionParserTest.java
@@ -34,14 +34,6 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
         return getAttributeDefn("mapped/" + fileName, MappedAttributeDefinition.class);
     }
 
-    @Test public void defaultCase() {
-        final MappedAttributeDefinition defn = getDefinition("mapped.xml");
-
-        Assert.assertTrue(defn.isPassThru());
-        Assert.assertEquals(defn.getValueMaps().size(), 2);
-        Assert.assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
-    }
-
     @Test public void multiDefault() {
         final MappedAttributeDefinition defn = getDefinition("resolver/multiDefault.xml");
 
@@ -50,7 +42,7 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
         Assert.assertEquals(defn.getDefaultAttributeValue().getValue(), "foobar");
     }
 
-    @Test public void resolver() {
+    @Test public void defaultCase() {
         final MappedAttributeDefinition defn = getDefinition("resolver/mapped.xml");
 
         Assert.assertTrue(defn.isPassThru());
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
index 40118c3..a00da50 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/SourceValueParserTest.java
@@ -41,19 +41,6 @@ public class SourceValueParserTest extends BaseAttributeDefinitionParserTest {
     }
 
     @Test public void simple() {
-        SourceValue value = getSourceValue("sourceValue.xml");
-
-        Assert.assertFalse(value.isIgnoreCase());
-        Assert.assertFalse(value.isPartialMatch());
-        try {
-            Assert.assertNull(value.getValue());
-            Assert.fail();
-        } catch (ConstraintViolationException e) {
-
-        }
-    }
-
-    @Test public void resolver() {
         SourceValue value = getSourceValue("resolver/sourceValue.xml");
 
         Assert.assertFalse(value.isIgnoreCase());
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
index f39a556..c4f2520 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/ValueMapParserTest.java
@@ -32,15 +32,11 @@ import org.testng.annotations.Test;
 public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
 
     private ValueMap getValueMap(final String fileName) {
-        return getValueMap(fileName, false);
-    }
-
-    private ValueMap getValueMap(final String fileName, final boolean resolver) {
         final GenericApplicationContext context = new GenericApplicationContext();
         setTestContext(context);
         context.setDisplayName("ApplicationContext: " + ValueMapParserTest.class);
 
-        return getBean(ATTRIBUTE_FILE_PATH + (resolver ? "mapped/resolver/" : "mapped/") + fileName, ValueMap.class,
+        return getBean(ATTRIBUTE_FILE_PATH + "mapped/resolver/"  + fileName, ValueMap.class,
                 context);
     }
 
@@ -52,18 +48,11 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
         Assert.assertEquals(value.getSourceValues().iterator().next().getPattern().pattern(), "source");
     }
 
-    @Test public void valueMapResolver() {
-
-        final ValueMap value = getValueMap("valueMap.xml", true);
-        Assert.assertEquals(value.getReturnValue(), "return");
-        Assert.assertEquals(value.getSourceValues().size(), 1);
-        Assert.assertEquals(value.getSourceValues().iterator().next().getPattern().pattern(), "source");
-    }
 
     @Test public void noSourceValues() {
 
         try {
-            getValueMap("valueMapNoSourceValue.xml", true);
+            getValueMap("valueMapNoSourceValue.xml");
             Assert.fail();
         } catch (final BeanDefinitionStoreException e) {
             // OK
@@ -73,7 +62,7 @@ public class ValueMapParserTest extends BaseAttributeDefinitionParserTest {
     @Test public void noValues() {
 
         try {
-            getValueMap("valueMapNoValues.xml", true);
+            getValueMap("valueMapNoValues.xml");
             Assert.fail();
         } catch (final BeanDefinitionStoreException e) {
             // OK
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml
deleted file mode 100644
index 3eb125a..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml
+++ /dev/null
@@ -1,10 +0,0 @@
- <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    dependencyOnly="1"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
-    xsi:type="ad:ContextDerivedAttribute" id="PD1" attributeValuesFunctionRef="ctxAttributeValuesFunction"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
deleted file mode 100644
index f846f67..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeDefinition 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    
-    id="cryptoTransientId"
-    xsi:type="ad:CryptoTransientId"
-    dataSealerRef="shibboleth.TransientIDDataSealer"
-    lifetime="PT3M"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-    />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
index a515594..c8c1d74 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
@@ -1,10 +1,5 @@
-
 <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
+	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
 	ref="TheHasRef" /> 
   
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
deleted file mode 100644
index a51c93e..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resolver:AttributeDefintion xsi:type="ad:Mapped"
-	xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-    <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-    <ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue>source</ad:SourceValue>
-	</ad:ValueMap>
-	<ad:ValueMap>
-		<ad:ReturnValue>return1</ad:ReturnValue>
-		<ad:SourceValue>source2</ad:SourceValue>
-	</ad:ValueMap>
-</resolver:AttributeDefintion>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
deleted file mode 100644
index a800a67..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
-	id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-	xsi:type="ad:Mapped">
-	<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-		ref="TheOrphan" />
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue/>
-	</ad:ValueMap>
-</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
deleted file mode 100644
index 3f3e7b1..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<ad:AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
-    id="container"
-	xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-	xsi:type="ad:Mapped">
-     <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-	<ad:ValueMap>
-		<ad:ReturnValue>return</ad:ReturnValue>
-		<ad:SourceValue>source</ad:SourceValue>
-	</ad:ValueMap>
-</ad:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
index 5896335..7c4f037 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
@@ -1,10 +1,5 @@
-<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" 
+<Dependency xmlns="urn:mace:shibboleth:2.0:resolver"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-    
-     ref="TheHasNotRef" /> 
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+    ref="TheHasNotRef" />
   
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
index 59b1ed7..3464102 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
@@ -1,8 +1,3 @@
-  <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"
+  <Dependency xmlns="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml
deleted file mode 100644
index 09673d0..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWith.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:Prescoped" id="prescopedWith" scopeDelimiter="#"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-    <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>                        
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
deleted file mode 100644
index 1d62cf1..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
+++ /dev/null
@@ -1,12 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:PrincipalAuthenticationMethod" id="PrincipalAuthenticationMethod"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
deleted file mode 100644
index d57dadb..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
+++ /dev/null
@@ -1,12 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:PrincipalName" id="PrincipalName"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
deleted file mode 100644
index 3af13f9..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:RegexSplit" id="regexSplitDefault" 
-    regex="at1-(.+)or"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-    <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFileMissing.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFileMissing.xml
new file mode 100644
index 0000000..2a81e1b
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeFileMissing.xml
@@ -0,0 +1,8 @@
+ <AttributeDefinition 
+    xmlns="urn:mace:shibboleth:2.0:resolver"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    dependencyOnly="1"
+    xsi:type="ScriptedAttribute" id="scriptedFile"
+    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+    <ScriptFile>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/file.script-missing</ScriptFile>
+</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
deleted file mode 100644
index 3e7a84b..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifierAttributes"
-    nameIdFormat = "format" 
-    nameIdQualifier = "qualifier"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-    />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml
deleted file mode 100644
index c5e3852..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:type="ad:SAML2NameID" id="SAML2NameId-Attr"
-    nameIdFormat = "format" 
-    nameIdQualifier = "qualifier"
-    nameIdSPQualifier = "name-Id-SP-Qualifier"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-    />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scoped.xml
deleted file mode 100644
index ef17779..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scoped.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver"
-	xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" scope="mYsCoPe"
-	xsi:type="ad:Scoped" id="scoped"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-	<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFile.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFile.xml
deleted file mode 100644
index b13251d..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFile.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:Script" id="scriptedFile"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-    <ad:ScriptFile>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/file.script</ad:ScriptFile>
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml
deleted file mode 100644
index fd6d71a..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:Script" id="scriptedFile"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-    <ad:ScriptFile>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/file.script-missing</ad:ScriptFile>
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
deleted file mode 100644
index 8825385..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
+++ /dev/null
@@ -1,13 +0,0 @@
- <AttributeDefinition 
-    xmlns="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    dependencyOnly="1"
-    xsi:type="ad:Script" id="scriptedInline"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-<ad:Script>foo="bar";</ad:Script></AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml
deleted file mode 100644
index eed2982..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
- <resolver:AttributeDefinition 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    id="templateIdAttr"
-    velocityEngine="otherVe"
-    xsi:type="ad:Template"
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" >
-                          <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"/>
-  <ad:Template>TheTemplate</ad:Template>
-  <ad:SourceAttribute>att1</ad:SourceAttribute>
-  <ad:SourceAttribute>att2</ad:SourceAttribute>
-</resolver:AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml
deleted file mode 100644
index 47c7b4a..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <resolver:AttributeDefinition 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
-    xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-    storageServiceRef="testStore"
-    id="transientIdWithTime"
-    xsi:type="ad:TransientId"
-    lifetime="PT3M"
-    
-    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                        urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                        urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                        urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-    />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
index e15d5d8..8adae11 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
-                            xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
-                            xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-                            xmlns:sec="urn:mace:shibboleth:2.0:security" 
-                            id = "TestID"
-                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                                               urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                                               urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                                               urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                                               urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
+<AttributeResolver  xmlns="urn:mace:shibboleth:2.0:resolver"
+					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+					id = "TestID"
+                    xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
index 83e3a79..18f41dd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
@@ -1,31 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
-                            xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
-                            xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-                            xmlns:sec="urn:mace:shibboleth:2.0:security" 
-                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                                               urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                                               urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                                               urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                                               urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+				   xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
 
     <!-- ========================================== -->
     <!--      Attribute Definitions                 -->
     <!-- ========================================== -->
 
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation" sourceAttributeID="staticEpA">
-        <resolver:Dependency ref="staticAttributes" />
-    </resolver:AttributeDefinition>
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" >
+        <InputDataConnector ref="staticAttributes" attributeNames="staticEpA"/>
+    </AttributeDefinition>
     
-    <resolver:DataConnector id="staticAttributes" xsi:type="dc:Static">
-        <dc:Attribute id="staticEpA">
-            <dc:Value>member</dc:Value>
-        </dc:Attribute>
-        <dc:Attribute id="eduPersonEntitlement">
-            <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
-            <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
-        </dc:Attribute>
-    </resolver:DataConnector>
+    <DataConnector id="staticAttributes" xsi:type="Static">
+        <Attribute id="staticEpA">
+            <Value>member</Value>
+        </Attribute>
+        <Attribute id="eduPersonEntitlement">
+            <Value>urn:example.org:entitlement:entitlement1</Value>
+            <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+        </Attribute>
+    </DataConnector>
 
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
index 1cefd9c..d237c01 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-                            xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" 
-                            xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" 
-                            xmlns:sec="urn:mace:shibboleth:2.0:security" 
-                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                                               urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
-                                               urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
-                                               urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
-                                               urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                            xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
 
     <!-- ========================================== -->
     <!--      Attribute Definitions                 -->
     <!-- ========================================== -->
 
-    <resolver:AttributeDefinition xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad" id="eduPersonAffiliation2" sourceAttributeID="eduPersonAffiliation">
-        <resolver:Dependency ref="eduPersonAffiliation" />
-    </resolver:AttributeDefinition>
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation2">
+        <InputAttributeDefinition ref="eduPersonAffiliation" />
+    </AttributeDefinition>
     
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
deleted file mode 100644
index a0e992a..0000000
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-ad.xsd
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:resolver:ad" elementFormDefault="qualified">
-
-    <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
-
-    <complexType name="Simple">
-        <annotation>
-            <documentation>A basic attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalName">
-        <annotation>
-            <documentation>Exposes the principal's name as an attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-
-    <complexType name="PrincipalAuthenticationMethod">
-        <annotation>
-            <documentation>Exposes the principal's authentication method as an attribute definition.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType"/>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="SubjectDerivedAttribute">
-        <annotation>
-            <documentation>A attribute definition to pull attribute values from the Principals.  A short cut looks at IdPAttributePrincipals</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="attributeValuesFunctionRef" type="string" >
-                    <annotation>
-                        <documentation>Provides a plug in point to allow general extraction of values from Principals.  Incompatible with idpAttributeName</documentation>
-                    </annotation>
-                </attribute>
-
-                <attribute name="principalAttributeName" type="string" >
-                    <annotation>
-                        <documentation>The id of the IdPAttribute contained within a IdPAttributePrincipal to look for.  Incompatible with attributeValueEngineRef.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="ContextDerivedAttribute">
-        <annotation>
-            <documentation>A attribute definition to pull attribute values from anywhere in the PRC tree</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="attributeValuesFunctionRef" type="string" use="required">
-                    <annotation>
-                        <documentation>The Function to generate the Attribute Values given a PRC</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="TransientId">
-        <annotation>
-            <documentation>A attribute definition used to construct transient subject identifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="storageServiceRef" type="string" default="shibboleth.StorageService">
-                    <annotation>
-                        <documentation>Storage service used to store created identifiers</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="lifetime" type="string">
-                    <annotation>
-                        <documentation>Lifetime of issued identifiers</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CryptoTransientId">
-        <annotation>
-            <documentation>An attribute definition used to construct stateless transient subject identifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="dataSealerRef" type="string" use="required">
-                    <annotation>
-                        <documentation>Object used to protect and encrypt identifiers</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="lifetime" type="string">
-                    <annotation>
-                        <documentation>Lifetime of issued identifiers</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Scoped">
-        <annotation>
-            <documentation>A basic attribute definition which supports attribute scoping.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="scope" type="string" use="required">
-                    <annotation>
-                        <documentation>Value to use for scoping the attribute.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="Prescoped">
-        <annotation>
-            <documentation>
-                An attribute definition that splits the values of the source attribute into an attribute value 
-                with a value and scope.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="scopeDelimiter" type="string">
-                    <annotation>
-                        <documentation>Delimiter between the value and scope.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <complexType name="RegexSplit">
-        <annotation>
-            <documentation>An attribute definition that splits the source attribute's values based on a regular expression.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="regex" type="string" use="required">
-                    <annotation>
-                        <documentation>The regular expression used to split a value.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="caseSensitive" type="string">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating the case sensitivity of the regular expression.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML1NameIdentifier">
-        <annotation>
-            <documentation>An attribute definition that creates attributes whose values are SAML 1 NameIdentifiers.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="nameIdFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 1 NameFormat of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 1 NameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="SAML2NameID">
-        <annotation>
-            <documentation>An attribute definition that creates attributes whose values are SAML 2 NameIDs.</documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <attribute name="nameIdFormat" type="string">
-                    <annotation>
-                        <documentation>The SAML 2 NameFormat of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 NameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="nameIdSPQualifier" type="string" use="optional">
-                    <annotation>
-                        <documentation>The SAML 2 SPNameQualifier of the NameID.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Script">
-        <annotation>
-            <documentation>
-                An attribute definition that constructs its attributes by means of a script supported by JSR-223. The
-                script is provided all the edu.internet2.middleware.shibboleth.common.attribute.Attribute object
-                resolved from all the definitions dependencies. The resultant attribute definition must then be bound to
-                a script attribute corresponding to the script variable whose name is the ID of the definition. This
-                variable is injected into the script by the attribute definition.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <choice>
-                    <element name="Script" type="string">
-                        <annotation>
-                            <documentation>The script to evaluate to construct the attribute.</documentation>
-                        </annotation>
-                    </element>
-                    <element name="ScriptFile" type="string">
-                        <annotation>
-                            <documentation>
-                                The filesystem path to the script to evaluate to construct the attribute.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </choice>
-                <attribute name="language" type="string">
-                    <annotation>
-                        <documentation>
-                            The JSR-233 name for the scripting language that will be used. By default "javascript" is
-                            supported.
-                        </documentation>
-                    </annotation>
-                </attribute>
-                <attribute name="customObjectRef" type="string">
-                    <annotation>
-                        <documentation>
-                            The name of a bean defined somewhere else which will be injected into the script as an
-                            object called "custom".  If not supplied, nothing is injected.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="Mapped">
-        <annotation>
-            <documentation>
-                The mapped attribute definition performs a many to many mapping from source attributes values provided
-                by the definition's dependencies to values which are returned. Each source value is passed through each
-                defined ValueMap which may result in one or more resulting values. If no ValueMaps match the source
-                value and a DefaultValue is defined, the DefaultValue is used.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <sequence>
-                    <element name="DefaultValue" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                A source value is mapped to the DefaultValue if none of the ValueMaps result in a match.
-                                This string may not contain regular expression back references.
-                            </documentation>
-                        </annotation>
-                        <complexType>
-                            <simpleContent>
-                                <extension base="string">
-                                    <attribute name="passThru" type="string">
-                                        <annotation>
-                                            <documentation>
-                                                If true, the source value is passed thru unmodified. If passThru is
-                                                enabled, DefaultValue may not contain a string value.
-                                            </documentation>
-                                        </annotation>
-                                    </attribute>
-                                </extension>
-                            </simpleContent>
-                        </complexType>
-                    </element>
-                    <element name="ValueMap" type="ad:ValueMapType" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="ValueMapType">
-        <annotation>
-            <documentation>
-                Performs many to one mapping of source values to a return value. SourceValue strings may include regular
-                expressions and the ReturnValue may include back references to capturing groups as supported by
-                java.util.regex.Pattern.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element name="ReturnValue" type="string">
-                <annotation>
-                    <documentation>The value to be returned from this value map.</documentation>
-                </annotation>
-            </element>
-            <element name="SourceValue" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>A regular expression string to be matched against the incoming value.</documentation>
-                </annotation>
-                <complexType>
-                    <simpleContent>
-                        <extension base="string">
-                            <attribute name="ignoreCase" type="string">
-                                <annotation>
-                                    <documentation>If true, value matching will be case-insensitive.</documentation>
-                                </annotation>
-                            </attribute>
-                            <attribute name="partialMatch" type="string">
-                                <annotation>
-                                    <documentation>
-                                        If true, the SourceValue may match only a substring of the incoming value. By
-                                        default, it must match the entire value.
-                                    </documentation>
-                                </annotation>
-                            </attribute>
-                        </extension>
-                    </simpleContent>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-
-    <complexType name="Template">
-        <annotation>
-            <documentation>
-                An Attribute Definition that constructs its values based on the values of its dependencies using the
-                Velocity Template Language. Dependencies may have multiple values, however multiple dependencies must
-                have the same number of values. In the case of multi-valued dependencies, the template will be evaluated
-                multiples times, iterating over each dependency.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:BaseAttributeDefinitionType">
-                <sequence>
-                    <element name="Template" type="string" minOccurs="0">
-                        <annotation>
-                            <documentation>
-                                Template specified in the Velocity Template Language used to construct attribute values.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="SourceAttribute" type="string" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                Attribute IDs which should be used in this definition, rather than the sourceAttributeID
-                                attribute. Each source attribute is available to be used in the Template as
-                                ${attribute_name}. If the source attribute has multiple values, only one value is
-                                available to the template at a time, but the template will be evaluated once for each
-                                value.
-                            </documentation>
-                        </annotation>
-                    </element>
-                </sequence>
-                <attribute name="velocityEngine" type="string">
-                    <annotation>
-                        <documentation>Name of the velocity engine defined within the application.</documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index f843338..bc0d441 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -29,14 +29,14 @@
         </attribute>
     </complexType>
 
-    <element name="AttributeDefinition" type="resolver:FlattenedBaseAttributeDefinitionType">
+    <element name="AttributeDefinition" type="resolver:BaseAttributeDefinitionType">
         <annotation>
             <documentation>Defines an attribute definition within this resolver.
             </documentation>
         </annotation>
     </element>
 
-    <complexType name="FlattenedBaseAttributeDefinitionType">
+    <complexType name="BaseAttributeDefinitionType">
         <annotation>
             <documentation>
                 Attribute definition define the finished attributes to be released by the
@@ -63,64 +63,6 @@
         </complexContent>
     </complexType>
 
-    <complexType name="BaseAttributeDefinitionType">
-        <annotation>
-            <documentation>
-                Legacy attribute definition define the finished attributes to be released by the
-                resolver.
-            </documentation>
-        </annotation>
-        <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
-                <sequence>
-                    <element ref="resolver:Dependency" minOccurs="0" maxOccurs="unbounded"/>
-                    <element name="DisplayName" type="resolver:LocalizedStringType"
-                        minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A human readable name of for this attribute. This name may, for
-                                example, be displayed to the user with an attribute release approval
-                                request.
-
-                                If multiple display names are used they should bear an xml:lang
-                                attribute to distinguish them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element name="DisplayDescription" type="resolver:LocalizedStringType"
-                        minOccurs="0" maxOccurs="unbounded">
-                        <annotation>
-                            <documentation>
-                                A human readable description of for this attribute. This name
-                                may, for example, be displayed to the user with an attribute release
-                                approval request.
-
-                                If multiple display descriptions are used they should bear an
-                                xml:lang attribute to distinguish them.
-                            </documentation>
-                        </annotation>
-                    </element>
-                    <element ref="resolver:AttributeEncoder" minOccurs="0"
-                        maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="sourceAttributeID" type="string">
-                    <annotation>
-                        <documentation>
-                            DEPRECATED
-                        
-                            The name of the attribute from a data connector dependency which should be
-                            used to populate this attribute definition.
-
-                            Whether this attribute is required or optional depends on whether the dependency
-                            set contains data connectors or attribute definitions. It may be left out for
-                            attribute dependencies but MUST be set if there are data connector dependencies.
-                        </documentation>
-                    </annotation>
-                </attribute>
-            </extension>
-        </complexContent>
-    </complexType>
-
     <element name="AttributeEncoder" type="resolver:BaseAttributeEncoderType">
         <annotation>
             <documentation>Defines an encoder for an attribute.</documentation>
@@ -411,7 +353,7 @@
             <documentation>A attribute definition to pull attribute values from anywhere in the PRC tree</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>
@@ -431,7 +373,7 @@
             <documentation>An attribute definition used to construct stateless transient subject identifiers.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>
@@ -461,7 +403,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -506,7 +448,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -530,7 +472,7 @@
             <documentation>Exposes the principal's authentication method as an attribute definition.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>
@@ -545,7 +487,7 @@
             <documentation>Exposes the principal's name as an attribute definition.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>
@@ -560,7 +502,7 @@
             <documentation>An attribute definition that splits the source attribute's values based on a regular expression.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -591,7 +533,7 @@
             <documentation>An attribute definition that creates attributes whose values are SAML 1 NameIdentifiers.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -620,7 +562,7 @@
             <documentation>An attribute definition that creates attributes whose values are SAML 2 NameIDs.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -654,7 +596,7 @@
             <documentation>A basic attribute definition which supports attribute scoping.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -687,7 +629,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -733,7 +675,7 @@
             <documentation>A basic attribute definition.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -752,7 +694,7 @@
             <documentation>A attribute definition to pull attribute values from the Principals.  A short cut looks at IdPAttributePrincipals</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>
@@ -783,7 +725,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element ref="resolver:Dependency"/>
                     <element ref="resolver:InputAttributeDefinition"/>
@@ -824,7 +766,7 @@
             <documentation>A attribute definition used to construct transient subject identifiers.</documentation>
         </annotation>
         <complexContent>
-            <extension base="resolver:FlattenedBaseAttributeDefinitionType">
+            <extension base="resolver:BaseAttributeDefinitionType">
                 <choice maxOccurs="unbounded" minOccurs="0">
                     <element name="DisplayName" type="resolver:LocalizedStringType"/>
                     <element name="DisplayDescription" type="resolver:LocalizedStringType"/>

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