[java-identity-provider] 03/06: IDP-1330 Move Encoder tests to new namespace
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 17 06:06:08 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=5e93096013e58bd17615eace0bce1ac3c316373a
commit 5e93096013e58bd17615eace0bce1ac3c316373a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Sep 13 15:05:26 2018 +0100
IDP-1330 Move Encoder tests to new namespace
https://issues.shibboleth.net/jira/browse/IDP-1330
---
.../attribute/resolver/spring/enc/Regressions.java | 2 +-
.../enc/SAML1Base64AttributeEncoderParserTest.java | 4 +-
...AML1ScopedStringAttributeEncoderParserTest.java | 4 +-
.../enc/SAML1StringAttributeEncoderParserTest.java | 4 +-
...SAML1StringNameIdentifierEncoderParserTest.java | 4 +-
.../SAML1XMLObjectAttributeEncoderParserTest.java | 4 +-
.../enc/SAML2Base64AttributeEncoderParserTest.java | 4 +-
...AML2ScopedStringAttributeEncoderParserTest.java | 4 +-
.../enc/SAML2StringAttributeEncoderParserTest.java | 6 +--
.../enc/SAML2StringNameIDEncoderParserTest.java | 2 +-
.../SAML2XMLObjectAttributeEncoderParserTest.java | 4 +-
.../idp/attribute/resolver/spring/enc/idp-571.xml | 49 ----------------------
.../resolver/spring/enc/resolver/idp-571.xml | 26 ++++++++++++
.../spring/enc/resolver/saml1Base64Default.xml | 4 ++
.../spring/enc/resolver/saml1Base64NoName.xml | 5 +++
.../spring/enc/resolver/saml1ScopedDefault.xml | 5 +++
.../spring/enc/resolver/saml1ScopedNoName.xml | 4 ++
.../spring/enc/resolver/saml1StringDefault.xml | 5 +++
.../saml1StringNameIdentifierConditional.xml | 8 ++++
.../resolver/saml1StringNameIdentifierDefault.xml | 4 ++
.../enc/{ => resolver}/saml1StringNoName.xml | 0
.../enc/{ => resolver}/saml1XmlObjectDefault.xml | 0
.../enc/{ => resolver}/saml1XmlObjectNoName.xml | 0
.../enc/{ => resolver}/saml2Base64Default.xml | 0
.../enc/{ => resolver}/saml2Base64NoName.xml | 0
.../enc/{ => resolver}/saml2ScopedDefault.xml | 0
.../enc/{ => resolver}/saml2ScopedNoName.xml | 0
.../enc/{ => resolver}/saml2StringConditional.xml | 0
.../enc/{ => resolver}/saml2StringDefault.xml | 0
.../{ => resolver}/saml2StringNameIDDefault.xml | 0
.../enc/{ => resolver}/saml2StringNoName.xml | 0
.../enc/{ => resolver}/saml2XmlObjectDefault.xml | 0
.../enc/{ => resolver}/saml2XmlObjectNoName.xml | 0
.../resolver/spring/enc/saml1Base64Default.xml | 14 -------
.../resolver/spring/enc/saml1Base64NoName.xml | 13 ------
.../resolver/spring/enc/saml1ScopedDefault.xml | 14 -------
.../resolver/spring/enc/saml1ScopedNoName.xml | 13 ------
.../resolver/spring/enc/saml1StringDefault.xml | 14 -------
.../enc/saml1StringNameIdentifierConditional.xml | 15 -------
.../enc/saml1StringNameIdentifierDefault.xml | 11 -----
40 files changed, 82 insertions(+), 164 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
index e9c7f04..b55982b 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/Regressions.java
@@ -35,7 +35,7 @@ public class Regressions extends BaseAttributeDefinitionParserTest {
@Test public void idp571() {
GenericApplicationContext context = new GenericApplicationContext();
setTestContext(context);
- loadFile(ENCODER_FILE_PATH + "idp-571.xml", context);
+ loadFile(ENCODER_FILE_PATH + "resolver/idp-571.xml", context);
context.refresh();
Collection<AttributeEncoder> encoders = context.getBeansOfType(AttributeEncoder.class).values();
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
index 3b40086..5541597 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1Base64AttributeEncoderParserTest.java
@@ -50,13 +50,13 @@ public class SAML1Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
@Test public void defaultCase() {
final SAML1ByteAttributeEncoder encoder =
- getAttributeEncoder("saml1Base64Default.xml", SAML1ByteAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1Base64Default.xml", SAML1ByteAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "Base64_ATTRIBUTE");
Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml1Base64NoName.xml", SAML1ByteAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1Base64NoName.xml", SAML1ByteAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
index bd9dc88..1113ab6 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1ScopedStringAttributeEncoderParserTest.java
@@ -56,7 +56,7 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
@Test public void defaultCase() {
final SAML1ScopedStringAttributeEncoder encoder =
- getAttributeEncoder("saml1ScopedDefault.xml", SAML1ScopedStringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1ScopedDefault.xml", SAML1ScopedStringAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "saml1_scoped_name");
Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
@@ -66,6 +66,6 @@ public class SAML1ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml1ScopedNoName.xml", SAML1ScopedStringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1ScopedNoName.xml", SAML1ScopedStringAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
index 925e2d6..e7914a0 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringAttributeEncoderParserTest.java
@@ -50,13 +50,13 @@ public class SAML1StringAttributeEncoderParserTest extends BaseAttributeDefiniti
@Test public void defaultCase() {
final SAML1StringAttributeEncoder encoder =
- getAttributeEncoder("saml1StringDefault.xml", SAML1StringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1StringDefault.xml", SAML1StringAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "ATTRIBUTE");
Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml1StringNoName.xml", SAML1StringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1StringNoName.xml", SAML1StringAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
index ea9436b..979831f 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1StringNameIdentifierEncoderParserTest.java
@@ -52,7 +52,7 @@ public class SAML1StringNameIdentifierEncoderParserTest extends BaseAttributeDef
@Test public void defaultCase() {
final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("saml1StringNameIdentifierDefault.xml", SAML1StringNameIdentifierEncoder.class);
+ getAttributeEncoder("resolver/saml1StringNameIdentifierDefault.xml", SAML1StringNameIdentifierEncoder.class);
Assert.assertEquals(encoder.getNameFormat(), NameIdentifier.UNSPECIFIED);
Assert.assertNull(encoder.getNameQualifier());;
@@ -65,7 +65,7 @@ public class SAML1StringNameIdentifierEncoderParserTest extends BaseAttributeDef
loadFile(ENCODER_FILE_PATH + "predicates.xml", context);
final SAML1StringNameIdentifierEncoder encoder =
- getAttributeEncoder("saml1StringNameIdentifierConditional.xml", SAML1StringNameIdentifierEncoder.class, context);
+ getAttributeEncoder("resolver/saml1StringNameIdentifierConditional.xml", SAML1StringNameIdentifierEncoder.class, context);
Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysFalse());
Assert.assertFalse(encoder.getActivationCondition().apply(null));
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
index 83cd688..9737717 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML1XMLObjectAttributeEncoderParserTest.java
@@ -49,13 +49,13 @@ public class SAML1XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
@Test public void defaultCase() {
final SAML1XMLObjectAttributeEncoder encoder =
- getAttributeEncoder("saml1XmlObjectDefault.xml", SAML1XMLObjectAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1XmlObjectDefault.xml", SAML1XMLObjectAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "XMLObject_ATTRIBUTE");
Assert.assertEquals(encoder.getNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml1XmlObjectNoName.xml", SAML1XMLObjectAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml1XmlObjectNoName.xml", SAML1XMLObjectAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
index 579e8f1..62acb71 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2Base64AttributeEncoderParserTest.java
@@ -51,7 +51,7 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
@Test public void defaultCase() {
final SAML2ByteAttributeEncoder encoder =
- getAttributeEncoder("saml2Base64Default.xml", SAML2ByteAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2Base64Default.xml", SAML2ByteAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "Base64Name");
Assert.assertNull(encoder.getFriendlyName());
@@ -59,6 +59,6 @@ public class SAML2Base64AttributeEncoderParserTest extends BaseAttributeDefiniti
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml2Base64NoName.xml", SAML2ByteAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2Base64NoName.xml", SAML2ByteAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
index 4473d61..74e5721 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2ScopedStringAttributeEncoderParserTest.java
@@ -57,7 +57,7 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
@Test public void defaultCase() {
final SAML2ScopedStringAttributeEncoder encoder =
- getAttributeEncoder("saml2ScopedDefault.xml", SAML2ScopedStringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2ScopedDefault.xml", SAML2ScopedStringAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "name");
Assert.assertNull(encoder.getFriendlyName());
@@ -68,6 +68,6 @@ public class SAML2ScopedStringAttributeEncoderParserTest extends BaseAttributeDe
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml2ScopedNoName.xml", SAML2ScopedStringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2ScopedNoName.xml", SAML2ScopedStringAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
index 11b9893..dcdd2c5 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringAttributeEncoderParserTest.java
@@ -55,7 +55,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
@Test public void defaultCase() {
final SAML2StringAttributeEncoder encoder =
- getAttributeEncoder("saml2StringDefault.xml", SAML2StringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2StringDefault.xml", SAML2StringAttributeEncoder.class);
Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysTrue());
Assert.assertTrue(encoder.getActivationCondition().apply(null));
@@ -65,7 +65,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml2StringNoName.xml", SAML2StringAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2StringNoName.xml", SAML2StringAttributeEncoder.class);
}
@Test public void conditional() {
@@ -75,7 +75,7 @@ public class SAML2StringAttributeEncoderParserTest extends BaseAttributeDefiniti
loadFile(ENCODER_FILE_PATH + "predicates.xml", context);
final SAML2StringAttributeEncoder encoder =
- getAttributeEncoder("saml2StringConditional.xml", SAML2StringAttributeEncoder.class, context);
+ getAttributeEncoder("resolver/saml2StringConditional.xml", SAML2StringAttributeEncoder.class, context);
Assert.assertSame(encoder.getActivationCondition(), Predicates.alwaysFalse());
Assert.assertFalse(encoder.getActivationCondition().apply(null));
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
index 2698325..34fe33c 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2StringNameIDEncoderParserTest.java
@@ -49,7 +49,7 @@ public class SAML2StringNameIDEncoderParserTest extends BaseAttributeDefinitionP
@Test public void defaultCase() {
final SAML2StringNameIDEncoder encoder =
- getAttributeEncoder("saml2StringNameIDDefault.xml", SAML2StringNameIDEncoder.class);
+ getAttributeEncoder("resolver/saml2StringNameIDDefault.xml", SAML2StringNameIDEncoder.class);
Assert.assertEquals(encoder.getNameFormat(), NameID.UNSPECIFIED);
Assert.assertNull(encoder.getNameQualifier());;
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
index f2f2a4b..bc943ac 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/enc/SAML2XMLObjectAttributeEncoderParserTest.java
@@ -51,7 +51,7 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
@Test public void defaultCase() {
final SAML2XMLObjectAttributeEncoder encoder =
- getAttributeEncoder("saml2XmlObjectDefault.xml", SAML2XMLObjectAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2XmlObjectDefault.xml", SAML2XMLObjectAttributeEncoder.class);
Assert.assertEquals(encoder.getName(), "XmlObjectName");
Assert.assertNull(encoder.getFriendlyName());
@@ -59,6 +59,6 @@ public class SAML2XMLObjectAttributeEncoderParserTest extends BaseAttributeDefin
}
@Test(expectedExceptions={BeanDefinitionStoreException.class,}) public void noName() {
- getAttributeEncoder("saml2XmlObjectNoName.xml", SAML2XMLObjectAttributeEncoder.class);
+ getAttributeEncoder("resolver/saml2XmlObjectNoName.xml", SAML2XMLObjectAttributeEncoder.class);
}
}
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml
deleted file mode 100644
index 40d3929..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/idp-571.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<resolver:AttributeResolver xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
- xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc" xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
-
- <resolver:AttributeDefinition id="skillsoftdept" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
- xsi:type="Script"
- sourceAttributeID="uid">
-
- <resolver:Dependency ref="static" />
-
- <resolver:AttributeEncoder xsi:type="SAML2String" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
- name="skillsoftdept"
- friendlyName="dept name for skillsoft"
- nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" />
-
- <Script><![CDATA[
-
- importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
-
- // Create attribute to be returned from definition
- skillsoftdept = new BasicAttribute("skillsoftdept");
-
-
- ]]></Script>
-
- </resolver:AttributeDefinition>
- <resolver:DataConnector id="static"
- xsi:type="dc:Static" xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pc="urn:mace:shibboleth:2.0:resolver:pc"
- xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad" xmlns:dc="urn:mace:shibboleth:2.0:resolver:dc"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:sec="urn:mace:shibboleth:2.0:security"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
- <dc:Attribute id="staticEpA">
- <dc:Value>member</dc:Value>
- </dc:Attribute>
- </resolver:DataConnector>
-</resolver:AttributeResolver>
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
new file mode 100644
index 0000000..563dcbf
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/idp-571.xml
@@ -0,0 +1,26 @@
+<AttributeResolver xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
+
+ <AttributeDefinition id="skillsoftdept" xsi:type="ScriptedAttribute" >
+ <!-- Old Style just for now -->
+ <Dependency ref="static" />
+
+ <AttributeEncoder xsi:type="SAML2String" name="skillsoftdept" friendlyName="dept name for skillsoft" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" />
+
+ <Script><![CDATA[
+
+ importPackage(Packages.edu.internet2.middleware.shibboleth.common.attribute.provider);
+
+ // Create attribute to be returned from definition
+ skillsoftdept = new BasicAttribute("skillsoftdept");
+
+
+ ]]></Script>
+
+ </AttributeDefinition>
+ <DataConnector id="static" xsi:type="Static" >
+ <Attribute id="staticEpA">
+ <Value>member</Value>
+ </Attribute>
+ </DataConnector>
+</AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64Default.xml
new file mode 100644
index 0000000..972e98b
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64Default.xml
@@ -0,0 +1,4 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="SAML1Base64" name="Base64_ATTRIBUTE"/>
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64NoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64NoName.xml
new file mode 100644
index 0000000..fca360f
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1Base64NoName.xml
@@ -0,0 +1,5 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="SAML1Base64"
+/>
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedDefault.xml
new file mode 100644
index 0000000..39f4943
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedDefault.xml
@@ -0,0 +1,5 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="SAML1ScopedString"
+ name="saml1_scoped_name" />
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedNoName.xml
new file mode 100644
index 0000000..09f8146
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1ScopedNoName.xml
@@ -0,0 +1,4 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:type="SAML1ScopedString"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd" />
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringDefault.xml
new file mode 100644
index 0000000..dfae337
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringDefault.xml
@@ -0,0 +1,5 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+ xsi:type="SAML1String"
+ name="ATTRIBUTE"/>
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml
new file mode 100644
index 0000000..17a260b
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierConditional.xml
@@ -0,0 +1,8 @@
+<AttributeEncoder xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+
+ xsi:type="SAML1StringNameIdentifier"
+ nameFormat="NAMEIDENTIFIER_FORMAT"
+ nameQualifier="NAMEIDENTIFIER_QUALIFIER"
+ activationConditionRef="predicate" />
+
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml
new file mode 100644
index 0000000..d6a5af3
--- /dev/null
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNameIdentifierDefault.xml
@@ -0,0 +1,4 @@
+<AttributeEncoder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mace:shibboleth:2.0:resolver"
+ xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd"
+
+ xsi:type="SAML1StringNameIdentifier"/>
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1StringNoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectDefault.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectNoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1XmlObjectNoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml1XmlObjectNoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64Default.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64Default.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64NoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2Base64NoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2Base64NoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedDefault.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedNoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2ScopedNoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2ScopedNoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringConditional.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringConditional.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringDefault.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNameIDDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNameIDDefault.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2StringNoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2StringNoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectDefault.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectDefault.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectNoName.xml
similarity index 100%
rename from idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml2XmlObjectNoName.xml
rename to idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/resolver/saml2XmlObjectNoName.xml
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml
deleted file mode 100644
index 0ba1c4f..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64Default.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="Base64_ATTRIBUTE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml
deleted file mode 100644
index f6e89fb..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1Base64NoName.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1Base64"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml
deleted file mode 100644
index f7dac02..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedDefault.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="saml1_scoped_name"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml
deleted file mode 100644
index 1bbee7c..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1ScopedNoName.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1ScopedString"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
- />
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml
deleted file mode 100644
index 413895a..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringDefault.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1String"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- name="ATTRIBUTE"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierConditional.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierConditional.xml
deleted file mode 100644
index b1cd1c8..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierConditional.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- nameFormat="NAMEIDENTIFIER_FORMAT"
- nameQualifier="NAMEIDENTIFIER_QUALIFIER"
- activationConditionRef="predicate"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
- urn:mace:shibboleth:2.0:resolver:pc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-pc.xsd
- urn:mace:shibboleth:2.0:resolver:ad http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-ad.xsd
- urn:mace:shibboleth:2.0:resolver:dc http://shibboleth.net/schema/idp/shibboleth-attribute-resolver-dc.xsd
- urn:mace:shibboleth:2.0:attribute:encoder http://shibboleth.net/schema/idp/shibboleth-attribute-encoder.xsd
- urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"/>
-
\ No newline at end of file
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml
deleted file mode 100644
index 06b2132..0000000
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/enc/saml1StringNameIdentifierDefault.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resolver:AttributeEncoder
- xsi:type="enc:SAML1StringNameIdentifier"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder"
- xmlns:resolver="urn:mace:shibboleth:2.0:resolver"
- 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