[java-identity-provider] 48/51: IDP-1408 Remove old and deprecated NameID/NameIdentifier 'encoders'
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:43:19 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=d649d8301713619c4df0032d004338ebd233f950
commit d649d8301713619c4df0032d004338ebd233f950
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Feb 1 15:28:33 2019 +0000
IDP-1408 Remove old and deprecated NameID/NameIdentifier 'encoders'
https://issues.shibboleth.net/jira/browse/IDP-1408
---
.../SAML1StringNameIdentifierEncoderParser.java | 98 ----------------------
.../enc/impl/SAML2StringNameIDEncoderParser.java | 98 ----------------------
.../impl/AttributeResolverNamespaceHandler.java | 13 +--
...SAML1StringNameIdentifierEncoderParserTest.java | 65 --------------
.../enc/SAML2StringNameIDEncoderParserTest.java | 50 -----------
.../enc/resolver/saml1StringNameIdentifier.xml | 8 --
.../saml1StringNameIdentifierConditional.xml | 8 --
.../resolver/saml1StringNameIdentifierDefault.xml | 4 -
.../spring/enc/resolver/saml2StringNameID.xml | 8 --
.../enc/resolver/saml2StringNameIDDefault.xml | 5 --
10 files changed, 2 insertions(+), 355 deletions(-)
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
deleted file mode 100644
index 78e50b9..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML1StringNameIdentifierEncoderParser.java
+++ /dev/null
@@ -1,98 +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 javax.annotation.Nullable;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.idp.profile.logic.ScriptedPredicate;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.ScriptTypeBeanParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1StringNameIdentifierEncoder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for {@link SAML1StringNameIdentifierEncoder}.
- *
- * @deprecated
- */
-public class SAML1StringNameIdentifierEncoderParser extends AbstractSingleBeanDefinitionParser {
-
- /** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
- "SAML1StringNameIdentifier");
-
- /** Local name of name format attribute. */
- @Nonnull @NotEmpty public static final String FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
- /** Local name of name qualifier attribute. */
- @Nonnull @NotEmpty public static final String NAMEQUALIFIER_ATTRIBUTE_NAME = "nameQualifier";
-
- /** {@inheritDoc} */
- @Override protected Class<SAML1StringNameIdentifierEncoder> getBeanClass(@Nullable final Element element) {
- return SAML1StringNameIdentifierEncoder.class;
- }
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
- super.doParse(config, parserContext, builder);
-
- DeprecationSupport.warnOnce(ObjectType.XSITYPE, DOMTypeSupport.getXSIType(config).toString(),
- parserContext.getReaderContext().getResource().getDescription(),
- "via NameID Generation Service configuration");
-
- if (config.hasAttributeNS(null, "activationConditionRef")) {
- builder.addPropertyReference("activationCondition",
- StringSupport.trimOrNull(config.getAttributeNS(null, "activationConditionRef")));
- } else {
- final Element child = ElementSupport.getFirstChildElement(config);
- if (child != null && ElementSupport.isElementNamed(child,
- AttributeResolverNamespaceHandler.NAMESPACE, "ActivationConditionScript")) {
- builder.addPropertyValue("activationCondition",
- ScriptTypeBeanParser.parseScriptType(ScriptedPredicate.class, child).getBeanDefinition());
- }
- }
-
- if (config.hasAttributeNS(null, FORMAT_ATTRIBUTE_NAME)) {
- final String format = StringSupport.trimOrNull(config.getAttributeNS(null, FORMAT_ATTRIBUTE_NAME));
- builder.addPropertyValue("nameFormat", format);
- }
- builder.setInitMethodName(null);
-
- builder.addPropertyValue("nameQualifier",
- StringSupport.trimOrNull(config.getAttributeNS(null, NAMEQUALIFIER_ATTRIBUTE_NAME)));
- }
-
- /** {@inheritDoc} */
- @Override public boolean shouldGenerateId() {
- return true;
- }
-
-}
\ No newline at end of file
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
deleted file mode 100644
index dac5a2b..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/impl/SAML2StringNameIDEncoderParser.java
+++ /dev/null
@@ -1,98 +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 javax.annotation.Nullable;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.idp.profile.logic.ScriptedPredicate;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.ScriptTypeBeanParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringNameIDEncoder;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Spring bean definition parser for {@link SAML2StringNameIDEncoder}.
- *
- * @deprecated
- */
-public class SAML2StringNameIDEncoderParser extends AbstractSingleBeanDefinitionParser {
-
- /** Schema type name.. */
- @Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
- "SAML2StringNameID");
-
- /** Local name of name format attribute. */
- @Nonnull @NotEmpty public static final String FORMAT_ATTRIBUTE_NAME = "nameFormat";
-
- /** Local name of name qualifier attribute. */
- @Nonnull @NotEmpty public static final String NAMEQUALIFIER_ATTRIBUTE_NAME = "nameQualifier";
-
- /** {@inheritDoc} */
- @Override protected Class<SAML2StringNameIDEncoder> getBeanClass(@Nullable final Element element) {
- return SAML2StringNameIDEncoder.class;
- }
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
- super.doParse(config, parserContext, builder);
-
- DeprecationSupport.warnOnce(ObjectType.XSITYPE, DOMTypeSupport.getXSIType(config).toString(),
- parserContext.getReaderContext().getResource().getDescription(),
- "via NameID Generation Service configuration");
-
- if (config.hasAttributeNS(null, "activationConditionRef")) {
- builder.addPropertyReference("activationCondition",
- StringSupport.trimOrNull(config.getAttributeNS(null, "activationConditionRef")));
- } else {
- final Element child = ElementSupport.getFirstChildElement(config);
- if (child != null && ElementSupport.isElementNamed(child,
- AttributeResolverNamespaceHandler.NAMESPACE, "ActivationConditionScript")) {
- builder.addPropertyValue("activationCondition",
- ScriptTypeBeanParser.parseScriptType(ScriptedPredicate.class, child).getBeanDefinition());
- }
- }
-
- if (config.hasAttributeNS(null, FORMAT_ATTRIBUTE_NAME)) {
- final String namespace = StringSupport.trimOrNull(config.getAttributeNS(null, FORMAT_ATTRIBUTE_NAME));
- builder.addPropertyValue("nameFormat", namespace);
- }
- builder.setInitMethodName(null);
-
- builder.addPropertyValue("nameQualifier",
- StringSupport.trimOrNull(config.getAttributeNS(null, NAMEQUALIFIER_ATTRIBUTE_NAME)));
- }
-
- /** {@inheritDoc} */
- @Override public boolean shouldGenerateId() {
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
index 1eea82b..dd1e044 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
@@ -48,17 +48,14 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.impl.RDBMSDataConne
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1Base64AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1ScopedStringAttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1StringAttributeEncoderParser;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1StringNameIdentifierEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1XMLObjectAttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2Base64AttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2ScopedStringAttributeEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringAttributeEncoderParser;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringNameIDEncoderParser;
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2XMLObjectAttributeEncoderParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/** Namespace handler for the attribute resolver. */
- at SuppressWarnings("deprecation")
public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandler {
/** Namespace for this handler. */
@@ -127,10 +124,7 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
registerBeanDefinitionParser(SAML1ScopedStringAttributeEncoderParser.TYPE_NAME_RESOLVER,
new SAML1ScopedStringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML1StringNameIdentifierEncoderParser.TYPE_NAME_RESOLVER,
- new SAML1StringNameIdentifierEncoderParser());
-
- registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML1XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
new SAML1XMLObjectAttributeEncoderParser());
registerBeanDefinitionParser(SAML2Base64AttributeEncoderParser.TYPE_NAME_RESOLVER,
@@ -142,10 +136,7 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
registerBeanDefinitionParser(SAML2StringAttributeEncoderParser.TYPE_NAME_RESOLVER,
new SAML2StringAttributeEncoderParser());
- registerBeanDefinitionParser(SAML2StringNameIDEncoderParser.TYPE_NAME_RESOLVER,
- new SAML2StringNameIDEncoderParser());
-
- registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
+ registerBeanDefinitionParser(SAML2XMLObjectAttributeEncoderParser.TYPE_NAME_RESOLVER,
new SAML2XMLObjectAttributeEncoderParser());
}
// Checkstyle: MethodLength ON
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
deleted file mode 100644
index 63fa757..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
+++ /dev/null
@@ -1,65 +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;
-
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML1StringNameIdentifierEncoderParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML1StringNameIdentifierEncoder;
-
-import org.opensaml.saml.saml1.core.NameIdentifier;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-
-/**
- * Test for {@link SAML1StringNameIdentifierEncoderParser}.
- */
- at SuppressWarnings("deprecation")
-public class SAML1StringNameIdentifierEncoderParserTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void resolver() {
- final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("resolver/saml1StringNameIdentifier.xml", SAML1StringNameIdentifierEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), "NAMEIDENTIFIER_FORMAT");
- Assert.assertEquals(encoder.getNameQualifier(),"NAMEIDENTIFIER_QUALIFIER");
- }
-
- @Test public void defaultCase() {
- final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("resolver/saml1StringNameIdentifierDefault.xml", SAML1StringNameIdentifierEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), NameIdentifier.UNSPECIFIED);
- Assert.assertNull(encoder.getNameQualifier());;
- }
-
- @Test public void conditional() {
- final GenericApplicationContext context = new GenericApplicationContext();
- setTestContext(context);
-
- loadFile(ENCODER_FILE_PATH + "predicates.xml", context);
-
- final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("resolver/saml1StringNameIdentifierConditional.xml", SAML1StringNameIdentifierEncoder.class, context);
-
- Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysFalse());
- Assert.assertFalse(encoder.getActivationCondition().test(null));
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index 66f341b..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
+++ /dev/null
@@ -1,50 +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;
-
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringNameIDEncoderParser;
-import net.shibboleth.idp.saml.attribute.encoding.impl.SAML2StringNameIDEncoder;
-
-import org.opensaml.saml.saml2.core.NameID;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Test for {@link SAML2StringNameIDEncoderParser}.
- */
- at SuppressWarnings("deprecation")
-public class SAML2StringNameIDEncoderParserTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void resolver() {
- final SAML2StringNameIDEncoder encoder =
- getAttributeEncoder("resolver/saml2StringNameID.xml", SAML2StringNameIDEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), "S2_NAMEID_FORMAT");
- Assert.assertEquals(encoder.getNameQualifier(),"S2_NAMEID_QUALIFIER");
- }
-
- @Test public void defaultCase() {
- final SAML2StringNameIDEncoder encoder =
- getAttributeEncoder("resolver/saml2StringNameIDDefault.xml", SAML2StringNameIDEncoder.class);
-
- Assert.assertEquals(encoder.getNameFormat(), NameID.UNSPECIFIED);
- Assert.assertNull(encoder.getNameQualifier());;
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifier.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifier.xml
deleted file mode 100644
index ebf2f39..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifier.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<AttributeEncoder
- xsi:type="SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="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"/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml
deleted file mode 100644
index 17a260b..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<AttributeEncoder 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"
-
- xsi:type="SAML1StringNameIdentifier"
- nameFormat="NAMEIDENTIFIER_FORMAT"
- nameQualifier="NAMEIDENTIFIER_QUALIFIER"
- activationConditionRef="predicate" />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml
deleted file mode 100644
index d6a5af3..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<AttributeEncoder 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"
-
- xsi:type="SAML1StringNameIdentifier"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameID.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameID.xml
deleted file mode 100644
index 7ebbd2b..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameID.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<AttributeEncoder
- xsi:type="SAML2StringNameID"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="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"/>
-
\ 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
deleted file mode 100644
index c12537b..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list