[java-identity-provider] 01/06: IDP-1330 Move AttributeDefinition tests to new namespace
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 17 06:06:06 EDT 2018
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=e464abd6bed36e90bc62f834205a103e1016001f
commit e464abd6bed36e90bc62f834205a103e1016001f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 12 17:07:19 2018 +0100
IDP-1330 Move AttributeDefinition tests to new namespace
https://issues.shibboleth.net/jira/browse/IDP-1330
---
...ntextDerivedAttributeDefinitionsParserTest.java | 4 +-
...toTransientIdAttributeDefinitionParserTest.java | 2 +-
.../ad/PrescopedAttributeDefinitionParserTest.java | 2 +-
.../RegexSplitAttributeDefinitionParserTest.java | 4 +-
...ameIdentifierAttributeDefinitionParserTest.java | 2 +-
...meIDdentifierAttributeDefinitionParserTest.java | 2 +-
.../spring/ad/ScriptedAttributeParserTest.java | 4 +-
.../spring/ad/SimpleAttributeParserTest.java | 6 +--
.../ad/TemplateAttributeDefinitionParserTest.java | 2 +-
.../TransientIdAttributeDefinitionParserTest.java | 2 +-
.../idp/attribute/resolver/filter/resolver.xml | 60 +++++++++-------------
.../attribute/resolver/spring/ad/cryptoNoTime.xml | 13 -----
.../resolver/spring/ad/prescopedWithout.xml | 15 ------
.../resolver/spring/ad/regexInsensitive.xml | 17 ------
.../idp/attribute/resolver/spring/ad/regexNone.xml | 17 ------
.../resolver/spring/ad/regexSensitive.xml | 17 ------
.../resolver/spring/ad/resolver/cryptoNoTime.xml | 7 +++
.../prescopedWithout.xml} | 8 +--
.../regexInsensitive.xml} | 12 +++--
.../{relyingParties.xml => resolver/regexNone.xml} | 10 ++--
.../regexSensitive.xml} | 10 ++--
.../spring/ad/{ => resolver}/relyingParties.xml | 0
.../spring/ad/resolver/saml1NameIdDefault.xml | 5 ++
.../spring/ad/resolver/saml2NameIdDefault.xml | 3 ++
.../spring/ad/resolver/scriptedAttributeAbsent.xml | 5 ++
.../spring/ad/resolver/scriptedAttributeBad.xml | 6 +++
.../ad/{ => resolver}/scriptedAttributeDupl.xml | 0
.../{ => resolver}/scriptedAttributeDuplFile.xml | 0
.../ad/resolver/simpleAttributeBadValues.xml | 6 +++
.../ad/resolver/simpleAttributeUnpopulated.xml | 5 ++
.../spring/ad/resolver/subjectDerivedComplex.xml | 5 ++
.../ad/resolver/subjectDerivedDependency.xml | 9 ++++
.../spring/ad/resolver/subjectDerivedFail.xml | 9 ++++
.../spring/ad/resolver/subjectDerivedWarn.xml | 8 +++
.../spring/ad/resolver/templateNoAttributes.xml | 8 +++
.../ad/{ => resolver}/templateTwoTemplate.xml | 2 +-
.../spring/ad/resolver/transientNoTime.xml | 6 +++
.../resolver/spring/ad/saml1NameIdDefault.xml | 14 -----
.../resolver/spring/ad/saml2NameIdDefault.xml | 13 -----
.../resolver/spring/ad/scriptedAttributeAbsent.xml | 14 -----
.../resolver/spring/ad/scriptedAttributeBad.xml | 14 -----
.../spring/ad/simpleAttributeBadValues.xml | 14 -----
.../spring/ad/simpleAttributeUnpopulated.xml | 15 ------
.../resolver/spring/ad/subjectDerivedComplex.xml | 11 ----
.../spring/ad/subjectDerivedDependency.xml | 16 ------
.../resolver/spring/ad/subjectDerivedFail.xml | 15 ------
.../resolver/spring/ad/subjectDerivedWarn.xml | 15 ------
.../resolver/spring/ad/templateNoAttributes.xml | 13 -----
.../resolver/spring/ad/transientNoTime.xml | 12 -----
49 files changed, 145 insertions(+), 314 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
index 10e02a3..bb97fa8 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
@@ -95,7 +95,7 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
}
@Test public void complex() throws ResolutionException {
- final AttributeDefinition attrDef = getAttributeDefn("subjectDerivedComplex.xml", "contextDerivedBeans.xml",
+ final AttributeDefinition attrDef = getAttributeDefn("resolver/subjectDerivedComplex.xml", "contextDerivedBeans.xml",
ContextDerivedAttributeDefinition.class);
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("BeanWhatever")).getValues();
@@ -129,7 +129,7 @@ public class ContextDerivedAttributeDefinitionsParserTest extends BaseAttributeD
@Test public void warn() throws ResolutionException {
final AttributeDefinition attrDef =
- getAttributeDefn("subjectDerivedWarn.xml", ContextDerivedAttributeDefinition.class);
+ getAttributeDefn("resolver/subjectDerivedWarn.xml", ContextDerivedAttributeDefinition.class);
final List<IdPAttributeValue<?>> foo = attrDef.resolve(getCtx("Whatever")).getValues();
Assert.assertEquals(2, foo.size());
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
index 14a5e13..fc2d89f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
@@ -63,7 +63,7 @@ public class CryptoTransientIdAttributeDefinitionParserTest extends BaseAttribut
@Test public void noTime() throws ComponentInitializationException {
- TransientIdAttributeDefinition defn = getDefinition("cryptoNoTime.xml");
+ TransientIdAttributeDefinition defn = getDefinition("resolver/cryptoNoTime.xml");
Assert.assertTrue(defn.isInitialized());
CryptoTransientIdGenerationStrategy strategy =
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
index 93fbc79..01f0e4f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/PrescopedAttributeDefinitionParserTest.java
@@ -47,7 +47,7 @@ public class PrescopedAttributeDefinitionParserTest extends BaseAttributeDefinit
@Test public void withoutScope() {
PrescopedAttributeDefinition attrDef =
- getAttributeDefn("prescopedWithout.xml", PrescopedAttributeDefinition.class);
+ getAttributeDefn("resolver/prescopedWithout.xml", PrescopedAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "prescopedWith");
Assert.assertEquals(attrDef.getScopeDelimiter(), "@");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
index 7247048..b4b012c 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/RegexSplitAttributeDefinitionParserTest.java
@@ -58,7 +58,7 @@ public class RegexSplitAttributeDefinitionParserTest extends BaseAttributeDefini
@Test public void sensitive() {
RegexSplitAttributeDefinition attrDef =
- getAttributeDefn("regexSensitive.xml", RegexSplitAttributeDefinition.class);
+ getAttributeDefn("resolver/regexSensitive.xml", RegexSplitAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "regexSplitSensitive");
@@ -70,7 +70,7 @@ public class RegexSplitAttributeDefinitionParserTest extends BaseAttributeDefini
@Test public void insensitive() {
RegexSplitAttributeDefinition attrDef =
- getAttributeDefn("regexInsensitive.xml", RegexSplitAttributeDefinition.class);
+ getAttributeDefn("resolver/regexInsensitive.xml", RegexSplitAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "regexSplitInsensitive");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
index 316b0e2..0d75344 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML1NameIdentifierAttributeDefinitionParserTest.java
@@ -31,7 +31,7 @@ public class SAML1NameIdentifierAttributeDefinitionParserTest extends BaseAttrib
@Test public void defaultCase() {
SAML1NameIdentifierAttributeDefinition attrDef =
- getAttributeDefn("saml1NameIdDefault.xml", SAML1NameIdentifierAttributeDefinition.class);
+ getAttributeDefn("resolver/saml1NameIdDefault.xml", SAML1NameIdentifierAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "SAML1NameIdentifier");
Assert.assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
index 2058d7a..8738e87 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SAML2NameIDdentifierAttributeDefinitionParserTest.java
@@ -31,7 +31,7 @@ public class SAML2NameIDdentifierAttributeDefinitionParserTest extends BaseAttri
@Test public void defaultCase() {
SAML2NameIDAttributeDefinition attrDef =
- getAttributeDefn("saml2NameIdDefault.xml", SAML2NameIDAttributeDefinition.class);
+ getAttributeDefn("resolver/saml2NameIdDefault.xml", SAML2NameIDAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "SAML2NameID");
Assert.assertEquals(attrDef.getNameIdFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
index 8d56ee7..9c0d983 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ScriptedAttributeParserTest.java
@@ -76,13 +76,13 @@ public class ScriptedAttributeParserTest extends BaseAttributeDefinitionParserTe
@Test public void dupl() {
ScriptedAttributeDefinition attrDef =
- getAttributeDefn("scriptedAttributeDupl.xml", ScriptedAttributeDefinition.class, true);
+ getAttributeDefn("resolver/scriptedAttributeDupl.xml", ScriptedAttributeDefinition.class, true);
Assert.assertEquals(attrDef.getId(), "scriptedDupl");
Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
Assert.assertEquals(StringSupport.trim(attrDef.getScript().getScript()), "stuff=\"stuff\";");
- attrDef = getAttributeDefn("scriptedAttributeDuplFile.xml", ScriptedAttributeDefinition.class, true);
+ attrDef = getAttributeDefn("resolver/scriptedAttributeDuplFile.xml", ScriptedAttributeDefinition.class, true);
Assert.assertEquals(attrDef.getId(), "scriptedDuplFile");
Assert.assertEquals(attrDef.getScript().getScriptLanguage(), "javascript");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
index 33db632..e8c2da3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeParserTest.java
@@ -52,7 +52,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
@Test public void simple() {
AttributeDefinition attrDef =
- getAttributeDefn("simpleAttributeUnpopulated.xml", SimpleAttributeDefinition.class);
+ getAttributeDefn("resolver/simpleAttributeUnpopulated.xml", SimpleAttributeDefinition.class);
Assert.assertEquals(attrDef.getId(), "simpleUnpopulated");
Assert.assertFalse(attrDef.isDependencyOnly(), "isDependencyOnly");
@@ -144,7 +144,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
}
@Test public void bad() throws ComponentInitializationException {
- getAttributeDefn("simpleAttributeBadValues.xml", SimpleAttributeDefinition.class);
+ getAttributeDefn("resolver/simpleAttributeBadValues.xml", SimpleAttributeDefinition.class);
}
@Test public void relyingParties() throws ComponentInitializationException {
@@ -162,7 +162,7 @@ public class SimpleAttributeParserTest extends BaseAttributeDefinitionParserTest
placeholderConfig.setPropertySources(propertySources);
context.addBeanFactoryPostProcessor(placeholderConfig);
- AttributeDefinition attr = getAttributeDefn("relyingParties.xml", SimpleAttributeDefinition.class, context);
+ AttributeDefinition attr = getAttributeDefn("resolver/relyingParties.xml", SimpleAttributeDefinition.class, context);
RelyingPartyIdPredicate pre = (RelyingPartyIdPredicate) attr.getActivationCondition();
ProfileRequestContext prc = new ProfileRequestContext<>();
RelyingPartyContext rpContext = prc.getSubcontext(RelyingPartyContext.class, true);
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
index 79a6615..6bcaab3 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
@@ -74,7 +74,7 @@ public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefiniti
@Test public void dupl() throws ComponentInitializationException {
final TemplateAttributeDefinition defn =
- getAttributeDefn("templateTwoTemplate.xml", "velocity2.xml", TemplateAttributeDefinition.class);
+ getAttributeDefn("resolver/templateTwoTemplate.xml", "velocity2.xml", TemplateAttributeDefinition.class);
Assert.assertEquals(defn.getId(), "templateIdAttr");
Assert.assertEquals(defn.getTemplateText(), "TheTemplate");
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
index a398b5f..b6f9659 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
@@ -78,7 +78,7 @@ public class TransientIdAttributeDefinitionParserTest extends BaseAttributeDefin
@Test public void noTime() throws ComponentInitializationException {
- TransientIdAttributeDefinition defn = getDefinition("transientNoTime.xml");
+ TransientIdAttributeDefinition defn = getDefinition("resolver/transientNoTime.xml");
Assert.assertTrue(defn.isInitialized());
StoredTransientIdGenerationStrategy generator =
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
index 45c1b4a..577facd 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/resolver.xml
@@ -1,48 +1,36 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
id="TestID"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <resolver:DataConnector id="staticAttributes"
- xsi:type="dc:Static">
- <dc:Attribute id="eduPersonAffiliation">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- <dc:Attribute id="eduPersonEntitlement">
- <dc:Value>urn:example.org:entitlement:entitlement1</dc:Value>
- <dc:Value>urn:mace:dir:entitlement:common-lib-terms</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
+ <DataConnector id="staticAttributes" xsi:type="Static">
+ <Attribute id="eduPersonAffiliation"><Value>member</Value></Attribute>
+ <Attribute id="eduPersonEntitlement">
+ <Value>urn:example.org:entitlement:entitlement1</Value>
+ <Value>urn:mace:dir:entitlement:common-lib-terms</Value>
+ </Attribute>
+ </DataConnector>
- <resolver:AttributeDefinition id="dn1" xsi:type="ad:Simple" sourceAttributeID="dn1">
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ <AttributeDefinition id="dn1" xsi:type="Simple" sourceAttributeID="dn1">
+ <Dependency ref="staticAttributes"/>
+ <AttributeEncoder xsi:type="SAML2String"
name="urn:mace:dir:attribute-def:displayName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
friendlyName="dn1" />
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ <AttributeEncoder xsi:type="SAML2String"
name="http://macedir.org/entity-category" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
friendlyName="c1" />
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition id="dn2" xsi:type="ad:Simple" sourceAttributeID="dn2">
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
+ <AttributeDefinition id="dn2" xsi:type="Simple" >
+ <InputDataConnector ref="staticAttributes" attributeNames="dn2"/>
+ <AttributeEncoder xsi:type="SAML2String"
name="urn:oid:2.16.840.1.113730.3.1.241" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
friendlyName="dn2" />
- </resolver:AttributeDefinition>
+ </AttributeDefinition>
- <resolver:AttributeDefinition id="eppn" xsi:type="ad:Simple" sourceAttributeID="eppn" >
- <resolver:Dependency ref="staticAttributes"/>
- <resolver:AttributeEncoder xsi:type="enc:SAML2String"
- name="urn:mace:dir:attribute-def:eduPersonPrincipalName" nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
- friendlyName="dn2" />
- </resolver:AttributeDefinition>
+ <AttributeDefinition id="eppn" xsi:type="Simple" >
+ <AttributeEncoder xsi:type="SAML2String" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" friendlyName="dn2"
+ nameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+ <InputDataConnector ref="staticAttributes" allAttributes="true"/>
+ </AttributeDefinition>
-</resolver:AttributeResolver>
+</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml
deleted file mode 100644
index 15d754d..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/cryptoNoTime.xml
+++ /dev/null
@@ -1,13 +0,0 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- id="cryptoTransientId"
- xsi:type="ad:CryptoTransientId"
- dataSealerRef="shibboleth.TransientIDDataSealer"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml
deleted file mode 100644
index e9565f3..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/prescopedWithout.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Prescoped" id="prescopedWith"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml
deleted file mode 100644
index a06bab3..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexInsensitive.xml
+++ /dev/null
@@ -1,17 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexSplitInsensitive"
- regex="at1-(.+)or"
- caseSensitive="0"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml
deleted file mode 100644
index 901d39c..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexNone.xml
+++ /dev/null
@@ -1,17 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexNone"
- regex=" "
- caseSensitive="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
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml
deleted file mode 100644
index 4129736..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/regexSensitive.xml
+++ /dev/null
@@ -1,17 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:RegexSplit" id="regexSplitSensitive"
- regex="at1-(.+)or"
- caseSensitive="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
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/cryptoNoTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/cryptoNoTime.xml
new file mode 100644
index 0000000..bc16008
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/cryptoNoTime.xml
@@ -0,0 +1,7 @@
+ <AttributeDefinition
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ id="cryptoTransientId"
+ xsi:type="CryptoTransientId"
+ dataSealerRef="shibboleth.TransientIDDataSealer"
+ 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/relyingParties.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWithout.xml
similarity index 62%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWithout.xml
index 0c3d879..341f764 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/prescopedWithout.xml
@@ -1,8 +1,8 @@
<AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xsi:type="Simple" id="attry"
- relyingParties="%{prop1} %{prop2} %{prop3}"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="Prescoped" id="prescopedWith"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <InputAttributeDefinition ref="fii"/>
+ <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/relyingParties.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexInsensitive.xml
similarity index 56%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexInsensitive.xml
index 0c3d879..c384ba9 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexInsensitive.xml
@@ -1,8 +1,10 @@
<AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xsi:type="Simple" id="attry"
- relyingParties="%{prop1} %{prop2} %{prop3}"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="RegexSplit" id="regexSplitInsensitive"
+ regex="at1-(.+)or"
+ caseSensitive="0"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <InputAttributeDefinition ref="fii"/>
-</AttributeDefinition>
\ No newline at end of file
+ <InputAttributeDefinition ref="TheOrphan" />
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexNone.xml
similarity index 59%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexNone.xml
index 0c3d879..5bbb593 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexNone.xml
@@ -1,8 +1,10 @@
<AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xsi:type="Simple" id="attry"
- relyingParties="%{prop1} %{prop2} %{prop3}"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="RegexSplit" id="regexNone"
+ regex=" "
+ caseSensitive="1"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <InputAttributeDefinition ref="fii"/>
+ <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/relyingParties.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexSensitive.xml
similarity index 56%
copy from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
copy to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexSensitive.xml
index 0c3d879..c47173c 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/regexSensitive.xml
@@ -1,8 +1,10 @@
<AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mace:shibboleth:2.0:resolver"
- xsi:type="Simple" id="attry"
- relyingParties="%{prop1} %{prop2} %{prop3}"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ dependencyOnly="1"
+ xsi:type="RegexSplit" id="regexSplitSensitive"
+ regex="at1-(.+)or"
+ caseSensitive="1"
xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
- <InputAttributeDefinition ref="fii"/>
+ <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/relyingParties.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/relyingParties.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/relyingParties.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/relyingParties.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml1NameIdDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml1NameIdDefault.xml
new file mode 100644
index 0000000..bdb8c45
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml1NameIdDefault.xml
@@ -0,0 +1,5 @@
+ <AttributeDefinition 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"
+
+ dependencyOnly="1"
+ xsi:type="SAML1NameIdentifier" id="SAML1NameIdentifier"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml2NameIdDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml2NameIdDefault.xml
new file mode 100644
index 0000000..c18976d
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/saml2NameIdDefault.xml
@@ -0,0 +1,3 @@
+ <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="SAML2NameID" id="SAML2NameID" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeAbsent.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeAbsent.xml
new file mode 100644
index 0000000..908cec2
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeAbsent.xml
@@ -0,0 +1,5 @@
+ <AttributeDefinition 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"
+ dependencyOnly="1"
+ language="javascript"
+ xsi:type="ScriptedAttribute" id="scriptedAbsent" />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeBad.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeBad.xml
new file mode 100644
index 0000000..414e0d3
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeBad.xml
@@ -0,0 +1,6 @@
+ <AttributeDefinition 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"
+ dependencyOnly="1"
+ xsi:type="ScriptedAttribute" id="scriptedBad">
+ <Script>fo=</Script>
+</AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeDupl.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDupl.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeDupl.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDupl.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeDuplFile.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDuplFile.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeDuplFile.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/scriptedAttributeDuplFile.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeBadValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeBadValues.xml
new file mode 100644
index 0000000..81b5df5
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeBadValues.xml
@@ -0,0 +1,6 @@
+ <AttributeDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="Simple"
+ dependencyOnly="FALSE" id="bad">
+ <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/simpleAttributeUnpopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeUnpopulated.xml
new file mode 100644
index 0000000..6bf26a3
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/simpleAttributeUnpopulated.xml
@@ -0,0 +1,5 @@
+ <AttributeDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="Simple" id="simpleUnpopulated">
+ <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/subjectDerivedComplex.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedComplex.xml
new file mode 100644
index 0000000..b9d0b95
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedComplex.xml
@@ -0,0 +1,5 @@
+ <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" 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"
+
+ xsi:type="SubjectDerivedAttribute" id="PD1" attributeValuesFunctionRef="princialAttributeValuesFunction"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml
new file mode 100644
index 0000000..ecc5b79
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedDependency.xml
@@ -0,0 +1,9 @@
+ <AttributeDefinition 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"
+ dependencyOnly="1"
+ xsi:type="SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever">
+
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
+ <InputAttributeDefinition ref="32" />
+
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedFail.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedFail.xml
new file mode 100644
index 0000000..7144812
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedFail.xml
@@ -0,0 +1,9 @@
+ <AttributeDefinition 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"
+
+ dependencyOnly="1"
+ xsi:type="SubjectDerivedAttribute" id="PD1" >
+
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
+
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedWarn.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedWarn.xml
new file mode 100644
index 0000000..f315369
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/subjectDerivedWarn.xml
@@ -0,0 +1,8 @@
+ <AttributeDefinition 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"
+ dependencyOnly="1"
+ xsi:type="SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever" attributeValuesFunctionRef="engineBean">
+
+ <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
+
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateNoAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateNoAttributes.xml
new file mode 100644
index 0000000..afed81a
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateNoAttributes.xml
@@ -0,0 +1,8 @@
+<AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+
+ xsi:type="Template"
+ id="templateId">
+ <InputAttributeDefinition ref="TheOrphan"/>
+</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateTwoTemplate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateTwoTemplate.xml
similarity index 83%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateTwoTemplate.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateTwoTemplate.xml
index 72a3634..db8b184 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateTwoTemplate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/templateTwoTemplate.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" >
- <Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan"/>
+ <InputAttributeDefinition ref="TheOrphan"/>
<Template>TheTemplate</Template>
<SourceAttribute>att1</SourceAttribute>
<Template>TheTemplate</Template>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/transientNoTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/transientNoTime.xml
new file mode 100644
index 0000000..77974b4
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/resolver/transientNoTime.xml
@@ -0,0 +1,6 @@
+ <AttributeDefinition
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:mace:shibboleth:2.0:resolver"
+ id="transientId"
+ xsi:type="TransientId"
+ 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/saml1NameIdDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml
deleted file mode 100644
index eb71128..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml1NameIdDefault.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:SAML1NameIdentifier" id="SAML1NameIdentifier"
- 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"
- />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdDefault.xml
deleted file mode 100644
index 208af29..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/saml2NameIdDefault.xml
+++ /dev/null
@@ -1,13 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="ad:SAML2NameID" id="SAML2NameID"
- 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"
- />
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeAbsent.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeAbsent.xml
deleted file mode 100644
index 5f8b2ca..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeAbsent.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- language="javascript"
- xsi:type="ad:Script" id="scriptedAbsent"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd" />
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeBad.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeBad.xml
deleted file mode 100644
index 4213919..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/scriptedAttributeBad.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <AttributeDefinition
- xmlns="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:type="ad:Script" id="scriptedBad"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-<ad:Script>fo=</ad:Script></AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml
deleted file mode 100644
index 078aea5..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeBadValues.xml
+++ /dev/null
@@ -1,14 +0,0 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- dependencyOnly="FALSE" id="bad"
- xsi:type="ad:Simple"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</resolver:AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml
deleted file mode 100644
index bc8b781..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributeUnpopulated.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
-
- xsi:type="ad:Simple" id="simpleUnpopulated"
-
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</resolver:AttributeDefinition>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedComplex.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedComplex.xml
deleted file mode 100644
index 7b0e72c..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedComplex.xml
+++ /dev/null
@@ -1,11 +0,0 @@
- <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- xsi:type="ad:SubjectDerivedAttribute" id="PD1" attributeValuesFunctionRef="princialAttributeValuesFunction"/>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedDependency.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedDependency.xml
deleted file mode 100644
index 9b27193..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedDependency.xml
+++ /dev/null
@@ -1,16 +0,0 @@
- <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- xsi:type="ad:SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever">
-
- <Dependency ref="32"/>
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
-
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedFail.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedFail.xml
deleted file mode 100644
index b34da26..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedFail.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- xsi:type="ad:SubjectDerivedAttribute" id="PD1" >
-
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
-
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedWarn.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedWarn.xml
deleted file mode 100644
index 57202bb..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/subjectDerivedWarn.xml
+++ /dev/null
@@ -1,15 +0,0 @@
- <AttributeDefinition xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- dependencyOnly="1"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
- xsi:type="ad:SubjectDerivedAttribute" id="PD1" principalAttributeName="Whatever" attributeValuesFunctionRef="engineBean">
-
- <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
-
-</AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateNoAttributes.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateNoAttributes.xml
deleted file mode 100644
index a00829d..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/templateNoAttributes.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" id="templateId"
- 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
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <resolver:Dependency xmlns:resolver="urn:mace:shibboleth:2.0:resolver" ref="TheOrphan" />
-</resolver:AttributeDefinition>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientNoTime.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientNoTime.xml
deleted file mode 100644
index 477bb01..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/transientNoTime.xml
+++ /dev/null
@@ -1,12 +0,0 @@
- <resolver:AttributeDefinition
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- id="transientId"
- xsi:type="ad:TransientId"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list