[java-identity-provider] 04/51: IDP-1121 Remove enc: namespace
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:35 EST 2019
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=df7e49ec16cb5280e375242e71e114b5ab0397db
commit df7e49ec16cb5280e375242e71e114b5ab0397db
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Nov 22 11:02:40 2018 +0000
IDP-1121 Remove enc: namespace
https://issues.shibboleth.net/jira/browse/IDP-1121
---
.../enc/impl/AttributeEncoderNamespaceHandler.java | 66 ------
.../impl/SAML1Base64AttributeEncoderParser.java | 6 +-
.../SAML1ScopedStringAttributeEncoderParser.java | 6 +-
.../impl/SAML1StringAttributeEncoderParser.java | 5 +-
.../SAML1StringNameIdentifierEncoderParser.java | 6 +-
.../impl/SAML1XMLObjectAttributeEncoderParser.java | 6 +-
.../impl/SAML2Base64AttributeEncoderParser.java | 6 +-
.../SAML2ScopedStringAttributeEncoderParser.java | 6 +-
.../impl/SAML2StringAttributeEncoderParser.java | 6 +-
.../enc/impl/SAML2StringNameIDEncoderParser.java | 6 +-
.../impl/SAML2XMLObjectAttributeEncoderParser.java | 6 +-
.../src/main/resources/META-INF/spring.handlers | 1 -
...ntextDerivedAttributeDefinitionsParserTest.java | 12 --
.../enc/SAML1Base64AttributeEncoderParserTest.java | 10 +-
...AML1ScopedStringAttributeEncoderParserTest.java | 11 -
.../enc/SAML1StringAttributeEncoderParserTest.java | 8 -
...SAML1StringNameIdentifierEncoderParserTest.java | 8 -
.../SAML1XMLObjectAttributeEncoderParserTest.java | 8 -
.../enc/SAML2Base64AttributeEncoderParserTest.java | 9 -
...AML2ScopedStringAttributeEncoderParserTest.java | 12 --
.../enc/SAML2StringAttributeEncoderParserTest.java | 11 +-
.../enc/SAML2StringNameIDEncoderParserTest.java | 10 +-
.../SAML2XMLObjectAttributeEncoderParserTest.java | 9 -
.../ad/resolver/simpleAttributePopulated2.xml | 12 +-
.../resolver/spring/ad/subjectDerived.xml | 14 --
.../spring/enc/resolver/saml1StringNoName.xml | 15 +-
.../spring/enc/resolver/saml1XmlObjectDefault.xml | 17 +-
.../spring/enc/resolver/saml2Base64Default.xml | 15 +-
.../spring/enc/resolver/saml2ScopedDefault.xml | 15 +-
.../spring/enc/resolver/saml2StringConditional.xml | 16 +-
.../spring/enc/resolver/saml2StringDefault.xml | 14 +-
.../enc/resolver/saml2StringNameIDDefault.xml | 16 +-
.../spring/enc/resolver/saml2XmlObjectDefault.xml | 14 +-
.../attribute/resolver/spring/enc/saml1Base64.xml | 15 --
.../attribute/resolver/spring/enc/saml1Scoped.xml | 17 --
.../attribute/resolver/spring/enc/saml1String.xml | 15 --
.../spring/enc/saml1StringNameIdentifier.xml | 14 --
.../resolver/spring/enc/saml1XmlObject.xml | 15 --
.../attribute/resolver/spring/enc/saml2Base64.xml | 15 --
.../attribute/resolver/spring/enc/saml2Scoped.xml | 18 --
.../attribute/resolver/spring/enc/saml2String.xml | 14 --
.../resolver/spring/enc/saml2StringNameID.xml | 15 --
.../resolver/spring/enc/saml2XmlObject.xml | 14 --
.../resolver/spring/mapperTest-attributes.xml | 100 ++++------
.../src/test/resources/c14n/attribute-resolver.xml | 21 +-
.../schema/shibboleth-attribute-encoder.xsd | 222 ---------------------
46 files changed, 100 insertions(+), 777 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
deleted file mode 100644
index cc83e53..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/AttributeEncoderNamespaceHandler.java
+++ /dev/null
@@ -1,66 +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.enc.impl;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-
-/** Namespace handler for the attribute resolver. */
- at SuppressWarnings("deprecation")
-public class AttributeEncoderNamespaceHandler extends BaseSpringNamespaceHandler {
-
- /** Namespace for this handler. */
- @Nonnull @NotEmpty public static final String NAMESPACE = "urn:mace:shibboleth:2.0:attribute:encoder";
-
- /** {@inheritDoc} */
- @Override
- public void init() {
- registerBeanDefinitionParser(SAML1StringAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML1StringAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML1Base64AttributeEncoderParser.TYPE_NAME_ENC,
- new SAML1Base64AttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML1ScopedStringAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML1ScopedStringAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML1XMLObjectAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML1StringNameIdentifierEncoderParser.TYPE_NAME_ENC,
- new SAML1StringNameIdentifierEncoderParser());
-
- registerBeanDefinitionParser(SAML2StringAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML2StringAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML2ScopedStringAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML2ScopedStringAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML2Base64AttributeEncoderParser.TYPE_NAME_ENC,
- new SAML2Base64AttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderParser.TYPE_NAME_ENC,
- new SAML2XMLObjectAttributeEncoderParser());
-
- registerBeanDefinitionParser(SAML2StringNameIDEncoderParser.TYPE_NAME_ENC,
- new SAML2StringNameIDEncoderParser());
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
index 6655b09..477bf38 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1Base64AttributeEncoderParser.java
@@ -35,11 +35,7 @@ import org.w3c.dom.Element;
*/
public class SAML1Base64AttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name: enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML1Base64");
-
- /** Schema type name: resolver:. */
+ /** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1Base64");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
index f1de48b..090890b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1ScopedStringAttributeEncoderParser.java
@@ -35,11 +35,7 @@ import org.w3c.dom.Element;
*/
public class SAML1ScopedStringAttributeEncoderParser extends AbstractWarningScopedAttributeEncoderParser {
- /** Schema type name - enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML1ScopedString");
-
- /** Schema type name - resolver:. */
+ /** Schema type name. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1ScopedString");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
index cd1c02f..c2ec9d6 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringAttributeEncoderParser.java
@@ -36,10 +36,7 @@ import org.w3c.dom.Element;
*/
public class SAML1StringAttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name - enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML1String");
- /** Schema type name - resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1String");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringNameIdentifierEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringNameIdentifierEncoderParser.java
index 38f18aa..78e50b9 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringNameIdentifierEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringNameIdentifierEncoderParser.java
@@ -44,11 +44,7 @@ import org.w3c.dom.Element;
*/
public class SAML1StringNameIdentifierEncoderParser extends AbstractSingleBeanDefinitionParser {
- /** Schema type- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML1StringNameIdentifier");
-
- /** Schema type- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML1StringNameIdentifier");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
index 18bf9f0..b3bb791 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1XMLObjectAttributeEncoderParser.java
@@ -33,11 +33,7 @@ import org.w3c.dom.Element;
/** Spring Bean Definition Parser for {@link SAML1XMLObjectAttributeEncoder}. */
public class SAML1XMLObjectAttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC =
- new QName(AttributeEncoderNamespaceHandler.NAMESPACE, "SAML1XMLObject");
-
- /** Schema type name- enc: (legacy). */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER =
new QName(AttributeResolverNamespaceHandler.NAMESPACE, "SAML1XMLObject");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
index d3ba886..822c672 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2Base64AttributeEncoderParser.java
@@ -35,11 +35,7 @@ import org.w3c.dom.Element;
*/
public class SAML2Base64AttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML2Base64");
-
- /** Schema type name- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2Base64");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
index 86f1346..826e550 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2ScopedStringAttributeEncoderParser.java
@@ -35,11 +35,7 @@ import org.w3c.dom.Element;
*/
public class SAML2ScopedStringAttributeEncoderParser extends AbstractWarningScopedAttributeEncoderParser {
- /** Schema type name- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML2ScopedString");
-
- /** Schema type name- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2ScopedString");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
index 2734872..68c98b2 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringAttributeEncoderParser.java
@@ -35,11 +35,7 @@ import org.w3c.dom.Element;
*/
public class SAML2StringAttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML2String");
-
- /** Schema type name- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2String");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringNameIDEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringNameIDEncoderParser.java
index 6f960b1..dac5a2b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringNameIDEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringNameIDEncoderParser.java
@@ -44,11 +44,7 @@ import org.w3c.dom.Element;
*/
public class SAML2StringNameIDEncoderParser extends AbstractSingleBeanDefinitionParser {
- /** Schema type- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML2StringNameID");
-
- /** Schema type- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2StringNameID");
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
index 0905863..4ff2cbb 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2XMLObjectAttributeEncoderParser.java
@@ -33,11 +33,7 @@ import org.w3c.dom.Element;
/** Spring Bean Definition Parser for SAML2 XMLObject attribute encoder. */
public class SAML2XMLObjectAttributeEncoderParser extends AbstractWarningAttributeEncoderParser {
- /** Schema type name- enc: (legacy). */
- @Nonnull public static final QName TYPE_NAME_ENC = new QName(AttributeEncoderNamespaceHandler.NAMESPACE,
- "SAML2XMLObject");
-
- /** Schema type name- resolver:. */
+ /** Schema type name.. */
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"SAML2XMLObject");
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 3659fd5..d7033cd 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,4 +1,3 @@
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
-urn\:mace\:shibboleth\:2.0\:attribute\:encoder = net.shibboleth.idp.attribute.resolver.spring.enc.impl.AttributeEncoderNamespaceHandler
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 bb97fa8..62dc855 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
@@ -70,18 +70,6 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
return ctx;
}
- @Test public void simple() throws ResolutionException {
- final AttributeDefinition attrDef =
- getAttributeDefn("subjectDerived.xml", ContextDerivedAttributeDefinition.class);
-
- final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("Whatever")).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 resolverSubject() throws ResolutionException {
final AttributeDefinition attrDef =
getAttributeDefn("resolver/subjectDerived.xml", ContextDerivedAttributeDefinition.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
index 5541597..87bbf08 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
@@ -30,15 +30,7 @@ import org.testng.annotations.Test;
* Test for {@link SAML1Base64AttributeEncoderParser}.
*/
public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void legacy() {
- final SAML1ByteAttributeEncoder encoder =
- getAttributeEncoder("saml1Base64.xml", SAML1ByteAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "SAML1_BASE64_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_BASE64_ATTRIBUTE_NAME_SPACE");
- }
-
+
@Test public void resolver() {
final SAML1ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1Base64.xml", SAML1ByteAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
index 1113ab6..354bfa7 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
@@ -31,17 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML1ScopedStringAttributeEncoder encoder =
- getAttributeEncoder("saml1Scoped.xml", SAML1ScopedStringAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "SAML1_SCOPED_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT");
- Assert.assertEquals(encoder.getScopeType(),"attribute");
- Assert.assertEquals(encoder.getScopeAttributeName(),"saml1ScopeAttrib");
- Assert.assertEquals(encoder.getScopeDelimiter(),"#@#");
- }
-
@Test public void resolver() {
final SAML1ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1Scoped.xml", SAML1ScopedStringAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
index e7914a0..40c5ba0 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
@@ -31,14 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML1StringAttributeEncoder encoder =
- getAttributeEncoder("saml1String.xml", SAML1StringAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "SAML1_STRING_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_STRING_ATTRIBUTE_NAME_SPACE");
- }
-
@Test public void newNameSpace() {
final SAML1StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1String.xml", SAML1StringAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
index db090e6..63fa757 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
@@ -34,14 +34,6 @@ import com.google.common.base.Predicates;
@SuppressWarnings("deprecation")
public class SAML1StringNameIdentifierEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("saml1StringNameIdentifier.xml", SAML1StringNameIdentifierEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), "NAMEIDENTIFIER_FORMAT");
- Assert.assertEquals(encoder.getNameQualifier(),"NAMEIDENTIFIER_QUALIFIER");
- }
-
@Test public void resolver() {
final SAML1StringNameIdentifierEncoder encoder =
getAttributeEncoder("resolver/saml1StringNameIdentifier.xml", SAML1StringNameIdentifierEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
index 9737717..e96afe1 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
@@ -31,14 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML1XMLObjectAttributeEncoder encoder =
- getAttributeEncoder("saml1XmlObject.xml", SAML1XMLObjectAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "SAML1_XMLObject_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getNamespace(),"SAML1_XMLObject_ATTRIBUTE_NAME_SPACE");
- }
-
@Test public void resolver() {
final SAML1XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml1XmlObject.xml", SAML1XMLObjectAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
index 62acb71..f5a31c4 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
@@ -31,15 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML2ByteAttributeEncoder encoder =
- getAttributeEncoder("saml2Base64.xml", SAML2ByteAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "Saml2Base64_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2Base64_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2Base64_ATTRIBUTE_NAME_FORMAT");
- }
-
@Test public void resolver() {
final SAML2ByteAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2Base64.xml", SAML2ByteAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
index 74e5721..ff79f93 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
@@ -31,18 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML2ScopedStringAttributeEncoder encoder =
- getAttributeEncoder("saml2Scoped.xml", SAML2ScopedStringAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"ATTRIBUTE_NAME_FORMAT");
- Assert.assertEquals(encoder.getScopeType(),"attribute");
- Assert.assertEquals(encoder.getScopeAttributeName(),"scopeAttrib");
- Assert.assertEquals(encoder.getScopeDelimiter(),"###");
- }
-
@Test public void resolver() {
final SAML2ScopedStringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2Scoped.xml", SAML2ScopedStringAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
index 1660762..5edc8ee 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
@@ -34,16 +34,7 @@ import com.google.common.base.Predicates;
* Test for {@link SAML2StringAttributeEncoderParser}.
*/
public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void legacy() {
- final SAML2StringAttributeEncoder encoder =
- getAttributeEncoder("saml2String.xml", SAML2StringAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "Saml2String_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2String_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2String_ATTRIBUTE_NAME_FORMAT");
- }
-
+
@Test public void resolver() {
final SAML2StringAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2String.xml", SAML2StringAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
index 34fe33c..66f341b 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
@@ -30,15 +30,7 @@ import org.testng.annotations.Test;
*/
@SuppressWarnings("deprecation")
public class SAML2StringNameIDEncoderParserTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void legacy() {
- final SAML2StringNameIDEncoder encoder =
- getAttributeEncoder("saml2StringNameID.xml", SAML2StringNameIDEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), "S2_NAMEID_FORMAT");
- Assert.assertEquals(encoder.getNameQualifier(),"S2_NAMEID_QUALIFIER");
- }
-
+
@Test public void resolver() {
final SAML2StringNameIDEncoder encoder =
getAttributeEncoder("resolver/saml2StringNameID.xml", SAML2StringNameIDEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
index bc943ac..7dea7de 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
@@ -31,15 +31,6 @@ import org.testng.annotations.Test;
*/
public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefinitionParserTest {
- @Test public void legacy() {
- final SAML2XMLObjectAttributeEncoder encoder =
- getAttributeEncoder("saml2XmlObject.xml", SAML2XMLObjectAttributeEncoder.class);
-
- Assert.assertEquals(encoder.getName(), "Saml2XmlObject_ATTRIBUTE_NAME");
- Assert.assertEquals(encoder.getFriendlyName(),"Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME");
- Assert.assertEquals(encoder.getNameFormat(),"Saml2XmlObject_ATTRIBUTE_NAME_FORMAT");
- }
-
@Test public void resolver() {
final SAML2XMLObjectAttributeEncoder encoder =
getAttributeEncoder("resolver/saml2XmlObject.xml", SAML2XMLObjectAttributeEncoder.class);
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
index 9f6d2d5..82cf76d 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributePopulated2.xml
@@ -1,19 +1,13 @@
<AttributeDefinition
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
dependencyOnly="false"
xsi:type="Simple" id="simplePopulated2"
- 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">
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<InputAttributeDefinition ref="dep3"/>
<DisplayName xml:lang="en">NameInAmerican</DisplayName>
- <AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerived.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerived.xml
deleted file mode 100644
index 298fee5..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerived.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: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:SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever">
-
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
-
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
index 725fc1a..d9de68f 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
@@ -1,13 +1,6 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
+<AttributeEncoder
+ xsi:type="SAML1String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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"
-/>
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ 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/enc/resolver/saml1XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
index 9d422db..7da2157 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
@@ -1,14 +1,7 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+<AttributeEncoder
+ xsi:type="SAML1XMLObject"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="XMLObject_ATTRIBUTE"
- 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"
-/>
+ 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/enc/resolver/saml2Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
index b7eec04..430b049 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
@@ -1,14 +1,7 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2Base64"
+<AttributeEncoder
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xsi:type="SAML2Base64"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="Base64Name"
- 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"
- />
+ 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/enc/resolver/saml2ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
index 4a37973..7f0778b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
@@ -1,14 +1,7 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2ScopedString"
+<AttributeEncoder
+ xsi:type="SAML2ScopedString"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="name"
- 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"
- />
+ 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/enc/resolver/saml2StringConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
index 94b1166..741d16b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
@@ -1,14 +1,8 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+<AttributeEncoder
+ xsi:type="SAML2String"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="Saml2StringConditional"
activationConditionRef="predicate"
- 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" />
+ 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/enc/resolver/saml2StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
index f892f9e..ef45b88 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
@@ -1,13 +1,7 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
+<AttributeEncoder
+ xsi:type="SAML2String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="Saml2StringName"
- 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" />
+ 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/enc/resolver/saml2StringNameIDDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
index 7b4d647..c12537b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
@@ -1,11 +1,5 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2StringNameID"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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
+<AttributeEncoder
+ xsi:type="SAML2StringNameID"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ 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/enc/resolver/saml2XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
index 38e4491..f77cbf9 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
@@ -1,13 +1,7 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2XMLObject"
+<AttributeEncoder
+ xsi:type="SAML2XMLObject"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
name="XmlObjectName"
- 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"/>
+ 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/enc/saml1Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml
deleted file mode 100644
index ba52cb5..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_BASE64_ATTRIBUTE_NAME"
- namespace="SAML1_BASE64_ATTRIBUTE_NAME_SPACE"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml
deleted file mode 100644
index 319dc4c..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Scoped.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_SCOPED_ATTRIBUTE_NAME"
- namespace="SAML1_SCOPED_ATTRIBUTE_NAME_FORMAT"
- scopeType="attribute"
- scopeAttribute="saml1ScopeAttrib"
- 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"/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml
deleted file mode 100644
index bad8382..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1String.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_STRING_ATTRIBUTE_NAME"
- namespace="SAML1_STRING_ATTRIBUTE_NAME_SPACE"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml
deleted file mode 100644
index 6927cab..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifier.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- nameFormat="NAMEIDENTIFIER_FORMAT"
- nameQualifier="NAMEIDENTIFIER_QUALIFIER"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml
deleted file mode 100644
index 0e0fe39..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObject.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="SAML1_XMLObject_ATTRIBUTE_NAME"
- namespace="SAML1_XMLObject_ATTRIBUTE_NAME_SPACE"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml
deleted file mode 100644
index 1b0e569..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2Base64_ATTRIBUTE_NAME"
- nameFormat="Saml2Base64_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2Base64_ATTRIBUTE_FRIENDLY_NAME"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml
deleted file mode 100644
index 4d92f71..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Scoped.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="ATTRIBUTE_NAME"
- nameFormat="ATTRIBUTE_NAME_FORMAT"
- friendlyName="ATTRIBUTE_FRIENDLY_NAME"
- scopeType="attribute"
- scopeAttribute="scopeAttrib"
- 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" />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml
deleted file mode 100644
index 1ee7122..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2String.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2String_ATTRIBUTE_NAME"
- nameFormat="Saml2String_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2String_ATTRIBUTE_FRIENDLY_NAME"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml
deleted file mode 100644
index f7a9732..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameID.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2StringNameID"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- nameFormat="S2_NAMEID_FORMAT"
- nameQualifier="S2_NAMEID_QUALIFIER"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml
deleted file mode 100644
index d3e7501..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObject.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML2XMLObject"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Saml2XmlObject_ATTRIBUTE_NAME"
- nameFormat="Saml2XmlObject_ATTRIBUTE_NAME_FORMAT"
- friendlyName="Saml2XmlObject_ATTRIBUTE_FRIENDLY_NAME"
- 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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
index 6f83577..3af27f3 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml
@@ -1,71 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is an EXAMPLE configuration file. While the configuration
- presented in this example file is functional, it isn't very interesting.
- However, there are lots of example attributes, encoders, and a couple example
- data connectors. Not all attribute definitions, data connectors, or principal
- connectors are demonstrated. Deployers should refer to the Shibboleth 2 documentation
- for a complete list of components and their options. -->
-<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:DataConnector id="staticAttributes" xsi:type="dc:Static">
- <dc:Attribute id="assurance">
- <dc:Value>tin</dc:Value>
- <dc:Value>pewter</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="oAssurance">
- <dc:Value>bakelite</dc:Value>
- <dc:Value>dross</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="assurance">
+ <Value>tin</Value>
+ <Value>pewter</Value>
+ </Attribute>
+ <Attribute id="oAssurance">
+ <Value>bakelite</Value>
+ <Value>dross</Value>
+ </Attribute>
+ <Attribute id="eduPersonEntitlement">
+ <Value>urn:example.org:entitlement:entitlement1</Value>
+ <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+ </Attribute>
+ </DataConnector>
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="eduPersonAssurance" sourceAttributeID="assurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance" sourceAttributeID="assurance">
+ <Dependency ref="staticAttributes" />
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherPersonAssurance" sourceAttributeID="oAssurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="Simple" id="otherPersonAssurance" sourceAttributeID="oAssurance">
+ <Dependency ref="staticAttributes" />
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:Simple" id="otherFormatPersonAssurance" sourceAttributeID="ofAssurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition xsi:type="Simple" id="otherFormatPersonAssurance" sourceAttributeID="ofAssurance">
+ <Dependency ref="staticAttributes" />
+ <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:Scoped" id="eduPersonScopedAffiliation" scope="example.org"
+ <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="example.org"
sourceAttributeID="assurance">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation"
+ <Dependency ref="staticAttributes" />
+ <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
+ <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation"
scopeDelimiter='#'/>
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition xsi:type="ad:SAML2NameID" id="eduPersonTID"
+ <AttributeDefinition xsi:type="SAML2NameID" id="eduPersonTID"
nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="eduPersonEntitlement">
- <resolver:Dependency ref="staticAttributes" />
- <resolver:AttributeEncoder xsi:type="enc:SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
+ <Dependency ref="staticAttributes" />
+ <AttributeEncoder xsi:type="SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
+ <AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
+ </AttributeDefinition>
+</AttributeResolver>
diff --git a/idp-conf/src/test/resources/c14n/attribute-resolver.xml b/idp-conf/src/test/resources/c14n/attribute-resolver.xml
index e3b89c0..e4bece1 100644
--- a/idp-conf/src/test/resources/c14n/attribute-resolver.xml
+++ b/idp-conf/src/test/resources/c14n/attribute-resolver.xml
@@ -1,21 +1,12 @@
<?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:pc="urn:mace:shibboleth:2.0:resolver:pc" 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: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">
+<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 for webflow testing -->
- <resolver:AttributeDefinition id="transientId" xsi:type="ad:TransientId"/>
+ <AttributeDefinition id="transientId" xsi:type="TransientId"/>
- <resolver:AttributeDefinition id="cryptoTransientId" xsi:type="ad:CryptoTransientId" dataSealerRef="shibboleth.DataSealer"/>
+ <AttributeDefinition id="cryptoTransientId" xsi:type="CryptoTransientId" dataSealerRef="shibboleth.DataSealer"/>
- <resolver:AttributeDefinition id="Principal" xsi:type="ad:PrincipalName"/>
-
-</resolver:AttributeResolver>
+ <AttributeDefinition id="Principal" xsi:type="PrincipalName"/>
+</AttributeResolver>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
deleted file mode 100644
index b8a7746..0000000
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-encoder.xsd
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:attribute:encoder" elementFormDefault="qualified">
-
- <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
-
- <!-- Encoders that produce SAML 1 or SAML 2 Attribtues -->
- <complexType name="SAML1String">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1Base64">
- <annotation>
- <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1XMLObject">
- <annotation>
- <documentation>Defines a SAML 1 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2String">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2Base64">
- <annotation>
- <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2XMLObject">
- <annotation>
- <documentation>Defines a SAML 2 Base64 encoder for an attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="BaseScopedAttributeEncoderType">
- <annotation>
- <documentation>Defines an encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="scopeType" type="string" use="optional">
- <annotation>
- <documentation>
- The type of scoping to use for the encoded attribute. Valid values are "inline" or
- "attribute".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scopeDelimiter" type="string" use="optional">
- <annotation>
- <documentation>
- If scopeType is "inline", this is the delimeter used between the attribute value and
- scope.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scopeAttribute" type="string" use="optional">
- <annotation>
- <documentation>
- If scopeType is "attribute", this is the name of the name of the attribute used to carry the
- scope value.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML1ScopedString">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="encoder:BaseScopedAttributeEncoderType">
- <attribute name="namespace" type="string">
- <annotation>
- <documentation>The SAML 1 Namespace of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2ScopedString">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for a scoped attribute.</documentation>
- </annotation>
- <complexContent>
- <extension base="encoder:BaseScopedAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the attribute.</documentation>
- </annotation>
- </attribute>
- <attribute name="friendlyName" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 FriendlyName of the attribute.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-<!-- Encoders that produce SAML 1 or 2 name identifiers -->
- <complexType name="SAML1StringNameIdentifier">
- <annotation>
- <documentation>Defines a SAML 1 string encoder for a NameIdentifier.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 1 NameFormat of the NameIdentifier.</documentation>
- </annotation>
- </attribute>
- <attribute name="nameQualifier" type="string" use="optional">
- <annotation>
- <documentation>The SAML 1 NameQualfier of the NameIdentifier.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="SAML2StringNameID">
- <annotation>
- <documentation>Defines a SAML 2 string encoder for a NameID.</documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseAttributeEncoderType">
- <attribute name="nameFormat" type="string">
- <annotation>
- <documentation>The SAML 2 NameFormat of the NameID.</documentation>
- </annotation>
- </attribute>
- <attribute name="nameQualifier" type="string" use="optional">
- <annotation>
- <documentation>The SAML 2 NameQualfier of the NameID.</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
-</schema>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list