[java-identity-provider] 23/51: IDP-1121 Remove <Dependency> from the schema
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:42:54 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=843f5d4e88cd171f14cd97e45b0c6924474ee941
commit 843f5d4e88cd171f14cd97e45b0c6924474ee941
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 21 16:49:55 2019 +0000
IDP-1121 Remove <Dependency> from the schema
https://issues.shibboleth.net/jira/browse/IDP-1121
And all associated tests.
---
.../resolver/spring/DependencyTypesTest.java | 2 +-
.../resolver/spring/ad/DependencyTest.java | 61 ----------------------
.../dc/ComputedIDDataConnectorParserTest.java | 9 ----
.../resolver/spring/ad/idInParentDependency.xml | 5 --
.../resolver/spring/ad/mapped/resolver/mapped.xml | 2 +-
.../spring/ad/mapped/resolver/sourceValue.xml | 2 +-
.../spring/ad/mapped/resolver/valueMap.xml | 2 +-
.../resolver/spring/ad/noIdInParentDependency.xml | 5 --
.../resolver/spring/ad/orphanDependency.xml | 3 --
.../resolver/spring/ad/resolver/prescopedWith.xml | 2 +-
.../resolver/spring/ad/resolver/regexDefault.xml | 2 +-
.../resolver/spring/ad/resolver/scoped.xml | 2 +-
.../spring/ad/resolver/templateAttributes.xml | 2 +-
.../resolver/ldap-attribute-resolver-v2-nosec.xml | 3 --
.../ldap/resolver/ldap-attribute-resolver-v2.xml | 4 +-
.../rdbms/resolver/rdbms-attribute-resolver-v2.xml | 4 +-
.../spring/dc/resolver/computedNoSource.xml | 10 ----
.../spring/dc/resolver/scriptedAttributeBoth.xml | 4 +-
.../dc/resolver/scriptedAttributeTooManyFiles.xml | 2 -
.../resolver/scriptedAttributeTooManyScripts.xml | 2 -
.../resolver/spring/enc/resolver/idp-571.xml | 2 +-
.../resolver/spring/mapperTest-attributes.xml | 10 ++--
.../resolver/spring/simpleDependencies.xml | 1 -
.../schema/shibboleth-attribute-resolver.xsd | 25 +--------
24 files changed, 19 insertions(+), 147 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
index 21769e3..7aafb2b 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/DependencyTypesTest.java
@@ -67,7 +67,7 @@ public class DependencyTypesTest extends BaseAttributeDefinitionParserTest {
@Test(dependsOnMethods={"attributeInput", "allAttributeDataConnector"}) public void simple() {
final AttributeDefinition attr = getBean(BEAN_FILE_PATH + "simpleDependencies.xml", AttributeDefinition.class, new GenericApplicationContext());
- Assert.assertEquals(attr.getDependencies().size(), 3);
+ Assert.assertEquals(attr.getDependencies().size(), 2);
}
}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/DependencyTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/DependencyTest.java
deleted file mode 100644
index 0638d58..0000000
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/DependencyTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.attribute.resolver.spring.ad;
-
-import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.ResolverPluginDependency;
-import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ServiceException;
-
-import org.springframework.context.support.GenericApplicationContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/** A work in progress to test the attribute resolver service. */
-
-public class DependencyTest extends BaseAttributeDefinitionParserTest {
-
- private ResolverPluginDependency getDependency(String fileName) {
-
- GenericApplicationContext context = new GenericApplicationContext();
- setTestContext(context);
- context.setDisplayName("ApplicationContext: " + DependencyTest.class);
-
- return getBean(ATTRIBUTE_FILE_PATH + fileName, ResolverPluginDependency.class, context);
- }
-
- @Test public void testOrphan() throws ComponentInitializationException, ServiceException, ResolutionException {
- ResolverPluginDependency depend = getDependency("orphanDependency.xml");
-
- Assert.assertEquals(depend.getDependencyPluginId(), "TheOrphan");
- }
-
- @Test public void testNoId() throws ComponentInitializationException, ServiceException, ResolutionException {
- ResolverPluginDependency depend = getDependency("noIdInParentDependency.xml");
-
- Assert.assertEquals(depend.getDependencyPluginId(), "TheHasNotRef");
- }
-
- @Test public void testId() throws ComponentInitializationException, ServiceException, ResolutionException {
- ResolverPluginDependency depend = getDependency("idInParentDependency.xml");
-
- Assert.assertEquals(depend.getDependencyPluginId(), "TheHasRef");
- Assert.assertNull(depend.getDependencyAttributeId());
- }
-}
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
index e70ab30..270c9a3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
@@ -66,15 +66,6 @@ public class ComputedIDDataConnectorParserTest extends BaseAttributeDefinitionPa
Assert.assertTrue(connector.isInitialized());
}
- @Test public void resolverNoSourceAttr() {
- try {
- getDataConnector("resolver/computedNoSource.xml", ComputedIDDataConnector.class);
- Assert.fail("Expected initialize to fail");
- } catch (final BeanCreationException ex) {
- Assert.assertEquals(ex.getCause().getClass(), ComponentInitializationException.class);
- }
- }
-
@Test public void resolverNoSourceDependency() {
final ComputedIDDataConnector connector = getDataConnector("resolver/computedNoSource1.xml", ComputedIDDataConnector.class);
Assert.assertEquals(connector.getId(), "computed");
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
deleted file mode 100644
index c8c1d74..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idInParentDependency.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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"
- ref="TheHasRef" />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml
index c030d33..e0a93e2 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mapped.xml
@@ -1,7 +1,7 @@
<AttributeDefintion xsi:type="Mapped"
xmlns="urn:mace:shibboleth:2.0:resolver" 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">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
<ValueMap>
<ReturnValue>return</ReturnValue>
<SourceValue>source</SourceValue>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml
index 38adf6c..e5d4616 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/sourceValue.xml
@@ -6,5 +6,5 @@
<ReturnValue>return</ReturnValue>
<SourceValue/>
</ValueMap>
- <Dependency ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml
index 670c832..a5d2bb1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/valueMap.xml
@@ -7,5 +7,5 @@
<ReturnValue>return</ReturnValue>
<SourceValue>source</SourceValue>
</ValueMap>
- <Dependency ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
deleted file mode 100644
index 7c4f037..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/noIdInParentDependency.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Dependency xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
- ref="TheHasNotRef" />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
deleted file mode 100644
index 3464102..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/orphanDependency.xml
+++ /dev/null
@@ -1,3 +0,0 @@
- <Dependency xmlns="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWith.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWith.xml
index 07a7f29..324c2e2 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWith.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWith.xml
@@ -4,5 +4,5 @@
dependencyOnly="1"
xsi:type="Prescoped" id="prescopedWith" scopeDelimiter="#"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <Dependency ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexDefault.xml
index 6db8a4f..1a6a6be 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexDefault.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexDefault.xml
@@ -5,5 +5,5 @@
xsi:type="RegexSplit" id="regexSplitDefault"
regex="at1-(.+)or"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <Dependency ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scoped.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scoped.xml
index 1501e4a..abd60fe 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scoped.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scoped.xml
@@ -3,5 +3,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" scope="mYsCoPe"
xsi:type="Scoped" id="scoped"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
+ <InputAttributeDefinition ref="TheOrphan" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml
index 3d27c7d..193a1fb 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateAttributes.xml
@@ -6,7 +6,7 @@
xsi:type="Template"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd" >
<SourceAttribute>att1</SourceAttribute>
- <Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"/>
+ <InputAttributeDefinition ref="TheOrphan"/>
<SourceAttribute>att2</SourceAttribute>
<Template>TheTemplate</Template>
</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
index 9d4b150..d9d5ff2 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-nosec.xml
@@ -25,8 +25,6 @@
<Column columnName="homephone" attributeID="phonenumber" />
- <Dependency ref="321"/>
-
<ConnectionPool
minPoolSize="5"
maxPoolSize="10"
@@ -43,7 +41,6 @@
<sec:PrivateKey>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.key</sec:PrivateKey>
<sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
</StartTLSAuthenticationCredential>
- <Dependency ref="321"/>
<LDAPProperty name="name2" value="value2"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
index 19746a5..503e8b8 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
@@ -23,8 +23,6 @@
<Column columnName="homephone" attributeID="phonenumber" />
- <Dependency ref="321"/>
-
<ConnectionPool
minPoolSize="5"
maxPoolSize="10"
@@ -57,7 +55,7 @@
<sec:Certificate>src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.crt</sec:Certificate>
</StartTLSTrustCredential>
- <Dependency ref="321"/>
+ <InputAttributeDefinition ref="321"/>
<LDAPProperty name="name2" value="value2"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml
index f9390da..b91f054 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml
@@ -30,7 +30,7 @@
<ResultCache elementTimeToLive="PT10S" maximumCachedElements="25"/>
- <Dependency ref="321"/>
+ <InputAttributeDefinition ref="321"/>
<QueryTemplate>
<![CDATA[
@@ -38,7 +38,7 @@
]]>
</QueryTemplate>
- <Dependency ref="321"/>
+ <InputAttributeDefinition ref="321"/>
</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource.xml
deleted file mode 100644
index b177efd..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/computedNoSource.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DataConnector id="computed"
- xsi:type="ComputedId" xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
- generatedAttributeID="jenny"
- salt="abcdefghijklmnopqrst "
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <FailoverDataConnector ref="2123"/>
- <Dependency ref="abc"/>
-</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeBoth.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeBoth.xml
index e544587..9650742 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeBoth.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeBoth.xml
@@ -7,8 +7,6 @@
<Script><![CDATA[
foo;
]]></Script>
- <Dependency ref="asr"/>
- <Dependency ref="ddde"/>
<ScriptFile>classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js</ScriptFile>
<FailoverDataConnector ref="w"/>
-</DataConnector>
+</DataConnector>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyFiles.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyFiles.xml
index 19adfb5..3439eac 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyFiles.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyFiles.xml
@@ -5,8 +5,6 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<ScriptFile>classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js</ScriptFile>
- <Dependency ref="asr"/>
- <Dependency ref="ddde"/>
<ScriptFile>classpath:/net/shibboleth/idp/attribute/resolver/spring/dc/scriptedConnector.8.js</ScriptFile>
<FailoverDataConnector ref="w"/>
</DataConnector>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyScripts.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyScripts.xml
index 9844e80..6d628f7 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyScripts.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/scriptedAttributeTooManyScripts.xml
@@ -7,8 +7,6 @@
<Script><![CDATA[
foo;
]]></Script>
- <Dependency ref="asr"/>
- <Dependency ref="ddde"/>
<Script><![CDATA[
bar;
]]></Script>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml
index 563dcbf..81ca522 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml
@@ -3,7 +3,7 @@
<AttributeDefinition id="skillsoftdept" xsi:type="ScriptedAttribute" >
<!-- Old Style just for now -->
- <Dependency ref="static" />
+ <InputDataConnector ref="static" attributeNames="staticEpA"/>
<AttributeEncoder xsi:type="SAML2String" name="skillsoftdept" friendlyName="dept name for skillsoft" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" />
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 3af27f3..a27b2b5 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
@@ -22,27 +22,27 @@
</DataConnector>
<AttributeDefinition xsi:type="Simple" id="eduPersonAssurance" sourceAttributeID="assurance">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector allAttributes="true" ref="staticAttributes" />
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
<AttributeEncoder xsi:type="SAML2String" nameFormat="http://example.org/Format" name="http://example.org/name/for/Attribute" friendlyName="fotherSAMLName" />
</AttributeDefinition>
<AttributeDefinition xsi:type="Simple" id="otherPersonAssurance" sourceAttributeID="oAssurance">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector allAttributes="true" ref="staticAttributes" />
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="feduPersonAssurance" />
</AttributeDefinition>
<AttributeDefinition xsi:type="Simple" id="otherFormatPersonAssurance" sourceAttributeID="ofAssurance">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector allAttributes="true" ref="staticAttributes" />
<AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" />
<AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" nameFormat="http://example.org/Format" friendlyName="fOeduPersonAssurance" />
</AttributeDefinition>
<AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="example.org"
sourceAttributeID="assurance">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector allAttributes="true" ref="staticAttributes" />
<AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
<AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="feduPersonScopedAffiliation"
scopeDelimiter='#'/>
@@ -50,7 +50,7 @@
<AttributeDefinition xsi:type="SAML2NameID" id="eduPersonTID"
nameIdFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" sourceAttributeID="eduPersonEntitlement">
- <Dependency ref="staticAttributes" />
+ <InputDataConnector allAttributes="true" ref="staticAttributes" />
<AttributeEncoder xsi:type="SAML1XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" />
<AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="feduPersonTargetedID" />
</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
index 7f968e1..977a5c1 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/simpleDependencies.xml
@@ -5,7 +5,6 @@
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
<InputDataConnector ref="dep2" allAttributes="true"/>
- <Dependency ref="dep1"/>
<InputAttributeDefinition ref="dep3"/>
</AttributeDefinition>
\ No newline at end of file
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 11f610e..a642aa6 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -208,13 +208,6 @@
</attribute>
</complexType>
- <element name="Dependency" type="resolver:PluginDependencyType">
- <annotation>
- <documentation>
- Defines a dependency on a specific resolution plug-in.
- </documentation>
- </annotation>
- </element>
<element name="InputAttributeDefinition" type="resolver:PluginDependencyType">
<annotation>
<documentation>
@@ -253,7 +246,7 @@
</element>
<complexType name="PluginDependencyType">
<annotation>
- <documentation>A type that represents a reference to another plugin</documentation>
+ <documentation>An (abstract) type that represents a reference to another plugin</documentation>
</annotation>
<attribute name="ref" type="string" use="required"/>
</complexType>
@@ -364,7 +357,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -409,7 +401,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -463,7 +454,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -494,7 +484,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -523,7 +512,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -557,7 +545,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -590,7 +577,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -636,7 +622,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -686,7 +671,6 @@
<complexContent>
<extension base="resolver:BaseAttributeDefinitionType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element name="DisplayName" type="resolver:LocalizedStringType"/>
@@ -754,7 +738,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -809,7 +792,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -1047,7 +1029,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -1171,7 +1152,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -1338,7 +1318,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -1385,7 +1364,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
@@ -1427,7 +1405,6 @@
<complexContent>
<extension base="resolver:BaseDataConnectorType">
<choice maxOccurs="unbounded" minOccurs="0">
- <element ref="resolver:Dependency"/>
<element ref="resolver:InputAttributeDefinition"/>
<element ref="resolver:InputDataConnector"/>
<element ref="resolver:FailoverDataConnector"/>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list