[java-identity-provider] 01/51: IDP-1121 Remove Principal Connectors - Parsing and XML
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:32 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=b4423a675282cf3d0c7a6ca93db29f8683498e90
commit b4423a675282cf3d0c7a6ca93db29f8683498e90
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 21 17:25:38 2018 +0000
IDP-1121 Remove Principal Connectors - Parsing and XML
https://issues.shibboleth.net/jira/browse/IDP-1121
---
.../impl/AttributeResolverNamespaceHandler.java | 2 -
.../pc/impl/AbstractPrincipalConnectorParser.java | 107 -------------
.../pc/impl/CryptoTransientConnectorParser.java | 73 ---------
.../spring/pc/impl/DirectConnectorParser.java | 60 -------
.../impl/PrincipalConnectorNamespaceHandler.java | 45 ------
.../spring/pc/impl/StoredIdConnectorParser.java | 91 -----------
.../spring/pc/impl/TransientConnectorParser.java | 79 ----------
.../resolver/spring/pc/impl/package-info.java | 23 ---
.../src/main/resources/META-INF/spring.handlers | 1 -
.../resolver/spring/pc/CryptoTransientTest.java | 37 -----
.../attribute/resolver/spring/pc/DirectTest.java | 63 --------
.../attribute/resolver/spring/pc/StoredIdTest.java | 173 ---------------------
.../resolver/spring/pc/TransientTest.java | 43 -----
.../resolver/spring/ad/contextDerived.xml | 1 -
.../resolver/spring/ad/cryptoWithTime.xml | 1 -
.../resolver/spring/ad/idInParentDependency.xml | 1 -
.../attribute/resolver/spring/ad/mapped/mapped.xml | 1 -
.../resolver/spring/ad/mapped/sourceValue.xml | 1 -
.../resolver/spring/ad/mapped/valueMap.xml | 1 -
.../resolver/spring/ad/noIdInParentDependency.xml | 1 -
.../spring/ad/principalAuthenticationMethod.xml | 1 -
.../attribute/resolver/spring/ad/principalName.xml | 1 -
.../attribute/resolver/spring/ad/regexDefault.xml | 1 -
.../resolver/spring/ad/saml1NameIdAttributes.xml | 1 -
.../resolver/spring/ad/saml2NameIdAttributes.xml | 1 -
.../spring/ad/scriptedAttributeFileMissing.xml | 1 -
.../resolver/spring/ad/scriptedAttributeInline.xml | 1 -
.../resolver/spring/ad/subjectDerived.xml | 1 -
.../resolver/spring/ad/templateAttributes.xml | 1 -
.../resolver/spring/ad/transientWithTime.xml | 1 -
.../resolver/spring/attribute-resolver2.xml | 6 +-
.../idp/attribute/resolver/spring/dc/computed.xml | 3 +-
.../spring/dc/containerManagedConnection.xml | 2 +-
.../resolver/spring/dc/scriptedAttributes-8.xml | 3 +-
.../resolver/spring/dc/scriptedAttributes.xml | 3 +-
.../resolver/spring/dc/staticAttributes.xml | 3 +-
.../idp/attribute/resolver/spring/dc/stored.xml | 3 +-
.../resolver/spring/mapperTest-attributes.xml | 6 +-
.../resolver/spring/multiFileResolver1.xml | 6 +-
.../resolver/spring/multiFileResolver2.xml | 3 +-
.../attribute/resolver/spring/pc/DeleteStore.sql | 1 -
.../attribute/resolver/spring/pc/StoredIdStore.sql | 11 --
.../idp/attribute/resolver/spring/pc/crypto.xml | 6 -
.../attribute/resolver/spring/pc/dataconnector.xml | 6 -
.../idp/attribute/resolver/spring/pc/direct.xml | 6 -
.../idp/attribute/resolver/spring/pc/directRPs.xml | 9 --
.../resolver/spring/pc/stored-beanConnector.xml | 41 -----
.../attribute/resolver/spring/pc/stored-direct.xml | 35 -----
.../idp/attribute/resolver/spring/pc/stored.xml | 36 -----
.../idp/attribute/resolver/spring/pc/transient.xml | 6 -
.../resolver/spring/pc/transientNoStore.xml | 6 -
.../schema/shibboleth-attribute-resolver-pc.xsd | 82 ----------
.../schema/shibboleth-attribute-resolver.xsd | 42 -----
53 files changed, 16 insertions(+), 1123 deletions(-)
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 4b2e60b..b3f6c0d 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
@@ -55,7 +55,6 @@ import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2ScopedStringAt
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.idp.attribute.resolver.spring.pc.impl.DirectConnectorParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
@@ -74,7 +73,6 @@ public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandle
registerBeanDefinitionParser(AttributeResolverParser.SCHEMA_TYPE, parser);
registerBeanDefinitionParser(AttributeResolverParser.ELEMENT_NAME, parser);
- registerBeanDefinitionParser(DirectConnectorParser.TYPE_NAME, new DirectConnectorParser());
registerBeanDefinitionParser(ResolverPluginDependencyParser.ELEMENT_NAME, new ResolverPluginDependencyParser());
registerBeanDefinitionParser(InputDataConnectorParser.ELEMENT_NAME, new InputDataConnectorParser());
registerBeanDefinitionParser(InputAttributeDefinitionParser.ELEMENT_NAME, new InputAttributeDefinitionParser());
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/AbstractPrincipalConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/AbstractPrincipalConnectorParser.java
deleted file mode 100644
index 8aee138..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/AbstractPrincipalConnectorParser.java
+++ /dev/null
@@ -1,107 +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.pc.impl;
-
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Base Parser for Direct <PrincipalConnector>.<br/>
- * Concrete implementations just need to add the SAML decoders via the
- * {@link #addSAMLDecoders(Element, ParserContext, BeanDefinitionBuilder)} method.
- */
-public abstract class AbstractPrincipalConnectorParser extends AbstractSingleBeanDefinitionParser {
-
- /** Relying Parties. */
- @Nonnull public static final QName RELYING_PARTY =
- new QName(AttributeResolverNamespaceHandler.NAMESPACE, "RelyingParty");
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractPrincipalConnectorParser.class);
-
- /** {@inheritDoc} */
- @Override protected Class<PrincipalConnector> getBeanClass(final Element element) {
- return PrincipalConnector.class;
- }
-
- /** {@inheritDoc} */
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
-
- DeprecationSupport.warn(ObjectType.ELEMENT, "<PrincipalConnector>",
- parserContext.getReaderContext().getResource().getDescription(),
- "c14n");
-
- builder.setInitMethodName("initialize");
- builder.setDestroyMethodName("destroy");
-
- super.doParse(config, parserContext, builder);
-
- // First up, add the per type decoders
- addSAMLDecoders(config, parserContext, builder);
-
- final String format = StringSupport.trimOrNull(config.getAttributeNS(null, "nameIDFormat"));
- builder.addPropertyValue("format", format);
-
-
- final String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
- builder.addPropertyValue("id", id);
-
- final List<Element> children = ElementSupport.getChildElements(config, RELYING_PARTY);
- final List<String> relyingParties = new ManagedList<>(children.size());
-
- for (final Element child : children) {
- relyingParties.add(child.getTextContent());
- }
-
- builder.addPropertyValue("relyingParties", relyingParties);
- }
-
- /**
- * Add in the two SAML decoders. <br/>
- * In order complete the construction of the principal decoder we need to supply a
- * {@link net.shibboleth.idp.saml.nameid.NameIDDecoder} and a
- * {@link net.shibboleth.idp.saml.nameid.NameIdentifierDecoder}. This is done via the
- * {@link BeanDefinitionBuilder#addConstructorArgValue(Object)} method, supplying the SAML2 decoder first
- *
- * @param config The configuration
- * @param parserContext The context
- * @param builder The builder upon which this method has to call
- * {@link BeanDefinitionBuilder#addConstructorArgValue(Object)}
- */
- protected abstract void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder);
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/CryptoTransientConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/CryptoTransientConnectorParser.java
deleted file mode 100644
index eca787a..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/CryptoTransientConnectorParser.java
+++ /dev/null
@@ -1,73 +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.pc.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.saml.nameid.impl.CryptoTransientNameIDDecoder;
-import net.shibboleth.idp.saml.nameid.impl.CryptoTransientNameIdentifierDecoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for CryptoTransient Principal Connector<br/>
- * <PrincipalConnector xsi:type="pc:CryptoTransient">.
- */
-public class CryptoTransientConnectorParser extends AbstractPrincipalConnectorParser {
-
- /** Schema type name. */
- @Nonnull public static final QName TYPE_NAME =
- new QName(PrincipalConnectorNamespaceHandler.NAMESPACE, "CryptoTransient");
-
- /** {@inheritDoc} */
- @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
-
- final String dataSealer = StringSupport.trimOrNull(config.getAttributeNS(null, "dataSealerRef"));
- if (dataSealer == null) {
- throw new BeanCreationException("dataSealerRef attribute is required");
- }
-
- // NameID
- BeanDefinitionBuilder subBuilder =
- BeanDefinitionBuilder.genericBeanDefinition(CryptoTransientNameIDDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- subBuilder.addPropertyReference("dataSealer", dataSealer);
- final String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
- subBuilder.addPropertyValue("id", id);
-
- builder.addPropertyValue("nameIDDecoder", subBuilder.getBeanDefinition());
-
- // NameIdentifier
- subBuilder = BeanDefinitionBuilder.genericBeanDefinition(CryptoTransientNameIdentifierDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- subBuilder.addPropertyReference("dataSealer", dataSealer);
- subBuilder.addPropertyValue("id", id);
- builder.addPropertyValue("nameIdentifierDecoder", subBuilder.getBeanDefinition());
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/DirectConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/DirectConnectorParser.java
deleted file mode 100644
index 58388b0..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/DirectConnectorParser.java
+++ /dev/null
@@ -1,60 +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.pc.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder;
-import net.shibboleth.idp.saml.nameid.impl.TransformingNameIdentifierDecoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for Direct Principal Connector<br/>
- * <PrincipalConnector xsi:type="pc:Direct">.
- */
-public class DirectConnectorParser extends AbstractPrincipalConnectorParser {
-
- /** Schema type name. */
- @Nonnull public static final QName TYPE_NAME = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE, "Direct");
-
- /** {@inheritDoc} */
- @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
-
- BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransformingNameIDDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- final String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
- subBuilder.addPropertyValue("id", id);
- builder.addPropertyValue("nameIDDecoder", subBuilder.getBeanDefinition());
-
- subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransformingNameIdentifierDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- subBuilder.addPropertyValue("id", id);
- builder.addPropertyValue("nameIdentifierDecoder", subBuilder.getBeanDefinition());
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/PrincipalConnectorNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/PrincipalConnectorNamespaceHandler.java
deleted file mode 100644
index d44b38b..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/PrincipalConnectorNamespaceHandler.java
+++ /dev/null
@@ -1,45 +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.pc.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 principal connector. This is a noop and is here purely to allow us to have a handler
- * declared (since all parsing is done inline).
- */
-public class PrincipalConnectorNamespaceHandler extends BaseSpringNamespaceHandler {
-
- /** Namespace for principal connector (which have not handlers). */
- @Nonnull @NotEmpty public static final String NAMESPACE = "urn:mace:shibboleth:2.0:resolver:pc";
-
- /** {@inheritDoc} */
- @Override public void init() {
- registerBeanDefinitionParser(DirectConnectorParser.TYPE_NAME, new DirectConnectorParser());
-
- registerBeanDefinitionParser(TransientConnectorParser.TYPE_NAME, new TransientConnectorParser());
-
- registerBeanDefinitionParser(CryptoTransientConnectorParser.TYPE_NAME, new CryptoTransientConnectorParser());
-
- registerBeanDefinitionParser(StoredIdConnectorParser.TYPE_NAME, new StoredIdConnectorParser());
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java
deleted file mode 100644
index d845125..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java
+++ /dev/null
@@ -1,91 +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.pc.impl;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.idp.saml.attribute.resolver.impl.StoredIDDataConnector;
-import net.shibboleth.idp.saml.nameid.NameDecoderException;
-import net.shibboleth.idp.saml.nameid.NameIdentifierDecoder;
-import net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdDecoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.opensaml.saml.saml1.core.NameIdentifier;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for StoredId Principal Connector<br/>
- * <PrincipalConnector xsi:type="pc:StoredId">.
- */
-public class StoredIdConnectorParser extends AbstractPrincipalConnectorParser {
-
- /** Schema type name. */
- @Nonnull public static final QName TYPE_NAME = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE, "StoredId");
-
- /** {@inheritDoc} */
- @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
-
- BeanDefinitionBuilder subBuilder =
- BeanDefinitionBuilder.genericBeanDefinition(EmbeddedStoredPersistentIdDecoder.class);
-
- final String dataConnector = StringSupport.trimOrNull(config.getAttributeNS(null, "storedIdDataConnectorRef"));
- subBuilder.addConstructorArgReference(dataConnector);
-
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- final String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
- subBuilder.addPropertyValue("id", id);
-
- builder.addPropertyValue("nameIDDecoder", subBuilder.getBeanDefinition());
-
- subBuilder = BeanDefinitionBuilder.genericBeanDefinition(NotImplementedNameIdentifierDecoder.class);
- builder.addPropertyValue("nameIdentifierDecoder", subBuilder.getBeanDefinition());
- }
-
- /** Helper class to allow us to inject in a StoredIdStore into StoredIdStore. */
- public static class EmbeddedStoredPersistentIdDecoder extends StoredPersistentIdDecoder {
-
- /**
- * Constructor.
- *
- * @param connector the data connector of interest
- */
- public EmbeddedStoredPersistentIdDecoder(final StoredIDDataConnector connector) {
- setPersistentIdStore(connector.getStoredIDStore());
- }
- }
-
- /** Helper class to allow us to put *something* into a the principalConnector. */
- public static class NotImplementedNameIdentifierDecoder implements NameIdentifierDecoder {
-
- /** {@inheritDoc} */
- @Override @Nullable public String decode(@Nonnull final SubjectCanonicalizationContext c14nContext,
- @Nonnull final NameIdentifier nameID) throws NameDecoderException {
- throw new NameDecoderException("Name Decoding for SAML1?");
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/TransientConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/TransientConnectorParser.java
deleted file mode 100644
index ceb337d..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/TransientConnectorParser.java
+++ /dev/null
@@ -1,79 +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.pc.impl;
-
-import javax.annotation.Nonnull;
-import javax.xml.namespace.QName;
-
-import net.shibboleth.idp.saml.nameid.impl.TransientNameIDDecoder;
-import net.shibboleth.idp.saml.nameid.impl.TransientNameIdentifierDecoder;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-/**
- * Parser for Transient Principal Connector<br/>
- * <PrincipalConnector xsi:type="pc:Transient">.
- */
-public class TransientConnectorParser extends AbstractPrincipalConnectorParser {
-
- /** Schema type name. */
- @Nonnull public static final QName TYPE_NAME = new QName(PrincipalConnectorNamespaceHandler.NAMESPACE, "Transient");
-
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(TransientConnectorParser.class);
-
- /** {@inheritDoc} */
- @Override protected void addSAMLDecoders(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
- @Nonnull final BeanDefinitionBuilder builder) {
-
- String idStore = "shibboleth.StorageService";
- if (config.hasAttributeNS(null, "storageServiceRef")) {
- idStore = StringSupport.trimOrNull(config.getAttributeNS(null, "storageServiceRef"));
- }
-
- // NameID
- BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransientNameIDDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- subBuilder.addPropertyReference("idStore", idStore);
- final String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
- subBuilder.addPropertyValue("id", id);
-
- builder.addPropertyValue("nameIDDecoder", subBuilder.getBeanDefinition());
-
- if (config.hasAttributeNS(null, "noResultIsError")) {
- log.warn("Transient PrincipalConnector does not support 'noResultIsError' attribute");
- }
-
- // NameIdentifier
- subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransientNameIdentifierDecoder.class);
- subBuilder.setInitMethodName("initialize");
- subBuilder.setDestroyMethodName("destroy");
-
- subBuilder.addPropertyReference("idStore", idStore);
- subBuilder.addPropertyValue("id", id);
- builder.addPropertyValue("nameIdentifierDecoder", subBuilder.getBeanDefinition());
- }
-
-}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/package-info.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/package-info.java
deleted file mode 100644
index 376ef3f..0000000
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/package-info.java
+++ /dev/null
@@ -1,23 +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.
- */
-
-/**
- * Parsers for <PrincipalConnectors>.
- * These are deprecated in V3
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.pc.impl;
\ No newline at end of file
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 ef244ab..3659fd5 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,5 +1,4 @@
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\:resolver\:pc = net.shibboleth.idp.attribute.resolver.spring.pc.impl.PrincipalConnectorNamespaceHandler
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/pc/CryptoTransientTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/CryptoTransientTest.java
deleted file mode 100644
index 18d2373..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/CryptoTransientTest.java
+++ /dev/null
@@ -1,37 +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.pc;
-
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * test for crypto principal connector parsers.
- */
-public class CryptoTransientTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void simple() {
- PrincipalConnector connector = getPrincipalConnector("crypto.xml", "sealer.xml");
-
- Assert.assertEquals(connector.getFormat(), "https://example.org/sealer");
- }
-
-}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
deleted file mode 100644
index 5d0fb1d..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
+++ /dev/null
@@ -1,63 +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.pc;
-
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
-import net.shibboleth.idp.saml.nameid.NameDecoderException;
-import net.shibboleth.idp.saml.nameid.impl.TransformingNameIDDecoder;
-import net.shibboleth.idp.saml.nameid.impl.TransformingNameIdentifierDecoder;
-
-import org.opensaml.saml.saml2.core.NameID;
-import org.opensaml.saml.saml2.core.impl.NameIDBuilder;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * test for direct principal connector parsers.
- */
-public class DirectTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void simple() throws NameDecoderException {
- final PrincipalConnector connector = getPrincipalConnector("direct.xml");
-
- Assert.assertTrue(connector.getNameIDDecoder() instanceof TransformingNameIDDecoder);
- Assert.assertTrue(connector.getNameIdentifierDecoder() instanceof TransformingNameIdentifierDecoder);
- Assert.assertEquals(connector.getFormat(), "https://example.org/direct");
- Assert.assertTrue(connector.getRelyingParties().isEmpty());
-
- final NameID id = new NameIDBuilder().buildObject();
- id.setFormat("https://example.org/sealer");
- id.setValue("The_value");
-
- Assert.assertEquals(connector.decode(new SubjectCanonicalizationContext(), id), "The_value");
- }
-
- @Test public void relyingParties() {
- final PrincipalConnector connector = getPrincipalConnector("directRPs.xml");
-
- Assert.assertTrue(connector.getNameIDDecoder() instanceof TransformingNameIDDecoder);
- Assert.assertTrue(connector.getNameIdentifierDecoder() instanceof TransformingNameIdentifierDecoder);
- Assert.assertEquals(connector.getFormat(), "http://example.org/schema");
- Assert.assertEquals(connector.getRelyingParties().size(), 2);
- Assert.assertTrue(connector.getRelyingParties().contains("SP1"));
- Assert.assertTrue(connector.getRelyingParties().contains("SP2"));
- }
-
-}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
deleted file mode 100644
index 40ceb83..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdTest.java
+++ /dev/null
@@ -1,173 +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.pc;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import net.shibboleth.idp.attribute.AttributeEncoder;
-import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.resolver.DataConnector;
-import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.attribute.resolver.spring.pc.impl.StoredIdConnectorParser.NotImplementedNameIdentifierDecoder;
-import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
-import net.shibboleth.idp.saml.nameid.NameDecoderException;
-import net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdDecoder;
-import net.shibboleth.idp.testing.DatabaseTestingSupport;
-
-import org.opensaml.saml.saml2.core.NameID;
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-/**
- * test for direct principal connector parsers.
- */
-public class StoredIdTest extends BaseAttributeDefinitionParserTest {
-
- private static final String INIT_FILE = "/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql";
-
- private static final String DELETE_FILE = "/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql";
-
- private DataSource testSource;
-
- private PrincipalConnector principalConnector;
-
- private DataConnector dataConnector;
-
- private AttributeResolverImpl ar;
-
- @BeforeTest public void setupSource() throws SQLException, IOException {
-
- testSource = DatabaseTestingSupport.GetMockDataSource(INIT_FILE, "storedId");
- }
-
- @AfterClass public void teardown() {
- DatabaseTestingSupport.InitializeDataSource(DELETE_FILE, testSource);
- }
-
- protected void setupConnectors(String fileName) {
-
- GenericApplicationContext context = new GenericApplicationContext();
- setTestContext(context);
- context.setDisplayName("ApplicationContext: " + PrincipalConnector.class);
-
- principalConnector = getBean(PRINCIPALCONNECTOR_FILE_PATH + fileName, PrincipalConnector.class, context);
- dataConnector = context.getBean("dc", DataConnector.class);
- ar = BaseAttributeDefinitionParserTest.getResolver(context);
- }
-
-
-
- @Test public void simple() {
- setupConnectors("stored.xml");
-
- Assert.assertEquals(principalConnector.getId(), "pc");
- Assert.assertEquals(dataConnector.getId(), "dc");
-
- Assert.assertTrue(principalConnector.getNameIDDecoder() instanceof StoredPersistentIdDecoder);
- Assert.assertTrue(principalConnector.getNameIdentifierDecoder() instanceof NotImplementedNameIdentifierDecoder);
- Assert.assertEquals(principalConnector.getFormat(), "https://example.org/stored");
- Assert.assertTrue(principalConnector.getRelyingParties().isEmpty());
- }
-
- @Test public void case426() throws ResolutionException {
- setupConnectors("stored.xml");
-
- final AttributeResolutionContext context = new AttributeResolutionContext();
- context.setPrincipal("PRINCIPAL");
- context.setAttributeIssuerID("ISSUER");
- context.setAttributeRecipientID("Recipient");
- context.getSubcontext(AttributeResolverWorkContext.class, true);
-
- ar.resolveAttributes(context);
-
- final Map<String, IdPAttribute> result = context.getResolvedIdPAttributes();
-
- Assert.assertNotNull(result.get("result"));
- }
-
-
- @Test public void directStore() throws ResolutionException, AttributeEncodingException, NameDecoderException {
- setupConnectors("stored-direct.xml");
-
- final AttributeResolutionContext arc = new AttributeResolutionContext();
- arc.setPrincipal("PRINCIPAL");
- arc.setAttributeIssuerID("ISSUER");
- arc.setAttributeRecipientID("Recipient");
- arc.getSubcontext(AttributeResolverWorkContext.class, true);
-
- ar.resolveAttributes(arc);
-
- final IdPAttribute result = arc.getResolvedIdPAttributes().get("result");
-
- final AttributeEncoder<NameID> encoder = (AttributeEncoder<NameID>) ar.getAttributeDefinitions().get("result").getAttributeEncoders().iterator().next();
-
- NameID nameID = encoder.encode(result);
-
- Assert.assertEquals(result.getValues().size(), 1);
-
- final SubjectCanonicalizationContext scc = new SubjectCanonicalizationContext();
- scc.setPrincipalName(arc.getPrincipal());
- scc.setRequesterId(arc.getAttributeRecipientID());
- scc.setResponderId(arc.getAttributeIssuerID());
-
- Assert.assertEquals(principalConnector.getNameIDDecoder().decode(scc, nameID), arc.getPrincipal());
- }
-
- @Test public void connectorStore() throws ResolutionException, AttributeEncodingException, NameDecoderException {
-
- setupConnectors("stored-beanConnector.xml");
-
- final AttributeResolutionContext arc = new AttributeResolutionContext();
- arc.setPrincipal("PRINCIPAL");
- arc.setAttributeIssuerID("ISSUER");
- arc.setAttributeRecipientID("Recipient");
- arc.getSubcontext(AttributeResolverWorkContext.class, true);
-
- ar.resolveAttributes(arc);
-
- final IdPAttribute result = arc.getResolvedIdPAttributes().get("result");
-
- final AttributeEncoder<NameID> encoder = (AttributeEncoder<NameID>) ar.getAttributeDefinitions().get("result").getAttributeEncoders().iterator().next();
-
- NameID nameID = encoder.encode(result);
-
- Assert.assertEquals(result.getValues().size(), 1);
-
- final SubjectCanonicalizationContext scc = new SubjectCanonicalizationContext();
- scc.setPrincipalName(arc.getPrincipal());
- scc.setRequesterId(arc.getAttributeRecipientID());
- scc.setResponderId(arc.getAttributeIssuerID());
-
- Assert.assertEquals(principalConnector.getNameIDDecoder().decode(scc, nameID), arc.getPrincipal());
- }
-
-
-}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java
deleted file mode 100644
index d159db8..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientTest.java
+++ /dev/null
@@ -1,43 +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.pc;
-
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.saml.attribute.principalconnector.impl.PrincipalConnector;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * test for transient principal connector parsers.
- */
-public class TransientTest extends BaseAttributeDefinitionParserTest {
-
- @Test public void simple() {
- PrincipalConnector connector = getPrincipalConnector("transientNoStore.xml", "idStore.xml");
-
- Assert.assertEquals(connector.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
- }
-
- @Test public void store() {
- PrincipalConnector connector = getPrincipalConnector("transient.xml", "idStore2.xml");
-
- Assert.assertEquals(connector.getFormat(), "urn:oasis:names:tc:SAML:2.0:nameid-format:transient");
- }
-
-}
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml
index 4d60d91..3eb125a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/contextDerived.xml
@@ -2,7 +2,6 @@
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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
index 1916d90..f846f67 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoWithTime.xml
@@ -9,7 +9,6 @@
dataSealerRef="shibboleth.TransientIDDataSealer"
lifetime="PT3M"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
index 1d23a68..a515594 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
@@ -2,7 +2,6 @@
<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
index bea0dc7..a51c93e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
@@ -2,7 +2,6 @@
xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
index b440433..a800a67 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/sourceValue.xml
@@ -3,7 +3,6 @@
id="container" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
index b173060..3f3e7b1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/valueMap.xml
@@ -4,7 +4,6 @@
xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
index a42a224..5896335 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
@@ -1,7 +1,6 @@
<resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
index caa1307..1d62cf1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalAuthenticationMethod.xml
@@ -6,7 +6,6 @@
dependencyOnly="1"
xsi:type="ad:PrincipalAuthenticationMethod" id="PrincipalAuthenticationMethod"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
index 11e27dd..d57dadb 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/principalName.xml
@@ -6,7 +6,6 @@
dependencyOnly="1"
xsi:type="ad:PrincipalName" id="PrincipalName"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
index e5ec768..3af13f9 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexDefault.xml
@@ -7,7 +7,6 @@
xsi:type="ad:RegexSplit" id="regexSplitDefault"
regex="at1-(.+)or"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
index 1dd637a..3e7a84b 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdAttributes.xml
@@ -8,7 +8,6 @@
nameIdFormat = "format"
nameIdQualifier = "qualifier"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml
index 92c8232..c5e3852 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdAttributes.xml
@@ -8,7 +8,6 @@
nameIdQualifier = "qualifier"
nameIdSPQualifier = "name-Id-SP-Qualifier"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml
index 3d7c657..fd6d71a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeFileMissing.xml
@@ -6,7 +6,6 @@
dependencyOnly="1"
xsi:type="ad:Script" id="scriptedFile"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
index 63f1e19..8825385 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeInline.xml
@@ -6,7 +6,6 @@
dependencyOnly="1"
xsi:type="ad:Script" id="scriptedInline"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
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
index c49d8c0..298fee5 100644
--- 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
@@ -2,7 +2,6 @@
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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml
index 468e607..eed2982 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateAttributes.xml
@@ -6,7 +6,6 @@
velocityEngine="otherVe"
xsi:type="ad:Template"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml
index a19339b..47c7b4a 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientWithTime.xml
@@ -8,7 +8,6 @@
lifetime="PT3M"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
index d938fce..e15d5d8 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver2.xml
@@ -1,11 +1,11 @@
<?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:ad="urn:mace:shibboleth:2.0:resolver:ad"
+ xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
+ xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
xmlns:sec="urn:mace:shibboleth:2.0:security"
id = "TestID"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
index 73c334f..cc0da39 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resolver:DataConnector id="computed"
xsi:type="dc:ComputedId" 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: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"
@@ -9,7 +9,6 @@
generatedAttributeID="jenny"
salt="abcdefghijklmnopqrst "
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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/containerManagedConnection.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/containerManagedConnection.xml
index eeb8ec0..4cbc970 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/containerManagedConnection.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/containerManagedConnection.xml
@@ -1,6 +1,6 @@
<resolver:DataConnector id="stored"
xsi:type="dc:StoredId" 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: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"
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes-8.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes-8.xml
index 86ca975..d1c7fc7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes-8.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes-8.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<resolver:DataConnector id="staticAttributes"
xsi:type="dc:Script" 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: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"
customObjectRef="other.CustomScriptObject"
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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes.xml
index 788aad1..f07b1a7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedAttributes.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<resolver:DataConnector id="staticAttributes"
xsi:type="dc:Script" 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: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"
customObjectRef="other.CustomScriptObject"
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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
index 42af696..dcaa031 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/staticAttributes.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<resolver:DataConnector id="staticAttributes"
xsi:type="dc:Static" 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: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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/stored.xml
index fc2ae14..91f2097 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/stored.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/stored.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resolver:DataConnector id="stored"
xsi:type="dc:StoredId" 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: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"
@@ -13,7 +13,6 @@
generatedAttributeID="jenny"
salt="abcdefghijklmnopqrst"
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
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 f42cb8c..6f83577 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
@@ -6,11 +6,11 @@
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: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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
index 2cf82cc..83e3a79 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver1.xml
@@ -1,10 +1,10 @@
<?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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
index b615902..1cefd9c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/multiFileResolver2.xml
@@ -1,10 +1,9 @@
<?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: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
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql
deleted file mode 100644
index 9ffe8bd..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/DeleteStore.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE shibpid;
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
deleted file mode 100644
index 9cc4018..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE shibpid (
- localEntity VARCHAR(255) NOT NULL,
- peerEntity VARCHAR(255) NOT NULL,
- persistentId VARCHAR(50) NOT NULL,
- principalName VARCHAR(50) NOT NULL,
- localId VARCHAR(50) NOT NULL,
- peerProvidedId VARCHAR(50) NULL,
- creationDate TIMESTAMP NOT NULL,
- deactivationDate TIMESTAMP NULL,
- PRIMARY KEY (localEntity, peerEntity, persistentId)
- );
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml
deleted file mode 100644
index 72d1aa5..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/crypto.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:CryptoTransient" id="CryptoTransient" nameIDFormat="https://example.org/sealer" dataSealerRef="shibboleth.TransientIDDataSealer"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml
deleted file mode 100644
index 16373d1..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
- <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" />
-
-</beans>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml
deleted file mode 100644
index f374714..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/direct.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Direct" id="shibDirect" nameIDFormat="https://example.org/direct" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml
deleted file mode 100644
index af5a36c..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/directRPs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Direct" id="shibDirect" nameIDFormat="http://example.org/schema">
- <resolver:RelyingParty>SP1</resolver:RelyingParty>
- <resolver:RelyingParty>SP2</resolver:RelyingParty>
-</resolver:PrincipalConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml
deleted file mode 100644
index 18325c3..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-beanConnector.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
- <bean class="org.hsqldb.jdbc.JDBCDataSource" p:url="jdbc:hsqldb:mem:storedId" p:user="SA" p:password="" id="Connector" />
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar" >
- <resolver:Dependency ref="staticAttributes" />
- <dc:BeanManagedConnection>Connector</dc:BeanManagedConnection>
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
-</beans>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
deleted file mode 100644
index a464b7d..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored-direct.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar" springResources="/net/shibboleth/idp/attribute/resolver/spring/pc/dataconnector.xml">
- <resolver:Dependency ref="staticAttributes" />
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2StringNameID" nameFormat="https://example.org/stored" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml
deleted file mode 100644
index d19e301..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/stored.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:PrincipalConnector
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xsi:type="pc:StoredId"
- id="pc" nameIDFormat="https://example.org/stored"
- storedIdDataConnectorRef="dc" />
-
- <resolver:DataConnector id="dc" xsi:type="dc:StoredId"
- generatedAttributeID="output" salt="123456789abcdefgh"
- sourceAttributeID="foobar">
- <resolver:Dependency ref="staticAttributes" />
- <dc:ApplicationManagedConnection
- jdbcURL="jdbc:hsqldb:mem:storedId" jdbcDriver="org.hsqldb.jdbc.JDBCDriver" jdbcUserName="SA" jdbcPassword="" />
- </resolver:DataConnector>
-
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="foobar">
- <dc:Value>barfoo</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-
- <resolver:AttributeDefinition id="result"
- xsi:type="ad:Simple" sourceAttributeID="output">
- <resolver:Dependency ref="dc" />
- </resolver:AttributeDefinition>
-</resolver:AttributeResolver>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml
deleted file mode 100644
index 9312efd..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transient.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Transient" id="Transient" nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" storageServiceRef="testStore"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml
deleted file mode 100644
index 207547d..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/transientNoStore.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resolver:PrincipalConnector xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd"
-
- xsi:type="pc:Transient" id="TransientNoStore" nameIDFormat="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" />
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-pc.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-pc.xsd
deleted file mode 100644
index db0dd68..0000000
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-pc.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:resolver="urn:mace:shibboleth:2.0:resolver" targetNamespace="urn:mace:shibboleth:2.0:resolver:pc" elementFormDefault="qualified">
-
- <import namespace="urn:mace:shibboleth:2.0:resolver" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
-
- <import namespace="urn:mace:shibboleth:2.0:resolver:dc" schemaLocation="http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd"/>
-
- <complexType name="Transient">
- <annotation>
- <documentation>
- A principal connector that returns the SAML name identifier value as the principal name.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BasePrincipalConnectorType">
- <attribute name="storageServiceRef" type="string" default="shibboleth.StorageService">
- <annotation>
- <documentation>
- The identifier of the storage service used to store and retrieve principal names.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="noResultIsError" type="boolean">
- <annotation>
- <documentation>
- A boolean flag indicating whether a query returning no results should be considered an error.
- Default value is false.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="CryptoTransient">
- <annotation>
- <documentation>
- A principal connector that decrypts the SAML name identifier value as the principal name.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BasePrincipalConnectorType">
- <attribute name="dataSealerRef" type="string" use="required">
- <annotation>
- <documentation>Object used to decrypt identifiers</documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="StoredId">
- <annotation>
- <documentation>
- A principal connector that returns the SAML name identifier value as the principal name.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BasePrincipalConnectorType">
- <attribute name="storedIdDataConnectorRef" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the StoredId data connector that created the ID to be resolved.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="Direct">
- <annotation>
- <documentation>
- A principal connector that returns the SAML name identifier value as the principal name.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BasePrincipalConnectorType"/>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 332ab58..f843338 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -20,7 +20,6 @@
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="resolver:AttributeDefinition"/>
<element ref="resolver:DataConnector"/>
- <element ref="resolver:PrincipalConnector"/>
</choice>
<attribute name="id" type="string">
<annotation>
@@ -241,47 +240,6 @@
</complexContent>
</complexType>
- <element name="PrincipalConnector" type="resolver:BasePrincipalConnectorType">
- <annotation>
- <documentation>
- DEPRECATED:
- Principal connectors convert a subject's NameID into an internal principal
- name for use within attribute definitions and data connectors.
- </documentation>
- </annotation>
- </element>
-
- <complexType name="BasePrincipalConnectorType">
- <annotation>
- <documentation>
- DEPRECATED:
- Principal connectors convert a subject's NameID into an internal principal
- name for use within attribute definitions and data connectors.
- </documentation>
- </annotation>
- <complexContent>
- <extension base="resolver:BaseResolutionPlugInType">
- <sequence>
- <element name="RelyingParty" type="string" minOccurs="0"
- maxOccurs="unbounded">
- <annotation>
- <documentation>
- The relying party for which this connector is valid.
- </documentation>
- </annotation>
- </element>
- </sequence>
- <attribute name="nameIDFormat" type="string" use="required">
- <annotation>
- <documentation>
- The format of the NameID for which this connector is valid.
- </documentation>
- </annotation>
- </attribute>
- </extension>
- </complexContent>
- </complexType>
-
<complexType name="FlattenedBaseResolutionPlugInType" abstract="true">
<annotation>
<documentation>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list